everywhere 0.1.0 → 1.0.0

data/README.rdoc

@@ -19,10 +19,17 @@ Same for where + like.
 
   SELECT "users".* FROM "users" WHERE ("users"."name" LIKE 'Akira%')
 
+=== where + not like
+
+And where + "not like" as well.
+
+  SELECT "users".* FROM "users" WHERE ("users"."name" NOT LIKE 'Matz%')
+
 
 == Syntaxes
 
-"+Everywhere+" supports 4 syntaxes.
+"+Everywhere+" supports 4 syntaxes. Note that you can use only one syntax at a time, and others will be disabled.
+The +hash_value+ syntax will be enabled by default.
 
 * hash_value
 Push the value into a Hash indexed by +:not+.
@@ -72,11 +79,6 @@ For example, if you prefer the symbol syntax, put the following line in your con
 The default value is +:hash_value+.
 
 
-== Todo
-
-+not like+ (if needed)
-
-
 == Contributing to Everywhere
 
 * Fork, fix, then send me a pull request.

data/everywhere.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Everywhere::VERSION
   s.authors     = ["Akira Matsuda"]
   s.email       = ["ronnie@dio.jp"]
-  s.homepage    = ""
+  s.homepage    = 'https://github.com/amatsuda/everywhere'
   s.summary     = %q{Hash condition syntax for AR query everywhere!}
   s.description = %q{Hash condition syntax for AR query everywhere!}
 

data/lib/everywhere/hash_key.rb

@@ -6,60 +6,66 @@ module ActiveRecord
       class << self
         include Everywhere::Util
 
-        def build_from_hash_with_not(engine, attributes, default_table)
-          attributes_with_not = {}
+        def build_from_hash_with_not_and_like_and_not_like(engine, attributes, default_table)
+          attributes_with_not_and_like_and_not_like = {}
           attributes.each do |column, value|
             # {not: {key: value}}
-            if column.in?([:not, :like])
+            if column.in?([:not, :like, :not_like])
               value.each do |k, v|
-                attributes_with_not["#{k}__#{column}__"] = v
+                attributes_with_not_and_like_and_not_like["#{k}__#{column}__"] = v
               end
             else
-              attributes_with_not[column] = value
+              attributes_with_not_and_like_and_not_like[column] = value
             end
           end
-          build_from_hash_without_not(engine, attributes_with_not, default_table).map do |rel|
+          build_from_hash_without_not_and_like_and_not_like(engine, attributes_with_not_and_like_and_not_like, default_table).map do |rel|
             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
+            elsif rel.left.name.to_s.ends_with? '__not_like__'
+              rel.left.name = rel.left.name.to_s.sub(/__not_like__$/, '').to_sym
+              Arel::Nodes::DoesNotMatch.new rel.left, rel.right
             else
               rel
             end
           end
         end
-        alias_method_chain :build_from_hash, :not
+        alias_method_chain :build_from_hash, :not_and_like_and_not_like
       end
     else
       include Everywhere::Util
 
-      def build_from_hash_with_not(attributes, default_table)
-        attributes_with_not = {}
+      def build_from_hash_with_not_and_like_and_not_like(attributes, default_table)
+        attributes_with_not_and_like_and_not_like = {}
         attributes.each do |column, value|
           # {not: {key: value}}
-          if (column == :not) || (column == :like)
+          if (column == :not) || (column == :like) || (column == :not_like)
             value.each do |k, v|
-              attributes_with_not["#{k}__#{column}__"] = v
+              attributes_with_not_and_like_and_not_like["#{k}__#{column}__"] = v
             end
           else
-            attributes_with_not[column] = value
+            attributes_with_not_and_like_and_not_like[column] = value
           end
         end
-        build_from_hash_without_not(attributes_with_not, default_table).map do |rel|
+        build_from_hash_without_not_and_like_and_not_like(attributes_with_not_and_like_and_not_like, default_table).map do |rel|
           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
+          elsif rel.left.name.to_s.ends_with? '__not_like__'
+            rel.left.name = rel.left.name.to_s.sub(/__not_like__$/, '').to_sym
+            Arel::Nodes::DoesNotMatch.new rel.left, rel.right
           else
             rel
           end
         end
       end
-      alias_method_chain :build_from_hash, :not
+      alias_method_chain :build_from_hash, :not_and_like_and_not_like
     end
   end
 end

data/lib/everywhere/hash_value.rb

@@ -6,54 +6,60 @@ module ActiveRecord
       class << self
         include Everywhere::Util
 
-        def build_from_hash_with_not(engine, attributes, default_table)
-          attributes_with_not = attributes.map do |column, value|
+        def build_from_hash_with_not_and_like_and_not_like(engine, attributes, default_table)
+          attributes_with_not_and_like_and_not_like = attributes.map do |column, value|
             # {key: {not: value}}
-            if value.is_a?(Hash) && (value.keys.size == 1) && value.keys.first.in?([:not, :like])
+            if value.is_a?(Hash) && (value.keys.size == 1) && value.keys.first.in?([:not, :like, :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|
+          build_from_hash_without_not_and_like_and_not_like(engine, attributes_with_not_and_like_and_not_like, default_table).map do |rel|
             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
+            elsif rel.left.name.to_s.ends_with?('__not_like__')
+              rel.left.name = rel.left.name.to_s.sub(/__not_like__$/, '').to_sym
+              Arel::Nodes::DoesNotMatch.new rel.left, rel.right
             else
               rel
             end
           end
         end
-        alias_method_chain :build_from_hash, :not
+        alias_method_chain :build_from_hash, :not_and_like_and_not_like
       end
     else
       include Everywhere::Util
 
-      def build_from_hash_with_not(attributes, default_table)
-        attributes_with_not = attributes.map do |column, value|
+      def build_from_hash_with_not_and_like_and_not_like(attributes, default_table)
+        attributes_with_not_and_like_and_not_like = attributes.map do |column, value|
           # {key: {not: value}}
-          if value.is_a?(Hash) && (value.keys.size == 1) && ((value.keys.first == :not) || (value.keys.first == :like))
+          if value.is_a?(Hash) && (value.keys.size == 1) && ((value.keys.first == :not) || (value.keys.first == :like) || (value.keys.first == :not_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|
+        build_from_hash_without_not_and_like_and_not_like(attributes_with_not_and_like_and_not_like, default_table).map do |rel|
           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
+          elsif rel.left.name.to_s.ends_with?('__not_like__')
+            rel.left.name = rel.left.name.to_s.sub(/__not_like__$/, '').to_sym
+            Arel::Nodes::DoesNotMatch.new rel.left, rel.right
           else
             rel
           end
         end
       end
-      alias_method_chain :build_from_hash, :not
+      alias_method_chain :build_from_hash, :not_and_like_and_not_like
     end
   end
 end

data/lib/everywhere/method.rb

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

data/lib/everywhere/symbol.rb

@@ -4,16 +4,18 @@ module ActiveRecord
   module QueryMethods
     include Everywhere::Util
 
-    def build_where_with_not(opts, other = [])
+    def build_where_with_not_and_like_and_not_like(opts, other = [])
       case opts
       when :not
-        build_where_without_not(*other).map {|r| negate r}
+        build_where_without_not_and_like_and_not_like(*other).map {|r| negate r}
       when :like
-        build_where_without_not(*other).map {|r| Arel::Nodes::Matches.new r.left, r.right}
+        build_where_without_not_and_like_and_not_like(*other).map {|r| Arel::Nodes::Matches.new r.left, r.right}
+      when :not_like
+        build_where_without_not_and_like_and_not_like(*other).map {|r| Arel::Nodes::DoesNotMatch.new r.left, r.right}
       else
-        build_where_without_not(opts, other)
+        build_where_without_not_and_like_and_not_like(opts, other)
       end
     end
-    alias_method_chain :build_where, :not
+    alias_method_chain :build_where, :not_and_like_and_not_like
   end
 end

data/lib/everywhere/version.rb

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

data/spec/hash_key_spec.rb

@@ -64,3 +64,15 @@ describe 'like' do
     its(:to_sql) { should == %q["posts"."title" LIKE 'he%'] }
   end
 end
+
+describe 'not like' do
+  describe 'not like match' do
+    before do
+      @where = Post.where(:not_like => {:title => 'he%'}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" NOT LIKE 'he%'] }
+  end
+end

data/spec/hash_value_spec.rb

@@ -64,3 +64,15 @@ describe 'like' do
     its(:to_sql) { should == %q["posts"."title" LIKE 'he%'] }
   end
 end
+
+describe 'not like' do
+  describe 'not like match' do
+    before do
+      @where = Post.where(:title => {:not_like => 'he%'}).where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" NOT LIKE 'he%'] }
+  end
+end

data/spec/method_spec.rb

@@ -64,3 +64,15 @@ describe 'like' do
     its(:to_sql) { should == %q["posts"."title" LIKE 'he%'] }
   end
 end
+
+describe 'not like' do
+  describe 'not like match' do
+    before do
+      @where = Post.where_not_like(:title => 'he%').where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" NOT LIKE 'he%'] }
+  end
+end

data/spec/symbol_spec.rb

@@ -64,3 +64,15 @@ describe 'like' do
     its(:to_sql) { should == %q["posts"."title" LIKE 'he%'] }
   end
 end
+
+describe 'not like' do
+  describe 'not like match' do
+    before do
+      @where = Post.where(:not_like, :title => 'he%').where_values
+    end
+    subject { @where }
+    it { @where.should have(1).item }
+    subject { @where.first }
+    its(:to_sql) { should == %q["posts"."title" NOT LIKE 'he%'] }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: everywhere
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70251485850240 !ruby/object:Gem::Requirement
+  requirement: &70208330286520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251485850240
+  version_requirements: *70208330286520
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70251485849520 !ruby/object:Gem::Requirement
+  requirement: &70208330286100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70251485849520
+  version_requirements: *70208330286100
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70251485868380 !ruby/object:Gem::Requirement
+  requirement: &70208330285680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70251485868380
+  version_requirements: *70208330285680
 description: Hash condition syntax for AR query everywhere!
 email:
 - ronnie@dio.jp
@@ -71,7 +71,7 @@ files:
 - spec/method_spec.rb
 - spec/spec_helper.rb
 - spec/symbol_spec.rb
-homepage: ''
+homepage: https://github.com/amatsuda/everywhere
 licenses: []
 post_install_message: 
 rdoc_options: []