groovy 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59f58f216c8fc9465c4eb8569145b401f55e71682e6c5361addb623eb3ad36aa
-  data.tar.gz: bdacfc59885d00a8f6457ebc707c653fd63a8251ed09ddcb133eed50f6a4d8df
+  metadata.gz: 51ebfa4af97ba85e2b162fdf64eeec5f0eda2a3829a12759e6d8fb01420b2c6a
+  data.tar.gz: 2b814b93565a791d87fb9cb77121d211c18d709c862b02c9c2c14feed54d8e2d
 SHA512:
-  metadata.gz: 7890d931e4ce3c20b6fb7c25772c7a3c078022640090fe18a2b2c5215a4e819951ee97ceb1485df5cdad5e148c7670f6de6e4f84e69f329db41a01f12b3e67ee
-  data.tar.gz: 823259a7565bad47388f1fedade8a0e2c0aa277f15d55fc1921f003c333d9be76fb01d98001dc002316941b3364ca9ca9bd92a199a95fd7221efaca8a28cfb8e
+  metadata.gz: bbdcd0ef05d17dc23cfd6a1ee1886bb4b827397ff2385cf62e16edb66eaf0a68041774572797c11333774d3fa902c617c334de47044e88221c71f2c9d414e930
+  data.tar.gz: b12cae355c2a12aa9e46d181ca05d94c9002cc90e0adbdec5b7194ab4ada0d65ce072cde9a777c119644079c9eedb3723f0754375d36d143fa23347ab0937085

data/lib/groovy/model.rb

@@ -24,7 +24,7 @@ module Groovy
       Kernel.const_get(table_name.sub(/ies$/, 'y').sub(/s$/, ''))
     end
 
-    def self.included(base)  
+    def self.included(base)
       base.extend(ClassMethods)
       base.include(Forwardable)
       base.table_name = base.name.sub(/y$/, 'ie') + 's'
@@ -81,7 +81,7 @@ module Groovy
 
       def find_records(&block)
         records = table.select(&block)
-        records.map do|r| 
+        records.map do |r|
           find_and_init_record(r.attributes['_key']['_id'])
         end
       end
@@ -103,7 +103,8 @@ module Groovy
       end
 
       def delete_all
-        all.each { |child| child.delete }.count
+        all.find_each { |child| child.delete }
+        # table.delete { |record| record.id > -1 }
         # schema.rebuild!
       end
 
@@ -144,7 +145,7 @@ module Groovy
       end
 
       def query
-		query_class.new(self, table)
+        query_class.new(self, table)
       end
 
       def scope(name, obj)
@@ -159,7 +160,7 @@ module Groovy
           query.public_send(scope_method, *args, &block)
         end
       end
-      
+
       # this seems to be the same as: `table[id]`
       # def search(key, options = nil)
       #   raise "Not supported!" unless table.respond_to?(:search)
@@ -231,17 +232,17 @@ module Groovy
 
       if set_record(record)
         # TODO: lazy load this
-        # self.class.schema.singular_references.each do |col| 
+        # self.class.schema.singular_references.each do |col|
         #   set_ref(col, record.public_send(col))
         # end
       end
 
       attrs ||= {}
       unless attrs.is_a?(Hash)
-        raise ArgumentError.new("Attributes should be a hash") 
+        raise ArgumentError.new("Attributes should be a hash")
       end
 
-      # don't call set_attributes since we don't want to call 
+      # don't call set_attributes since we don't want to call
       # setters, that might be overriden with custom logic.
       # attrs.each { |k,v| self[k] = v }
       set_attributes(attrs)
@@ -261,7 +262,7 @@ module Groovy
       return set_ref(key, val) if val.respond_to?(:record) || val.is_a?(Groonga::Record)
 
       unless self.class.attribute_names.include?(key.to_sym)
-        raise "Invalid attribute: #{key}" 
+        raise "Invalid attribute: #{key}"
       end
 
       set_attribute(key, val)
@@ -312,6 +313,7 @@ module Groovy
     end
 
     def reload
+      raise RecordNotPersisted if id.nil?
       ensure_persisted!
       record = self.class.table[id] # _key
       # TODO: fix duplication
@@ -345,7 +347,7 @@ module Groovy
     end
 
     def set_ref(name, obj)
-      unless obj.nil? || obj.respond_to?(:record) 
+      unless obj.nil? || obj.respond_to?(:record)
         obj = Model.initialize_from_record(obj)
       end
 

data/lib/groovy/query.rb

@@ -47,9 +47,11 @@ module Groovy
     end
 
     def find_each(&block)
+      count = 0
       in_batches(of: 10) do |group|
-        group.each { |item| yield(item) }
+        group.each { |item| count += 1; yield(item) }
       end
+      count
     end
 
     # http://groonga.org/docs/reference/grn_expr/query_syntax.html
@@ -74,7 +76,7 @@ module Groovy
               add_param(AND + str)
 
             else
-              str = val.nil? || val.to_s.strip == '' ? '\\' : val.to_s
+              str = val.nil? || val == false || val.to_s.strip == '' ? '\\' : val.to_s
               add_param(AND + [key, str].join(':'))
             end
           end
@@ -108,7 +110,7 @@ module Groovy
               add_param(AND + str)
 
             else
-              str = val.nil? || val.to_s.strip == '' ? '\\' : val.to_s
+              str = val.nil? || val == false || val.to_s.strip == '' ? '\\' : val.to_s
               add_param(AND + [key, str].join(':!')) # not
             end
           end

data/lib/groovy/version.rb

@@ -1,3 +1,3 @@
 module Groovy
-  VERSION = '0.2.8'.freeze
+  VERSION = '0.2.9'.freeze
 end

data/spec/model_spec.rb

@@ -58,6 +58,23 @@ describe Groovy::Model do
   end
 
   describe '.delete_all' do
+
+    before do
+      @first  = TestProduct.create!(name: 'A product', price: 100)
+      @second = TestProduct.create!(name: 'Another product', price: 200)
+      expect(TestProduct.count).to eq(2)
+    end
+
+    it 'deletes all' do
+      TestProduct.delete_all
+      expect(TestProduct.count).to eq(0)
+
+      # expect { @first.reload }.to raise_error
+      # expect { @second.reload }.to raise_error
+      # expect { TestProduct.find(@first.id) }.to raise_error
+      # expect { TestProduct.find(@second.id) }.to raise_error
+    end
+
   end
 
   describe '#[]' do

data/spec/query_spec.rb

@@ -17,6 +17,24 @@ describe Groovy::Query do
   end
 
   describe '#where' do
+    describe 'boolean value' do
+      it 'finds expected records' do
+        res = TestProduct.where(visible: true)
+        expect(res.map(&:id)).to eq([@p1.id, @p3.id, @p5.id])
+
+        res = TestProduct.where(visible: false)
+        expect(res.map(&:id)).to eq([@p2.id, @p4.id])
+      end
+
+      it 'works with other args too' do
+        res = TestProduct.where(visible: true).where(name: 'Product 5')
+        expect(res.map(&:id)).to eq([@p5.id])
+
+        res = TestProduct.where(visible: false).where(name: 'Product 2')
+        expect(res.map(&:id)).to eq([@p2.id])
+      end
+    end
+
     describe 'nil value' do
       it 'finds expected records' do
         res = TestProduct.where(tag_list: nil)
@@ -141,6 +159,24 @@ describe Groovy::Query do
   end
 
   describe '#not' do
+    describe 'boolean value' do
+      it 'finds expected records' do
+        res = TestProduct.where.not(visible: true)
+        expect(res.map(&:id)).to eq([@p2.id, @p4.id])
+
+        res = TestProduct.where.not(visible: false)
+        expect(res.map(&:id)).to eq([@p1.id, @p3.id, @p5.id])
+      end
+
+      it 'works with other args too' do
+        res = TestProduct.where.not(visible: true).where(name: 'Product 2')
+        expect(res.map(&:id)).to eq([@p2.id])
+
+        res = TestProduct.where.not(visible: false).where(name: 'Product 5')
+        expect(res.map(&:id)).to eq([@p5.id])
+      end
+    end
+
     describe 'nil value' do
       it 'finds expected records' do
         res = TestProduct.where.not(tag_list: nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groovy
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-16 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga