groovy 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b64b5151ebc9ad89b92fac064613d778e067449e11eb0c87cbf8ce40ca5e2630
-  data.tar.gz: 3e95ca4bac3946bcf79805c174216be0cb2870c06e47369056054bfb4d61a637
+  metadata.gz: c2e735dd501cd86a3ee2ab21b111bf7aa4ab3d76d9d14acf8be86b97e34335b1
+  data.tar.gz: 97b3b88d1f297ab6d74b9818858272c8fa711a27a3c0d64964508988a3304b85
 SHA512:
-  metadata.gz: 3320e1c8e3d31b9d48c2fbf409f2688b3be16734eebd631b9ee44f9509934968079b9ed1ab14a02422a559865e2619da1954640feed825bc17b8865ab96ac4d1
-  data.tar.gz: 1d1ebb476d22fa504a2b1f7ef7585f298fb5fbc84dbdc22cb34997c1a8e57032622e0c12867aab730bf75f08293d7f093a49059efb68d11c150be5684e4c9c34
+  metadata.gz: deb85e6549f328555d795e542e282c6e3a50c574fdac769530648c69292f02ed469bc293304db863b7c9ac28a5bb653bd85eb79a7652f6390b3f5309fc492552
+  data.tar.gz: 7546011290684eca615cf4823df5886908fe823c9bee086a80504a01a7d3aa846a0fd34dc05efc023a061078ac3645d352618c64a03b614989cb51bc3ca4c5c9

data/lib/groovy.rb

@@ -1,6 +1,14 @@
 require 'groonga'
 require File.expand_path(File.dirname(__FILE__)) + '/groovy/model'
 
+# overwrite Groonga::Record#inspect because the #attributes part is
+# making debugging take ages
+class Groonga::Record
+  def inspect
+    super
+  end
+end
+
 module Groovy
 
   class Error < StandardError; end

data/lib/groovy/model.rb

@@ -208,7 +208,7 @@ module Groovy
         end
       end
 
-      [:find_each, :find_by, :search, :where, :not, :sort_by, :limit, :offset, :paginate, :in_batches].each do |scope_method|
+      [:select, :find_each, :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
@@ -309,6 +309,12 @@ module Groovy
       @changes = {}
     end
 
+    # get reference to the actual record in the Groonga table,
+    # not the temporary one we get as part of a search result.
+    def load_record
+      self.class.table[id]
+    end
+
     def inspect
       "#<#{self.class.name} id:#{id.inspect} attributes:[#{self.class.attribute_names.join(', ')}]>"
     end

data/lib/groovy/query.rb

@@ -47,6 +47,11 @@ module Groovy
       self
     end
 
+    def select(&block)
+      @select_block = block
+      self
+    end
+
     def find(id)
       find_by(_id: id)
     end
@@ -141,10 +146,10 @@ module Groovy
       self
     end
 
-    def paginate(page = 1)
+    def paginate(page = 1, per_page: PER_PAGE)
       page = 1 if page.to_i < 1
-      offset = ((page.to_i)-1) * PER_PAGE
-      offset(offset).limit(PER_PAGE) # returns self
+      offset = ((page.to_i)-1) * per_page
+      offset(offset).limit(per_page) # returns self
     end
 
     # sort_by(title: :asc)
@@ -229,9 +234,10 @@ module Groovy
     end
 
     private
-    attr_reader :model, :table, :options
+    attr_reader :model, :table, :options, :select_block
 
     def add_param(param)
+      raise "Select block already given!" if select_block
       raise "Duplicate param: #{param}" if parameters.include?(param)
       parameters.push(param)
     end
@@ -244,7 +250,10 @@ module Groovy
     end
 
     def execute
-      set = if parameters.any?
+      set = if select_block
+        debug "Finding records with select block"
+        table.select { |record| select_block.call(record) }
+      elsif parameters.any?
         query = prepare_query
         debug "Finding records with query: #{query}"
         table.select(query, options)

data/lib/groovy/version.rb

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

metadata

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