ransack_query 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77ba48428f3a018d79c6ea475d82d3f8b31201c7
-  data.tar.gz: d372b67bebccd07ff7823d376ffb6d4c3dfb611b
+  metadata.gz: ba83db8ce90749467d06d5dd8bc18813b6f8103e
+  data.tar.gz: 04bd58590bd3725568971bec161f328263994f59
 SHA512:
-  metadata.gz: 1c9ec53846f5b04e2db3640932d9d853a19565ccab19be3bd68930e8194d46ac8c0454e3e923a51b974c7ab2fab0b22bdb818dc215d34878c42c1a9ebde08c94
-  data.tar.gz: 9761dfeb707d6d5930e84ffeaefe5c49bf9a5cf1db6c47fb2b5e08b43250f5fe25e4e8703366c2781d569acea41957bf119d3c8f3fab71e0e1ca1d5a1e4ffd6f
+  metadata.gz: ddc574e4fdd3f6bdadcf020ec743aaa5a13d83faed21ba824a61594296c5d8b3fbdb8c9ed82718264fda34b55dac34bd9b7503ecbbc86cf7542b3d3e86b2ec56
+  data.tar.gz: 2ea8de2fc4ba1334ddb7708713226d1d68bb92c4382a86a553bad5288d30e39d60c0738a19f2bf63a13512c55238565c0f7b50c57a01b374b28f8723fc584b44

data/README.md

@@ -26,27 +26,23 @@ Simple Usage:
       grouping.add_condition(Condition.new(attribute: 'first_name', value: 'Bob'))
       grouping.add_condition(Condition.new(attribute: 'last_name', value: 'Smith', predicate: :not_eq))
     end
-and
+and chainable
     
     RansackQuery.build do |grouping|
       grouping.add_condition(Condition.new(attribute: 'first_name', value: 'Bob')).
         add_condition(Condition.new(attribute: 'last_name', value: 'Smith', predicate: :not_eq))
     end
-and
+and with arrays
     
     RansackQuery.build do |grouping|
       conditions = []
       conditions << Condition.new(attribute: 'first_name', value: 'Bob')
-      conditions << Condition.new do |condition|
-        condition.attribute = 'last_name'
-        condition.value = 'Smith'
-        condition.predicate = :not_eq
-      end
+      conditions << Condition.new(attribute: 'last_name', value: 'Smith', predicate: :not_eq)
       grouping.add_conditions(conditions)
     end
-and
+and with blocks
 
-    RansackQuery.build(prefix: 'q') do |grouping|
+    RansackQuery.build do |grouping|
       grouping.add_condition do |condition|
         condition.attribute = 'first_name'
         condition.value = 'Bob'
@@ -60,7 +56,7 @@ and
     end
 
 
-All Produce the following output (with different ids):
+All Produce the following output in json (with different ids):
 
     {
         "g" => {
@@ -101,7 +97,7 @@ All Produce the following output (with different ids):
      
 and passing the following options hash to build
     
-    RansackQuery.build(format: :json, prefix: 'q')
+    RansackQuery.build(prefix: 'q')
     
 will produce the following in json 
 
@@ -229,7 +225,7 @@ Will produce:
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/ransack_query/fork )
+1. Fork it ( https://github.com/frank-west-iii/ransack_query/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/grouping.rb

@@ -42,7 +42,7 @@ class Grouping
 
   def ransackify
     ransack_hash = {
-        'g' => {
+        group_id => {
             @id => {
                 'm' => @combinator.to_s
             }
@@ -55,14 +55,18 @@ class Grouping
 
   private
 
+  def group_id
+    "ransack_group_#{id}"
+  end
+
   def ransackify_conditions(ransack_hash)
     return if conditions.empty?
-    ransack_hash['g'][@id].merge!({'c' => conditions.reduce({}) {|result, condition| result.merge! condition.ransackify}})
+    ransack_hash[group_id][@id].merge!({'c' => conditions.reduce({}) { |result, condition| result.merge! condition.ransackify }})
   end
 
   def ransackify_groupings(ransack_hash)
     return if groupings.empty?
-    groupings.each {|grouping| ransack_hash['g'][@id].merge!(grouping.ransackify)}
+    groupings.each { |grouping| ransack_hash[group_id][@id].merge!(grouping.ransackify) }
   end
 
 end

data/lib/ransack_query/version.rb

@@ -1,3 +1,3 @@
 module RansackQuery
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/lib/ransack_query.rb

@@ -12,8 +12,7 @@ module RansackQuery
     end
     ransack_hash = grouping.ransackify
     ransack_hash = {options[:prefix] => ransack_hash} if options[:prefix]
-    ransack_hash = ransack_hash.to_json if options[:format] == :json
-    ransack_hash
+    ransack_hash.to_json.gsub(/"ransack_group.*?"/, '"g"')
   end
 
   def self.generate_id

data/spec/factories/grouping.rb

@@ -7,7 +7,12 @@ FactoryGirl.define do
     trait :complex do
       combinator :or
       after(:build) do |obj|
-        obj.add_grouping(FactoryGirl.build(:grouping, :with_conditions))
+        grouping = FactoryGirl.build(:grouping, :with_conditions)
+        grouping.id = 2
+        obj.add_grouping(grouping)
+        grouping = FactoryGirl.build(:grouping, :with_conditions)
+        grouping.id = 3
+        obj.add_grouping(grouping)
       end
     end
 

data/spec/factories/hash.rb

@@ -26,10 +26,10 @@ FactoryGirl.define do
     skip_create
     initialize_with {
       {
-          'g' => {
+          'ransack_group_1' => {
               1 => {
                   'm' => 'or',
-                  'g' => {
+                  'ransack_group_2' => {
                       2 => {
                           'm' => 'and',
                           'c' => {
@@ -61,10 +61,44 @@ FactoryGirl.define do
                               }
                           }
                       }
+                  },
+                  'ransack_group_3' => {
+                      3 => {
+                          'm' => 'and',
+                          'c' => {
+                              2 => {
+                                  'a' => {
+                                      '0' => {
+                                          'name' => 'first_name'
+                                      }
+                                  },
+                                  'p' => 'eq',
+                                  'v' => {
+                                      '0' => {
+                                          'value' => 'Bob'
+                                      }
+                                  }
+                              },
+                              3 => {
+                                  'a' => {
+                                      '0' => {
+                                          'name' => 'last_name'
+                                      }
+                                  },
+                                  'p' => 'eq',
+                                  'v' => {
+                                      '0' => {
+                                          'value' => 'Smith'
+                                      }
+                                  }
+                              }
+                          }
+                      }
                   }
               }
           }
-      } }
+      }
+    }
   end
 
 end

data/spec/models/grouping_spec.rb

@@ -39,6 +39,28 @@ describe Grouping do
     subject.groupings.size.should eq 2
   end
 
+  it 'should allow adding groupings without chaining' do
+    subject.add_grouping(Grouping.new)
+    subject.add_grouping(Grouping.new)
+    subject.groupings.size.should eq 2
+  end
+
+  it 'should do stuff' do
+    g = Grouping.new do |grouping|
+      grouping.combinator = :or
+      grouping.add_grouping do |new_grouping|
+        new_grouping.add_condition(Condition.new(attribute: 'ItemNumber', value: 'RC')).
+            add_condition(Condition.new(attribute: 'LocationCode', value: '002'))
+      end
+      grouping.add_grouping do |new_grouping|
+        new_grouping.add_condition(Condition.new(attribute: 'ItemNumber', value: 'RC')).
+            add_condition(Condition.new(attribute: 'LocationCode', value: '001'))
+      end
+    end
+
+    g.groupings.size.should eq 2
+  end
+
   it 'should allow adding conditions en masse' do
     subject.add_conditions(
         [Condition.new(attribute: 'location_code', value: '001', predicate: 'eq'),
@@ -75,7 +97,7 @@ describe Grouping do
     id.should eq grouping.id
   end
 
-  it 'should build a ransack hash' do
+  it 'should build a complex ransack hash' do
     complex.ransackify.should eq FactoryGirl.build(:grouping_hash)
   end
 

data/spec/models/ransack_query_spec.rb

@@ -13,7 +13,7 @@ describe RansackQuery do
     klass.should equal Grouping
   end
 
-  it 'should return a hash' do
+  it 'should return a json string' do
     RansackQuery.build do |grouping|
       grouping.id = 'id1'
       grouping.add_condition do |condition|
@@ -21,18 +21,7 @@ describe RansackQuery do
         condition.attribute = 'attribute'
         condition.value = 'value'
       end
-    end.should eq({'g' => {'id1' => {'m' => 'and', 'c' => {'id2' => {'a' => {'0' => {'name' => 'attribute'}}, 'p' => 'eq', 'v' => {'0' => {'value' => 'value'}}}}}}})
-  end
-
-  it 'should return a json string if specified' do
-    RansackQuery.build(format: :json) do |grouping|
-      grouping.id = 'id1'
-      grouping.add_condition do |condition|
-        condition.id = 'id2'
-        condition.attribute = 'attribute'
-        condition.value = 'value'
-      end
-    end.should eq "{\"g\":{\"id1\":{\"m\":\"and\",\"c\":{\"id2\":{\"a\":{\"0\":{\"name\":\"attribute\"}},\"p\":\"eq\",\"v\":{\"0\":{\"value\":\"value\"}}}}}}}"
+    end.should eq("{\"g\":{\"id1\":{\"m\":\"and\",\"c\":{\"id2\":{\"a\":{\"0\":{\"name\":\"attribute\"}},\"p\":\"eq\",\"v\":{\"0\":{\"value\":\"value\"}}}}}}}" )
   end
 
   it 'should allow a prefix to be passed in' do
@@ -43,7 +32,7 @@ describe RansackQuery do
         condition.attribute = 'attribute'
         condition.value = 'value'
       end
-    end.should eq({'q' => {'g' => {'id1' => {'m' => 'and', 'c' => {'id2' => {'a' => {'0' => {'name' => 'attribute'}}, 'p' => 'eq', 'v' => {'0' => {'value' => 'value'}}}}}}}})
+    end.should eq("{\"q\":{\"g\":{\"id1\":{\"m\":\"and\",\"c\":{\"id2\":{\"a\":{\"0\":{\"name\":\"attribute\"}},\"p\":\"eq\",\"v\":{\"0\":{\"value\":\"value\"}}}}}}}}")
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack_query
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Frank West