query_string_interface 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b64e1159126382c94d4807220de37a8955d91a67
-  data.tar.gz: 4b31661e75bf0d529f20309bc9891dbb81ae56e9
+  metadata.gz: 495587c8e1031bc3d990a6805a15ae017557cebe
+  data.tar.gz: 527a145f1ef759b3cd749db88def744ed4a258b3
 SHA512:
-  metadata.gz: 208fdf3418d15633d1edf83ba43ba7abf84ce24702436619979274417086c39fda1c8fdc08b7608e59db818f8fba05bc4d146ba6c16bb69eca3d787edb848a4c
-  data.tar.gz: a11fecde00b9addab369cc7cb33f7df37095b6a884cbafaa0a485202284d3c01a52533f05b3063b47f4caa1bb1012638fad28bd7691739b8d8906900a74cee12
+  metadata.gz: 2fe4d51f6ac48b8b5a55b2bdc2d6dade987cb9e9d48e385c0871ec4be181463e834a42b4f47ce65ef95c2c99a64dd464748d94e8d1173c28ea576e9e938b2c33
+  data.tar.gz: 6624b1761fd0e101440c49c7477bc51a0c0c2deecc6680a81037f69ecd8b40e602684ff1dc8183ebbc899d804c5049adda524f9600406dc79cae3719aca68b98

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    query_string_interface (0.6.2)
+    query_string_interface (0.6.3)
       activesupport (>= 3.0.0)
 
 GEM

data/lib/query_string_interface/error.rb

@@ -1,4 +1,7 @@
 module QueryStringInterface
   class DateTimeParseError < ArgumentError
   end
-end
+
+  class MixedArgumentError < ArgumentError
+  end
+end

data/lib/query_string_interface/filter.rb

@@ -38,6 +38,10 @@ module QueryStringInterface
       raw_attribute == 'or'
     end
 
+    def or_value
+      @or_value ||= JSON.parse(raw_value) if or_attribute?
+    end
+
     def include?(other_filter)
       if or_attribute?
         json_value.any? do |filters|
@@ -63,8 +67,10 @@ module QueryStringInterface
           result[filter_operation] = filter_value
           result
         end
-      else
+      elsif !operator.nil? && !other_filter.operator.nil?
         @value = value.merge(other_filter.value)
+      else
+        raise MixedArgumentError, "arguments `#{raw_attribute}` and `#{other_filter.raw_attribute}` could not be mixed"
       end
     end
 

data/lib/query_string_interface/filter_collection.rb

@@ -53,7 +53,7 @@ module QueryStringInterface
       def optimized_filter_parsers
         if or_filter_parser
           if or_filter_parser.value.is_a?(Array) && or_filter_parser.value.count == 1
-            or_inner_filters = or_filter_parser.value.first.with_indifferent_access.map do |raw_attribute, raw_value|
+            or_inner_filters = or_filter_parser.or_value.first.with_indifferent_access.map do |raw_attribute, raw_value|
               Filter.new(raw_attribute, raw_value, @attributes_to_replace, @raw_filters)
             end
             filter_parsers.delete(or_filter_parser)

data/lib/query_string_interface/version.rb

@@ -1,3 +1,3 @@
 module QueryStringInterface
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query_string_interface
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Vicente Mundim
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport