groovy 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12ec33808ce635a4cc1d18432daab18f075fdd6112d41be94c4b3d81039cfb9
-  data.tar.gz: 72fc2666d2c87469399e7c3297fa69a613e194f95ba22a51f1f4306a7123b36d
+  metadata.gz: c90b7fef2c3e9e61d8a3d4a0330edfb035705efd801c5dda53684703ec9cf322
+  data.tar.gz: ac5b9735a4e1340776249bb5d9f6c47b72878dec064441586fafbf9d13cf0577
 SHA512:
-  metadata.gz: 31599509b743b69e7b0da3f1348da0bbd029b81003685bddc3ce6b95100e8c11f7ad2524ba7b3600925cbd50b5468bae09eba0126d5e8b0072dc032e990be9f4
-  data.tar.gz: 0f73afaab9eb391731d864aaace675755c713ef32bfa2c045bc1760d5eda25cd67d3f2b395562d31a5bbf7affff0e50ec9c5d923a8f222516a21dec4dfef34f6
+  metadata.gz: 89a6be0023c93158048596aa6a8a5d34fad6b69fbe407a468a0426797907c2bd8e2cd6b1eeec1eb9d0bc53c1332ee7f54eddc1e7122765b2a05e75679640602b
+  data.tar.gz: cae8bd6799692fcbc8a1ffc8d5b53eadd13d1d5b99591ef7fadd2c11599cba75e6cb7d601698baf59c4ef6564b260d069ea69f5a0d9a4e50a601f368ca365cc8

data/lib/groovy/model.rb

@@ -168,8 +168,8 @@ module Groovy
       # end
 
       [:search, :where, :not, :sort_by, :limit, :offset, :paginate, :in_batches].each do |scope_method|
-        define_method scope_method do |*args|
-          query.public_send(scope_method, *args)
+        define_method scope_method do |*args, &block|
+          query.public_send(scope_method, *args, &block)
         end
       end
       
@@ -294,7 +294,7 @@ module Groovy
     end
 
     def update_attributes!(obj)
-      update_attributes or raise "Invalid!"
+      update_attributes(obj) or raise "Invalid!"
     end
 
     def save(options = {})

data/lib/groovy/query.rb

@@ -172,7 +172,7 @@ module Groovy
       records[size-1]
     end
 
-    def in_batches(of: 1000, from: nil)
+    def in_batches(of: 1000, from: nil, &block)
       @sorting[:limit] = of
       @sorting[:offset] = from || 0
 
@@ -223,8 +223,6 @@ module Groovy
         table.select(options)
       end
 
-      puts set.expression.inspect
-
       @total_entries = set.size
 
       puts "Sorting with #{sort_key_and_order}, #{sorting.inspect}" if ENV['DEBUG']

data/lib/groovy/schema.rb

@@ -139,7 +139,7 @@ module Groovy
 
     def has_column?(name, type = nil)
       table.columns.any? do |col| 
-        col.name == "#{table_name}.#{name}" # && (type.nil? or col.type == type)
+        col && col.name == "#{table_name}.#{name}" # && (type.nil? or col.type == type)
       end
     end
 

data/lib/groovy/version.rb

@@ -1,3 +1,3 @@
 module Groovy
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: groovy
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Tomás Pollak