duck_chain 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd46928c5d5d1ee398d1fb04aef1f57616e88c07
-  data.tar.gz: 4f35627f52ea073c32832bd361ad4b7ba6271dbc
+  metadata.gz: 27f1bbe0a02c0a8cf4b2e8259aefc4dfc7eab511
+  data.tar.gz: 384b5cad977fa280087b717782d4f69d8765c6ea
 SHA512:
-  metadata.gz: 96f7b2408a2ea2dc44906dea7ef82f904eeaf16ac64bb7b4f1f22f8f95cb0d9c18c47693929966f35fe25ea5dd774f64dda2557d5aba4713ba18606bf6f249e3
-  data.tar.gz: 16183a35f800aa5539a0606b9ac990f934795175123843158637fa8d70896e6d20441661e7d58be3be5de28937349c8566087e8ff624265c95c207e891a99fad
+  metadata.gz: 2018bc688697f81a82dee75e2fdfa7a142ced7bc9f461baebb7b636703ec2327b16d03af5e4a0a9dc3344a6d4b1e0e94fdf1214805cdc27d155d31f272b9d282
+  data.tar.gz: 420db6290a3d620da329d9424f1016dba8fc91a39ea0d4da0a46d123ce9acf08772d0cb6727fc84c507e01793687f555337b2416cea2356562cf3dcb8f156bb3

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+Version 1.1.2
+* Table names added to query conditions (ambisoft)
+
 Version 1.1.1
 * Use string litterals in column names for the conditions (ambisoft)
 

data/lib/duck_chain/toolset.rb

@@ -5,6 +5,10 @@ module DuckChain
     def self.set_as_array(value)
       value.is_a?(Array) ? value : [value]
     end
+    
+    def self.col_full_name(quoted_table_name, m)      
+      "#{quoted_table_name}.#{m}"
+    end
 
     # Creates 'eq' class methods for the model
     # Ex:: Post.title_eq("Why do my feet smell?")
@@ -25,9 +29,9 @@ module DuckChain
         ['eq','equals','is','in'].each do |suffix|
           self.class.send(:define_method, "#{m}_#{suffix}", Proc.new{ |search_term| 
               if search_term.is_a?(Array) || search_term.is_a?(Range)
-                where(["#{m} IN (?)", search_term])               
+                where(["#{Toolset.col_full_name(quoted_table_name, m)} IN (?)", search_term])               
               else
-                where(["#{m} = ?", search_term])
+                where(["#{Toolset.col_full_name(quoted_table_name, m)} = ?", search_term])
               end
             } 
           )
@@ -36,9 +40,9 @@ module DuckChain
         ['neq','not_equal','is_not','does_not_equal','not_in'].each do |suffix|
           self.class.send(:define_method, "#{m}_#{suffix}", Proc.new{ |search_term| 
               if search_term.is_a?(Array) || search_term.is_a?(Range)
-                where(["#{m} NOT IN (?)", search_term])               
+                where(["#{Toolset.col_full_name(quoted_table_name, m)} NOT IN (?)", search_term])               
               else
-                where(["#{m} != ?", search_term])
+                where(["#{Toolset.col_full_name(quoted_table_name, m)} != ?", search_term])
               end
             } 
           )
@@ -57,13 +61,13 @@ module DuckChain
     # * not_end_with
     def self.create_like_methods(model_attributes)
       Toolset.set_as_array(model_attributes).each do |m|
-        self.class.send(:define_method, "#{m}_like", Proc.new{ |search_term| where(["#{m} LIKE (?)", "%#{search_term}%"])} )
-        self.class.send(:define_method, "#{m}_begins_with", Proc.new{ |search_term| where(["#{m} LIKE (?)", "#{search_term}%"])} )
-        self.class.send(:define_method, "#{m}_ends_with", Proc.new{ |search_term| where(["#{m} LIKE (?)", "%#{search_term}"])} )
+        self.class.send(:define_method, "#{m}_like", Proc.new{ |search_term| where(["#{Toolset.col_full_name(quoted_table_name, m)} LIKE (?)", "%#{search_term}%"])} )
+        self.class.send(:define_method, "#{m}_begins_with", Proc.new{ |search_term| where(["#{Toolset.col_full_name(quoted_table_name, m)} LIKE (?)", "#{search_term}%"])} )
+        self.class.send(:define_method, "#{m}_ends_with", Proc.new{ |search_term| where(["#{Toolset.col_full_name(quoted_table_name, m)} LIKE (?)", "%#{search_term}"])} )
 
-        self.class.send(:define_method, "#{m}_not_like", Proc.new{ |search_term| where(["#{m} NOT LIKE (?)", "%#{search_term}%"])} )
-        self.class.send(:define_method, "#{m}_not_begin_with", Proc.new{ |search_term| where(["#{m} NOT LIKE (?)", "#{search_term}%"])} )
-        self.class.send(:define_method, "#{m}_not_end_with", Proc.new{ |search_term| where(["#{m} NOT LIKE (?)", "%#{search_term}"])} )
+        self.class.send(:define_method, "#{m}_not_like", Proc.new{ |search_term| where(["#{Toolset.col_full_name(quoted_table_name, m)} NOT LIKE (?)", "%#{search_term}%"])} )
+        self.class.send(:define_method, "#{m}_not_begin_with", Proc.new{ |search_term| where(["#{Toolset.col_full_name(quoted_table_name, m)} NOT LIKE (?)", "#{search_term}%"])} )
+        self.class.send(:define_method, "#{m}_not_end_with", Proc.new{ |search_term| where(["#{Toolset.col_full_name(quoted_table_name, m)} NOT LIKE (?)", "%#{search_term}"])} )
       end
     end
 
@@ -81,16 +85,16 @@ module DuckChain
     def self.create_range_methods(model_attributes)
       Toolset.set_as_array(model_attributes).each do |m|
         ['gt','greater_than'].each do |suffix|
-          self.class.send(:define_method, "#{m}_#{suffix}", Proc.new{ |search_term| where(["#{m} > ?", search_term])} )
+          self.class.send(:define_method, "#{m}_#{suffix}", Proc.new{ |search_term| where(["#{Toolset.col_full_name(quoted_table_name, m)} > ?", search_term])} )
         end
         ['gte','greater_than_or_equal_to'].each do |suffix|
-          self.class.send(:define_method, "#{m}_#{suffix}", Proc.new{ |search_term| where(["#{m} >= ?", search_term])} )
+          self.class.send(:define_method, "#{m}_#{suffix}", Proc.new{ |search_term| where(["#{Toolset.col_full_name(quoted_table_name, m)} >= ?", search_term])} )
         end
         ['lt','less_than'].each do |suffix|
-          self.class.send(:define_method, "#{m}_#{suffix}", Proc.new{ |search_term| where(["#{m} < ?", search_term])} )
+          self.class.send(:define_method, "#{m}_#{suffix}", Proc.new{ |search_term| where(["#{Toolset.col_full_name(quoted_table_name, m)} < ?", search_term])} )
         end
         ['lte','less_than_or_equal_to'].each do |suffix|
-          self.class.send(:define_method, "#{m}_#{suffix}", Proc.new{ |search_term| where(["#{m} <= ?", search_term])} )
+          self.class.send(:define_method, "#{m}_#{suffix}", Proc.new{ |search_term| where(["#{Toolset.col_full_name(quoted_table_name, m)} <= ?", search_term])} )
         end
       end
     end

data/lib/duck_chain/version.rb

@@ -1,3 +1,3 @@
 module DuckChain
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duck_chain
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Tony Drake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord