groovy 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fe19dcb7e82fdd7b2406c612b32137d3db0ffb636f7b9b1f14933f79adf6e18
-  data.tar.gz: '038aee1d0a2a4c97fc29d7dd462bdf27dc372f62887191ec0d0852998c787c4f'
+  metadata.gz: 56df8a7df15cb6444023882779e0f99db75c5fd2a2843356b4aae4e18dd62659
+  data.tar.gz: f8515e325de94ae8966caa271659c010c9a4a4335a3270c10f3d5360528d2faf
 SHA512:
-  metadata.gz: 5ba1804fcda6767d13e38d7dc07c8ba81c7a865acc6a7ad153da24af9b7fec8f20737a753c61a2f3a642cc5a3e8874cbea8686b1071490fd42fe32f2fe719a0a
-  data.tar.gz: 0de80b8fdb6b8ef09c1c4083e2b821c209abe9e117f9ca65a7373a4c25556b1155e6f77b7e1e7a496cbc33bfd2d8c9df1e01a3a05851f76f3cdba376f187d3e3
+  metadata.gz: c6257e0e6c769952f74099b04fc41cf81116cb4f8ed7105030c694c5af8ab4d99424a851b9bbff332fe12424f6d578dcdcfc1db4396ce07c030df105fa3e9162
+  data.tar.gz: 02252aa72c91778f9d464e4c4341e3bafa55f0b4fc71687b8e4e2c7520e78a860bd465bfa971a5ec0d84a2f1e83ef3e2fa46d813436a8141fc6ce9f8e20a55f7

data/example/basic.rb

@@ -12,8 +12,8 @@ class Product
     t.timestamps
   end
 
-  scope :by_price, -> { sort_by(price: :asc) }
-  scope :named, -> (name) { where(name: name) if name }
+  scope :by_price, -> { puts self.inspect; sort_by(price: :asc) }
+  scope :named, -> (name) { puts self.inspect; where(name: name) if name }
 end
 
 def populate

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", "~> 7.1"
+  s.add_runtime_dependency "rroonga", "~> 9.0"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rspec", '~> 3.0', '>= 3.0.0'

data/lib/groovy/model.rb

@@ -143,16 +143,8 @@ module Groovy
         num == 1 ? arr.first : arr
       end
 
-      def find_by(params)
-        where(params).limit(1).first
-      end
-
-      def clear_query
-        @query = nil
-      end
-
       def query
-        @query ||= query_class.new(self, table)
+		query_class.new(self, table)
       end
 
       def scope(name, obj)
@@ -162,7 +154,7 @@ module Groovy
         end
       end
 
-      [:search, :where, :not, :sort_by, :limit, :offset, :paginate, :in_batches].each do |scope_method|
+      [: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

data/lib/groovy/query.rb

@@ -6,12 +6,14 @@ module Groovy
     AND = '+'.freeze
     NOT = '-'.freeze
     PER_PAGE = 50.freeze
+    VALID_QUERY_CHARS = 'a-zA-Z0-9_\.,&-'.freeze
+    REMOVE_INVALID_CHARS_REGEX = Regexp.new('[^\s' + VALID_QUERY_CHARS + ']').freeze
 
     attr_reader :parameters, :sorting
 
     def self.add_scope(name, obj)
       define_method(name) do |*args|
-        res = obj.respond_to?(:call) ? obj.call(*args) : obj
+        res = obj.respond_to?(:call) ? instance_exec(*args, &obj) : obj
         self
       end
     end
@@ -32,10 +34,16 @@ module Groovy
       end
     end
 
-    def inspect
-      clear_query
-      # "<#{self.class.name} #{parameters}>"
-      super
+    # def inspect
+    #   "<#{self.class.name} #{parameters}>"
+    # end
+
+    def find(id)
+      find_by(_id: id)
+    end
+
+    def find_by(conditions)
+      where(conditions).limit(1).first
     end
 
     # http://groonga.org/docs/reference/grn_expr/query_syntax.html
@@ -51,7 +59,7 @@ module Groovy
               add_param(AND + [key, val.max].join(':<=')) if val.max # gte
 
             elsif val.is_a?(Regexp)
-              str = val.source.gsub(/[^a-zA-Z0-9\s_\.,-]/, '')
+              str = val.source.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 +93,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(/[^a-zA-Z0-9\s_\.,-]/, '')
+              str = val.source.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
 
@@ -194,13 +202,8 @@ module Groovy
     private
     attr_reader :model, :table, :options
 
-    def clear_query
-      model.clear_query # sets @query to nil
-    end
-
     def add_param(param)
       if parameters.include?(param)
-        # clear_query
         raise "Duplicate param: #{param}" 
       end
 
@@ -213,8 +216,6 @@ module Groovy
     rescue Groonga::TooLargeOffset
       # puts "Offset is higher than table size!"
       []
-    ensure
-      clear_query
     end
 
     def execute
@@ -252,8 +253,9 @@ module Groovy
     end
 
     def prepare_query
-      query = parameters.join(" ").split(/ or /i).map do |part|
-        part.gsub(/\s(\w)/, '\ \1')
+      space_regex = Regexp.new('\s([' + VALID_QUERY_CHARS + '])')
+      query = parameters.join(' ').split(/ or /i).map do |part|
+        part.gsub('  ', ' ').gsub(space_regex, '\ \1')
       end.join(' OR ').sub(/^-/, '_id:>0 -') #.gsub(' OR -', ' -')
     end
   end

data/lib/groovy/version.rb

@@ -1,3 +1,3 @@
 module Groovy
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/spec/model_spec.rb

@@ -11,10 +11,6 @@ describe Groovy::Model do
     Groovy.close('model_spec')
   end
 
-  after :each do
-    TestProduct.clear_query # otherwise next test will fail
-  end
-
   describe '.schema' do
   end
 
@@ -43,9 +39,9 @@ describe Groovy::Model do
 
       it 'does not duplicate params' do
         res = TestProduct.with_name('foo').by_price_asc.cheapest
-        res.query
-        expect(res.query.parameters).to eq(["+name:foo"])
-        expect(res.query.sorting).to eq(:by=>[{:key=>"price", :order=>:asc}], :limit=>-1, :offset=>0)
+        expect(res).to be_a(Groovy::Query)
+        expect(res.parameters).to eq(["+name:foo"])
+        expect(res.sorting).to eq(:by=>[{:key=>"price", :order=>:asc}], :limit=>-1, :offset=>0)
       end
 
     end

data/spec/query_spec.rb

@@ -5,7 +5,7 @@ describe Groovy::Query do
   before :all do
     Groovy.open('tmp/querying', 'query_spec')
     load_schema! 'query_spec'
-    @p1 = TestProduct.create!(name: "Product 1", visible: true, price: 10, tag_list: 'one, number two, and three')
+    @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", visible: true, price: 30, tag_list: nil)
     @p4 = TestProduct.create!(name: "Product 4", visible: false, price: 40, tag_list: 'one, number two')
@@ -48,6 +48,11 @@ describe Groovy::Query do
         res = TestProduct.where(name: 'Product 2')
         expect(res.map(&:id)).to eq([@p2.id])
       end
+
+      it 'works with symbols' do
+        res = TestProduct.where(tag_list: 'one, number two & three')
+        expect(res.map(&:id)).to eq([@p1.id])
+      end
     end
 
     context 'basic regex' do
@@ -60,6 +65,11 @@ describe Groovy::Query do
         res = TestProduct.where(tag_list: /TWO/)
         expect(res.map(&:id)).to eq([@p1.id, @p2.id, @p4.id])
       end
+
+      it 'works with symbols' do
+        res = TestProduct.where(tag_list: /two & three/)
+        expect(res.map(&:id)).to eq([@p1.id])
+      end
     end
 
     describe 'starts with regex' do
@@ -138,6 +148,11 @@ describe Groovy::Query do
         res = TestProduct.not(name: 'Product 2')
         expect(res.map(&:id)).to eq([@p1.id, @p3.id, @p4.id, @p5.id])
       end
+
+      it 'works with symbols' do
+        res = TestProduct.not(tag_list: 'one, number two & three')
+        expect(res.map(&:id)).to eq([@p2.id, @p3.id, @p4.id, @p5.id])
+      end
     end
 
     context 'basic regex' do
@@ -150,6 +165,11 @@ describe Groovy::Query do
         res = TestProduct.not(tag_list: /TWO/)
         expect(res.map(&:id)).to eq([@p3.id, @p5.id])
       end
+
+      it 'works with symbols' do
+        res = TestProduct.not(tag_list: /two & three/)
+        expect(res.map(&:id)).to eq([@p2.id, @p3.id, @p4.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.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rroonga
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A wrapper around Groonga/Rroonga