ruby-montage 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: decd9cc4e67b76eee7421a652d5e706c3b22d020
-  data.tar.gz: d709bf40de4d8db85a47c32b1f879c69c657f65d
+  metadata.gz: ff94ccc5900983ed4a32427891dfa8ee6101e0b4
+  data.tar.gz: 1abfb57b4be19e851eadb4b2d7fb85df3928ca5c
 SHA512:
-  metadata.gz: db6e762a2f195f7e89121412d57bc580a3da0a12a1067f88ce232693699e9e7396ee40b5196b10302d1499816ea443d7fc64a088ba544cdc3f15971183e6af04
-  data.tar.gz: d745d68b4d24937e52cd7d7e4fc67e9c9a3ad576f42ec70e0b7ec29ab41f2bd001646eee763085fdff1fb3955348efc0b1a5a3c7c5605e6c58adf2960b64a6f7
+  metadata.gz: a5f82b3395d986f92a1cdf2184bebf63baa88a220f0f8359052bdc243b3deabcec553c0486b847a7cd8a8062908838adc0b22832d4413f423b4e3df4e55707b6
+  data.tar.gz: 16f1f2cf70b1fe1ed8b9014e910ef35c51746d11830cc4c29a0481a3571e0b25a6bfa7c38be62c63686b4d435992e498798bd80bd3b29d29710b1cac032c38f8

data/.gitignore

@@ -11,3 +11,4 @@
 .env
 tmp.json
 ruby-montage-*.gem
+/build

data/README.md

@@ -91,6 +91,7 @@ All API actions are available as methods on the client object. The following met
 | not in      | __notin            |
 | like        | __contains         |
 | ilike       | __icontains        |
+| includes    | __includes         |
 
 
 ## The Query Object

data/lib/montage/operators.rb

@@ -9,6 +9,7 @@ require 'montage/operators/ilike'
 require 'montage/operators/like'
 require 'montage/operators/in'
 require 'montage/operators/nil'
+require 'montage/operators/includes'
 
 module Montage
   module Operators
@@ -24,6 +25,7 @@ module Montage
         Montage::Operators::In,
         Montage::Operators::Ilike,
         Montage::Operators::Like,
+        Montage::Operators::Includes
       ]
     end
 

data/lib/montage/operators/in.rb

@@ -10,7 +10,7 @@ module Montage
       end
 
       def self.==(value)
-        value =~ /in/i && !value.downcase.include?("not")
+        value =~ /\bin\b(?=([^']*'[^']*')*[^']*$)/i && !value.downcase.include?("not")
       end
     end
   end

data/lib/montage/operators/includes.rb

@@ -0,0 +1,17 @@
+module Montage
+  module Operators
+    class Includes
+      def self.operator
+        "includes"
+      end
+
+      def self.montage_operator
+        "__includes"
+      end
+
+      def self.==(value)
+        value =~ /\bincludes\b(?=([^']*'[^']*')*[^']*$)/i
+      end
+    end
+  end
+end

data/lib/montage/query_parser.rb

@@ -41,14 +41,18 @@ module Montage
     # Parse a single portion of the query string
     #
     def parse_part(part)
-      if is_i?(part)
-        part.to_i
-      elsif is_f?(part)
-        part.to_f
-      elsif part =~ /\(.*\)/
-        to_array(part)
+      parsed_part = JSON.parse(part) rescue part
+
+      if is_i?(parsed_part)
+        parsed_part.to_i
+      elsif is_f?(parsed_part)
+        parsed_part.to_f
+      elsif parsed_part =~ /\(.*\)/
+        to_array(parsed_part)
+      elsif parsed_part.is_a?(Array)
+        parsed_part
       else
-        part.gsub(/('|')/, "")
+        parsed_part.gsub(/('|')/, "")
       end
     end
 

data/lib/montage/version.rb

@@ -1,3 +1,3 @@
 module Montage
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-montage
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - dphaener
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -205,6 +205,7 @@ files:
 - lib/montage/operators/gte.rb
 - lib/montage/operators/ilike.rb
 - lib/montage/operators/in.rb
+- lib/montage/operators/includes.rb
 - lib/montage/operators/like.rb
 - lib/montage/operators/lt.rb
 - lib/montage/operators/lte.rb