groovy 0.4.0 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1019bd31fda4785bec67322dfb8aeddfab4d0fa12143b23a8dd75f4a3c84515e
-  data.tar.gz: 44ab6a5fd87d136bc3b6915ab323fac95b6a8012f5cdc4ea2fb6498d5236cb3a
+  metadata.gz: f2e7655a8fefa2f17295105acb6ba387f275eb158c0babed04675d566f736766
+  data.tar.gz: 5a9b94a767f58b033a11044d3b7992911a6cde0ad068955c76d85bdd2c0464b9
 SHA512:
-  metadata.gz: 2ae8f4bcfb8d6166fa4ad8814521c498a44f3e512de23c4cb986d7ce7cd4ef98722a889c3a8e69e1f55bdfc9651f19a9b03e9d31bcb2f87552c73c194fc8f099
-  data.tar.gz: 4a29d7007af10d67f4265ef9e431fa347ebc979745c87037fbf8957e2441fc012904cf5385d8aad8d1da6708e91ffae6b407acecf6e3c8e19f2f0bc787d90639
+  metadata.gz: 2c8813e0920559c6422f8129ca40e51c42a6db26efc65c9f2d9a1d47d8f5f6d5638f9677f970a38d36a180c93cf610b99b7adc372579eaff92ae4d8bd9aa41ae
+  data.tar.gz: d12ed329507b8a5c191308e198a5434f8226fd24bf4f25c8b2b8d64a832c05df39ff9946dddd53b7da5df11c2d14bc9ab97e4dcf84d67e60c9c2811d0c0122b6

data/example/basic.rb

@@ -9,6 +9,7 @@ class Product
   schema do |t|
     t.string :name
     t.integer :price
+    t.boolean :published
     t.timestamps
   end
 
@@ -19,11 +20,11 @@ end
 def populate
   5_000.times do |i|
     puts "Creating product #{i}" if i % 1000 == 0
-    Product.create!(name: "A product with index #{i}", price: 10000 + i % 10)
+    Product.create!(name: "A product with index #{i}", published: true, price: 10000 + i % 10)
   end
 end
 
-populate if Product.count == 0 
+populate if Product.count == 0
 
 # 50_000 products: 50M
 # 100_000 products: 50M

data/example/relations.rb

@@ -34,6 +34,7 @@ class Place
     t.reference :categories, "Categories", type: :vector
     t.string :name
     t.string :description, index: true
+    t.boolean :visible
     t.timestamps
   end
 

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
@@ -221,6 +221,12 @@ module Groovy
         set_timestamp(attributes, :created_at)
         set_timestamp(attributes, :updated_at)
 
+        # remove nil attributes for integer columns, otherwise
+        # we get a TypeError (no implicit conversion from nil to integer)
+        attributes.each do |k, v|
+          attributes.delete(k) if v.nil? # && schema.integer_columns.include?(k)
+        end
+
         if table.support_key?
           raise "Key required" if key.nil?
           table.add(key, attributes)
@@ -297,7 +303,7 @@ module Groovy
       else
         attrs ||= {}
         unless attrs.is_a?(Hash)
-          raise ArgumentError.new("Attributes should be a Hash")
+          raise ArgumentError.new("Attributes should be a Hash, not a #{attrs.class}")
         end
 
         # don't call set_attributes since we don't want to call
@@ -309,6 +315,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
@@ -394,22 +406,21 @@ module Groovy
     end
 
     def ==(other)
-      self.id == other.id
+      self.class == other.class && self.id == other.id
     end
 
     def <=>(other)
-      self.id <=> other.id
+      self.class == other.class && self.id <=> other.id
     end
 
     private
 
     def get_record_attribute(key)
-      if val = record[key]
-        if self.class.schema.time_column?(key)
-          fix_time_value(val)
-        else
-          val
-        end
+      val = record[key]
+      if self.class.schema.time_columns.include?(key)
+        fix_time_value(val)
+      else
+        val
       end
     end
 

data/lib/groovy/query.rb

@@ -6,6 +6,7 @@ module Groovy
     AND = '+'.freeze
     NOT = '-'.freeze
     PER_PAGE = 50.freeze
+    # ESCAPE_CHARS_REGEX = /([\(\)\/\\])/.freeze
     VALID_QUERY_CHARS = 'a-zA-Z0-9_\.,&-'.freeze
     REMOVE_INVALID_CHARS_REGEX = Regexp.new('[^\s' + VALID_QUERY_CHARS + ']').freeze
 
@@ -47,6 +48,11 @@ module Groovy
       self
     end
 
+    def select(&block)
+      @select_block = block
+      self
+    end
+
     def find(id)
       find_by(_id: id)
     end
@@ -76,7 +82,7 @@ module Groovy
               add_param(AND + [key, val.max].join(':<=')) if val.max # gte
 
             elsif val.is_a?(Regexp)
-              str = val.source.gsub(REMOVE_INVALID_CHARS_REGEX, '')
+              str = val.source.gsub('/', '_slash_').gsub('(', '_openp_').gsub(')', '_closep_').gsub(REMOVE_INVALID_CHARS_REGEX, '')
               param = val.source[0] == '^' ? ':^' : val.source[-1] == '$' ? ':$' : ':~' # starts with or regexp
               add_param(AND + [key, str.downcase].join(param)) # regex must be downcase
 
@@ -85,7 +91,7 @@ module Groovy
               add_param(AND + str)
 
             else
-              str = val.nil? || val == false || val.to_s.strip == '' ? '\\' : escape_val(val)
+              str = val.nil? || val === false || val.to_s.strip == '' ? "\"\"" : escape_val(val)
               add_param(AND + [key, str].join(':'))
             end
           end
@@ -110,7 +116,7 @@ module Groovy
               add_param(AND + [key, val.max].join(':>=')) if val.max # lte, nil if range.max is -1
 
             elsif val.is_a?(Regexp)
-              str = val.source.gsub(REMOVE_INVALID_CHARS_REGEX, '')
+              str = val.source.gsub('/', '_slash_').gsub('(', '_openp_').gsub(')', '_closep_').gsub(REMOVE_INVALID_CHARS_REGEX, '')
               param = val.source[0] == '^' ? ':^' : val.source[-1] == '$' ? ':$' : ':~' # starts with or regexp
               add_param(NOT + [key, str.downcase].join(param)) # regex must be downcase
 
@@ -119,7 +125,7 @@ module Groovy
               add_param(AND + str)
 
             else
-              str = val.nil? || val == false || val.to_s.strip == '' ? '\\' : escape_val(val)
+              str = val.nil? || val === false || val.to_s.strip == '' ? "\"\"" : escape_val(val)
               add_param(AND + [key, str].join(':!')) # not
             end
           end
@@ -141,10 +147,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,15 +235,12 @@ module Groovy
     end
 
     private
-    attr_reader :model, :table, :options
+    attr_reader :model, :table, :options, :select_block
 
     def add_param(param)
-      if parameters.include?(param)
-        raise "Duplicate param: #{param}"
-      end
-
-      # if param matches blank/nil, put at the end of the stack
-      param[/:\!?\\/] ? parameters.push(param) : parameters.unshift(param)
+      raise "Select block already given!" if select_block
+      raise "Duplicate param: #{param}" if parameters.include?(param)
+      parameters.push(param)
     end
 
     def results
@@ -248,7 +251,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)
@@ -291,6 +297,7 @@ module Groovy
       query = parameters.join(' ').split(/ or /i).map do |part|
         part.gsub('  ', ' ') # replace double with single spaces
             .gsub(space_regex, '\ \1') # escape spaces before word letters
+            .gsub('_slash_', '\/').gsub('_openp_', '\(').gsub('_closep_', '\)')
             .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

data/lib/groovy/schema.rb

@@ -56,14 +56,25 @@ module Groovy
     end
 
     def time_columns
-      # @time_columns ||=
-      get_names(table.columns.select { |c| c.column? && c.range.name == 'Time' })
+      columns_by_type('Time')
     end
 
-    def time_column?(name)
-      time_columns.include?(name)
+    def integer_columns
+      columns_by_type('Int32')
     end
 
+    def boolean_columns
+      columns_by_type('Bool')
+    end
+
+    def columns_by_type(type)
+      get_names(table.columns.select { |c| c.column? && c.range.name == type })
+    end
+
+    # def time_column?(name)
+    #   time_columns.include?(name)
+    # end
+
     def rebuild!
       log("Rebuilding!")
       # remove_table! if table

data/lib/groovy/version.rb

@@ -1,3 +1,3 @@
 module Groovy
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.4.5'.freeze
 end

data/spec/model_spec.rb

@@ -17,7 +17,7 @@ describe Groovy::Model do
   describe '.scope' do
 
     before :all do
-      TestProduct.class_eval do 
+      TestProduct.class_eval do
         scope :with_name, -> (name) { where(name: name) if name }
         scope :by_price_asc, -> { sort_by(price: :asc) }
         scope :cheapest, -> { by_price_asc }
@@ -49,6 +49,13 @@ describe Groovy::Model do
   end
 
   describe '.create' do
+
+    it 'does not explode when inserting nil values for columns' do
+      expect do
+        TestProduct.create({ price: nil })
+      end.not_to raise_error
+    end
+
   end
 
   describe '.find' do
@@ -60,6 +67,7 @@ describe Groovy::Model do
   describe '.delete_all' do
 
     before do
+      TestProduct.delete_all
       @first  = TestProduct.create!(name: 'A product', price: 100)
       @second = TestProduct.create!(name: 'Another product', price: 200)
       expect(TestProduct.count).to eq(2)

data/spec/query_spec.rb

@@ -8,7 +8,7 @@ describe Groovy::Query do
     @p1 = TestProduct.create!(name: "Product 1", visible: true, price: 10, tag_list: 'one, number two & three')
     @p2 = TestProduct.create!(name: "Product 2", visible: false, price: 20, tag_list: 'number two, three')
     @p3 = TestProduct.create!(name: "Product 3: The Best", visible: true, price: 30, tag_list: nil)
-    @p4 = TestProduct.create!(name: "Product 4", visible: false, price: 40, tag_list: 'one, number two')
+    @p4 = TestProduct.create!(name: "Product 4", visible: false, price: 40, tag_list: 'one, number two / something')
     @p5 = TestProduct.create!(name: "Product 5", visible: true, price: 50, tag_list: '')
   end
 
@@ -40,6 +40,13 @@ describe Groovy::Query do
         res = TestProduct.where(tag_list: nil)
         expect(res.map(&:id)).to eq([@p3.id, @p5.id])
       end
+      it 'works with other nil values too' do
+        res = TestProduct.where(visible: nil).where(tag_list: nil)
+        expect(res.map(&:id)).to eq([])
+
+        res = TestProduct.where(tag_list: nil).where(name: nil)
+        expect(res.map(&:id)).to eq([])
+      end
       it 'works with other args too' do
         res = TestProduct.where(name: 'Product 5').where(tag_list: nil)
         expect(res.map(&:id)).to eq([@p5.id])
@@ -117,6 +124,12 @@ describe Groovy::Query do
         res = TestProduct.where(tag_list: /two & three/)
         expect(res.map(&:id)).to eq([@p1.id])
       end
+
+      it 'works with slashes' do
+        str = 'two / something'
+        res = TestProduct.where(tag_list: /#{str}/)
+        expect(res.map(&:id)).to eq([@p4.id])
+      end
     end
 
     describe 'starts with regex' do
@@ -187,6 +200,13 @@ describe Groovy::Query do
         res = TestProduct.where.not(tag_list: nil)
         expect(res.map(&:id)).to eq([@p1.id, @p2.id, @p4.id])
       end
+      it 'works with other nil values too' do
+        res = TestProduct.where.not(visible: nil).where(tag_list: nil)
+        expect(res.map(&:id)).to eq([@p3.id, @p5.id])
+
+        res = TestProduct.where.not(tag_list: nil).where(name: nil)
+        expect(res.map(&:id)).to eq([])
+      end
       it 'works with other args too' do
         res = TestProduct.where.not(name: 'Product 2').where.not(tag_list: nil)
         expect(res.map(&:id)).to eq([@p1.id, @p4.id])
@@ -239,6 +259,12 @@ describe Groovy::Query do
         res = TestProduct.not(tag_list: /two & three/)
         expect(res.map(&:id)).to eq([@p2.id, @p3.id, @p4.id, @p5.id])
       end
+
+      it 'works with slashes' do
+        str = 'two / something'
+        res = TestProduct.not(tag_list: /#{str}/)
+        expect(res.map(&:id)).to eq([@p1.id, @p2.id, @p3.id, @p5.id])
+      end
     end
 
     describe 'starts with regex' do

metadata

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