hash-to-conditions 0.3.3 → 0.3.4

data/lib/helpers/array_helper.rb

@@ -21,7 +21,7 @@ class ArrayHelper
     parts = @array.first.to_s.split('.')
     raise "field_cannot_be_empty" if parts.empty?
 
-    field = parts[0].strip
+    field = parts[0].strip.to_s
     operator = parts[1]
     value = @array.last
 
@@ -34,35 +34,43 @@ class ArrayHelper
       # handle implicit .eq ({'name' => 'value'}) or .like ({'name' => 'value%'})
       operator = value.to_s.index('%') ? 'like' : 'eq'
     end
-    operator = operator.downcase
+    operator = operator.to_s.downcase
     mapped = operator.to_operator
     raise "unknown_operator" unless mapped
 
     # handle .null or .nnull, suppress value
     return  [field + mapped] if operator.index('null')
 
-    # handle .in (?) or .between ? and ?
-    if ['in', 'between'].index(operator)
-      values = value.to_s.split(',').collect { | ea | ea.strip }
-      if 'in' == operator
-        result = [field + mapped, values]
-      else
-        # between
-        result = [field + mapped, values[0], values[1]]
-      end
-      return result
-    end
+    return [field + mapped, value] unless ['in', 'between'].index(operator)
 
-    [field + mapped, value]
+    handle_in_between(operator, field, mapped, value)
   end
 
 
   protected
 
-   # Creates a new instance
-   def initialize(array)
+    # Creates a new instance
+    def initialize(array)
       @array = array
     end
+
+
+  private
+
+    # Handle .in (?) or .between ? and ?
+    # Return an expanded Array condition
+    #
+    def handle_in_between(operator, field, mapped_operator, csv)
+      values = csv.to_s.split(',').collect { | ea | ea.strip }
+      if 'in' == operator
+        result = [field + mapped_operator, values]
+      else
+        # between
+        result = [field + mapped_operator, values[0], values[1]]
+      end
+      result
+    end
+
 end
 
 end

data/lib/helpers/hash_helper.rb

@@ -35,7 +35,7 @@ class HashHelper
     raise "empty_condition" if @hash.empty?
     result_s = ''
     result_a = []
-    join_s = @hash.first.first
+    join_s = @hash.first.first.to_s
     if ['AND', 'OR'].index(join_s.upcase)
       parse(@hash.first.last, join_s.upcase, result_s, result_a)
     else
@@ -56,8 +56,8 @@ class HashHelper
 
       result_s << '('
       count = hash.length
-      hash.each_pair { | pair |
-        arr = pair.to_condition
+      hash.each_pair { | k, v |
+        arr = [k, v].to_condition
         if arr.kind_of?(Hash)
           # handle nested condition
           parse(arr.first.last, arr.first.first, result_s, result_a, 1+nest_lev)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash-to-conditions
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-31 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies: []
 description: The HashToConditions gem provides an easy way to build ActiveRecord Array
   conditions directly from a Hash.
@@ -26,7 +26,8 @@ files:
 - lib/ext/string.rb
 - lib/ext/hash.rb
 homepage: https://rubygems.org/gems/hash-to-conditions
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -45,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Converts a Hash to ActiveRecord Array conditions