cream 0.5.9 → 0.5.10

data/Gemfile

@@ -2,9 +2,9 @@ source :rubygems
 source 'http://gems.github.com/'
 
 group :default do
-  gem "devise-links",      "~> 0.1.1"    
-  gem "cancan-rest-links", "~> 0.1.1" 
-  gem "cancan-permits",    "~> 0.1.2" 
+  gem "devise-links",      "~> 0.1.3"    
+  gem "cancan-rest-links", "~> 0.1.3" 
+  gem "cancan-permits",    "~> 0.1.4" 
 
   gem "require_all",       "~> 1.2.0"    
 

data/Rakefile

@@ -15,9 +15,9 @@ begin
 
     gem.add_dependency "require_all",       "~> 1.2.0"
     
-    gem.add_dependency "devise-links",      "~> 0.1.2"
-    gem.add_dependency "cancan-rest-links", "~> 0.1.2" 
-    gem.add_dependency "cancan-permits",    "~> 0.1.3" 
+    gem.add_dependency "devise-links",      "~> 0.1.3"
+    gem.add_dependency "cancan-rest-links", "~> 0.1.3" 
+    gem.add_dependency "cancan-permits",    "~> 0.1.4" 
 
     gem.add_dependency "devise",            ">= 1.1.2"
     gem.add_dependency "cancan",            "~> 1.3.4" 

data/VERSION

@@ -1 +1 @@
-0.5.9
+0.5.10

data/cream.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.5.9"
+  s.version = "0.5.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -121,9 +121,9 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec-action_view>, ["~> 0.3.1"])
       s.add_development_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<devise-links>, ["~> 0.1.2"])
-      s.add_runtime_dependency(%q<cancan-rest-links>, ["~> 0.1.2"])
-      s.add_runtime_dependency(%q<cancan-permits>, ["~> 0.1.3"])
+      s.add_runtime_dependency(%q<devise-links>, ["~> 0.1.3"])
+      s.add_runtime_dependency(%q<cancan-rest-links>, ["~> 0.1.3"])
+      s.add_runtime_dependency(%q<cancan-permits>, ["~> 0.1.4"])
       s.add_runtime_dependency(%q<devise>, [">= 1.1.2"])
       s.add_runtime_dependency(%q<cancan>, ["~> 1.3.4"])
       s.add_runtime_dependency(%q<rails>, ["~> 3.0.0"])
@@ -137,9 +137,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec-action_view>, ["~> 0.3.1"])
       s.add_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_dependency(%q<devise-links>, ["~> 0.1.2"])
-      s.add_dependency(%q<cancan-rest-links>, ["~> 0.1.2"])
-      s.add_dependency(%q<cancan-permits>, ["~> 0.1.3"])
+      s.add_dependency(%q<devise-links>, ["~> 0.1.3"])
+      s.add_dependency(%q<cancan-rest-links>, ["~> 0.1.3"])
+      s.add_dependency(%q<cancan-permits>, ["~> 0.1.4"])
       s.add_dependency(%q<devise>, [">= 1.1.2"])
       s.add_dependency(%q<cancan>, ["~> 1.3.4"])
       s.add_dependency(%q<rails>, ["~> 3.0.0"])
@@ -154,9 +154,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec-action_view>, ["~> 0.3.1"])
     s.add_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-    s.add_dependency(%q<devise-links>, ["~> 0.1.2"])
-    s.add_dependency(%q<cancan-rest-links>, ["~> 0.1.2"])
-    s.add_dependency(%q<cancan-permits>, ["~> 0.1.3"])
+    s.add_dependency(%q<devise-links>, ["~> 0.1.3"])
+    s.add_dependency(%q<cancan-rest-links>, ["~> 0.1.3"])
+    s.add_dependency(%q<cancan-permits>, ["~> 0.1.4"])
     s.add_dependency(%q<devise>, [">= 1.1.2"])
     s.add_dependency(%q<cancan>, ["~> 1.3.4"])
     s.add_dependency(%q<rails>, ["~> 3.0.0"])

data/lib/cream/configure/rails.rb

@@ -14,7 +14,7 @@ Rails3::Plugin::Extender.new do
   # extend action_view with methods from some modules
   extend_rails :view do
     extend_from_module Cream::View, :role, :host, :user_action_menu
-    extend_from_module Cream::Helper, :role
+    extend_from_module Cream::Helper, :role, :auth_label
   end  
   
   after :initialize do   

data/lib/cream/helper/authlabels.rb

@@ -4,6 +4,8 @@ module Cream::Helper
       @auth_labels ||= translate_labels
     end
 
+    protected
+
     def translate_labels
       ns_actions = 'cream.actions'
       labels = {}
@@ -12,10 +14,6 @@ module Cream::Helper
       end 
       labels[:confirm] = t 'cream.confirm'
       labels           
-    end 
-    
-    def self.included(base)
-      base.helper_method :auth_labels
-    end         
+    end    
   end
 end

data/spec/cream/configure/rails_spec.rb

@@ -20,7 +20,7 @@ describe "Rails extension" do
     it "should extend Action View with Roles helper instance_methods and specific role methods" do
       after_init :view do
         :view.should be_extended_with Cream::View,    :role, :host, :user_action_menu
-        :view.should be_extended_with Cream::Helper,  :role
+        :view.should be_extended_with Cream::Helper,  :role, :auth_label
       end
       
       init_app_railties :minimal, :view
@@ -35,6 +35,10 @@ describe "Rails extension" do
       end            
       
       init_app_railties :minimal, :view
+    end   
+    
+    it "should work with safe_concat" do
+      "abc".html_safe.should == "abc"
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 9
-  version: 0.5.9
+  - 10
+  version: 0.5.10
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -105,8 +105,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 2
-        version: 0.1.2
+        - 3
+        version: 0.1.3
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -120,8 +120,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 2
-        version: 0.1.2
+        - 3
+        version: 0.1.3
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -135,8 +135,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 3
-        version: 0.1.3
+        - 4
+        version: 0.1.4
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency