simple_cacheable 1.4.1 → 1.5.0

data/spec/models/account.rb

@@ -1,5 +1,13 @@
 class Account < ActiveRecord::Base
+  include Cacheable
   belongs_to :user
 
   belongs_to :group
+
+  belongs_to :account_location, class_name: Location,
+                                foreign_key: :account_location_id
+
+  model_cache do
+    with_association :user, :account_location
+  end
 end

data/spec/models/post.rb

@@ -1,9 +1,15 @@
 class Post < ActiveRecord::Base
   include Cacheable
+  extend FriendlyId
 
   belongs_to :location
   belongs_to :user
 
+  friendly_modules = [:slugged]
+  friendly_modules << :finders if Cacheable.rails4?
+
+  friendly_id :title, use: friendly_modules
+
   has_many :comments, :as => :commentable
   has_many :images, :as => :viewable
 
@@ -13,9 +19,12 @@ class Post < ActiveRecord::Base
     with_key
     with_attribute :user_id
     with_association :user, :comments, :images, :tags
-    with_class_method :default_post, :retrieve_with_user_id, :retrieve_with_both
+    with_class_method :retrieve_with_user_id, :retrieve_with_both, :default_post,
+                      :where_options_are
   end
 
+  before_validation :create_slug
+
   def self.default_post
     Post.first
   end
@@ -28,4 +37,15 @@ class Post < ActiveRecord::Base
     Post.find(post_id) == Post.find_by_user_id(user_id)
   end
 
+  def self.where_options_are(options={})
+    Post.where(options).first
+  end
+
+  def create_slug
+    self.slug = title
+  end
+
+  def to_param
+    slug
+  end
 end

data/spec/models/user.rb

@@ -10,9 +10,10 @@ class User < ActiveRecord::Base
   model_cache do
     with_key
     with_attribute :login
-    with_method :last_post
+    with_method :last_post, :bad_iv_name!, :bad_iv_name?, :admin?, :hash_with_class_key
     with_association :posts, :account, :images, :group
-    with_class_method :default_name
+    with_class_method :default_name, :user_with_id, :user_with_email,
+                      :users_with_ids, :users_with_ids_in, :user_with_attributes
   end
 
   def last_post
@@ -23,4 +24,39 @@ class User < ActiveRecord::Base
     "flyerhzm"
   end
 
+  def bad_iv_name!
+    42
+  end
+
+  def bad_iv_name?
+    44
+  end
+
+  def admin?
+    false
+  end
+
+  def hash_with_class_key
+    {:foo => "Bar", :class => "batman"}
+  end
+
+    # accepts a number
+  def self.user_with_id(id)
+    User.find(id)
+  end
+
+  # accepts a string
+  def self.user_with_email(email)
+    User.find_by_email(email)
+  end
+
+  # accepts an array
+  def self.users_with_ids(ids)
+    User.find(ids)
+  end
+
+  # accepts a range
+  def self.users_with_ids_in(range)
+    User.select { |u| range.include?(u.id) }
+  end
 end

data/spec/spec_helper.rb

@@ -3,10 +3,13 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 
 require 'rails'
 require 'active_record'
+require 'support/ar_patches'
+require 'support/coder_macro'
 require 'rspec'
 require 'mocha/api'
 require 'memcached'
 require 'cacheable'
+require 'friendly_id'
 
 # It needs this order otherwise cacheable throws
 # errors when looking for reflection classes
@@ -39,6 +42,8 @@ RSpec.configure do |config|
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
 
+  config.include CoderMacro
+
   config.before :all do
     ::ActiveRecord::Schema.define(:version => 1) do
       create_table :users do |t|
@@ -49,12 +54,14 @@ RSpec.configure do |config|
       create_table :accounts do |t|
         t.integer :user_id
         t.integer :group_id
+        t.integer :account_location_id
       end
 
       create_table :posts do |t|
         t.integer :user_id
         t.string :title
         t.integer :location_id
+        t.string :slug
       end
 
       create_table :comments do |t|
@@ -86,6 +93,10 @@ RSpec.configure do |config|
       end
     end
 
+    config.before :each do
+      Rails.cache.clear
+    end
+
   end
 
   config.after :all do
@@ -94,3 +105,5 @@ RSpec.configure do |config|
     end
   end
 end
+
+

data/spec/support/ar_patches.rb

@@ -0,0 +1,51 @@
+# Monkey patch to raise exceptions from after_commit
+# https://github.com/rails/rails/pull/11123
+
+module ActiveRecord
+  module ConnectionAdapters
+    module DatabaseStatements
+      def within_new_transaction(options = {})
+        transaction = begin_transaction(options)
+        yield
+      rescue Exception => error
+        rollback_transaction if transaction
+        raise
+      ensure
+        begin
+          commit_transaction unless error
+        rescue Exception
+          rollback_transaction unless transaction.state.complete?
+          raise
+        end
+      end
+    end
+  end
+end
+
+module ActiveRecord
+  module ConnectionAdapters
+    # Not patched but need to be here
+    class Transaction; end
+    class ClosedTransaction < Transaction; end
+
+    class TransactionState
+      def complete?
+        committed? || rolledback?
+      end
+    end
+
+    class OpenTransaction < Transaction
+      def commit_records
+        @state.set_state(:committed)
+        records.uniq.each do |record|
+          begin
+            record.committed!
+          rescue => e
+            record.logger.error(e) if record.respond_to?(:logger) && record.logger
+            raise
+          end
+        end
+      end
+    end
+  end
+end

data/spec/support/coder_macro.rb

@@ -0,0 +1,12 @@
+module CoderMacro
+
+  # Helper to give correct equivalent of what's in cache
+  def coder(object)
+    if object.is_a?(Array)
+      object.map {|obj| Cacheable.send(:coder_from_record, obj) }
+    else
+      Cacheable.send(:coder_from_record, object)
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_cacheable
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Richard Huang
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2014-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +53,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.10.5
+- !ruby/object:Gem::Dependency
+  name: friendly_id
+  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: a simple cache implementation based on activerecord
 email:
 - flyerhzm@gmail.com
@@ -66,16 +80,22 @@ files:
 - .ruby-gemset
 - .ruby-version
 - .travis.yml
+- Appraisals
 - ChangeLog
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - cacheable.gemspec
+- gemfiles/3.2.gemfile
+- gemfiles/3.2.gemfile.lock
+- gemfiles/4.0.gemfile
+- gemfiles/4.0.gemfile.lock
 - lib/cacheable.rb
 - lib/cacheable/caches.rb
 - lib/cacheable/expiry.rb
 - lib/cacheable/keys.rb
+- lib/cacheable/model_fetch.rb
 - lib/cacheable/types/association_cache.rb
 - lib/cacheable/types/attribute_cache.rb
 - lib/cacheable/types/class_method_cache.rb
@@ -83,6 +103,7 @@ files:
 - lib/cacheable/types/method_cache.rb
 - lib/cacheable/version.rb
 - spec/cacheable/expiry_cache_spec.rb
+- spec/cacheable/model_fetch_spec.rb
 - spec/cacheable/types/association_cache_spec.rb
 - spec/cacheable/types/attribute_cache_spec.rb
 - spec/cacheable/types/class_method_cache_spec.rb
@@ -99,8 +120,11 @@ files:
 - spec/models/tag.rb
 - spec/models/user.rb
 - spec/spec_helper.rb
-homepage: https://github.com/flyerhzm/simple-cacheable
-licenses: []
+- spec/support/ar_patches.rb
+- spec/support/coder_macro.rb
+homepage: https://github.com/flyerhzm/simple_cacheable
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -118,12 +142,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: a simple cache implementation based on activerecord
 test_files:
 - spec/cacheable/expiry_cache_spec.rb
+- spec/cacheable/model_fetch_spec.rb
 - spec/cacheable/types/association_cache_spec.rb
 - spec/cacheable/types/attribute_cache_spec.rb
 - spec/cacheable/types/class_method_cache_spec.rb
@@ -140,3 +165,5 @@ test_files:
 - spec/models/tag.rb
 - spec/models/user.rb
 - spec/spec_helper.rb
+- spec/support/ar_patches.rb
+- spec/support/coder_macro.rb