record-cache 0.1.3 → 0.1.4

data/spec/lib/version_store_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe RecordCache::VersionStore do
+RSpec.describe RecordCache::VersionStore do
   
   before(:each) do
     @version_store = RecordCache::Base.version_store

data/spec/models/apple.rb

@@ -1,8 +1,7 @@
 class Apple < ActiveRecord::Base
-  
   cache_records :store => :shared, :key => "apl", :index => [:store_id, :person_id], :ttl => 300
 
   belongs_to :store
   belongs_to :person
-  
+
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+ENV["RAILS_ENV"]="test"
+
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift dir + "/../lib"
 $LOAD_PATH.unshift dir
@@ -7,12 +9,14 @@ SimpleCov.start do
   add_filter '/spec/'
 end
 
-require "rubygems"
-require "rspec"
+require 'rubygems'
+require 'rspec'
 require 'database_cleaner'
-require "logger"
-require "record_cache"
-require "record_cache/test/resettable_version_store"
+require 'logger'
+require 'record_cache'
+require 'record_cache/test/resettable_version_store'
+
+require 'test_after_commit'
 
 # spec support files
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
@@ -24,7 +28,7 @@ ActiveRecord::Base.logger = Logger.new(dir + "/log/debug.log")
 
 # SQL Lite
 ActiveRecord::Base.configurations = YAML::load(IO.read(dir + "/db/database.yml"))
-ActiveRecord::Base.establish_connection("sqlite3")
+ActiveRecord::Base.establish_connection(ENV["DATABASE_ADAPTER"] || "sqlite3")
 
 # Initializers + Model + Data
 load(dir + "/initializers/record_cache.rb")
@@ -32,14 +36,19 @@ load(dir + "/db/schema.rb")
 Dir["#{dir}/models/*.rb"].each {|f| load(f) }
 load(dir + "/db/seeds.rb")
 
+# backwards compatibility for previous versions of rails
+load(dir + "/initializers/backward_compatibility.rb")
+
 # Clear cache after each test
 RSpec.configure do |config|
+  config.disable_monkey_patching!
+  config.color = true
 
   config.before(:each) do
     RecordCache::Base.enable
     DatabaseCleaner.start
   end
-  
+
   config.after(:each) do
     DatabaseCleaner.clean
     RecordCache::Base.version_store.reset!

data/spec/support/matchers/hit_cache_matcher.rb

@@ -54,4 +54,4 @@ RSpec::Matchers.define :hit_cache do |model|
     @statistics_msg = @stats.map{|strategy, s| "#{strategy} => #{s.inspect}" }.join(", ")
   end
 
-end 
+end

data/spec/support/matchers/miss_cache_matcher.rb

@@ -54,4 +54,4 @@ RSpec::Matchers.define :miss_cache do |model|
     @statistics_msg = @stats.map{|strategy, s| "#{strategy} => #{s.inspect}" }.join(", ")
   end
 
-end 
+end

data/spec/support/matchers/use_cache_matcher.rb

@@ -54,4 +54,4 @@ RSpec::Matchers.define :use_cache do |model|
     @statistics_msg = @stats.map{|strategy, s| "#{strategy} => #{s.inspect}" }.join(", ")
   end
 
-end 
+end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: record-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Orslumen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-16 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>'
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,34 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +164,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test_after_commit
+  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'
 description: Record Cache for Rails 3
 email: orslumen@gmail.com
 executables: []
@@ -149,6 +191,8 @@ files:
 - lib/record_cache/datastore/active_record_30.rb
 - lib/record_cache/datastore/active_record_31.rb
 - lib/record_cache/datastore/active_record_32.rb
+- lib/record_cache/datastore/active_record_40.rb
+- lib/record_cache/datastore/active_record_41.rb
 - lib/record_cache/dispatcher.rb
 - lib/record_cache/multi_read.rb
 - lib/record_cache/query.rb
@@ -161,9 +205,11 @@ files:
 - lib/record_cache/test/resettable_version_store.rb
 - lib/record_cache/version.rb
 - lib/record_cache/version_store.rb
+- spec/db/create-record-cache-db_and_user.sql
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/db/seeds.rb
+- spec/initializers/backward_compatibility.rb
 - spec/initializers/record_cache.rb
 - spec/lib/active_record/visitor_spec.rb
 - spec/lib/base_spec.rb
@@ -187,7 +233,6 @@ files:
 - spec/models/person.rb
 - spec/models/store.rb
 - spec/spec_helper.rb
-- spec/support/after_commit.rb
 - spec/support/matchers/hit_cache_matcher.rb
 - spec/support/matchers/log.rb
 - spec/support/matchers/miss_cache_matcher.rb
@@ -215,12 +260,14 @@ rubyforge_project:
 rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
-summary: Record Cache v0.1.3 transparantly stores Records in a Cache Store and retrieve
+summary: Record Cache v0.1.4 transparantly stores Records in a Cache Store and retrieve
   those Records from the store when queried using Active Model.
 test_files:
+- spec/db/create-record-cache-db_and_user.sql
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/db/seeds.rb
+- spec/initializers/backward_compatibility.rb
 - spec/initializers/record_cache.rb
 - spec/lib/active_record/visitor_spec.rb
 - spec/lib/base_spec.rb
@@ -244,7 +291,6 @@ test_files:
 - spec/models/person.rb
 - spec/models/store.rb
 - spec/spec_helper.rb
-- spec/support/after_commit.rb
 - spec/support/matchers/hit_cache_matcher.rb
 - spec/support/matchers/log.rb
 - spec/support/matchers/miss_cache_matcher.rb

data/spec/support/after_commit.rb

@@ -1,73 +0,0 @@
-# @see http://outofti.me/post/4777884779/test-after-commit-hooks-with-transactional-fixtures
-module ActiveRecord
-  module ConnectionAdapters
-    module DatabaseStatements
-      #
-      # Run the normal transaction method; when it's done, check to see if there
-      # is exactly one open transaction. If so, that's the transactional
-      # fixtures transaction; from the model's standpoint, the completed
-      # transaction is the real deal. Send commit callbacks to models.
-      #
-      # If the transaction block raises a Rollback, we need to know, so we don't
-      # call the commit hooks. Other exceptions don't need to be explicitly
-      # accounted for since they will raise uncaught through this method and
-      # prevent the code after the hook from running.
-      #
-      def transaction_with_transactional_fixtures(options = {}, &block)
-        rolled_back = false
-
-        transaction_without_transactional_fixtures do
-          begin
-            yield
-          rescue Exception => exception
-            if exception.is_a?(ActiveRecord::Rollback)
-              rolled_back = true
-            else
-              puts "Exception in aftercommit: #{exception}"
-              puts exception.backtrace
-            end
-            raise exception
-          end
-        end
-
-        if !rolled_back && open_transactions == 1
-          commit_transaction_records(false)
-        end
-        true
-      end
-      alias_method_chain :transaction, :transactional_fixtures
-
-      #
-      # The @_current_transaction_records is an stack of arrays, each one
-      # containing the records associated with the corresponding transaction
-      # in the transaction stack. This is used by the
-      # `rollback_transaction_records` method (to only send a rollback hook to
-      # models attached to the transaction being rolled back) but is usually
-      # ignored by the `commit_transaction_records` method. Here we
-      # monkey-patch it to temporarily replace the array with only the records
-      # for the top-of-stack transaction, so the real
-      # `commit_transaction_records` method only sends callbacks to those.
-      #
-      def commit_transaction_records_with_transactional_fixtures(commit = true)
-        unless commit
-          real_current_transaction_records = @_current_transaction_records
-          @_current_transaction_records = @_current_transaction_records.pop
-        end
-
-        begin
-          @_current_transaction_records ||= []
-          commit_transaction_records_without_transactional_fixtures
-        rescue Exception => exception
-          puts "Error in aftercommit: #{exception}"
-          puts exception.backtrace
-        ensure
-          unless commit
-            @_current_transaction_records = real_current_transaction_records
-          end
-        end
-        true
-      end
-      alias_method_chain :commit_transaction_records, :transactional_fixtures
-    end
-  end
-end