activerecord-like 0.0.3 → 0.0.4

data/.travis.yml

@@ -3,5 +3,10 @@ cache: bundler
 rvm:
   - 1.9.3
   - rbx-2.1.1
-# uncomment this line if your project needs to run something other than `rake`:
-# # script: bundle exec rspec spec
+env:
+  - DB=pg
+  - DB=sqlite3
+  - DB=mysql
+before_script:
+  - psql -c 'create database activerecord_like_test' -U postgres
+  - mysql -e 'create database activerecord_like_test'

data/Gemfile

@@ -5,7 +5,14 @@ gem 'activerecord', '>= 4.0.0'
 group :test do
   gem 'rake'
 
-  gem 'sqlite3'
+  case ENV['DB']
+  when 'pg'
+    gem 'pg'
+  when 'mysql'
+    gem 'mysql2'
+  else
+    gem 'sqlite3'
+  end
 
   gem 'minitest', '>= 3'
 end

data/README.md

@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/ReneB/activerecord-like.png?branch=master)](https://travis-ci.org/ReneB/activerecord-like)
 [![Code Climate](https://codeclimate.com/github/ReneB/activerecord-like.png)](https://codeclimate.com/github/ReneB/activerecord-like)
 [![Dependency Status](https://gemnasium.com/ReneB/activerecord-like.png)](https://gemnasium.com/ReneB/activerecord-like)
+[![Gem Version](https://badge.fury.io/rb/activerecord-like.png)](http://badge.fury.io/rb/activerecord-like)
 
 An Active Record Plugin that allows chaining a more DSL-style 'like' or 'not-like' query to an ActiveRecord::Base#where. Requires Rails 4 beta or higher.
 

data/activerecord-like.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency             "activerecord", ">= 4.0.0"
-  gem.add_dependency             "arel",         ">= 4.0.2"
+  gem.add_dependency             "arel",         "~> 4.0.2"
 end

data/lib/active_record/like/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Like
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/test/helper.rb

@@ -3,7 +3,100 @@ require 'minitest/autorun'
 require 'minitest/spec'
 require 'active_record/like'
 
-ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+module Test
+  module Postgres
+    def connect_db
+      ActiveRecord::Base.establish_connection(postgres_config)
+    end
+
+    def drop_and_create_database
+      # drops and create need to be performed with a connection to the 'postgres' (system) database
+      temp_connection = postgres_config.merge(database: 'postgres', schema_search_path: 'public')
+      ActiveRecord::Base.establish_connection(temp_connection)
+
+      # drop the old database (if it exists)
+      ActiveRecord::Base.connection.drop_database(database_name) rescue nil
+
+      # create new
+      ActiveRecord::Base.connection.create_database(database_name)
+    end
+
+    def postgres_config
+      @postgres_config ||= {
+        adapter:   'postgresql',
+        database:  database_name,
+        username:  'postgres'
+      }
+    end
+
+    def database_name
+      'activerecord_like_test'
+    end
+  end
+
+  module SQLite3
+    def connect_db
+      ActiveRecord::Base.establish_connection(adapter: 'sqlite3', database: ':memory:')
+    end
+
+    def drop_and_create_database
+      # NOOP for SQLite3
+    end
+  end
+
+  module MySQL
+    def connect_db
+      ActiveRecord::Base.establish_connection(mysql_config)
+    end
+
+    def drop_and_create_database
+      temp_connection = mysql_config.merge(database: 'mysql')
+
+      ActiveRecord::Base.establish_connection(temp_connection)
+
+      # drop the old database (if it exists)
+      ActiveRecord::Base.connection.drop_database(database_name) rescue nil
+
+      # create new
+      ActiveRecord::Base.connection.create_database(database_name)
+    end
+
+    def mysql_config
+      @mysql_config ||= {
+        adapter:   'mysql2',
+        database:  database_name,
+        username:  db_user_name,
+      }
+    end
+
+    def db_user_name
+      # change this to whatever your config requires
+      ENV['TRAVIS'] ? 'travis' : 'root'
+    end
+
+    def database_name
+      'activerecord_like_test'
+    end
+  end
+end
+
+case ENV['DB']
+when 'pg'
+  include Test::Postgres
+when 'sqlite3'
+  include Test::SQLite3
+when 'mysql'
+  include Test::MySQL
+else
+  puts "No DB environment variable provided, testing using SQLite3"
+  include Test::SQLite3
+end
+
+unless ENV['TRAVIS'] # if we're running on Travis, no drop/create needed
+  drop_and_create_database
+end
+
+connect_db
 
 ActiveRecord::Schema.verbose = false
 ActiveRecord::Schema.define do

data/test/integration/like_test.rb

@@ -36,7 +36,7 @@ describe ActiveRecord::QueryMethods::WhereChain do
 
     describe "security-related behavior"  do
       before do
-        @user_input = "unused%' OR 1=1); --"
+        @user_input = "unused%' OR 1=1); -- "
       end
 
       # This test is only here to provide the contrast for the test below

data/test/integration/not_like_test.rb

@@ -36,7 +36,7 @@ describe ActiveRecord::QueryMethods::WhereChain do
 
     describe "security-related behavior"  do
       before do
-        @user_input = "unused%' OR 1=1); --"
+        @user_input = "unused%' OR 1=1); -- "
       end
 
       # This test is only here to provide the contrast for the test below

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-like
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -32,7 +32,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.2
   type: :runtime
@@ -40,7 +40,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.2
 description: An ActiveRecord plugin providing a higher-level abstraction for SQL 'LIKE'
@@ -78,15 +78,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3561638004466154601
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3561638004466154601
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ! 'ActiveRecord::Like provides ActiveRecord::Base with where.like(attribute: