groovy 0.4.1 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b64b5151ebc9ad89b92fac064613d778e067449e11eb0c87cbf8ce40ca5e2630
-  data.tar.gz: 3e95ca4bac3946bcf79805c174216be0cb2870c06e47369056054bfb4d61a637
+  metadata.gz: 2569117dfa3663d6c60ed950be2972c58116e7eaf6d21f5c6640cb91642fee4f
+  data.tar.gz: 33e1651825dd626dab979e9c504d5de1b7d8162363d42cbeca43873e370cad04
 SHA512:
-  metadata.gz: 3320e1c8e3d31b9d48c2fbf409f2688b3be16734eebd631b9ee44f9509934968079b9ed1ab14a02422a559865e2619da1954640feed825bc17b8865ab96ac4d1
-  data.tar.gz: 1d1ebb476d22fa504a2b1f7ef7585f298fb5fbc84dbdc22cb34997c1a8e57032622e0c12867aab730bf75f08293d7f093a49059efb68d11c150be5684e4c9c34
+  metadata.gz: 66b311fe79a3f9c8467ddbe9f863a2fd731b9c7dd9df2dbeb49fc1b8d62f4b7b506b2e0ca1f05c6ad7766ede89df0a26cb4a8eae8f96097ff613ab17cadde593
+  data.tar.gz: c1dbb4f84dfdb79d870a0e498acbc63d7e1268f5cfd1f0951fd16cc7d890b68a6d3679e903eb703b8de4a44b6765070594df0eb53b8cfbeb7ac9fb1499f5dd3f

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

@@ -187,16 +187,6 @@ module Groovy
         query
       end
 
-      def first(num = 1)
-        arr = limit(num)
-        num == 1 ? arr.first : arr
-      end
-
-      def last(num = 1)
-        arr = all.sort_by(_id: :desc).limit(num)
-        num == 1 ? arr.first : arr
-      end
-
       def query
         query_class.new(self, table)
       end
@@ -208,7 +198,7 @@ module Groovy
         end
       end
 
-      [:find_each, :find_by, :search, :where, :not, :sort_by, :limit, :offset, :paginate, :in_batches].each do |scope_method|
+      [:first, :last, :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 +211,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 +293,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 +305,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,18 +396,18 @@ 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)
       val = record[key]
-      if self.class.schema.time_column?(key)
+      if self.class.schema.time_columns.include?(key)
         fix_time_value(val)
       else
         val

data/lib/groovy/query.rb

@@ -3,9 +3,11 @@ module Groovy
   class Query
 
     include Enumerable
+
     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 +49,11 @@ module Groovy
       self
     end
 
+    def select(&block)
+      @select_block = block
+      self
+    end
+
     def find(id)
       find_by(_id: id)
     end
@@ -76,7 +83,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
 
@@ -110,7 +117,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
 
@@ -132,25 +139,25 @@ module Groovy
     end
 
     def limit(num)
-      @sorting[:limit] = num
+      sorting[:limit] = num
       self
     end
 
     def offset(num)
-      @sorting[:offset] = num
+      sorting[:offset] = num
       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)
     def sort_by(hash)
-      if hash.is_a?(String) || hash.is_a?(Symbol) # e.g. 'title.desc' or :title (asc by default)
-        param, dir = hash.to_s.split('.')
+      if hash.is_a?(String) || hash.is_a?(Symbol) # e.g. 'title.desc', 'title desc' or :title (asc by default)
+        param, dir = hash.to_s.split(/\s|\./)
         hash = {}
         hash[param] = dir || 'asc'
       end
@@ -201,23 +208,30 @@ module Groovy
       @total_entries
     end
 
-    def last(count = 1)
-      if count > 1
-        records[(size-count)..-1]
-      else
-        records[size-1]
+    def first(num = 1)
+      limit(num)
+      num == 1 ? records.first : records
+    end
+
+    def last(num = 1)
+      if sorting[:by]
+        get_last(num)
+      else # no sorting, so
+        sort_by(_id: :desc).limit(num)
+        # if last(2) or more, then re-sort by ascending ID
+        num == 1 ? records.first : records.sort { |a,b| a.id <=> b.id }
       end
     end
 
     def in_batches(of: 1000, from: nil, &block)
-      @sorting[:limit] = of
-      @sorting[:offset] = from || 0
+      sorting[:limit] = of
+      sorting[:offset] = from || 0
 
       while results.any?
         yield to_a
         break if results.size < of
 
-        @sorting[:offset] += of
+        sorting[:offset] += of
         @records = @results = nil # reset
       end
     end
@@ -229,9 +243,18 @@ module Groovy
     end
 
     private
-    attr_reader :model, :table, :options
+    attr_reader :model, :table, :options, :select_block
+
+    def get_last(count = 1)
+      if count > 1
+        records[(size-count)..-1]
+      else
+        records[size-1]
+      end
+    end
 
     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 +267,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)
@@ -255,7 +281,7 @@ module Groovy
 
       @total_entries = set.size
 
-      debug "Sorting with #{sort_key_and_order}, #{sorting.inspect}"
+      debug "Sorting with #{sort_key_and_order} (options: #{sorting.inspect})"
       set = set.sort(sort_key_and_order, {
         limit: sorting[:limit],
         offset: sorting[:offset], # [sorting[:offset], @total_entries].min
@@ -287,6 +313,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.1'.freeze
+  VERSION = '0.4.6'.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
 
@@ -124,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
@@ -253,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.1
+  version: 0.4.6
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga