cream 0.6.0 → 0.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.6.0
1
+ 0.6.1
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{cream}
8
- s.version = "0.6.0"
8
+ s.version = "0.6.1"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Kristian Mandrup"]
@@ -7,7 +7,7 @@ require 'cancan'
7
7
  require 'cancan-rest-links'
8
8
  require 'cancan-permits'
9
9
 
10
- require 'cream/namespaces'
10
+ require 'cream/namespaces'
11
11
 
12
12
  require 'sugar-high/alias'
13
13
  require 'sugar-high/kind_of'
@@ -18,3 +18,5 @@ require_all File.dirname(__FILE__) + '/cream/controller'
18
18
  require_all File.dirname(__FILE__) + '/cream/helper'
19
19
  require_all File.dirname(__FILE__) + '/cream/view'
20
20
 
21
+ require 'cream/configure'
22
+
@@ -1,3 +1,3 @@
1
1
  require 'require_all'
2
2
  require 'cream/namespaces'
3
- require_all File.dirname(__FILE__) + '/configure'
3
+ require 'cream/configure/rails'
@@ -7,8 +7,7 @@ Rails3::Plugin::Extender.new do
7
7
  extend_rails :controller do
8
8
  extend_from_module Cream, :role
9
9
  extend_from_module Cream::Controller, :ability
10
- extend_from_module Cream::Helper, :role, :local_host, :auth_label
11
- extend_from_module Cream::Link, :session, :registration, :rest, :session
10
+ extend_from_module Cream::Helper, :role, :host, :auth_label
12
11
  end
13
12
 
14
13
  # extend action_view with methods from some modules
@@ -18,7 +17,6 @@ Rails3::Plugin::Extender.new do
18
17
  end
19
18
 
20
19
  after :initialize do
21
- puts "Rails app initialized"
22
20
  require_all File.dirname(__FILE__) + '/after_init'
23
21
  end
24
22
  end
@@ -1,5 +1,7 @@
1
1
  require 'configure_helper'
2
2
 
3
+ require 'cream/configure'
4
+
3
5
  class Role
4
6
  attr_accessor :name
5
7
 
@@ -12,9 +14,6 @@ class Role
12
14
  end
13
15
  end
14
16
 
15
- require 'cream/role'
16
- require 'cream/configure'
17
-
18
17
  describe "Rails extension" do
19
18
  describe 'Extensions' do
20
19
  it "should extend Action View with Roles helper instance_methods and specific role methods" do
@@ -30,8 +29,7 @@ describe "Rails extension" do
30
29
  after_init :controller do
31
30
  :controller.should be_extended_with Cream, :role
32
31
  :controller.should be_extended_with Cream::Controller, :ability
33
- :controller.should be_extended_with Cream::Helper, :role, :local_host, :auth_label
34
- :controller.should be_extended_with Cream::Link, :session, :registration, :rest, :session
32
+ :controller.should be_extended_with Cream::Helper, :role, :host, :auth_label
35
33
  end
36
34
 
37
35
  init_app_railties :minimal, :view
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 6
8
- - 0
9
- version: 0.6.0
8
+ - 1
9
+ version: 0.6.1
10
10
  platform: ruby
11
11
  authors:
12
12
  - Kristian Mandrup