cream 0.5.8 → 0.5.9

data/VERSION

@@ -1 +1 @@
-0.5.8
+0.5.9

data/cream.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.5.8"
+  s.version = "0.5.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

data/lib/cream.rb

@@ -1,6 +1,4 @@
-require 'active_support/inflector'
 require 'require_all'
-
 require 'rails'
 # require 'devise'
 require 'devise-links'
@@ -15,6 +13,7 @@ require 'sugar-high/alias'
 require 'sugar-high/kind_of'
 require 'sugar-high/array'
 
+require 'cream/role'    
 require_all File.dirname(__FILE__) + '/cream/controller'
 require_all File.dirname(__FILE__) + '/cream/helper'
 require_all File.dirname(__FILE__) + '/cream/view'

data/lib/cream/configure/rails.rb

@@ -3,12 +3,13 @@ require 'r3_plugin_toolbox'
 
 Rails3::Plugin::Extender.new do
   # extend action_controller with methods from some modules
-  # extend_rails(:controller) do
-  #   extend_from_module Cream, :role
-  #   extend_from_module Cream::Controller, :ability
-  #   extend_from_module Cream::Helper, :role, :local_host, :auth_label
-  #   extend_from_module Cream::Link, :session, :registration, :rest, :session          
-  # end  
+
+  extend_rails :controller do
+    extend_from_module Cream, :role
+    extend_from_module Cream::Controller, :ability
+    extend_from_module Cream::Helper, :role, :local_host, :auth_label
+    extend_from_module Cream::Link, :session, :registration, :rest, :session          
+  end  
 
   # extend action_view with methods from some modules
   extend_rails :view do

data/spec/cream/configure/rails_spec.rb

@@ -16,18 +16,24 @@ require 'cream/role'
 require 'cream/configure'
 
 describe "Rails extension" do
-  describe 'View extension' do
+  describe 'Extensions' 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
-        # [:admin, :guest].each do |role|
-        #   view.should respond_to? :"for_#{role}"
-        #   view.should respond_to? :"#{role}_area"
-        #   view.should respond_to? :"#{role}?"
-        # end
       end
+      
+      init_app_railties :minimal, :view
+    end
 
+    it "should extend Action Controller" do
+      after_init :controller do
+        :controller.should be_extended_with Cream, :role
+        :controller.should be_extended_with Cream::Controller, :ability
+        :controller.should be_extended_with Cream::Helper, :role, :local_host, :auth_label
+        :controller.should be_extended_with Cream::Link, :session, :registration, :rest, :session
+      end            
+      
       init_app_railties :minimal, :view
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 8
-  version: 0.5.8
+  - 9
+  version: 0.5.9
 platform: ruby
 authors: 
 - Kristian Mandrup