ruby-montage 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19af8eb700ad25dbe263925210cbef5ba33706ce
-  data.tar.gz: b8a16d26ef94490a98a9edf8f84a004baa099f4e
+  metadata.gz: 7ad2f36315b6d08ab4b631d6294d0e16adb48077
+  data.tar.gz: 04447618fc62e0776b7ba47e20574cc441720953
 SHA512:
-  metadata.gz: c581ceddddbb15fbbbd81f48581a82976511117f13f5f255b501d43e0ced7c05e652743db0212a81b7cff5c9f5c3ae3a3efc6371e0f72453a54119c8b83e341a
-  data.tar.gz: d36fb3e6f5f25d9824ee073e67115da38268a5b732a59637525efddfa96c045f5e4311d29fd3755c7bcc1256f41367347ef9b7984f32bd82f43ef6314a04d3d7
+  metadata.gz: e5c8e150825baba19131a674920349f2e3a5baa80ec451a18b529b961776bdcd2c38950023122dc6343909ff6e0d9ecefa4413fd3896326f8b2b21376c764461
+  data.tar.gz: daf00f4f90bd696947774f0aaa8cee3557f76efd9c3f73d548f3787fae8cfb610c208c5ed390ca606c611df1a9c04ac32844ddddfd8c49afcfa8d5dc594bd1e5

data/Rakefile

@@ -4,6 +4,7 @@ require "rake/testtask"
 
 Rake::TestTask.new do |t|
   t.libs << "lib"
+  t.libs << "test"
   t.pattern = "test/**/*_test.rb"
   t.verbose = true
 end

data/lib/montage/operators/gt.rb

@@ -6,7 +6,7 @@ module Montage
       end
 
       def self.montage_operator
-        "__gt"
+        "$gt"
       end
 
       def self.==(value)

data/lib/montage/operators/gte.rb

@@ -6,7 +6,7 @@ module Montage
       end
 
       def self.montage_operator
-        "__gte"
+        "$gte"
       end
 
       def self.==(value)

data/lib/montage/operators/ilike.rb

@@ -6,7 +6,7 @@ module Montage
       end
 
       def self.montage_operator
-        "__icontains"
+        "$icontains"
       end
 
       def self.==(value)

data/lib/montage/operators/in.rb

@@ -6,7 +6,7 @@ module Montage
       end
 
       def self.montage_operator
-        "__in"
+        "$in"
       end
 
       def self.==(value)

data/lib/montage/operators/includes.rb

@@ -6,7 +6,7 @@ module Montage
       end
 
       def self.montage_operator
-        "__includes"
+        "$includes"
       end
 
       def self.==(value)

data/lib/montage/operators/intersects.rb

@@ -6,7 +6,7 @@ module Montage
       end
 
       def self.montage_operator
-        "__intersects"
+        "$intersects"
       end
 
       def self.==(value)

data/lib/montage/operators/like.rb

@@ -6,7 +6,7 @@ module Montage
       end
 
       def self.montage_operator
-        "__contains"
+        "$contains"
       end
 
       def self.==(value)

data/lib/montage/operators/lt.rb

@@ -6,7 +6,7 @@ module Montage
       end
 
       def self.montage_operator
-        "__lt"
+        "$lt"
       end
 
       def self.==(value)

data/lib/montage/operators/lte.rb

@@ -6,7 +6,7 @@ module Montage
       end
 
       def self.montage_operator
-        "__lte"
+        "$lte"
       end
 
       def self.==(value)

data/lib/montage/operators/not.rb

@@ -6,7 +6,7 @@ module Montage
       end
 
       def self.montage_operator
-        "__not"
+        "$not"
       end
 
       def self.==(value)

data/lib/montage/operators/not_in.rb

@@ -6,7 +6,7 @@ module Montage
       end
 
       def self.montage_operator
-        "__notin"
+        "$notin"
       end
 
       def self.==(value)

data/lib/montage/operators.rb

@@ -32,7 +32,7 @@ module Montage
     end
 
     def self.find_operator(query_string)
-      self.classes.find(Proc.new { Montage::Operators::Nil }) { |c| c == query_string }
+      self.classes.find(proc { Montage::Operators::Nil }) { |c| c == query_string }
     end
   end
 end

data/lib/montage/query/query_parser.rb

@@ -55,7 +55,7 @@ module Montage
     # * *Examples* :
     #    @part = "tree_happiness_level > 9"
     #    get_query_operator(@part)
-    #    => [">", "__gt"]
+    #    => [">", "$gt"]
     #
     def get_query_operator(part)
       operator = Montage::Operators.find_operator(part)
@@ -79,7 +79,7 @@ module Montage
     end
 
     # Parse a single portion of the query string.  String values representing
-    # a float or interger are coerced into actual numerical values.  Newline
+    # a float or integer are coerced into actual numerical values.  Newline
     # characters are removed and single quotes are replaced with double quotes
     #
     # * *Args* :
@@ -120,7 +120,7 @@ module Montage
     # * *Examples* :
     #    @part = "tree_happiness_level > 9"
     #    get_parts(@part)
-    #    => ["tree_happiness_level", "__gt", 9]
+    #    => ["tree_happiness_level", "$gt", 9]
     #
     def get_parts(str)
       operator, montage_operator = get_query_operator(str)
@@ -147,8 +147,8 @@ module Montage
     #
     def parse_hash
       query.map do |key, value|
-        new_key = value.is_a?(Array) ? "#{key}__in" : key
-        ["#{new_key}", value]
+        new_value = value.is_a?(Array) ? ["$in", value] : value
+        [key.to_s, new_value]
       end
     end
 
@@ -169,7 +169,7 @@ module Montage
         if operator == ""
           ["#{column_name}", value]
         else
-          ["#{column_name}", ["$#{operator}", value]]
+          ["#{column_name}", ["#{operator}", value]]
         end
       end
     end

data/lib/montage/version.rb

@@ -1,3 +1,3 @@
 module Montage
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-montage
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - dphaener
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler