Merge pull request #44 from pitr/rails-40

Rails 4.0
orslumen · Oct 12, 2015 · 6e03f7b · 6e03f7b
2 parents 6981075 + 088da10
commit 6e03f7b
Show file tree

Hide file tree

Showing 37 changed files with 1,085 additions and 583 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,8 +15,6 @@ matrix:
     - rvm: jruby-head
 
 gemfile:
-  - gemfiles/rails_30.gemfile
-  - gemfiles/rails_31.gemfile
-  - gemfiles/rails_32.gemfile
+  - gemfiles/rails_40.gemfile
 
 script: 'bundle exec rake'
diff --git a/Appraisals b/Appraisals
@@ -1,11 +1,15 @@
 appraise 'rails-30' do
-  gem 'rails', '3.0.19'
+  gem 'rails', '3.0.20'
 end
 
 appraise 'rails-31' do
   gem 'rails', '3.1.12'
 end
 
 appraise 'rails-32' do
-  gem 'rails', '3.2.19'
-end
+  gem 'rails', '3.2.21'
+end
+
+appraise 'rails-40' do
+  gem 'rails', '4.0.13'
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,130 +2,118 @@ PATH
   remote: .
   specs:
     record-cache (0.1.3)
-      rails (> 3.0)
+      rails
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
+    actionmailer (4.0.12)
+      actionpack (= 4.0.12)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.0.12)
+      activesupport (= 4.0.12)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
-      tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
-      multi_json (~> 1.0)
-    appraisal (1.0.0)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.12)
+      activesupport (= 4.0.12)
+      builder (~> 3.1.0)
+    activerecord (4.0.12)
+      activemodel (= 4.0.12)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.12)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.12)
+      i18n (~> 0.6, >= 0.6.9)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (1.0.2)
       bundler
       rake
       thor (>= 0.14.0)
-    arel (2.2.1)
-    builder (3.0.0)
+    arel (4.0.2)
+    builder (3.1.4)
     coderay (1.1.0)
-    database_cleaner (0.7.0)
+    database_cleaner (1.3.0)
     diff-lcs (1.2.5)
-    docile (1.1.3)
+    docile (1.1.5)
     erubis (2.7.0)
     hike (1.2.3)
-    i18n (0.6.0)
-    json (1.8.1)
-    mail (2.3.0)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    i18n (0.7.0)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (1.25.1)
-    multi_json (1.0.4)
-    mysql2 (0.3.17)
-    polyglot (0.3.5)
-    pry (0.10.1)
+    mime-types (2.4.3)
+    minitest (4.7.5)
+    multi_json (1.10.1)
+    mysql2 (0.4.1)
+    pry (0.10.2)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.3.10)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.4)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
-      bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.12)
+      actionmailer (= 4.0.12)
+      actionpack (= 4.0.12)
+      activerecord (= 4.0.12)
+      activesupport (= 4.0.12)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.12)
+      sprockets-rails (~> 2.0)
+    railties (4.0.12)
+      actionpack (= 4.0.12)
+      activesupport (= 4.0.12)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (0.9.2.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.4.2)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
       rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.3)
+    rspec-core (3.1.7)
       rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.1)
+    rspec-expectations (3.1.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.0)
+    rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
-    rspec-support (3.1.0)
-    simplecov (0.8.2)
+    rspec-support (3.1.2)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.6.0)
-    sprockets (2.0.4)
+    sprockets (2.12.3)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.9)
-    thor (0.14.6)
+    sprockets-rails (2.2.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
+    test_after_commit (0.4.0)
+      activerecord (>= 3.2)
+    thor (0.19.1)
+    thread_safe (0.3.4)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.42)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (> 3.0)
+  activerecord (< 4.1)
   appraisal
-  bundler (~> 1.3)
+  bundler
   database_cleaner
   mysql2
   pry
@@ -134,3 +122,4 @@ DEPENDENCIES
   rspec (~> 3.0)
   simplecov
   sqlite3
+  test_after_commit
diff --git a/README.markdown b/README.markdown
@@ -4,7 +4,7 @@ Record Cache
 [![Build Status](http://img.shields.io/travis/orslumen/record-cache.svg?style=flat)](https://travis-ci.org/orslumen/record-cache)
 [![Gem Version](http://img.shields.io/gem/v/record-cache.svg?style=flat)](https://rubygems.org/gems/record-cache)
 
-*Cache Active Model Records in Rails 3*
+*Cache Active Model Records in Rails 3 and Rails 4*
 
 Record Cache transparently stores Records in a Cache Store to retrieve those Records from the store when queried using Active Model.
 Cache invalidation is performed automatically when Records are created, updated or destroyed. Currently only Active Record is supported, but more
@@ -128,7 +128,7 @@ Cucumber example, in features/support/env.rb:
 Restrictions
 ------------
 
-1. This gem is dependent on Rails 3
+1. This gem is dependent on Rails 3 and Rails 4
 
 2. Only Active Record is supported as a data store.
 
@@ -242,6 +242,7 @@ Development
 -----------
 
     $ bundle
+    $ appraisal
 
     # run the specs (requires ruby 1.9.3)
     $ appraisal rake

diff --git a/gemfiles/rails_30.gemfile b/gemfiles/rails_30.gemfile
@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "3.0.19"
+gem "rails", "3.0.20"
 
 gemspec :path => "../"