wherex 1.0.6 → 1.0.7

data/Gemfile

@@ -1,22 +1,4 @@
 source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-gem 'arel', '~> 2.0'
-gem 'activerecord', '~> 3.0'
-
-case ENV["RAILS_DB"]
-when "postgres"
-  gem 'pg'
-when "mysql"
-  gem 'mysql2', '~>0.2.11'
-else
-  gem 'sqlite3'
-end
-
-group :test do
-  gem 'redgreen'
-  gem 'turn'
-  gem "rcov", ">= 0"
-  gem 'rake', '>= 0.8.3'
-end
 
+# Specify your gem's dependencies in activerecord_enum.gemspec
+gemspec

data/Gemfile.lock

@@ -1,36 +1,44 @@
+PATH
+  remote: .
+  specs:
+    wherex (1.0.6)
+      activerecord (>= 3.0)
+      arel (>= 2.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.6)
-      activesupport (= 3.0.6)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.6)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
+      builder (~> 3.0.0)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     ansi (1.2.2)
-    arel (2.0.9)
-    builder (2.1.2)
-    i18n (0.5.0)
+    arel (3.0.2)
+    builder (3.0.0)
+    i18n (0.6.0)
+    multi_json (1.2.0)
     rake (0.8.7)
     rcov (0.9.9)
     redgreen (1.2.2)
-    sqlite3 (1.3.3)
+    sqlite3 (1.3.5)
     turn (0.8.2)
       ansi (>= 1.2.2)
-    tzinfo (0.3.26)
+    tzinfo (0.3.32)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 3.0)
-  arel (~> 2.0)
   rake (>= 0.8.3)
   rcov
   redgreen
   sqlite3
   turn
+  wherex!

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/rcov

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rcov' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rcov', 'rcov')

data/bin/rg

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rg' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('redgreen', 'rg')

data/bin/turn

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'turn' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('turn', 'turn')

data/lib/wherex/version.rb

@@ -1,3 +1,3 @@
 module Wherex
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/lib/wherex/visitor.rb

@@ -11,7 +11,7 @@ module Wherex
     def visit_Arel_Nodes_Equality_with_wherex o
       right = o.right
       if right.present? and right.is_a? Regexp
-        @connection.regexp visit(o.left), visit(right)
+        ::ActiveRecord::Base.connection.regexp visit(o.left), visit(right)
       else
         visit_Arel_Nodes_Equality_without_wherex o
       end
@@ -20,13 +20,13 @@ module Wherex
     def visit_Arel_Nodes_NotEqual_with_wherex o
       right = o.right
       if right.present? and right.is_a? Regexp
-        @connection.regexp_not visit(o.left), visit(right)
+        ::ActiveRecord::Base.connection.regexp_not visit(o.left), visit(right)
       else
         visit_Arel_Nodes_NotEqual_without_wherex o
       end
     end
 
-    def visit_Regexp o; @connection.regexp_quote(o.source) end
+    def visit_Regexp o; ::ActiveRecord::Base.connection.regexp_quote(o.source) end
 
   end
 end

data/lib/wherex.rb

@@ -6,5 +6,6 @@ require 'wherex/visitor'
 require 'wherex/connection'
 module Wherex
   ::Arel::Visitors::ToSql.send :include, Visitor
+  ::Arel::Visitors::DepthFirst.send :include, Visitor
   ::ActiveRecord::Base.send :extend, ActiveRecord
 end

data/test/helper.rb

@@ -30,13 +30,13 @@ ActiveRecord::Base.silence do
   load File.join(FIXTURES_PATH, 'schema.rb')
 end
 
-Fixtures.create_fixtures(FIXTURES_PATH, ActiveRecord::Base.connection.tables)
+ActiveRecord::Fixtures.create_fixtures(FIXTURES_PATH, ActiveRecord::Base.connection.tables)
 
 class Test::Unit::TestCase
   def method_missing method, *args
     candidate = method.to_s.classify
     begin
-      candidate.constantize.find( Fixtures.identify args[0] )
+      candidate.constantize.find( ActiveRecord::Fixtures.identify args[0] )
     rescue NameError
       raise NameError.new "undefined local variable or method `#{method}`"
     end

data/test/test_wherex.rb

@@ -3,7 +3,7 @@ require 'helper'
 class TestWherex < Test::Unit::TestCase
   def test_user_example
     assert u = User.where( :zipcode => /^9[345][0-9]{3}$/ )
-    assert_equal 3, u.count 
+    assert_equal 3, u.count
     [:two, :three, :four ].each do |id|
       assert u.include?( users(id) )
     end
@@ -21,7 +21,7 @@ class TestWherex < Test::Unit::TestCase
   def test_student_example
     assert s = Student.all( :conditions => { :name => /[^a-zA-Z ]/ } )
     assert_equal 3, s.count
-    [ :two, :three, :four ].each do |id| 
+    [ :two, :three, :four ].each do |id|
       assert s.include?( students(id) )
     end
   end

data/wherex.gemspec

@@ -21,4 +21,19 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'arel', '>= 2.0'
   s.add_dependency 'activerecord', '>= 3.0'
+
+  case ENV["RAILS_DB"]
+  when "postgres"
+    s.add_development_dependency 'pg'
+  when "mysql"
+    s.add_development_dependency 'mysql2'
+  else
+    s.add_development_dependency 'sqlite3'
+  end
+
+  s.add_development_dependency 'redgreen'
+  s.add_development_dependency 'turn'
+  s.add_development_dependency "rcov", ">= 0"
+  s.add_development_dependency 'rake', '>= 0.8.3'
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wherex
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Jason King
@@ -47,11 +47,86 @@ dependencies:
         version: "3.0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: redgreen
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: turn
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 8
+        - 3
+        version: 0.8.3
+  type: :development
+  version_requirements: *id007
 description: This gem allows you to pass a Regexp as the value for any finder in ActiveRecord - Rails3 only
 email: 
 - jk@handle.it
-executables: []
-
+executables: 
+- rake
+- rcov
+- rg
+- turn
 extensions: []
 
 extra_rdoc_files: []
@@ -63,6 +138,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/rake
+- bin/rcov
+- bin/rg
+- bin/turn
 - lib/wherex.rb
 - lib/wherex/adapters.rb
 - lib/wherex/connection.rb