restaurant 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b71b7b9e2f1badd422562dbd949f97726687e86
-  data.tar.gz: a062a4d399caec20cc4632c4b18944202b8d1fda
+  metadata.gz: 3c1d430a1159169aec6aa667513e2d6f642f6746
+  data.tar.gz: e70ce1d3a20d05b25152c8318a93855b400f5f78
 SHA512:
-  metadata.gz: 9f2b51e1b30de2786cb3ce4578073b6832a4e21863e84caf0e96886f65bd8eda8b42c7c980db443c5f6d8bde9ed69696d36a9437548d53f6b7800ddf5ab724b3
-  data.tar.gz: 04dbbaa38de272c411809c1a4d887feb24fe5b6a7fb0f4b80c62b2cb5b2148ba043bacedbaeb2e9ff6ca36ae5a84ce44241ca8b67eb7a651c0e6efd5b02a6e3a
+  metadata.gz: 673a81a243eae127b1dfd786ce369cc00df6454d8935657a2322e11c9dd0583071efbe7da23c5ae66706b683031cc3141d6ce6c00085fd778b056264bdabe068
+  data.tar.gz: a7751b9eca273868f3cbf249274d86a379c1a4e1b2a16623302513cbb215b8cf360104e9e50f9dcab56986ccdc12f8db46e7bb456fbfeba6b778792aace49812

data/README.md

@@ -54,16 +54,20 @@ While Restaurant automagically defines what RESTful API needs, you can do them o
 # config/routes.rb
 #   1. V1::ResourcesController < ApplicationController are defined if not defined
 #   2. The following routes are defined
-#     GET    /v1/:resources     -> V1::ReosurcesController#index
-#     GET    /v1/:resources/:id -> V1::ResourcesController#show
-#     POST   /v1/:resources     -> V1::ResourcesController#create
-#     PUT    /v1/:resources/:id -> V1::ResourcesController#update
-#     DELETE /v1/:resources/:id -> V1::ResourcesController#destroy
+#     GET    /v1/:resource     -> V1::ReosurcesController#index
+#     GET    /v1/:resource/:id -> V1::ResourcesController#show
+#     POST   /v1/:resource     -> V1::ResourcesController#create
+#     PUT    /v1/:resource/:id -> V1::ResourcesController#update
+#     DELETE /v1/:resource/:id -> V1::ResourcesController#destroy
 namespace :v1 do
   Restaurant::Router.route(self)
 end
 
 # Or customize what you want (e.g. only provides Read API)
+#   1. V2::ResourcesController < ApplicationController are defined if not defined
+#   2. The following routes are defined
+#     GET    /v2/:resource     -> V1::ReosurcesController#index
+#     GET    /v2/:resource/:id -> V1::ResourcesController#show
 namespace :v2 do
   scope ":resource" do
     controller :resources do

data/lib/restaurant/actions.rb

@@ -4,14 +4,16 @@ module Restaurant
       base.before_filter :require_valid_id, :require_resource, :only => [:show, :update, :destroy]
       base.before_filter :add_created_at, :only => :create
       base.before_filter :add_updated_at, :only => :update
+      base.after_filter :expire_resource_cache, :only => [:update, :destroy]
+      base.after_filter :update_resources_version_cache, :only => [:create, :update, :destroy]
     end
 
     def index
-      respond_with collection.find(filter_params).sort(sort_params).skip(skip_params).limit(limit_params)
+      respond_with resources
     end
 
     def show
-      respond_with @resource
+      respond_with resource
     end
 
     def create
@@ -34,13 +36,43 @@ module Restaurant
     end
 
     def require_resource
-      @resource = collection.find(:_id => resource_id).first || head(404)
+      head 404 unless resource
     end
 
     def collection
       Mongoid.default_session[resources_name]
     end
 
+    def resource
+      @resource ||= collection.find(:_id => resource_id).first
+    end
+
+    def resources
+      collection.find(filter_params).sort(sort_params).skip(skip_params).limit(limit_params).to_a
+    end
+
+    def resources_with_cache
+      if cache_configured?
+        cache_store.fetch(resources_cache_key) do
+          resources_without_cache
+        end
+      else
+        resources_without_cache
+      end
+    end
+    alias_method_chain :resources, :cache
+
+    def resource_with_cache
+      if cache_configured?
+        cache_store.fetch(resource_cache_key) do
+          resource_without_cache
+        end
+      else
+        resource_without_cache
+      end
+    end
+    alias_method_chain :resource, :cache
+
     def resource_name
       resources_name.singularize
     end
@@ -90,5 +122,31 @@ module Restaurant
     def add_updated_at
       resource_params[:updated_at] = Time.now
     end
+
+    def expire_resource_cache
+      cache_store.delete(resource_cache_key) if cache_configured?
+    end
+
+    def resource_cache_key
+      params.slice(:resource, :id)
+    end
+
+    def resources_version_cache_key
+      { :resource => params[:resource] }
+    end
+
+    def update_resources_version_cache
+      if cache_configured?
+        cache_store.write(resources_version_cache_key, Time.now.to_f)
+      end
+    end
+
+    def resources_version
+      cache_store.read(resources_version_cache_key)
+    end
+
+    def resources_cache_key
+      params.slice(:resource, :filter, :sort, :page).merge(:version => resources_version)
+    end
   end
 end

data/lib/restaurant/version.rb

@@ -1,3 +1,3 @@
 module Restaurant
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restaurant
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid