groovy 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c90b7fef2c3e9e61d8a3d4a0330edfb035705efd801c5dda53684703ec9cf322
-  data.tar.gz: ac5b9735a4e1340776249bb5d9f6c47b72878dec064441586fafbf9d13cf0577
+  metadata.gz: c4cf906ae6b02c372764a0b38842986a3ac6b8db27207798c51db3e0708b838c
+  data.tar.gz: 2104bb1cc0b8b22593cf856c63f0943e7cc7abc12609676af8c3394b677fcea0
 SHA512:
-  metadata.gz: 89a6be0023c93158048596aa6a8a5d34fad6b69fbe407a468a0426797907c2bd8e2cd6b1eeec1eb9d0bc53c1332ee7f54eddc1e7122765b2a05e75679640602b
-  data.tar.gz: cae8bd6799692fcbc8a1ffc8d5b53eadd13d1d5b99591ef7fadd2c11599cba75e6cb7d601698baf59c4ef6564b260d069ea69f5a0d9a4e50a601f368ca365cc8
+  metadata.gz: 453c18aecd83f7615dbdaf71dbd29f1be7b807e510304b46c0b25095c64a4bcf53d6b1403488df19a49997792cac43dbc162cdad9a3e1754a1d17fda2a12a933
+  data.tar.gz: 250930ca9234eed807582ae2292f0196168c3b76d7b9ca9797445e258539d661b6128795d99db40377ef7b49ca1c8af27d7ec7e62537ef0ce1d5ddba80b2d873

data/lib/groovy/model.rb

@@ -68,14 +68,6 @@ module Groovy
         end
       end
 
-      def scope(name, obj)
-        define_singleton_method(name) do |*args|
-          res = obj.respond_to?(:call) ? obj.call(*args) : obj
-          # res = obj.respond_to?(:call) ? self.instance_exec(*args) { |a| obj.call(*a) } : obj
-          self # return self instead of query, so we can call other scopes
-        end
-      end
-
       # called from Query, so needs to be public
       def new_from_record(record)
         new(record.attributes, record)
@@ -137,14 +129,6 @@ module Groovy
         arr.slice(2..-1) # .flatten
       end
 
-      def clear_query
-        @query = nil
-      end
-
-      def query
-        @query ||= Query.new(self, table)
-      end
-
       def all
         query
       end
@@ -163,9 +147,20 @@ module Groovy
         where(params).limit(1).first
       end
 
-      # def in_batches(of: 1000, from: nil, &block)
-      #   all.in_batches(of: of, from: from, &block)
-      # end
+      def clear_query
+        @query = nil
+      end
+
+      def query
+        @query ||= query_class.new(self, table)
+      end
+
+      def scope(name, obj)
+        query_class.add_scope(name, obj)
+        define_singleton_method(name) do |*args|
+          query.public_send(name, *args)
+        end
+      end
 
       [:search, :where, :not, :sort_by, :limit, :offset, :paginate, :in_batches].each do |scope_method|
         define_method scope_method do |*args, &block|
@@ -198,6 +193,14 @@ module Groovy
 
       private
 
+      def query_class
+        @query_class ||= begin
+          Class.new(Query).tap do |klass|
+            Object.const_set("#{name}Query", klass)
+          end
+        end
+      end
+
       def db_context
         Groovy.contexts[context_name.to_sym] or raise "Context not defined: #{context_name}"
       end

data/lib/groovy/query.rb

@@ -9,6 +9,13 @@ module Groovy
 
     attr_reader :parameters, :sorting
 
+    def self.add_scope(name, obj)
+      define_method(name) do |*args|
+        res = obj.respond_to?(:call) ? obj.call(*args) : obj
+        self
+      end
+    end
+
     def initialize(model, table, options = {})
       @model, @table, @options = model, table, options
       @parameters = options.delete(:parameters) || []
@@ -16,16 +23,6 @@ module Groovy
       @default_sort_key = table.is_a?(Groonga::Hash) ? '_key' : '_id'
     end
 
-    def merge_with!(another)
-      # puts "merging #{parameters.inspect} with #{another.parameters.inspect}"
-      # parameters.merge!(another.parameters)
-      @parameters = another.parameters
-      @sorting = another.sorting
-      # parameters.concat(another.parameters)
-      # sorting.merge!(another.sorting)
-      self
-    end
-
     def search(obj)
       obj.each do |col, q|
         unless model.index_columns.include?(col)
@@ -37,6 +34,7 @@ module Groovy
 
     def inspect
       clear_query
+      # "<#{self.class.name} #{parameters}>"
       super
     end
 
@@ -177,11 +175,11 @@ module Groovy
       @sorting[:offset] = from || 0
 
       while results.any?
-        yield all
+        yield to_a
         break if results.size < of
 
         @sorting[:offset] += of
-        @all = @results = nil # reset
+        @records = @results = nil # reset
       end
     end
 
@@ -201,7 +199,10 @@ module Groovy
     end
 
     def add_param(param)
-      raise "Duplicate param: #{param}" if parameters.include?(param)
+      if parameters.include?(param)
+        # clear_query
+        raise "Duplicate param: #{param}" 
+      end
       parameters.push(param)
     end
 
@@ -253,15 +254,6 @@ module Groovy
         part.gsub(/\s(\w)/, '\ \1')
       end.join(' OR ').sub(/^-/, '_id:>0 -') #.gsub(' OR -', ' -')
     end
-
-    def method_missing(name, *args)
-      if model.respond_to?(name)
-        other = model.public_send(name, *args)
-        merge_with!(other.query)
-      else
-        super
-      end
-    end
   end
 
 end

data/lib/groovy/version.rb

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

data/spec/query_spec.rb

@@ -193,6 +193,17 @@ describe Groovy::Query do
   end
 
   describe '#in_batches' do
+    it 'returns batches as expected' do
+      groups = []
+      res = TestProduct.in_batches(of: 2) do |group|
+        groups.push(group)
+      end
+
+      expect(groups.size).to eq(3)
+      expect(groups[0].map(&:id)).to eql([1,2])
+      expect(groups[1].map(&:id)).to eql([3,4])
+      expect(groups[2].map(&:id)).to eql([5])
+    end
   end
 
   describe '#paginate' do

metadata

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