itrigga-param_fu 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/trigga/param_fu/param_fu.rb

@@ -34,14 +34,14 @@ module Trigga
       end
       
       def id_or_name_condition(table, val)
-        condition = {:where => [], :values=>[]}
+        condition = {:where => nil, :values=>nil}
         unless val.to_s.empty?
           unless val.match(/[^0-9]/)
-            condition[:where] << "#{table}.id = ?"
-            condition[:values] << val.to_i
+            condition[:where] = "#{table}.id = ?"
+            condition[:values] = val.to_i
           else
-            condition[:where] << "#{table}.name LIKE ?"
-            condition[:values] << "#{'%' + val.gsub(/\(\d+\)/,"")  + '%'}"
+            condition[:where] = "#{table}.name LIKE ?"
+            condition[:values] = "#{'%' + val.gsub(/\(\d+\)/,"")  + '%'}"
           end
         end
         condition

data/spec/param_fu_spec.rb

@@ -117,21 +117,21 @@ describe ::Trigga::ParamFu do
 
       context "when given a string value" do
         it "should include '(table).name like ?' in the where clause" do
-          Tester.id_or_name_condition('mymodel', 'string_value')[:where][0].should =~ /mymodel\.name\s*like\s*\?/i
+          Tester.id_or_name_condition('mymodel', 'string_value')[:where].should =~ /mymodel\.name\s*like\s*\?/i
         end
 
         it "should include the given value in values, wrapped in wildcard markers" do
-          Tester.id_or_name_condition('mymodel', 'string_value')[:values][0].should == '%string_value%'
+          Tester.id_or_name_condition('mymodel', 'string_value')[:values].should == '%string_value%'
         end
       end
       context "when given an integer value" do
         
         it "should include '(table).id == ?' in the where clause" do
-          Tester.id_or_name_condition('mymodel', '2')[:where][0].should =~ /mymodel\.id\s*=\s*\?/i
+          Tester.id_or_name_condition('mymodel', '2')[:where].should =~ /mymodel\.id\s*=\s*\?/i
         end
 
         it "should include the given value in values, as an integer" do
-          Tester.id_or_name_condition('mymodel', '2')[:values][0].should == 2
+          Tester.id_or_name_condition('mymodel', '2')[:values].should == 2
         end
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: itrigga-param_fu
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Al Davidson