groovy 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af9ef6dd23a84a0887fa26436fb1a3f98112621f25b1088c7e5835706fedefc9
-  data.tar.gz: 4fa395ca4c1f32c3d31df1707a2ee66e2c6fabf0550957962b7d5efa3fd7458c
+  metadata.gz: e3e87c857a45ab045967ed1af60d619ec7340fc751c950032645657049bd1c68
+  data.tar.gz: 4886e8db94b7fa3627312f82842d141b9c24ea7954e59955f4840dab7f70f776
 SHA512:
-  metadata.gz: 7c6936e830cb7449843a43882cf5895b452806ab61ca7f01c2e7c97ae272d0daeb456a2f4d9c16b5cad52c46b8f9902e851b4e6e9c43d27de1d995bdca44fdbf
-  data.tar.gz: dbde160c35f34339e5f155bea793c0c4fd5671916326a34c9c69efe9e266baffb47ed12e0afe5edd7a1fae5ba46abc7c41cc8957cba511be5ad4f3972df09ed9
+  metadata.gz: df4c68551089cf9ade2f20ac70436962fff82c0a83db5caeb0208b107a1215443386ab429d644c939200fef844a70db315c502cfb4c901aff7c809f578a07b67
+  data.tar.gz: 8eb292ae1c4365040a62c4f9feb8e04b27119ae5b4d84b1adf0640cb7f1d46cbea29bafd57ad076ca0d0f593fae504f4bb6eb4afac392b530f725f82948b8ad1

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # specified in groovy.gemspec
 gemspec

data/groovy.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   # s.required_rubygems_version = ">= 1.3.6"
   # s.rubyforge_project         = "groovy"
 
-  s.add_runtime_dependency "rroonga", "= 9.0.3"
+  s.add_runtime_dependency "rroonga", "= 12.1.0"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rspec", '~> 3.0', '>= 3.0.0'

data/lib/groovy/model.rb

@@ -202,9 +202,13 @@ module Groovy
         end
       end
 
-      [: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)
+      def where(*args, &block)
+        query.where(*args, &block)
+      end
+
+      [:first, :last, :select, :find_by, :search, :not, :sort_by, :in_batches, :limit, :offset, :paginate].each do |scope_method|
+        define_method scope_method do |**args, &block|
+          query.public_send(scope_method, **args, &block)
         end
       end
 
@@ -231,7 +235,7 @@ module Groovy
       end
 
       def set_timestamp(obj, key_name)
-        obj[key_name] = Time.now if attribute_names.include?(key_name.to_sym)
+        obj[key_name] = Time.now.utc if attribute_names.include?(key_name.to_sym)
       end
 
       def callbacks
@@ -256,7 +260,7 @@ module Groovy
       end
 
       def db_context
-        Groovy.contexts[context_name.to_sym] \
+        Groovy.contexts[context_name&.to_sym] \
           or raise "Context not defined: #{context_name} Please call Groovy.open('./db/path') first."
       end
 

data/lib/groovy/query.rb

@@ -75,7 +75,7 @@ module Groovy
     def where(conditions = nil)
       case conditions
         when String # "foo:bar"
-          add_param(AND + "(#{map_operator(conditions)})")
+          add_param(AND + "(#{map_operator(handle_timestamps(conditions))})")
         when Hash # { foo: 'bar' } or { views: 1..100 }
           conditions.each do |key, val|
             if val.is_a?(Range)
@@ -91,6 +91,15 @@ module Groovy
               str = "#{key}:#{val.join(" OR #{key}:")}"
               add_param(AND + str)
 
+            elsif val.is_a?(Time)
+               # The second, specify the timestamp as string in following format:
+               # “(YEAR)/(MONTH)/(DAY) (HOUR):(MINUTE):(SECOND)”
+
+              # date_str = val.utc.strftime("%Y/%m/%d %H\:%M\:%S")
+              date_str = val.strftime("%Y/%m/%d %H\:%M\:%S")
+              str = "#{key}:#{date_str}"
+              add_param(AND + str)
+
             else
               str = val.nil? || val === false || val.to_s.strip == '' ? "\"\"" : escape_val(val)
               add_param(AND + [key, str].join(':'))
@@ -229,6 +238,7 @@ module Groovy
     end
 
     def in_batches(of: 1000, from: nil, &block)
+      puts "of: #{of}"
       sorting[:limit] = of
       sorting[:offset] = from || 0
 
@@ -305,6 +315,12 @@ module Groovy
          .sub(' >= ', ':>=')
     end
 
+    # remove timezones from timestamps, otherwise we get a 'failed to cast to <Time>' error
+    def handle_timestamps(str)
+      # 2023-11-21 10:38:17 -0300 -> 2023/11/21 10:38:17
+      str.sub(/(\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+) (.+)/, '\1/\2/\3 \4:\5:\6')
+    end
+
     def sort_key_and_order
       sorting[:by] or [{ key: @default_sort_key, order: :asc }]
     end

data/lib/groovy/version.rb

@@ -1,3 +1,3 @@
 module Groovy
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/lib/groovy.rb

@@ -41,7 +41,7 @@ module Groovy
       contexts[name.to_sym] = if name == :default
         Groonga::Context.default.tap { |ctx| open_or_create_db(ctx, db_path) }
       else
-        init_context(db_path, opts)
+        init_context(db_path)
       end
     end
 
@@ -63,8 +63,8 @@ module Groovy
 
     private
 
-    def init_context(db_path, opts)
-      Groonga::Context.new(opts).tap do |ctx|
+    def init_context(db_path)
+      Groonga::Context.new.tap do |ctx|
         open_or_create_db(ctx, db_path)
       end
     end

data/spec/groovy_spec.rb

@@ -5,6 +5,18 @@ describe Groovy do
     Groonga::Context.default = nil
   end
 
+  it 'explodes if opening a scheme without opening first' do
+    expect do
+      class Foobar; end
+      Foobar.class_eval do
+        include Groovy::Model
+        schema do |t|
+          t.string :foobar
+        end
+      end
+    end.to raise_error("Context not defined:  Please call Groovy.open('./db/path') first.")
+  end
+
   describe '.open' do
     it 'explodes if called with no params' do
       expect do

data/spec/query_spec.rb

@@ -95,10 +95,10 @@ describe Groovy::Query do
         res = TestProduct.where(created_at: @one_week_ago)
         expect(res.map(&:id)).to eq([@p3.id])
 
-        res = TestProduct.where("created_at > #{@one_week_ago.to_s}")
+        res = TestProduct.where("created_at > #{@one_week_ago}")
         expect(res.map(&:id)).to eq([@p1.id, @p2.id, @p4.id, @p5.id])
 
-        res = TestProduct.where("created_at < #{Time.now.to_s}")
+        res = TestProduct.where("created_at < #{Time.now}")
         expect(res.map(&:id)).to eq([@p3.id])
 
         eight_days = Time.at(@one_week_ago.to_i - 3600 * 24)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groovy
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.0.3
+        version: 12.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.0.3
+        version: 12.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -120,8 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: A wrapper around Groonga/Rroonga