wallet 0.0.1 → 0.0.2

data/examples/tv/config/environment.rb

@@ -7,35 +7,6 @@ RAILS_GEM_VERSION = '2.3.3' unless defined? RAILS_GEM_VERSION
 require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|
-  # Settings in config/environments/* take precedence over those specified here.
-  # Application configuration should go into files in config/initializers
-  # -- all .rb files in that directory are automatically loaded.
-
-  # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/extras )
-
-  # Specify gems that this application depends on and have them installed with rake gems:install
-  # config.gem "bj"
-  # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
-  # config.gem "sqlite3-ruby", :lib => "sqlite3"
-  # config.gem "aws-s3", :lib => "aws/s3"
-
-  # Only load the plugins named here, in the order given (default is alphabetical).
-  # :all can be used as a placeholder for all plugins not explicitly named
-  # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-  # Skip frameworks you're not going to use. To use Rails without a database,
-  # you must remove the Active Record framework.
-  # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
-
-  # Activate observers that should always be running
-  # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-  # Run "rake -D time" for a list of tasks for finding time zone names.
+  config.gem "wallet", :lib => 'wallet', :version => '>=0.0.1', :source => "http://gemcutter.org"
   config.time_zone = 'UTC'
-
-  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
-  # config.i18n.default_locale = :de
-end
+end

data/examples/tv/lib/wallet.rb

@@ -44,6 +44,7 @@ class Wallet
     yml = YAML.load config_yml rescue nil
     @config = yml || {}
     @default_ttl = (eval(@config["default_ttl"]).to_i || 60) rescue 60
+    setup_action_caching
   end
 
   # Returns true or false based on whether or not a controller action is configured for caching in the wallet
@@ -87,26 +88,36 @@ class Wallet
     return *args
   end
 
-end
-
-ActionController::Base.class_eval do
-  before_filter :wallet
-  @@action_cached_controllers = {}
-
-  def wallet
-    @wallet ||= Wallet.new((File.open(RAILS_ROOT + "/config/wallet.yml") rescue ""))
-    controller_class_name = self.class.name 
-    controller = controller_class_name.underscore.gsub(/_controller$/, '')
-
-    # if we haven't already setup action caching on this controller
-    if @@action_cached_controllers[controller] == nil
-
-      @@action_cached_controllers[controller] = controller
-      @wallet.cached_actions(controller).each do |action|
-        puts "I'm setting up action caching for #{controller_class_name}::#{action}"
-        controller_class_name.constantize.send :caches_action, action.to_sym, :expires_in => @wallet.ttl(controller, action)
+  def setup_action_caching
+    @config.each do |controller, actions|
+      controller_class = (controller + "_controller").camelize.constantize
+      cached_actions(controller).each do |action|
+        controller_class.send :caches_action, action.to_sym, :expires_in => ttl(controller, action)
       end
     end
   end
-
 end
+
+Wallet.new((File.open(RAILS_ROOT + "/config/wallet.yml") rescue ""))
+
+#ActionController::Base.class_eval do
+#  before_filter :wallet
+#  @@action_cached_controllers = {}
+#
+#  def wallet
+#    @wallet ||= Wallet.new((File.open(RAILS_ROOT + "/config/wallet.yml") rescue ""))
+#    controller_class_name = self.class.name 
+#    controller = controller_class_name.underscore.gsub(/_controller$/, '')
+#
+#    # if we haven't already setup action caching on this controller
+#    if @@action_cached_controllers[controller] == nil
+#
+#      @@action_cached_controllers[controller] = controller
+#      @wallet.cached_actions(controller).each do |action|
+#        puts "I'm setting up action caching for #{controller_class_name}::#{action}"
+#        controller_class_name.constantize.send :caches_action, action.to_sym, :expires_in => @wallet.ttl(controller, action)
+#      end
+#    end
+#  end
+#
+#end

data/lib/wallet/action_controller.rb

@@ -1,19 +1,19 @@
-ActionController::Base.class_eval do
-  before_filter :wallet
-  @@action_cached_controllers = {}
-
-  def wallet
-    @wallet ||= Wallet.new((File.open(RAILS_ROOT + "/config/wallet.yml") rescue ""))
-    controller_class_name = self.class.name 
-    controller = controller_class_name.underscore.gsub(/_controller$/, '')
-
-    # if we haven't already setup action caching on this controller
-    if @@action_cached_controllers[controller] == nil
-      @@action_cached_controllers[controller] = controller
-      @wallet.cached_actions(controller).each do |action|
-        controller_class_name.constantize.send :caches_action, action.to_sym, :expires_in => @wallet.ttl(controller, action)
-      end
-    end
-  end
-
-end if defined?(ActionController::Base)
+#ActionController::Base.class_eval do
+#  before_filter :wallet
+#  @@action_cached_controllers = {}
+#
+#  def wallet
+#    @wallet ||= Wallet.new((File.open(RAILS_ROOT + "/config/wallet.yml") rescue ""))
+#    controller_class_name = self.class.name 
+#    controller = controller_class_name.underscore.gsub(/_controller$/, '')
+#
+#    # if we haven't already setup action caching on this controller
+#    if @@action_cached_controllers[controller] == nil
+#      @@action_cached_controllers[controller] = controller
+#      @wallet.cached_actions(controller).each do |action|
+#        controller_class_name.constantize.send :caches_action, action.to_sym, :expires_in => @wallet.ttl(controller, action)
+#      end
+#    end
+#  end
+#
+#end if defined?(ActionController::Base)

data/lib/wallet/wallet.rb

@@ -5,7 +5,10 @@ class Wallet
   
   # This error gets thrown whenever you attempt to retreive a TTL
   # for an action that's not in the wallet. 
-  class ActionNotCached < Exception
+  class ActionNotCached < StandardError
+  end
+
+  class UnknownController < StandardError
   end
 
   attr_reader :config #:nodoc:
@@ -44,6 +47,8 @@ class Wallet
     yml = YAML.load config_yml rescue nil
     @config = yml || {}
     @default_ttl = (eval(@config["default_ttl"]).to_i || 60) rescue 60
+    @config.delete "default_ttl"
+    setup_action_caching
   end
 
   # Returns true or false based on whether or not a controller action is configured for caching in the wallet
@@ -87,4 +92,16 @@ class Wallet
     return *args
   end
 
+  def setup_action_caching
+    @config.each do |controller, actions|
+      begin
+        controller_class = (controller + "_controller").camelize.constantize
+        cached_actions(controller).each do |action|
+          controller_class.send :caches_action, action.to_sym, :expires_in => ttl(controller, action)
+        end
+      rescue Exception => e
+        #raise UnknownController.new("We're sorry, but the controller '#{(controller + "_controller").camelize}' does not exist in app/controllers/") 
+      end
+    end
+  end
 end

data/lib/wallet.rb

@@ -1,2 +1,3 @@
 require 'wallet/wallet'
 require 'wallet/action_controller'
+Wallet.new((File.open(RAILS_ROOT + "/config/wallet.yml") rescue "")) if defined?(RAILS_ROOT)

data/spec/lib_specs/wallet_spec.rb

@@ -4,7 +4,7 @@ describe Wallet do
   describe "Wallet::new" do
     it "should load the config on initialization if provided with a path to a yaml file" do
       YAML.should_receive(:load).once
-      wallet = Wallet.new(File.open(File.dirname(__FILE__) + '/../support/wallet.yml'))
+      wallet = Wallet.new("channels:\n  adult_swim:")
       wallet.config.should_not == false
     end
     
@@ -32,41 +32,41 @@ describe Wallet do
 
   describe "Wallet::cached?" do
     before do
-      config_yml = "pages:\n  show:\n"
+      config_yml = "channels:\n  cartoon_network:\n"
       @wallet = Wallet.new config_yml
     end
 
     it "should return true for a controller/action that is cached" do
-      @wallet.cached?("pages", "show").should == true
+      @wallet.cached?("channels", "cartoon_network").should == true
     end
 
     it "should return false for a controller/action that is not cached" do
       @wallet.cached?("blah", "blah").should == false
-      @wallet.cached?("pages", "blah").should == false
+      @wallet.cached?("channels", "blah").should == false
     end
 
     it "should work with both strings and symbols" do
-      @wallet.cached?("pages", "show").should == true
-      @wallet.cached?(:pages, :show).should == true
+      @wallet.cached?("channels", "cartoon_network").should == true
+      @wallet.cached?(:channels, :cartoon_network).should == true
     end
   end
 
   describe "Wallet::ttl" do
     before do
-      config_yml = "pages:\n  show: 5.minute\n  index: "
+      config_yml = "channels:\n  cartoon_network: 5.minute\n  current_tv: "
       @wallet = Wallet.new config_yml
     end
 
-    it "should return 5 minutes for the pages:show ttl" do
-      @wallet.ttl(:pages, :show).should == 5.minutes.to_i
+    it "should return 5 minutes for the channels:cartoon_network ttl" do
+      @wallet.ttl(:channels, :cartoon_network).should == 5.minutes.to_i
     end
 
-    it "should return the default ttl for the index action" do
-      @wallet.ttl(:pages, :index).should == @wallet.default_ttl
+    it "should return the default ttl for the current_tv action" do
+      @wallet.ttl(:channels, :current_tv).should == @wallet.default_ttl
     end
 
     it "should raise a ActionNotCached error for the dne action" do
-      proc {@wallet.ttl(:pages, :dne)}.should raise_error(Wallet::ActionNotCached)
+      proc {@wallet.ttl(:channels, :dne)}.should raise_error(Wallet::ActionNotCached)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wallet
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Matt Parker
@@ -79,7 +79,6 @@ test_files:
 - examples/tv/config/initializers/mime_types.rb
 - examples/tv/config/initializers/new_rails_defaults.rb
 - examples/tv/config/initializers/session_store.rb
-- examples/tv/config/initializers/wallet.rb
 - examples/tv/config/routes.rb
 - examples/tv/lib/wallet.rb
 - examples/tv/test/performance/browsing_test.rb

data/examples/tv/config/initializers/wallet.rb

@@ -1 +0,0 @@
-require 'wallet'