kiosk 0.2.0 → 0.3.0

data/lib/kiosk/cacheable/connection.rb

@@ -31,8 +31,7 @@ module Kiosk
     # +cache_expire_by_pattern+.
     #
     def cache_key_matcher
-      case Rails.cache
-      when ActiveSupport::Cache::RedisStore
+      if defined?(ActiveSupport::Cache::RedisStore) && Rails.cache.is_a?(ActiveSupport::Cache::RedisStore)
         :glob
       else
         :regexp
@@ -73,11 +72,11 @@ module Kiosk
     # fresh result is returned.
     #
     def cache_read_write(key)
-      if result = cache(:read, cache_key(key))
-        result = JSON.parse(result)
+      if cached_object = cache(:read, cache_key(key))
+        result = cached_object
       elsif result = yield
         options = (expiry = cache_expiry_of(result)) ? {:expires_in => expiry} : {}
-        cache(:write, cache_key(key), result.to_json, options) if result
+        cache(:write, cache_key(key), result, options) if result
       end
       result
     end

data/lib/kiosk/cacheable/resource.rb

@@ -100,12 +100,10 @@ module Kiosk
       end
     end
 
-    module InstanceMethods
-      # Expire the resource from the cache.
-      #
-      def expire
-        self.class.expire_resource(self)
-      end
+    # Expire the resource from the cache.
+    #
+    def expire
+      self.class.expire_resource(self)
     end
   end
 end

data/lib/kiosk/controller.rb

@@ -6,56 +6,54 @@ module Kiosk
   module Controller
     extend ActiveSupport::Concern
 
-    module InstanceMethods
-      # Declares a rewrite of content nodes that sets the host portion of
-      # each node's URI attribute (href or src) to target the configured CDN
-      # host.
-      #
-      def rewrite_cdn_paths_for(resource_model)
-        Kiosk.rewriter.add_rewrite(Rewrite.new(:cdn, resource_model))
-      end
+    # Declares a rewrite of content nodes that sets the host portion of
+    # each node's URI attribute (href or src) to target the configured CDN
+    # host.
+    #
+    def rewrite_cdn_paths_for(resource_model)
+      Kiosk.rewriter.add_rewrite(Rewrite.new(:cdn, resource_model))
+    end
 
-      # Declares a rewrite of content nodes.
-      #
-      # Example:
-      #
-      #   class PostsController
-      #     include Kiosk::Controller
-      #
-      #     before_filter do
-      #       rewrite_content_for(Attachment) do |attachment,node|
-      #         case node.name
-      #         when 'a'
-      #           node['title'] = 'Some photo'
-      #         when 'img'
-      #           node['src'] = attachment_path(attachment.filename)
-      #         end
-      #       end
-      #     end
-      #   end
-      #
-      def rewrite_content_for(resource_model, &blk)
-        Kiosk.rewriter.add_rewrite(Rewrite.new(:node, resource_model, &blk))
-      end
+    # Declares a rewrite of content nodes.
+    #
+    # Example:
+    #
+    #   class PostsController
+    #     include Kiosk::Controller
+    #
+    #     before_filter do
+    #       rewrite_content_for(Attachment) do |attachment,node|
+    #         case node.name
+    #         when 'a'
+    #           node['title'] = 'Some photo'
+    #         when 'img'
+    #           node['src'] = attachment_path(attachment.filename)
+    #         end
+    #       end
+    #     end
+    #   end
+    #
+    def rewrite_content_for(resource_model, &blk)
+      Kiosk.rewriter.add_rewrite(Rewrite.new(:node, resource_model, &blk))
+    end
 
-      # Declares a rewrite of content nodes that sets a new URL any href or src
-      # attributes (the first one found, it that order). The given block is
-      # passed the instantiated resource and node as its arguments and should
-      # return the new value for the node attribute.
-      #
-      # Example:
-      #
-      #   class PostsController
-      #     include Kiosk::Controller
-      #
-      #     before_filter do
-      #       rewrite_paths_for(Post) { |post| post_path(post.slug) }
-      #     end
-      #   end
-      #
-      def rewrite_paths_for(resource_model, &blk)
-        Kiosk.rewriter.add_rewrite(Rewrite.new(:path, resource_model, &blk))
-      end
+    # Declares a rewrite of content nodes that sets a new URL any href or src
+    # attributes (the first one found, it that order). The given block is
+    # passed the instantiated resource and node as its arguments and should
+    # return the new value for the node attribute.
+    #
+    # Example:
+    #
+    #   class PostsController
+    #     include Kiosk::Controller
+    #
+    #     before_filter do
+    #       rewrite_paths_for(Post) { |post| post_path(post.slug) }
+    #     end
+    #   end
+    #
+    def rewrite_paths_for(resource_model, &blk)
+      Kiosk.rewriter.add_rewrite(Rewrite.new(:path, resource_model, &blk))
     end
   end
 end

data/lib/kiosk/version.rb

@@ -1,3 +1,3 @@
 module Kiosk
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -2,7 +2,7 @@
 name: kiosk
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Daniel Duvall
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-12 00:00:00 Z
+date: 2012-05-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.4
+        version: 3.2.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -46,16 +46,27 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: shoulda-matchers
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: "1.1"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: thinking-sphinx
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+  type: :development
+  version_requirements: *id005
 description: "Kiosk provides APIs for integrating WordPress content into a Ruby application: a base REST model for retrieving content, a caching layer, and a rewriting engine for canonicalizing and contextualizing content elements."
 email: 
 - dan@mutual.io