everywhere 0.0.1 → 0.1.0

data/README.rdoc

@@ -11,7 +11,13 @@ Hash condition syntax for AR query everywhere!
 
   SELECT "users".* FROM "users" WHERE ("users"."name" != 'foo')
   SELECT "users".* FROM "users" WHERE ("users"."created_at" IS NOT NULL)
-  SELECT "users".* FROM "users" WHERE ("users"."status" NOT IN ('inactive', 'deleted')
+  SELECT "users".* FROM "users" WHERE ("users"."status" NOT IN ('inactive', 'deleted'))
+
+=== where + like
+
+Same for where + like.
+
+  SELECT "users".* FROM "users" WHERE ("users"."name" LIKE 'Akira%')
 
 
 == Syntaxes
@@ -40,9 +46,11 @@ Put +:not+ as the first parameter of +where+ method.
 * method
 Use the special method named +where_not+.
 
-    User.where_not(:not, :name => 'foo')
+    User.where_not(:name => 'foo')
      => SELECT "users".* FROM "users" WHERE ("users"."name" != 'foo')
 
+See specs for more details.
+
 
 == Supported versions
 
@@ -66,7 +74,7 @@ The default value is +:hash_value+.
 
 == Todo
 
-+like+ and +not like+ (if needed)
++not like+ (if needed)
 
 
 == Contributing to Everywhere

data/lib/everywhere/hash_key.rb

@@ -10,9 +10,9 @@ module ActiveRecord
           attributes_with_not = {}
           attributes.each do |column, value|
             # {not: {key: value}}
-            if column == :not
+            if column.in?([:not, :like])
               value.each do |k, v|
-                attributes_with_not["#{k}__not__"] = v
+                attributes_with_not["#{k}__#{column}__"] = v
               end
             else
               attributes_with_not[column] = value
@@ -22,6 +22,9 @@ module ActiveRecord
             if rel.left.name.to_s.ends_with? '__not__'
               rel.left.name = rel.left.name.to_s.sub(/__not__$/, '').to_sym
               negate rel
+            elsif rel.left.name.to_s.ends_with? '__like__'
+              rel.left.name = rel.left.name.to_s.sub(/__like__$/, '').to_sym
+              Arel::Nodes::Matches.new rel.left, rel.right
             else
               rel
             end
@@ -36,9 +39,9 @@ module ActiveRecord
         attributes_with_not = {}
         attributes.each do |column, value|
           # {not: {key: value}}
-          if column == :not
+          if (column == :not) || (column == :like)
             value.each do |k, v|
-              attributes_with_not["#{k}__not__"] = v
+              attributes_with_not["#{k}__#{column}__"] = v
             end
           else
             attributes_with_not[column] = value
@@ -48,6 +51,9 @@ module ActiveRecord
           if rel.left.name.to_s.ends_with? '__not__'
             rel.left.name = rel.left.name.to_s.sub(/__not__$/, '').to_sym
             negate rel
+          elsif rel.left.name.to_s.ends_with? '__like__'
+            rel.left.name = rel.left.name.to_s.sub(/__like__$/, '').to_sym
+            Arel::Nodes::Matches.new rel.left, rel.right
           else
             rel
           end

data/lib/everywhere/hash_value.rb

@@ -9,16 +9,19 @@ module ActiveRecord
         def build_from_hash_with_not(engine, attributes, default_table)
           attributes_with_not = attributes.map do |column, value|
             # {key: {not: value}}
-            if value.is_a?(Hash) && (value.keys.size == 1) && (value.keys.first == :not)
-              ["#{column}__not__", value.values.first]
+            if value.is_a?(Hash) && (value.keys.size == 1) && value.keys.first.in?([:not, :like])
+              ["#{column}__#{value.keys.first}__", value.values.first]
             else
               [column, value]
             end
           end
           build_from_hash_without_not(engine, attributes_with_not, default_table).map do |rel|
-            if rel.left.name.to_s.ends_with? '__not__'
+            if rel.left.name.to_s.ends_with?('__not__')
               rel.left.name = rel.left.name.to_s.sub(/__not__$/, '').to_sym
               negate rel
+            elsif rel.left.name.to_s.ends_with?('__like__')
+              rel.left.name = rel.left.name.to_s.sub(/__like__$/, '').to_sym
+              Arel::Nodes::Matches.new rel.left, rel.right
             else
               rel
             end
@@ -32,16 +35,19 @@ module ActiveRecord
       def build_from_hash_with_not(attributes, default_table)
         attributes_with_not = attributes.map do |column, value|
           # {key: {not: value}}
-          if value.is_a?(Hash) && (value.keys.size == 1) && (value.keys.first == :not)
-            ["#{column}__not__", value.values.first]
+          if value.is_a?(Hash) && (value.keys.size == 1) && ((value.keys.first == :not) || (value.keys.first == :like))
+            ["#{column}__#{value.keys.first}__", value.values.first]
           else
             [column, value]
           end
         end
         build_from_hash_without_not(attributes_with_not, default_table).map do |rel|
-          if rel.left.name.to_s.ends_with? '__not__'
+          if rel.left.name.to_s.ends_with?('__not__')
             rel.left.name = rel.left.name.to_s.sub(/__not__$/, '').to_sym
             negate rel
+          elsif rel.left.name.to_s.ends_with?('__like__')
+            rel.left.name = rel.left.name.to_s.sub(/__like__$/, '').to_sym
+            Arel::Nodes::Matches.new rel.left, rel.right
           else
             rel
           end

data/lib/everywhere/method.rb

@@ -3,7 +3,7 @@ require 'everywhere/util'
 module ActiveRecord
   class Base
     class << self
-      delegate :where_not, :to => :scoped
+      delegate :where_not, :where_like, :to => :scoped
     end
   end
 
@@ -17,5 +17,13 @@ module ActiveRecord
       relation.where_values += build_where(opts, rest).map {|r| negate r}
       relation
     end
+
+    def where_like(opts, *rest)
+      return self if opts.blank?
+
+      relation = clone
+      relation.where_values += build_where(opts, rest).map {|r| Arel::Nodes::Matches.new r.left, r.right}
+      relation
+    end
   end
 end

data/lib/everywhere/symbol.rb

@@ -5,8 +5,11 @@ module ActiveRecord
     include Everywhere::Util
 
     def build_where_with_not(opts, other = [])
-      if opts == :not
+      case opts
+      when :not
         build_where_without_not(*other).map {|r| negate r}
+      when :like
+        build_where_without_not(*other).map {|r| Arel::Nodes::Matches.new r.left, r.right}
       else
         build_where_without_not(opts, other)
       end

data/lib/everywhere/version.rb

@@ -1,3 +1,3 @@
 module Everywhere
-  VERSION = "0.0.1"
+  VERSION = '0.1.0'
 end

data/spec/hash_key_spec.rb

@@ -11,42 +11,56 @@ describe 'normal query' do
   its(:to_sql) { should == %q["posts"."title" = 'hello'] }
 end
 
-describe 'not eq' do
-  before do
-    @where = Post.where(:not => {:title => 'hello'}).where_values
+describe 'not' do
+  describe 'not eq' do
+    before do
+      @where = Post.where(:not => {:title => 'hello'}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" != 'hello'] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["posts"."title" != 'hello'] }
-end
 
-describe 'not null' do
-  before do
-    @where = Post.where(:not => {:created_at => nil}).where_values
+  describe 'not null' do
+    before do
+      @where = Post.where(:not => {:created_at => nil}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."created_at" IS NOT NULL] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["posts"."created_at" IS NOT NULL] }
-end
 
-describe 'not in' do
-  before do
-    @where = Post.where(:not => {:title => %w[hello goodbye]}).where_values
+  describe 'not in' do
+    before do
+      @where = Post.where(:not => {:title => %w[hello goodbye]}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" NOT IN ('hello', 'goodbye')] }
+  end
+
+  describe 'association' do
+    before do
+      @where = Post.joins(:comments).where(:comments => {:not => {:body => 'foo'}}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["comments"."body" != 'foo'] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["posts"."title" NOT IN ('hello', 'goodbye')] }
 end
 
-describe 'association' do
-  before do
-    @where = Post.joins(:comments).where(:comments => {:not => {:body => 'foo'}}).where_values
+describe 'like' do
+  describe 'like match' do
+    before do
+      @where = Post.where(:like => {:title => 'he%'}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" LIKE 'he%'] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["comments"."body" != 'foo'] }
 end

data/spec/hash_value_spec.rb

@@ -11,42 +11,56 @@ describe 'normal query' do
   its(:to_sql) { should == %q["posts"."title" = 'hello'] }
 end
 
-describe 'not eq' do
-  before do
-    @where = Post.where(:title => {:not => 'hello'}).where_values
+describe 'not' do
+  describe 'not eq' do
+    before do
+      @where = Post.where(:title => {:not => 'hello'}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" != 'hello'] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["posts"."title" != 'hello'] }
-end
 
-describe 'not null' do
-  before do
-    @where = Post.where(:created_at => {:not => nil}).where_values
+  describe 'not null' do
+    before do
+      @where = Post.where(:created_at => {:not => nil}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."created_at" IS NOT NULL] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["posts"."created_at" IS NOT NULL] }
-end
 
-describe 'not in' do
-  before do
-    @where = Post.where(:title => {:not => %w[hello goodbye]}).where_values
+  describe 'not in' do
+    before do
+      @where = Post.where(:title => {:not => %w[hello goodbye]}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" NOT IN ('hello', 'goodbye')] }
+  end
+
+  describe 'association' do
+    before do
+      @where = Post.joins(:comments).where(:comments => {:body => {:not => 'foo'}}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["comments"."body" != 'foo'] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["posts"."title" NOT IN ('hello', 'goodbye')] }
 end
 
-describe 'association' do
-  before do
-    @where = Post.joins(:comments).where(:comments => {:body => {:not => 'foo'}}).where_values
+describe 'like' do
+  describe 'like match' do
+    before do
+      @where = Post.where(:title => {:like => 'he%'}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" LIKE 'he%'] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["comments"."body" != 'foo'] }
 end

data/spec/method_spec.rb

@@ -11,42 +11,56 @@ describe 'normal query' do
   its(:to_sql) { should == %q["posts"."name" = 'hello'] }
 end
 
-describe 'not eq' do
-  before do
-    @where = Post.where_not(:name => 'hello').where_values
+describe 'not' do
+  describe 'not eq' do
+    before do
+      @where = Post.where_not(:name => 'hello').where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."name" != 'hello'] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["posts"."name" != 'hello'] }
-end
 
-describe 'not null' do
-  before do
-    @where = Post.where_not(:created_at => nil).where_values
+  describe 'not null' do
+    before do
+      @where = Post.where_not(:created_at => nil).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."created_at" IS NOT NULL] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["posts"."created_at" IS NOT NULL] }
-end
 
-describe 'not in' do
-  before do
-    @where = Post.where_not(:name => %w[hello goodbye]).where_values
+  describe 'not in' do
+    before do
+      @where = Post.where_not(:name => %w[hello goodbye]).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."name" NOT IN ('hello', 'goodbye')] }
+  end
+
+  describe 'association' do
+    before do
+      @where = Post.joins(:comments).where_not(:comments => {:body => 'foo'}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["comments"."body" != 'foo'] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["posts"."name" NOT IN ('hello', 'goodbye')] }
 end
 
-describe 'association' do
-  before do
-    @where = Post.joins(:comments).where_not(:comments => {:body => 'foo'}).where_values
+describe 'like' do
+  describe 'like match' do
+    before do
+      @where = Post.where_like(:title => 'he%').where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" LIKE 'he%'] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["comments"."body" != 'foo'] }
 end

data/spec/symbol_spec.rb

@@ -11,42 +11,56 @@ describe 'normal query' do
   its(:to_sql) { should == %q["posts"."name" = 'hello'] }
 end
 
-describe 'not eq' do
-  before do
-    @where = Post.where(:not, :name => 'hello').where_values
+describe 'not' do
+  describe 'not eq' do
+    before do
+      @where = Post.where(:not, :name => 'hello').where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."name" != 'hello'] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["posts"."name" != 'hello'] }
-end
 
-describe 'not null' do
-  before do
-    @where = Post.where(:not, :created_at => nil).where_values
+  describe 'not null' do
+    before do
+      @where = Post.where(:not, :created_at => nil).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."created_at" IS NOT NULL] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["posts"."created_at" IS NOT NULL] }
-end
 
-describe 'not in' do
-  before do
-    @where = Post.where(:not, :name => %w[hello goodbye]).where_values
+  describe 'not in' do
+    before do
+      @where = Post.where(:not, :name => %w[hello goodbye]).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."name" NOT IN ('hello', 'goodbye')] }
+  end
+
+  describe 'association' do
+    before do
+      @where = Post.joins(:comments).where(:not, :comments => {:body => 'foo'}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["comments"."body" != 'foo'] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["posts"."name" NOT IN ('hello', 'goodbye')] }
 end
 
-describe 'association' do
-  before do
-    @where = Post.joins(:comments).where(:not, :comments => {:body => 'foo'}).where_values
+describe 'like' do
+  describe 'like match' do
+    before do
+      @where = Post.where(:like, :title => 'he%').where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" LIKE 'he%'] }
   end
-  subject { @where }
-  it { @where.should have(1).item }
-  subject { @where.first }
-  its(:to_sql) { should == %q["comments"."body" != 'foo'] }
 end

metadata

@@ -1,74 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: everywhere
-version: !ruby/object:Gem::Version 
-  hash: 29
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70251485850240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70251485850240
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70251485849520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70251485849520
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70251485868380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70251485868380
 description: Hash condition syntax for AR query everywhere!
-email: 
+email:
 - ronnie@dio.jp
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -89,43 +71,33 @@ files:
 - spec/method_spec.rb
 - spec/spec_helper.rb
 - spec/symbol_spec.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: everywhere
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Hash condition syntax for AR query everywhere!
-test_files: 
+test_files:
 - spec/hash_key_spec.rb
 - spec/hash_value_spec.rb
 - spec/method_spec.rb
 - spec/spec_helper.rb
 - spec/symbol_spec.rb
-has_rdoc: