groovy 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c1e884b501a549852378578a4dfd5b6f276b43261536c3af41fe6701b73fb8
-  data.tar.gz: 0b97dc5daad7e8ceb61477d496792372b358126be3385f69a2a8e7996b0ff789
+  metadata.gz: 110e7b285ae629862ff897e7069044bceff9c104b5b237fa8268ac692f493639
+  data.tar.gz: b4d4058f54bb63ab377c8d985802893f8cba1b7a9941def3db8d241ba6ecab0b
 SHA512:
-  metadata.gz: 408eb311bf8f0953b2feb9fbd1cc3ae52156633753530931acb5b5f3c20f0f07139ed08b9fa123e2fb2e64f777da3c66fa92968f639b77c33f9a5e8358512fe3
-  data.tar.gz: 05d8d038f043348839ccb8d437c5dad826717a3f20878635a0afd028d485a65a97c6806d760e3c480dfea0878a3a008cb1a61820cc7b7f094c1beecea7d0c95a
+  metadata.gz: 5b249ffbc6783c5f8b9bbd443e999096087328661aa111879862d715ee85adb801290d8d0033a0c74b7002277490421c7e9d945fa016a8cde44970c297eba91a
+  data.tar.gz: 5d544679cdab55ef73e59895d38cad72cde505b640042b93645ad803c124d652b5f4f638a58ec0af53c5e1347305c3cb0d2fc937b235d5fb88a2c696be9c6662

data/README.md

@@ -0,0 +1,5 @@
+# Groovy
+
+An ORM for Groonga.
+
+

data/lib/groovy/query.rb

@@ -28,7 +28,7 @@ module Groovy
     def search(obj)
       obj.each do |col, q|
         unless model.index_columns.include?(col)
-          raise "Not an index column, so cannot do fulltext search: #{col}" 
+          raise "Not an index column, so cannot do fulltext search: #{col}"
         end
         parameters.push(AND + "(#{col}:@#{q})")
       end
@@ -48,9 +48,9 @@ module Groovy
 
     def find_each(&block)
       in_batches(of: 10) do |group|
-        group.each { |item| yield(item) }  
+        group.each { |item| yield(item) }
       end
-    end 
+    end
 
     # http://groonga.org/docs/reference/grn_expr/query_syntax.html
     # TODO: support match_columns (search value in two or more columns)
@@ -119,7 +119,7 @@ module Groovy
       end
       self
     end
-      
+
     def limit(num)
       @sorting[:limit] = num
       self
@@ -174,7 +174,7 @@ module Groovy
     def each(&block)
       records.each { |r| block.call(r) }
     end
-    
+
     def total_entries
       results # ensure query has been run
       @total_entries
@@ -210,7 +210,7 @@ module Groovy
 
     def add_param(param)
       if parameters.include?(param)
-        raise "Duplicate param: #{param}" 
+        raise "Duplicate param: #{param}"
       end
 
       # if param matches blank/nil, put at the end of the stack
@@ -236,9 +236,9 @@ module Groovy
       @total_entries = set.size
 
       puts "Sorting with #{sort_key_and_order}, #{sorting.inspect}" if ENV['DEBUG']
-      set = set.sort(sort_key_and_order, { 
-        limit: sorting[:limit], 
-        offset: sorting[:offset] 
+      set = set.sort(sort_key_and_order, {
+        limit: sorting[:limit],
+        offset: sorting[:offset]
       })
 
       sorting[:group_by] ? set.group(group_by) : set
@@ -261,9 +261,11 @@ module Groovy
     def prepare_query
       space_regex = Regexp.new('\s([' + VALID_QUERY_CHARS + '])')
       query = parameters.join(' ').split(/ or /i).map do |part|
-        part.gsub('  ', ' ').gsub(space_regex, '\ \1')
+        part.gsub('  ', ' ') # replace double with single spaces
+            .gsub(space_regex, '\ \1') # escape spaces before word letters
+            .gsub(/(\d\d):(\d\d):(\d\d)/, '\1\:\2\:\3') # escape hh:mm:ss in timestamps
       end.join(' OR ').sub(/^-/, '_id:>0 -') #.gsub(' OR -', ' -')
     end
   end
 
-end
+end

data/lib/groovy/schema.rb

@@ -98,7 +98,7 @@ module Groovy
 
     def switch_to_context(db_context)
       log("Switching context to #{db_context}")
-      @context = db_context 
+      @context = db_context
       @table = @search_table = nil # clear cached vars
     end
 
@@ -120,7 +120,7 @@ module Groovy
         default_tokenizer: "TokenBigram"
       })
       log("Creating search table with options: #{opts.inspect}")
-      Groonga::Schema.create_table(SEARCH_TABLE_NAME, opts.merge(context: context)) 
+      Groonga::Schema.create_table(SEARCH_TABLE_NAME, opts.merge(context: context))
     end
 
     def remove_columns_not_in(list)
@@ -138,7 +138,7 @@ module Groovy
     end
 
     def has_column?(name, type = nil)
-      table.columns.any? do |col| 
+      table.columns.any? do |col|
         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.2.3'.freeze
+  VERSION = '0.2.5'.freeze
 end

data/spec/query_spec.rb

@@ -55,6 +55,30 @@ describe Groovy::Query do
       end
     end
 
+    describe 'lower/greater than search (timestamps)' do
+      before do
+        @one_week_ago = Time.now - (3600 * 24 * 7)
+        @p3.update_attributes(created_at: Time.at(@one_week_ago.to_i))
+      end
+
+      it 'finds expected records' 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}")
+        expect(res.map(&:id)).to eq([@p1.id, @p2.id, @p4.id, @p5.id])
+
+        res = TestProduct.where("created_at < #{Time.now.to_s}")
+        expect(res.map(&:id)).to eq([@p3.id])
+
+        eight_days = Time.at(@one_week_ago.to_i - 3600 * 24)
+        six_days = Time.at(@one_week_ago.to_i + 3600 * 24)
+
+        res = TestProduct.where("created_at < #{six_days}").where("created_at > #{eight_days}")
+        expect(res.map(&:id)).to eq([@p3.id])
+      end
+    end
+
     context 'basic regex' do
       it 'finds expected records' do
         res = TestProduct.where(tag_list: /two/)

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ RSpec.configure do |config|
   end
 end
 
-class TestProduct 
+class TestProduct
   include Groovy::Model
 end
 
@@ -23,6 +23,7 @@ def load_schema!(context_name)
     t.string  :name
     t.integer :price
     t.string  :tag_list
+    t.timestamps
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groovy
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-18 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
@@ -81,6 +81,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- README.md
 - Rakefile
 - example/Gemfile
 - example/Gemfile.lock
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A wrapper around Groonga/Rroonga