groovy 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43812d3bd8ef9579ceed22b3d19e78378ceb3a924bfc8d6c0983e49199c26c88
-  data.tar.gz: 5960ca73a253d62f31301995c8f643bcaa084a99140b5f59eee0161c816d20e2
+  metadata.gz: 334e9f5cb0dffab38a1bcd065ba7bedd4d4382ad79cc8c572044ebb0fd6f3586
+  data.tar.gz: 6fae9ad07b1e8316594e320da974d5aee980deaaca717c729a260004a221d8a8
 SHA512:
-  metadata.gz: 22cc09a73d9804f5d5e1cb432d3948ff24ef9a28dbd84b5a403b3709477d013089617ebf19b23f4d3450c3c7dc8e15c01ab527698c5efa5821c9d351056777ad
-  data.tar.gz: 809b9fa8e3158df7afeb6e80967d7156772094b21b69f6fe7d9f5e6db03626fe8a9b2ee123f89c7bf791ef6e195415524b1e967291d836becdc6173fbd0bfbfc
+  metadata.gz: fa11b79ead949a9f3595459a5b8b7baecb48ac30769e0586627f1d9753ec991a7e2a4a3f20e8cef12bf7f474e02fa30f8b347b9a7330db26fe39462496ed12a5
+  data.tar.gz: 113348c59d32fcefab72dfa707ce97e6972294454b5afb84e5e9e72bfe6c26538e6236161353d915827ae9962291437ac821d59c5d81ee86276a88d8630c7306

data/README.md

@@ -2,4 +2,7 @@
 
 An ORM for Groonga.
 
+# TODO: 
+ 
+ - [ ] Allow using scopes/queries through Vector class.
 

data/example/relations.rb

@@ -21,6 +21,7 @@ class Category
 
   schema do |t|
     t.string :name
+    t.reference :place, "Places"
     t.timestamps
   end
 

data/lib/groovy/model.rb

@@ -26,7 +26,7 @@ module Groovy
     # end
 
     def self.model_from_table(table_name)
-      Kernel.const_get(table_name.sub(/ies$/, 'y').sub(/s$/, '').capitalize)
+      Kernel.const_get(table_name.to_s.sub(/ies$/, 'y').sub(/s$/, '').classify)
     end
 
     def self.included(base)
@@ -190,14 +190,19 @@ module Groovy
         query_class.new(self, table)
       end
 
+      def scopes
+        @scopes ||= []
+      end
+
       def scope(name, obj)
+        scopes.push(name)
         query_class.add_scope(name, obj)
         define_singleton_method(name) do |*args|
           query.public_send(name, *args)
         end
       end
 
-      [:first, :last, :select, :find_each, :find_by, :search, :where, :not, :sort_by, :limit, :offset, :paginate, :in_batches].each do |scope_method|
+      [:first, :last, :select, :find_by, :search, :where, :not, :sort_by, :limit, :offset, :paginate, :in_batches].each do |scope_method|
         define_method scope_method do |*args, &block|
           query.public_send(scope_method, *args, &block)
         end

data/lib/groovy/query.rb

@@ -62,13 +62,13 @@ module Groovy
       where(conditions).limit(1).first
     end
 
-    def find_each(opts = {}, &block)
-      count = 0
-      in_batches({ of: 10 }.merge(opts)) do |group|
-        group.each { |item| count += 1; yield(item) }
-      end
-      count
-    end
+    # def find_each(opts = {}, &block)
+    #   count = 0
+    #   in_batches({ of: 10 }.merge(opts)) do |group|
+    #     group.each { |item| count += 1; yield(item) }
+    #   end
+    #   count
+    # end
 
     # http://groonga.org/docs/reference/grn_expr/query_syntax.html
     # TODO: support match_columns (search value in two or more columns)

data/lib/groovy/vector.rb

@@ -74,9 +74,30 @@ module Groovy
 
     alias_method :<<, :push
 
+    [:first, :last, :find_by, :search, :where, :not, :sort_by, :limit, :offset, :paginate, :in_batches].each do |scope_method|
+      define_method scope_method do |*args, &block|
+        query.public_send(scope_method, *args, &block)
+      end
+    end
+
     private
     attr_reader :obj, :key
 
+    def query
+      model = Model.model_from_table(key.capitalize)
+      obj_name = obj.class.name.downcase
+      model.query.where(obj_name => obj.id)
+    end
+
+    def method_missing(name, *args, &block)
+      model = Model.model_from_table(key.capitalize)
+      if model.scopes.include?(name)
+        query.send(name)
+      else
+        super
+      end
+    end
+
     def remove_record(rec)
       recs = obj.record[key].delete_if { |r| r == rec }
       obj.record[key] = recs

data/lib/groovy/version.rb

@@ -1,3 +1,3 @@
 module Groovy
-  VERSION = '0.4.7'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

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