swiss_knife 1.0.2 → 1.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swiss_knife (1.0.2)
+    swiss_knife (1.0.3)
       rails (>= 3.0.0)
 
 GEM

data/lib/swiss_knife/action_controller.rb

@@ -23,20 +23,27 @@ module SwissKnife
       end
     end
 
+    # Store page title options that are used on
+    # I18n interpolation.
+    #
+    def page_title_options
+      @page_title_options ||= {}
+    end
+
     private
     def page_title_set(title, options)
-      @_page_title_options = {:title => title, :options => options}
+      @page_title_options = options
+      @page_title = title
     end
 
     def page_title_get
       controller = self unless respond_to?(:controller)
       controller_name = controller.controller_name
-      action_name = SwissKnife::Helpers::ACTION_ALIASES[controller.action_name] || controller.action_name
+      action_name = controller.action_name
+      action_name = SwissKnife::Helpers::ACTION_ALIASES.fetch(action_name, action_name)
 
-      @_page_title_options ||= {}
-      options = @_page_title_options[:options] || {}
-      title = @_page_title_options[:title]
-      title ||= t("titles.#{controller_name}.#{action_name}", options)
+      title = @title
+      title ||= t("titles.#{controller_name}.#{action_name}", page_title_options)
       title
     end
   end

data/lib/swiss_knife/version.rb

@@ -2,7 +2,7 @@ module SwissKnife
   module Version
     MAJOR = 1
     MINOR = 0
-    PATCH = 2
+    PATCH = 3
     STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
   end
 end

data/spec/controllers/application_controller_spec.rb

@@ -15,6 +15,11 @@ describe ApplicationController do
     controller.page_title.should == "All products"
   end
 
+  it "should store interpolation options" do
+    controller.page_title :name => "Some product"
+    controller.page_title_options.should == {:name => "Some product"}
+  end
+
   it "should return internationalized title with interpolation options" do
     controller.page_title :name => "Some product"
     controller.stub :action_name => "edit"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swiss_knife
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70214631283800 !ruby/object:Gem::Requirement
+  requirement: &70201540829060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70214631283800
+  version_requirements: *70201540829060
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70214631282900 !ruby/object:Gem::Requirement
+  requirement: &70201540827080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70214631282900
+  version_requirements: *70201540827080
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70214631282440 !ruby/object:Gem::Requirement
+  requirement: &70201540826680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214631282440
+  version_requirements: *70201540826680
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70214631281640 !ruby/object:Gem::Requirement
+  requirement: &70201540819560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214631281640
+  version_requirements: *70201540819560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70214631280760 !ruby/object:Gem::Requirement
+  requirement: &70201540818480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214631280760
+  version_requirements: *70201540818480
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70214631280220 !ruby/object:Gem::Requirement
+  requirement: &70201540817380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70214631280220
+  version_requirements: *70201540817380
 description: Several helpers for Rails 3
 email:
 - fnando.vieira@gmail.com
@@ -156,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4566748509901688145
+      hash: -1342515705368064854
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4566748509901688145
+      hash: -1342515705368064854
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10