ultracache 0.1.0 → 0.1.1

data/lib/ultracache/cached.rb

@@ -21,7 +21,7 @@ module Ultracache
 
     included do
       extend ActiveModel::Callbacks
-      define_model_callbacks :save, :destroy
+      define_model_callbacks :create, :update, :destroy
 
       after_create :save_cache
       after_update :update_cache

data/lib/ultracache/macro.rb

@@ -13,14 +13,13 @@ module Ultracache
       end
 
       def has_cached_queue(another, options={})
-        name = options[:as] ? options[:as] : another
-        relationship = HasCachedQueue.new name, :self_class => self,
+        relationship = HasCachedQueue.new another, :self_class => self,
           :associated_class => options[:class] ? options[:class] : another
 
         self.relationships(:strict => true).add(relationship)
 
-        define_method name do |*options|
-          read_cache(name, options.first || {})
+        define_method another do |*options|
+          read_cache(another, options.first || {})
         end
       end
 
@@ -28,7 +27,6 @@ module Ultracache
         relationship = HasCachedAttribute.new name, block, :self_class => self,
           :serializer => options[:serializer]
 
-        rs = self.relationships(:strict => true)
         self.relationships(:strict => true).add(relationship)
 
         define_method name do |*options|

data/lib/ultracache/railtie.rb

@@ -8,7 +8,7 @@ module Rails
       initializer 'ultracache' do |app|
         if defined? ::Mongoid
           require File.join(File.dirname(__FILE__), 'models/mongoid_extension.rb')
-          ::Mongoid::Document.send :include, Ultracache::Models::MongoidExtension
+          ::Mongoid::Document.send :include, ::Ultracache::Models::MongoidExtension
         end
       end
     end

data/lib/ultracache/relationship.rb

@@ -20,5 +20,14 @@ module Ultracache
     def save_cache(obj); end
     def destroy_cache(obj); end
     def update_cache(obj); end
+
+    protected
+      def storage
+        Ultracache::Configurations.storage
+      end
+
+      def serializer
+        Ultracache::Configurations.serializer
+      end
   end
 end

data/lib/ultracache/relationship/belongs_as_cached_queue.rb

@@ -6,9 +6,6 @@ module Ultracache
       @alias = options[:as]
       @need_update = options[:need_update]
       @unless = options[:unless]
-
-      @storage = Ultracache::Configurations.storage
-      @serializer = Ultracache::Configurations.serializer
     end
 
     # Saves serialized form of object into cache queue which the object
@@ -24,10 +21,10 @@ module Ultracache
       value = if @serializer_block
         @serializer_block.call obj
       else
-        JSON.generate(obj.as_json)
+        serializer.serialize(obj.as_json)
       end
 
-      @storage.put_queue(key(obj), score_of(obj), value)
+      storage.put_queue(key(obj), score_of(obj), value)
     end
 
     # Destroys serialized cache from associated cache queue. In some cases
@@ -42,21 +39,21 @@ module Ultracache
       score = score_of(obj)
       key = key(obj)
 
-      docs = @storage.get_queue(key, :from => score, :to => score)
+      docs = storage.get_queue(key, :from => score, :to => score)
 
       if docs.count == 1
         # Only one document is fetched from queue, and it is okay to remove
-        @storage.remove_from_queue_by_range(key, :from => score, :to => score)
+        storage.remove_from_queue_by_range(key, :from => score, :to => score)
       elsif docs.count > 1
         # We should deserialize fetched documents to find the document having
         # the same id with `obj`
         docs.each do |doc|
-          deserialized = @serializer.deserialize(doc)
+          deserialized = serializer.deserialize(doc)
           _id = deserialized["id"]
           _id = deserialized["_id"] unless _id
 
           if _id == obj.id
-            @storage.remove_from_queue(key, doc)
+            storage.remove_from_queue(key, doc)
           end
         end
       end
@@ -84,13 +81,6 @@ module Ultracache
       def score_of(obj)
         obj.respond_to?(:cached_queue_score) ? obj.cached_queue_score : obj.id
       end
-
-      def serialize(obj)
-        # Is it okay to refer configurations object here?
-        @serializer.serialize(obj) do |obj|
-          @serializer_block.call(obj)
-        end
-      end
   end
 end
 

data/lib/ultracache/relationship/has_cached_attribute.rb

@@ -4,9 +4,6 @@ module Ultracache
       super(name, options)
       @serializer_method = options[:serializer]
       @serializing_block = block if block_given?
-
-      @serializer = Ultracache::Configurations.serializer
-      @storage = Ultracache::Configurations.storage
     end
 
     def key(obj)
@@ -18,14 +15,14 @@ module Ultracache
     # serializeing hash returned by its `as_json` method.
     def save_cache(obj)
       value = if @serializer_method
-        @serializer.serialize(obj.send(@serializer_method))
+        serializer.serialize(obj.send(@serializer_method))
       elsif @serializing_block
-        @serializer.serialize(@serializing_block.call(obj))
+        serializer.serialize(@serializing_block.call(obj))
       else
-        @serializer.serialize(obj.as_json)
+        serializer.serialize(obj.as_json)
       end
 
-      @storage.set(key(obj), value)
+      storage.set(key(obj), value)
       value
     end
 
@@ -34,12 +31,12 @@ module Ultracache
     def read_cache(obj, options = {})
       k = key(obj)
 
-      @storage.get(k) || save_cache(obj)
+      storage.get(k) || save_cache(obj)
     end
 
     # Destroys cache from storage
     def destroy_cache(obj)
-      @storage.del(key(obj))
+      storage.del(key(obj))
     end
 
     # Updates value of existing cache. Its behavior is same with that of

data/lib/ultracache/relationship/has_cached_queue.rb

@@ -5,8 +5,6 @@ module Ultracache
     def initialize(name, options={})
       @fetch_by = options[:fetch_by]
       super(name, options)
-
-      @storage = Ultracache::Configurations.storage
     end
 
     def key(obj)
@@ -20,11 +18,11 @@ module Ultracache
 
       fetch_by = @fetch_by || options[:fetch_by]
       if fetch_by && fetch_by == :rank
-        @storage.get_queue_by_rank(k, options)
+        storage.get_queue_by_rank(k, options)
       elsif options[:per_page]
-        @storage.get_queue_paged(k, options)
+        storage.get_queue_paged(k, options)
       else
-        @storage.get_queue(k, options)
+        storage.get_queue(k, options)
       end
     end
   end

data/lib/ultracache/serializer/json_serializer.rb

@@ -4,6 +4,7 @@ module Ultracache
   module Serializer
     class JsonSerializer < Serializer::Base
       def serialize(obj, &block)
+        obj = block.call(obj) if block_given?
         JSON.generate(obj)
       end
 

data/lib/ultracache/storage/redis.rb

@@ -5,10 +5,8 @@ require 'json'
 module Ultracache
   module Storage
     class Redis
-      include Storage
-
       def initialize(options = {})
-        @urls = options[:urls] || 'localhost'
+        @urls = options[:urls] || ['redis://localhost:6379/1']
       end
 
       def connection

data/lib/ultracache/version.rb

@@ -1,3 +1,3 @@
 module Ultracache
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/unit/cached_spec.rb

@@ -2,7 +2,13 @@ require "spec_helper"
 
 describe Ultracache::Cached do
   before do
-    Ultracache::Configurations.storage = Ultracache::Storage::Redis.new(:urls => ['localhost:6379'])
+    Ultracache::Configurations.storage = Ultracache::Storage::Redis.new(:urls => ['redis://localhost:6379/1'])
+    Ultracache::Configurations.serializer = Ultracache::Serializer::JsonSerializer.new
+  end
+
+  after do
+    Ultracache::Configurations.storage = nil
+    Ultracache::Configurations.serializer = nil
   end
 
   context "without model hierarchy" do

data/spec/unit/relationship/belongs_as_cached_queue_spec.rb

@@ -2,10 +2,8 @@ require "spec_helper"
 
 describe Ultracache::BelongsAsCachedQueue do
   let(:belongs_as_cached_queue) do
-    Ultracache::BelongsAsCachedQueue.new :cached_posts,
-      :self_class => Post, :associated_class => Person do |p|
-      p.to_json
-    end
+    Ultracache::BelongsAsCachedQueue.new :cached_posts, nil,
+      :self_class => Post, :associated_class => Person
   end
 
   describe "#key" do

data/spec/unit/relationship/has_cached_attribute_spec.rb

@@ -8,7 +8,7 @@ describe Ultracache::HasCachedAttribute do
   end
 
   let(:cached_attribute) do
-    Ultracache::HasCachedAttribute.new :cached_name,
+    Ultracache::HasCachedAttribute.new :cached_name, nil,
       :self_class => Person, :serializer_block => person_attribute_block
   end
 

data/spec/unit/serializer/json_serializer_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe Ultracache::Serializer::JsonSerializer do
   let(:serializer) { Ultracache::Serializer::JsonSerializer.new }
-  let(:obj) { Person.new }
+  let(:person) { Person.new }
 
   describe "#serialize" do
     it "serializes object to JSON" do
-      serialized_str = serializer.serialize(obj) do
+      serialized_str = serializer.serialize(person) do |obj|
         { :id => obj.id }
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ultracache
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-07 00:00:00.000000000 Z
+date: 2012-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70152863679380 !ruby/object:Gem::Requirement
+  requirement: &70315745190060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152863679380
+  version_requirements: *70315745190060
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70152863677340 !ruby/object:Gem::Requirement
+  requirement: &70315745187660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152863677340
+  version_requirements: *70315745187660
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70152863675180 !ruby/object:Gem::Requirement
+  requirement: &70315749287900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70152863675180
+  version_requirements: *70315749287900
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70152863673460 !ruby/object:Gem::Requirement
+  requirement: &70315749285640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70152863673460
+  version_requirements: *70315749285640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70152863669820 !ruby/object:Gem::Requirement
+  requirement: &70315749280800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70152863669820
+  version_requirements: *70315749280800
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70152863666360 !ruby/object:Gem::Requirement
+  requirement: &70315749278220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152863666360
+  version_requirements: *70315749278220
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70152863663540 !ruby/object:Gem::Requirement
+  requirement: &70315749272460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152863663540
+  version_requirements: *70315749272460
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70152863657880 !ruby/object:Gem::Requirement
+  requirement: &70315749268700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70152863657880
+  version_requirements: *70315749268700
 description: Ultracache reduces computational costs occur from dynamic attributes
   by caching them into Redis
 email: