swiss_knife 1.0.4 → 1.0.5

data/Gemfile.lock

@@ -1,43 +1,41 @@
 PATH
   remote: .
   specs:
-    swiss_knife (1.0.4)
+    swiss_knife (1.0.5)
       rails (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0)
-      actionpack (= 3.1.0)
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
       mail (~> 2.3.0)
-    actionpack (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
       rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
+      rack-cache (~> 1.1)
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
+      sprockets (~> 2.0.2)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0)
-      activemodel (= 3.1.0)
-      activesupport (= 3.1.0)
-    activesupport (3.1.0)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
       multi_json (~> 1.0)
     arel (2.2.1)
-    bcrypt-ruby (3.0.0)
     builder (3.0.0)
     coderay (0.9.8)
     diff-lcs (1.1.3)
@@ -45,23 +43,24 @@ GEM
     fakeweb (1.3.0)
     hike (1.2.1)
     i18n (0.6.0)
+    json (1.6.1)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    method_source (0.6.6)
-      ruby_parser (~> 2.0.5)
-    mime-types (1.16)
+    method_source (0.6.7)
+      ruby_parser (>= 2.3.1)
+    mime-types (1.17.2)
     multi_json (1.0.3)
     nokogiri (1.5.0)
-    polyglot (0.3.2)
-    pry (0.9.6.2)
+    polyglot (0.3.3)
+    pry (0.9.7.4)
       coderay (~> 0.9.8)
-      method_source (~> 0.6.5)
-      ruby_parser (~> 2.0.5)
+      method_source (~> 0.6.7)
+      ruby_parser (>= 2.3.1)
       slop (~> 2.1.0)
-    rack (1.3.2)
-    rack-cache (1.0.3)
+    rack (1.3.5)
+    rack-cache (1.1)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
@@ -69,23 +68,24 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0)
-      actionmailer (= 3.1.0)
-      actionpack (= 3.1.0)
-      activerecord (= 3.1.0)
-      activeresource (= 3.1.0)
-      activesupport (= 3.1.0)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
       bundler (~> 1.0)
-      railties (= 3.1.0)
-    railties (3.1.0)
-      actionpack (= 3.1.0)
-      activesupport (= 3.1.0)
+      railties (= 3.1.1)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
-    rdoc (3.9.4)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
     rspec (2.7.0)
       rspec-core (~> 2.7.0)
       rspec-expectations (~> 2.7.0)
@@ -99,11 +99,11 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.7.0)
-    ruby_parser (2.0.6)
+    ruby_parser (2.3.1)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.7)
+    sexp_processor (3.0.8)
     slop (2.1.0)
-    sprockets (2.0.0)
+    sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -113,7 +113,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.30)
+    tzinfo (0.3.31)
 
 PLATFORMS
   ruby

data/lib/swiss_knife/action_controller.rb

@@ -38,7 +38,11 @@ module SwissKnife
 
     def page_title_get
       controller = self unless respond_to?(:controller)
-      controller_name = controller.controller_name
+
+      controller_name = controller.class.name.underscore
+      controller_name.gsub!(/\//, "_")
+      controller_name.gsub!(/_controller$/, "")
+
       action_name = controller.action_name
       action_name = SwissKnife::Helpers::ACTION_ALIASES.fetch(action_name, action_name)
 

data/lib/swiss_knife/helpers.rb

@@ -68,10 +68,6 @@ module SwissKnife
     #   <%= dispatcher %>
     #
     def dispatcher_tag
-      controller_name = controller.class.name.underscore
-      controller_name.gsub!(/\//, "_")
-      controller_name.gsub!(/_controller$/, "")
-
       %[<meta name="page" content="#{controller_name}##{controller.action_name}" />].html_safe
     end
 
@@ -90,12 +86,13 @@ module SwissKnife
     #
     def body(options = {}, &block)
       action_name = ACTION_ALIASES[controller.action_name] || controller.action_name
+      controller_name_for_css_class = controller_name.gsub(/\_/, "-")
 
       options = {
-        :id => "#{controller.controller_name}-page",
+        :id => "#{controller_name_for_css_class}-page",
         :class => [
-          "#{controller.controller_name}-#{action_name}",
-          "#{controller.controller_name}-#{controller.action_name}",
+          "#{controller_name_for_css_class}-#{action_name}",
+          "#{controller_name_for_css_class}-#{controller.action_name}",
           I18n.locale,
           Rails.env
         ].uniq.join(" ")
@@ -275,5 +272,17 @@ module SwissKnife
 
       buffer.html_safe
     end
+    
+    private
+    
+    def controller_name
+      unless @controller_name
+        @controller_name = controller.class.name.underscore
+        @controller_name.gsub!(/\//, "_")
+        @controller_name.gsub!(/_controller$/, "")
+      end
+      
+      @controller_name
+    end
   end
 end

data/lib/swiss_knife/version.rb

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

data/spec/controllers/application_controller_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe ApplicationController do
   before do
-    controller.stub :controller_name => "products"
+    controller = double("ProductsController")
   end
 
   it "should return inline title" do
@@ -54,4 +54,15 @@ describe ApplicationController do
   it "should be added as a helper method" do
     ApplicationController._helper_methods.should include(:page_title)
   end
+
+  context "with namespace" do
+    before do
+      controller = double("Admin::ProductsController")
+    end
+
+    it "should return internationalized title" do
+      controller.stub :action_name => "index"
+      controller.page_title.should == "Listing products"
+    end
+  end
 end

data/spec/support/config/locales/en.yml

@@ -1,5 +1,7 @@
 en:
   titles:
+    admin_products:
+      index: "Listing products"
     products:
       index: "All products"
       new: "Add a new product"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: swiss_knife
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-24 00:00:00.000000000 Z
+date: 2011-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70134942185100 !ruby/object:Gem::Requirement
+  requirement: &70319037970000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70134942185100
+  version_requirements: *70319037970000
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70134942183760 !ruby/object:Gem::Requirement
+  requirement: &70319037980320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70134942183760
+  version_requirements: *70319037980320
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70134942183140 !ruby/object:Gem::Requirement
+  requirement: &70319037977820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70134942183140
+  version_requirements: *70319037977820
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70134942178620 !ruby/object:Gem::Requirement
+  requirement: &70319037992360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70134942178620
+  version_requirements: *70319037992360
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70134942175260 !ruby/object:Gem::Requirement
+  requirement: &70319037989720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70134942175260
+  version_requirements: *70319037989720
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70134942174360 !ruby/object:Gem::Requirement
+  requirement: &70319037986480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70134942174360
+  version_requirements: *70319037986480
 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: -2755399729409022499
+      hash: -4097759454801460063
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,10 +165,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2755399729409022499
+      hash: -4097759454801460063
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Several helpers for Rails 3