ilike 0.0.3 → 0.0.4

data/.rspec

@@ -0,0 +1 @@
+--color

data/README.md

@@ -8,9 +8,21 @@ write code that doesn't depend explicitly on your db adapter:
 ```ruby
   class Product < ActiveRecord::Base; end
 
-  Product.create(:name => 'Mozzarella Cheese', :price => 1.50)
-  Product.ilike(:name => '%cheese')
-  => [#<Product id: 2, name: "Mozzarella Cheese", price: #<BigDecimal:7fdeab856c90,'0.15E1',18(18)>>]
+  Product.create(:name => 'Pinot wine', :origin => 'France', :price => 13.50)
+  Product.create(:name => 'Barolo wine', :origin => 'Italy', :price => 12.50)
+
+  # basic search:
+  Product.ilike(:name => '%wine')
+  # => [#<Product id: 2, name: "Pinot wine", origin: "France", price: #<BigDecimal:105b70880,'0.135E2',18(18)>>,
+        #<Product id: 3, name: "Barolo wine", origin: "Italy", price: #<BigDecimal:105b705d8,'0.125E2',18(18)>>]
+
+  # search on multiple fields:
+  Product.ilike(:name => '%wine%', :origin => '%Ita%')
+  # => [#<Product id: 3, name: "Barolo wine", origin: "Italy", price: #<BigDecimal:1059677a0,'0.125E2',18(18)>>]
+
+  # search with multiple keywords on the same field:
+  Product.ilike(:name => ['%wine', '%barolo%')
+  # => [#<Product id: 3, name: "Barolo wine", origin: "Italy", price: #<BigDecimal:1059fe998,'0.125E2',18(18)>>]
 ```
 
 
@@ -28,6 +40,7 @@ Or install it yourself as:
 
     $ gem install liker
 
+
 ## Contributing
 
 1. Fork it

data/ilike.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Ilike::VERSION
 
+  gem.add_dependency 'rake'
   gem.add_dependency 'activerecord', '>= 3.0'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'guard-rspec'

data/lib/ilike.rb

@@ -2,10 +2,13 @@ require 'ilike/version'
 require 'active_record'
 
 module Ilike
-  def ilike(condition)
-    field = condition.keys.first
-    value = condition.values.first
-    where(arel_table[field].matches(value))
+  autoload :ArelTemplate, 'ilike/arel_template'
+
+  def ilike(conditions)
+    code = conditions.inject [] do |parts, arr|
+      parts << ArelTemplate.new(arr).build
+    end.flatten.join('.and')
+    class_eval "where(#{code})"
   end
 end
 

data/lib/ilike/arel_template.rb

@@ -0,0 +1,21 @@
+module Ilike
+  class ArelTemplate
+    attr_reader :field, :values
+
+    def initialize(arr)
+      @field, @values = arr
+    end
+
+    def build
+      if Array === values
+        values.map {|value| template(value)}
+      else
+        template(values)
+      end
+    end
+
+    def template(value)
+      "(arel_table[:#{field}].matches('#{value}'))"
+    end
+  end
+end

data/lib/ilike/version.rb

@@ -1,3 +1,3 @@
 module Ilike
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/ilike/arel_template_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module Ilike
+  describe ArelTemplate do
+    let(:template)       { ArelTemplate.new([:name, 'andrea%'])}
+    let(:multi_template) { ArelTemplate.new([:name, ['%andrea%', '%longhi%']])}
+
+    it 'template builds the basic code for arel' do
+      template.template('andrea%').should ==  "(arel_table[:name].matches('andrea%'))"
+    end
+
+    context 'when passing multiple keywords for field' do
+      it 'builds an array of templates' do
+        multi_template.build.should be_an(Array)
+      end
+
+      it 'builds expected templates' do
+        expected = ["(arel_table[:name].matches('%andrea%'))", "(arel_table[:name].matches('%longhi%'))"]
+        multi_template.build.should == expected
+      end
+    end
+  end
+end

data/spec/lib/ilike_spec.rb

@@ -10,16 +10,22 @@ describe Ilike do
     )
     ActiveRecord::Schema.define do
       create_table :products do |t|
-        t.string  :name,  :null => false
-        t.decimal :price, :null => false
+        t.string  :name,   :null => false
+        t.string  :origin, :null => false
+        t.decimal :price,  :null => false
       end
     end
   end
 
   before do
     Product.delete_all
-    @pasta  = Product.create(:name => 'Spaghetti Pasta', :price => 1.00)
-    @cheese = Product.create(:name => 'Mozzarella Fresh Cheese', :price => 1.50)
+    @pasta  = Product.create(:name => 'Spaghetti Pasta', :origin => 'Italy', :price => 1.00)
+    @pinot  = Product.create(:name => 'Pinot wine', :origin => 'France', :price => 13.50)
+    @barolo = Product.create(:name => 'Barolo wine', :origin => 'Italy', :price => 12.50)
+  end
+
+  it 'finds records that end with the requested string' do
+    Product.ilike(:name => '%pasta').should == [@pasta]
   end
 
   it 'finds records that end with the requested string' do
@@ -27,6 +33,19 @@ describe Ilike do
   end
 
   it 'finds records that contain the requested string' do
-    Product.ilike(:name => '%cheese%').should == [@cheese]
+    Product.ilike(:name => '%olo%').should == [@barolo]
+  end
+
+  it 'finds records that match all matchers' do
+    Product.ilike(:name => '%wine', :origin => '%fra%').should == [@pinot]
+  end
+
+  it 'searches with all options' do
+    Product.ilike(:name => ['%wine%', '%barolo%']).should == [@barolo]
+  end
+
+  it 'builds the expected sql' do
+    sql = 'SELECT "products".* FROM "products"  WHERE ("products"."name" LIKE \'%wine%\' AND "products"."name" LIKE \'%barolo%\')'
+    Product.ilike(:name => ['%wine%', '%barolo%']).to_sql.should == sql
   end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ilike
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
-  version: 0.0.3
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - andrea longhi
@@ -10,52 +15,79 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-07 00:00:00 Z
+date: 2012-12-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: rake
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  requirement: *id001
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
         version: "3.0"
   type: :runtime
-  version_requirements: *id001
+  requirement: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  requirement: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: guard-rspec
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  requirement: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   name: sqlite3
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  requirement: *id005
+  prerelease: false
 description: easy way to match strings with active record
 email: 
 - andrea@spaghetticode.it
@@ -67,6 +99,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
 - Gemfile
 - Guardfile
 - LICENSE
@@ -74,7 +107,9 @@ files:
 - Rakefile
 - ilike.gemspec
 - lib/ilike.rb
+- lib/ilike/arel_template.rb
 - lib/ilike/version.rb
+- spec/lib/ilike/arel_template_spec.rb
 - spec/lib/ilike_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/spaghetticode/ilike
@@ -90,12 +125,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
@@ -105,6 +146,6 @@ signing_key:
 specification_version: 3
 summary: easy way to match strings with active record
 test_files: 
+- spec/lib/ilike/arel_template_spec.rb
 - spec/lib/ilike_spec.rb
 - spec/spec_helper.rb
-has_rdoc: