cream 0.5.7 → 0.5.8

data/Rakefile

@@ -15,9 +15,9 @@ begin
 
     gem.add_dependency "require_all",       "~> 1.2.0"
     
-    gem.add_dependency "devise-links",      "~> 0.1.1"
-    gem.add_dependency "cancan-rest-links", "~> 0.1.1" 
-    gem.add_dependency "cancan-permits",    "~> 0.1.2" 
+    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",            ">= 1.1.2"
     gem.add_dependency "cancan",            "~> 1.3.4" 

data/VERSION

@@ -1 +1 @@
-0.5.7
+0.5.8

data/cream.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.5.7"
+  s.version = "0.5.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
@@ -62,12 +62,12 @@ Gem::Specification.new do |s|
      "lib/generators/cream_refactor.rb",
      "log/development.log",
      "sandbox/test.rb",
+     "spec/configure_helper.rb",
      "spec/cream/configure/rails_spec.rb",
      "spec/cream/helper/host_spec.rb",
      "spec/cream/helper/role_spec.rb",
      "spec/cream/view/host_area_spec.rb",
      "spec/cream/view/role_area_spec.rb",
-     "spec/cream/view/role_ext_spec.rb",
      "spec/generator_spec_helper.rb",
      "spec/generators/cream/config/devise/existing_devise_users.rb",
      "spec/generators/cream/config/empty_app/default_args_spec.rb",
@@ -93,12 +93,12 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Integrates Devise, Roles and CanCan with Permits for a Rails 3 app}
   s.test_files = [
-    "spec/cream/configure/rails_spec.rb",
+    "spec/configure_helper.rb",
+     "spec/cream/configure/rails_spec.rb",
      "spec/cream/helper/host_spec.rb",
      "spec/cream/helper/role_spec.rb",
      "spec/cream/view/host_area_spec.rb",
      "spec/cream/view/role_area_spec.rb",
-     "spec/cream/view/role_ext_spec.rb",
      "spec/generator_spec_helper.rb",
      "spec/generators/cream/config/devise/existing_devise_users.rb",
      "spec/generators/cream/config/empty_app/default_args_spec.rb",
@@ -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.1"])
-      s.add_runtime_dependency(%q<cancan-rest-links>, ["~> 0.1.1"])
-      s.add_runtime_dependency(%q<cancan-permits>, ["~> 0.1.2"])
+      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>, [">= 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.1"])
-      s.add_dependency(%q<cancan-rest-links>, ["~> 0.1.1"])
-      s.add_dependency(%q<cancan-permits>, ["~> 0.1.2"])
+      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>, [">= 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.1"])
-    s.add_dependency(%q<cancan-rest-links>, ["~> 0.1.1"])
-    s.add_dependency(%q<cancan-permits>, ["~> 0.1.2"])
+    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>, [">= 1.1.2"])
     s.add_dependency(%q<cancan>, ["~> 1.3.4"])
     s.add_dependency(%q<rails>, ["~> 3.0.0"])

data/lib/cream/configure/after_init/role_config.rb

@@ -18,7 +18,7 @@ end
 module Cream::Helper
   module Role    
     # admin?,  guest? ...
-    AuthAssistant::Role.available.each do |role|
+    Cream::Role.available.each do |role|
       class_eval %{
         def #{role}?
           has_role? :#{role}

data/lib/cream/configure/rails.rb

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

data/lib/cream/role.rb

@@ -1,4 +1,4 @@
-module AuthAssistant
+module Cream
   module Role
     def self.available
       ::Role.all.map(&:name).to_symbols

data/lib/cream/view/role_area.rb

@@ -25,7 +25,7 @@ module Cream::View
       options = last_option(user_roles)
       not_for_roles user_roles do             
         clazz = options[:class] || 'special'
-        area(clazz, &block)
+        area(:class => clazz, &block)
       end
     end  
     alias_method :area_not_for_role, :area_not_for_roles

data/spec/configure_helper.rb

@@ -0,0 +1,17 @@
+require 'rspec/core'
+require 'r3_plugin_toolbox'
+require 'cream'
+require 'action_controller'
+require 'action_view'
+require 'active_support/railtie'
+
+module Minimal
+  class Application < Rails::Application
+    config.active_support.deprecation = :log
+  end
+end
+
+RSpec.configure do |config|
+  config.mock_with :mocha 
+end
+

data/spec/cream/configure/rails_spec.rb

@@ -1,16 +1,4 @@
-require 'spec_helper'
-require 'r3_plugin_toolbox'
-
-require 'active_support'
-require 'action_controller'
-require 'action_view'
-require 'active_support/railtie'
-
-module Minimal
-  class Application < Rails::Application
-    config.active_support.deprecation = :log
-  end
-end
+require 'configure_helper'
 
 class Role  
   attr_accessor :name
@@ -27,25 +15,20 @@ end
 require 'cream/role'
 require 'cream/configure'
 
-Rails.application = Minimal::Application
-
-Minimal::Application.initialize!
-
 describe "Rails extension" do
   describe 'View extension' do
     it "should extend Action View with Roles helper instance_methods and specific role methods" do
-      extend Rails3::Plugin::Extender::Macro
-  
-      after_init :view do |view|
-        view.should be_extended_with Cream::View, :roles, :area, :user_action_menu
-        [:admin, :guest].each do |role|
-          view.should respond_to? :"for_#{role}"
-          view.should respond_to? :"#{role}_area"
-          view.should respond_to? :"#{role}?"
-        end
+      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
 
-      Minimal::Application.initialize!
-    end    
+      init_app_railties :minimal, :view
+    end
   end
-end
+end

data/spec/cream/helper/role_spec.rb

@@ -8,27 +8,27 @@ describe Cream::Helper::Role do
   context 'method auto-generated when Rails initialize based on registered roles' do
     describe '#guest_area' do              
 
-      it "should execute an Admin guarded block for :admin" do        
-        with_engine do |e, view|
-          view.stubs(:has_role?).with([:admin]).returns true
-
-          res = e.run_template do 
-            %{<%= for_admin { 'hello' } %>}
-          end        
-          res.should match /hello/
-        end
-      end
-  
-      it "should not execute an Admin guarded block for user not :admin" do        
-        with_engine do |e, view|
-          view.stubs(:has_role?).with([:admin]).returns false
-
-          res = e.run_template do 
-            %{<%= for_admin { 'hello' } %>}
-          end        
-          res.should be_empty
-        end
-      end
+      # it "should execute an Admin guarded block for :admin" do        
+      #   with_engine do |e, view|
+      #     view.stubs(:has_role?).with([:admin]).returns true
+      # 
+      #     res = e.run_template do 
+      #       %{<%= for_admin { 'hello' } %>}
+      #     end        
+      #     res.should match /hello/
+      #   end
+      # end
+      #   
+      # it "should not execute an Admin guarded block for user not :admin" do        
+      #   with_engine do |e, view|
+      #     view.stubs(:has_role?).with([:admin]).returns false
+      # 
+      #     res = e.run_template do 
+      #       %{<%= for_admin { 'hello' } %>}
+      #     end        
+      #     res.should be_empty
+      #   end
+      # end
     end # desc
   end # context
 

data/spec/cream/view/role_area_spec.rb

@@ -8,6 +8,7 @@ require 'cream/view/host_area'
 
 describe Cream::View::Role do
   extend_view_with Cream::View, :role, :host
+  extend_view_with Cream::Helper, :role
   
   describe '#area' do
     it "should display the div with hello" do
@@ -81,44 +82,51 @@ describe Cream::View::Role do
 
   describe '#area_not_for_roles' do              
     it "should not display an area for user :admin" do        
-      with_action_view do |view|      
+      with_engine do |e, view|
         view.stubs(:has_role?).with([:admin]).returns true
-        view.area_not_for_roles(:admin) { 'hello' }.should be_nil
+        res = e.run_template do 
+          %{<%= area_not_for_roles(:admin) { 'hello' } %>}
+        end        
+        res.should be_empty
       end    
     end
   
     it "should display an area for user not :admin" do        
-      with_action_view do |view|  
+      with_engine do |e, view|
         # he is not admin    
         view.stubs(:has_role?).with([:admin]).returns false
-        view.area_not_for_roles(:admin) { 'hello' }.should match /hello/
+
+        res = e.run_template do 
+          %{<%= area_not_for_roles(:admin) { 'hello' } %>}
+        end        
+        res.should match /hello/
       end    
     end                
   end # desc
 
-  context 'method auto-generated when Rails initialize based on registered roles'
-    describe '#guest_area' do              
-      it "should display an Admin area for :admin" do        
-        with_engine do |e, view|
-          view.stubs(:has_role?).with([:admin]).returns true
-
-          res = e.run_template do 
-            %{<%= admin_area { 'hello' } %>}
-          end        
-          res.should match /hello/
-        end
-      end
-  
-      it "should not display a Admin area for user not :admin" do        
-        with_engine do |e, view|
-          view.stubs(:has_role?).with([:admin]).returns false
-
-          res = e.run_template do 
-            %{<%= admin_area { 'hello' } %>}
-          end        
-          res.should be_empty
-        end
-      end
-    end # desc
-  end # context  
+  # context 'method auto-generated when Rails initialize based on registered roles' do
+  #   describe '#guest_area' do              
+  #     it "should display an Admin area for :admin" do        
+  #       with_engine do |e, view|
+  #         view.stubs(:has_role?).with([:admin]).returns true
+  # 
+  #         res = e.run_template do 
+  #           %{<%= admin_area { 'hello' } %>}
+  #         end        
+  #         res.should match /hello/
+  #       end
+  #     end
+  # 
+  #     it "should not display a Admin area for user not :admin" do        
+  #       with_engine do |e, view|
+  #         view.stubs(:has_role?).with([:admin]).returns false
+  # 
+  #         res = e.run_template do 
+  #           %{<%= admin_area { 'hello' } %>}
+  #         end        
+  #         res.should be_empty
+  #       end
+  #     end
+  #   end # desc
+  # end # context  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 7
-  version: 0.5.7
+  - 8
+  version: 0.5.8
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -105,8 +105,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 1
-        version: 0.1.1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -120,8 +120,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 1
-        version: 0.1.1
+        - 2
+        version: 0.1.2
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -135,8 +135,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 2
-        version: 0.1.2
+        - 3
+        version: 0.1.3
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -299,12 +299,12 @@ files:
 - lib/generators/cream_refactor.rb
 - log/development.log
 - sandbox/test.rb
+- spec/configure_helper.rb
 - spec/cream/configure/rails_spec.rb
 - spec/cream/helper/host_spec.rb
 - spec/cream/helper/role_spec.rb
 - spec/cream/view/host_area_spec.rb
 - spec/cream/view/role_area_spec.rb
-- spec/cream/view/role_ext_spec.rb
 - spec/generator_spec_helper.rb
 - spec/generators/cream/config/devise/existing_devise_users.rb
 - spec/generators/cream/config/empty_app/default_args_spec.rb
@@ -356,12 +356,12 @@ signing_key:
 specification_version: 3
 summary: Integrates Devise, Roles and CanCan with Permits for a Rails 3 app
 test_files: 
+- spec/configure_helper.rb
 - spec/cream/configure/rails_spec.rb
 - spec/cream/helper/host_spec.rb
 - spec/cream/helper/role_spec.rb
 - spec/cream/view/host_area_spec.rb
 - spec/cream/view/role_area_spec.rb
-- spec/cream/view/role_ext_spec.rb
 - spec/generator_spec_helper.rb
 - spec/generators/cream/config/devise/existing_devise_users.rb
 - spec/generators/cream/config/empty_app/default_args_spec.rb

data/spec/cream/view/role_ext_spec.rb

@@ -1,36 +0,0 @@
-require 'spec_helper'
-
-require 'active_support'
-require 'action_controller'
-require 'action_view'
-# require 'active_record'
-# require 'action_mailer'
-require 'active_support/railtie'
-# require 'rails/all'
-
-module Minimal
-  class Application < Rails::Application
-    config.active_support.deprecation = :log
-  end
-end
-
-Rails.application = Minimal::Application
-
-class User
-end
-
-describe "View extensions" do
-  describe 'Role area functionality' do
-    
-    it "should extend Action View with various Roles helper methods" do
-      after_init :view do
-        :view.should be_extended_with AuthAssistant::View, :roles
-        :view.should be_extended_with AuthAssistant::Helper, :role
-      end
-
-      User.stubs(:roles).returns [:admin, :guest]
-
-      init_app_railties :minimal, :view
-    end
-  end
-end