Fix handling of database queries

ychatz · ychatz · commit 045a5f912714 · 2012-04-15T23:07:16.000+03:00
SQLite `Select` queries return an Array for each column, not a Hash.
diff --git a/lib/database.rb b/lib/database.rb
@@ -24,7 +24,7 @@ def load(table)
 
       {}.tap do |result|
         rows.each do |row|
-          result[row["key"].to_sym] = row["value"]
+          result[row[0].to_sym] = row[1]
         end
       end
     end
diff --git a/lib/preferences.rb b/lib/preferences.rb
@@ -11,6 +11,11 @@ def initialize
     end
 
     def method_missing(meth, *args, &blk)
+      if meth == :[] || meth == :[]=
+        #convert hash key to symbol
+        args[0] = args[0].to_sym
+      end
+
       @target.send(meth, *args, &blk)
     end
 
diff --git a/spec/lib/database_spec.rb b/spec/lib/database_spec.rb
@@ -11,9 +11,9 @@
 
   context ".load" do
     it "returns a proper hash" do
-      db = HH::Database.new(double(:execute => [{"key" => "key", "value" => "value"}]))
+      db = HH::Database.new(double(:execute => [ ["key1", "value1"], ["key2", "value2"] ]))
 
-      db.load("names").should  eql({:key => "value"})
+      db.load("names").should  eql({:key1 => "value1", :key2 => "value2"})
     end
   end
 end
