groovy 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1019bd31fda4785bec67322dfb8aeddfab4d0fa12143b23a8dd75f4a3c84515e
-  data.tar.gz: 44ab6a5fd87d136bc3b6915ab323fac95b6a8012f5cdc4ea2fb6498d5236cb3a
+  metadata.gz: b64b5151ebc9ad89b92fac064613d778e067449e11eb0c87cbf8ce40ca5e2630
+  data.tar.gz: 3e95ca4bac3946bcf79805c174216be0cb2870c06e47369056054bfb4d61a637
 SHA512:
-  metadata.gz: 2ae8f4bcfb8d6166fa4ad8814521c498a44f3e512de23c4cb986d7ce7cd4ef98722a889c3a8e69e1f55bdfc9651f19a9b03e9d31bcb2f87552c73c194fc8f099
-  data.tar.gz: 4a29d7007af10d67f4265ef9e431fa347ebc979745c87037fbf8957e2441fc012904cf5385d8aad8d1da6708e91ffae6b407acecf6e3c8e19f2f0bc787d90639
+  metadata.gz: 3320e1c8e3d31b9d48c2fbf409f2688b3be16734eebd631b9ee44f9509934968079b9ed1ab14a02422a559865e2619da1954640feed825bc17b8865ab96ac4d1
+  data.tar.gz: 1d1ebb476d22fa504a2b1f7ef7585f298fb5fbc84dbdc22cb34997c1a8e57032622e0c12867aab730bf75f08293d7f093a49059efb68d11c150be5684e4c9c34

data/example/basic.rb

@@ -9,6 +9,7 @@ class Product
   schema do |t|
     t.string :name
     t.integer :price
+    t.boolean :published
     t.timestamps
   end
 
@@ -19,11 +20,11 @@ end
 def populate
   5_000.times do |i|
     puts "Creating product #{i}" if i % 1000 == 0
-    Product.create!(name: "A product with index #{i}", price: 10000 + i % 10)
+    Product.create!(name: "A product with index #{i}", published: true, price: 10000 + i % 10)
   end
 end
 
-populate if Product.count == 0 
+populate if Product.count == 0
 
 # 50_000 products: 50M
 # 100_000 products: 50M

data/example/relations.rb

@@ -34,6 +34,7 @@ class Place
     t.reference :categories, "Categories", type: :vector
     t.string :name
     t.string :description, index: true
+    t.boolean :visible
     t.timestamps
   end
 

data/lib/groovy/model.rb

@@ -404,12 +404,11 @@ module Groovy
     private
 
     def get_record_attribute(key)
-      if val = record[key]
-        if self.class.schema.time_column?(key)
-          fix_time_value(val)
-        else
-          val
-        end
+      val = record[key]
+      if self.class.schema.time_column?(key)
+        fix_time_value(val)
+      else
+        val
       end
     end
 

data/lib/groovy/query.rb

@@ -85,7 +85,7 @@ module Groovy
               add_param(AND + str)
 
             else
-              str = val.nil? || val == false || val.to_s.strip == '' ? '\\' : escape_val(val)
+              str = val.nil? || val === false || val.to_s.strip == '' ? "\"\"" : escape_val(val)
               add_param(AND + [key, str].join(':'))
             end
           end
@@ -119,7 +119,7 @@ module Groovy
               add_param(AND + str)
 
             else
-              str = val.nil? || val == false || val.to_s.strip == '' ? '\\' : escape_val(val)
+              str = val.nil? || val === false || val.to_s.strip == '' ? "\"\"" : escape_val(val)
               add_param(AND + [key, str].join(':!')) # not
             end
           end
@@ -232,12 +232,8 @@ module Groovy
     attr_reader :model, :table, :options
 
     def add_param(param)
-      if parameters.include?(param)
-        raise "Duplicate param: #{param}"
-      end
-
-      # if param matches blank/nil, put at the end of the stack
-      param[/:\!?\\/] ? parameters.push(param) : parameters.unshift(param)
+      raise "Duplicate param: #{param}" if parameters.include?(param)
+      parameters.push(param)
     end
 
     def results

data/lib/groovy/version.rb

@@ -1,3 +1,3 @@
 module Groovy
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.1'.freeze
 end

data/spec/query_spec.rb

@@ -40,6 +40,13 @@ describe Groovy::Query do
         res = TestProduct.where(tag_list: nil)
         expect(res.map(&:id)).to eq([@p3.id, @p5.id])
       end
+      it 'works with other nil values too' do
+        res = TestProduct.where(visible: nil).where(tag_list: nil)
+        expect(res.map(&:id)).to eq([])
+
+        res = TestProduct.where(tag_list: nil).where(name: nil)
+        expect(res.map(&:id)).to eq([])
+      end
       it 'works with other args too' do
         res = TestProduct.where(name: 'Product 5').where(tag_list: nil)
         expect(res.map(&:id)).to eq([@p5.id])
@@ -187,6 +194,13 @@ describe Groovy::Query do
         res = TestProduct.where.not(tag_list: nil)
         expect(res.map(&:id)).to eq([@p1.id, @p2.id, @p4.id])
       end
+      it 'works with other nil values too' do
+        res = TestProduct.where.not(visible: nil).where(tag_list: nil)
+        expect(res.map(&:id)).to eq([@p3.id, @p5.id])
+
+        res = TestProduct.where.not(tag_list: nil).where(name: nil)
+        expect(res.map(&:id)).to eq([])
+      end
       it 'works with other args too' do
         res = TestProduct.where.not(name: 'Product 2').where.not(tag_list: nil)
         expect(res.map(&:id)).to eq([@p1.id, @p4.id])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groovy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-09 00:00:00.000000000 Z
+date: 2020-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga