wherex 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06f7931fb087e7901a750ae933265bcb110adeae
-  data.tar.gz: dbd498b628d94789801361f8cc44219a2507a4cf
+  metadata.gz: 08b47f8bb7b2485cde76210e5d69a85928849db9
+  data.tar.gz: d372d37d005fab5e117cb6cf63a187944354337f
 SHA512:
-  metadata.gz: d2f59b336978596eeec1230a6b09d58dfc784bf41238bfc94a1c4ad70805494a4a5b20e03a7c0459167cfcc09617bf8bcdaa5c7fcb618a8b04c0e0a71faf5167
-  data.tar.gz: 33741b3669e61fa0e5e3c563d4e941688796afa923fcf38c15c9a5945fb6fc3b2f11d1876c190ff669bd2129a3c2f8d6c9a0630fe4035a4ad9d8d766a43bfe76
+  metadata.gz: 356bb9ba52355cb5d47f69f0c3d9364dea13b40a97adb1689ff8115cf50c2c795ed0796ff582ad4814f282626a60bf79f8f4bf8970f9bfa54abc3f18e654695b
+  data.tar.gz: 07f020e23f65c9c3371d79bf802e6104accaff381e0b867a00451dcfc10f91bd0c8150a72c90ae67529e677930146456e51ba95121b9d1da0596481e80c1312d

data/.travis.yml

@@ -2,8 +2,8 @@ cache: bundler
 language: ruby
 
 before_script:
-  - mysql -e 'create database wherex_test;'
-  - psql -c 'create database wherex_test;' -U postgres
+  - if [[ "$DB" == "mysql" ]]; then mysql -e 'create database wherex_test;'; fi
+  - if [[ "$DB" == "postgres" ]]; then psql -c 'create database wherex_test;' -U postgres; fi
 
 rvm:
   - 2.0.0
@@ -11,22 +11,22 @@ rvm:
   - ruby-head
 
 gemfile:
-  - gemfiles/activerecord_3.1.gemfile
-  - gemfiles/activerecord_3.2.gemfile
-  - gemfiles/activerecord_4.0.gemfile
-  - gemfiles/activerecord_4.1.gemfile
-  - gemfiles/activerecord_4.2.gemfile
+  - gemfiles/ar_3.1.gemfile
+  - gemfiles/ar_3.2.gemfile
+  - gemfiles/ar_4.0.gemfile
+  - gemfiles/ar_4.1.gemfile
+  - gemfiles/ar_4.2.gemfile
 
 env:
-  - RAILS_DB=sqlite
-  - RAILS_DB=mysql
-  - RAILS_DB=postgres
+  - DB=sqlite
+  - DB=mysql
+  - DB=postgres
 
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
-    - gemfile: gemfiles/activerecord_4.2.gemfile
+    - gemfile: gemfiles/ar_4.2.gemfile
 
 addons:
   code_climate:

data/Appraisals

@@ -1,19 +1,19 @@
-appraise "activerecord-3.1" do
+appraise "ar-3.1" do
   gem "activerecord", "~> 3.1.0"
 end
 
-appraise "activerecord-3.2" do
+appraise "ar-3.2" do
   gem "activerecord", "~> 3.2.0"
 end
 
-appraise "activerecord-4.0" do
+appraise "ar-4.0" do
   gem "activerecord", "~> 4.0.0"
 end
 
-appraise "activerecord-4.1" do
+appraise "ar-4.1" do
   gem "activerecord", "~> 4.1.0"
 end
 
-appraise "activerecord-4.2" do
+appraise "ar-4.2" do
   gem "activerecord", "~> 4.2.0.rc1"
 end

data/LICENSE.txt

@@ -1,20 +1,20 @@
-Copyright (c) 2011 Jason King
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Copyright (c) 2014 Jason King
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -14,18 +14,22 @@ you can just use this in your `Gemfile`:
 gem 'wherex', '~> 1.0'
 ```
 
-## What the?
+Only works with Rails >= 3.1
 
-    # find users in 93, 94 and 95 (5 digit) zipcodes (new style finder)
-    User.where :zipcode => /^9[345][0-9]{3}$/
+## Examples
 
-    # find students with invalid characters in their names (old style finder)
-    Student.all :conditions => { :name => /[^a-zA-Z ]/ }
+```ruby
+# find users in 93, 94 and 95 (5 digit) zipcodes (new style finder)
+User.where :zipcode => /^9[345][0-9]{3}$/
+
+# find students with invalid characters in their names (old style finder)
+Student.all :conditions => { :name => /[^a-zA-Z ]/ }
 
-    # find products with a complex code structure (dynamic finders)
-    Product.find_by_code /^[NRW][^-]+-[456]/
+# find products with a complex code structure (dynamic finders)
+Product.find_by_code /^[NRW][^-]+-[456]/
+```
 
-## Limitations?
+## Be Aware
 
 ### POSIX Only (mostly)
 
@@ -61,19 +65,21 @@ RE one actually).
 
 Here's how I'd add in Oracle support:
 
-    # config/initializers/wherex.rb
-    module Wherex
-      module OracleEnhancedAdapter
-        def regexp left, right
-          "REGEXP_LIKE( #{left}, #{right} )"
-        end
-
-        def regexp_not left, right
-          "NOT #{regexp left, right}"
-        end
-      end
+```ruby
+# config/initializers/wherex.rb
+module Wherex
+  module OracleEnhancedAdapter
+    def regexp left, right
+      "REGEXP_LIKE( #{left}, #{right} )"
     end
 
+    def regexp_not left, right
+      "NOT #{regexp left, right}"
+    end
+  end
+end
+```
+
 That's it (and the 'NOT' is only necessary if you use meta_where or something
 that enables negative Arel statements to be generated).  You just have to make
 sure it is named correctly (needs to be the same as your actual adapter, so if
@@ -85,26 +91,64 @@ Wherex will pick this module up, and add it into the right place.  Just see
 
 ## Testing
 
+With the latest 1.1 I have added [Appraisal](//github.com/thoughtbot/appraisal)
+for testing multiple versions of ActiveRecord. Check that out for how it works, but
+basically you can run tests for all supported AR versions with:
+
+```bash
+appraisal rake
+```
+
+or you can pick one of the names from the `Appraisals` file and run just one, eg:
+
+```bash
+appraisal ar-4.0 rake
+```
+
+### Databases
+
 There are test suites for all three database engines that ship with Rails, the
 default is SQLite and requires no preconfiguration.  So you can just clone the
 repo and run `rake` and it will run the tests against SQLite
 
 If you want to run the tests against MySQL or PostgreSQL then you will first
-need to create a `wherex_test` database in your local machine.  Then you will
-need to provide the `DB` environment variable to rake, eg:
+need to create a `wherex_test` database in your local machine for the given DB.
+Then you will need to `bundle install` for the given DB by using the `DB`
+environment variable, eg:
+
+```bash
+DB=mysql bundle
+```
 
-    DB=mysql rake
+...or...
 
-…or…
+```bash
+DB=postgres bundle
+```
+
+You do the same thing when you're running the tests, eg:
+
+```bash
+DB=mysql rake
+```
 
-    DB=postgres rake
+...or...
+
+```bash
+DB=postgres rake
+```
 
 These will use a default user of `root` for MySQL and `postgres` for PostgreSQL.
 If you want to use different usernames or passwords then take a look in the
 `config/database.yml` file and either provide the appropriate environment
 variables, or edit the file itself.
 
-## Copyright
+You can also run an appraisal, or all appraisals through the same thing:
 
-Copyright © 2011 Jason King. See LICENSE.txt for further details.
+```bash
+DB=mysql appraisal rake
+```
+
+## Copyright
 
+Copyright © 2014 Jason King. See LICENSE.txt for further details.

data/lib/wherex/version.rb

@@ -1,3 +1,3 @@
 module Wherex
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/wherex.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.homepage    = "http://github.com/smathy/wherex"
   s.license     = "MIT"
   s.summary     = %q{Regexp for ActiveRecord finders}
-  s.description = %q{This gem allows you to pass a Regexp as the value for any finder in ActiveRecord - Rails3 only}
+  s.description = %q{This gem allows you to pass a Regexp as the value for any finder in ActiveRecord}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = s.files.grep /^test/
@@ -18,9 +18,14 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'activerecord', '>= 3.1'
 
-  s.add_development_dependency 'pg'
-  s.add_development_dependency 'mysql2'
-  s.add_development_dependency 'sqlite3', ">= 1.3.7"
+  case ENV["DB"]
+  when "postgres", "postgresql", "pg"
+    s.add_development_dependency 'pg'
+  when "mysql", "mysql2"
+    s.add_development_dependency 'mysql2'
+  else
+    s.add_development_dependency 'sqlite3', ">= 1.3.7"
+  end
 
   s.add_development_dependency 'rake', '>= 1.0'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wherex
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jason King
@@ -24,34 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +53,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 description: This gem allows you to pass a Regexp as the value for any finder in ActiveRecord
-  - Rails3 only
 email:
 - jk@handle.it
 executables: []
@@ -104,11 +75,11 @@ files:
 - bin/tapout
 - bin/thor
 - bin/turn
-- gemfiles/activerecord_3.1.gemfile
-- gemfiles/activerecord_3.2.gemfile
-- gemfiles/activerecord_4.0.gemfile
-- gemfiles/activerecord_4.1.gemfile
-- gemfiles/activerecord_4.2.gemfile
+- gemfiles/ar_3.1.gemfile
+- gemfiles/ar_3.2.gemfile
+- gemfiles/ar_4.0.gemfile
+- gemfiles/ar_4.1.gemfile
+- gemfiles/ar_4.2.gemfile
 - lib/wherex.rb
 - lib/wherex/adapters.rb
 - lib/wherex/connection.rb