cream 0.8.9 → 0.8.9.1

data/README.textile

@@ -22,6 +22,8 @@ The gems "devise-links":http://github.com/kristianmandrup/devise-links and "canc
 
 Cream comes with a suite of specialized generators that should let you configure your Rails 3 app with these systems to a large degree. 
 
+Note: Lately Cream also has options for some common customizations such as allowing login using either username or email. 
+
 h2. Objectives
 
 * Integrate a set of widely accepted sub-systems for a fully integrated solution
@@ -39,7 +41,9 @@ Please let me know of other areas that you think should be covered in the Wiki o
 h2. The magic behind the curtain...
 
 Cream leverages an extensive "Tool suite":https://github.com/kristianmandrup/cream/wiki/Tool-suite-for-designing-powerful-generators-and-gems-for-Rails-3 I have created specifically to make it much easier/faster to create gems and generators for Rails 3 and spec/test them with RSpec 2, all using more natural DSLs and APIs. 
-If you look into the Cream code you can see extensive usage of this "magic" (especially in the generators). 
+If you look into the Cream code you can see extensive usage of this "magic" (especially in the generators).
+
+Status (Jan 15): I'm currently in the process of refactoring and improving this underlying "tool suite". I might call it _rails-mixer_ or something :P ?
 
 h2. Cream user group
 
@@ -49,10 +53,31 @@ h2. Inspiration and Ideas
 
 _Tony Amoyal_ has written a two part series ("Part I":http://www.tonyamoyal.com/2010/07/28/rails-authentication-with-devise-and-cancan-customizing-devise-controllers/, "Part II":http://www.tonyamoyal.com/2010/09/29/rails-authentication-with-devise-and-cancan-part-2-restful-resources-for-administrators/) on how to setup a fully integrated Devise/CanCan solution with Roles. You might want to take a look at this for further customization needs. It might also provide food for thought for suggestions on improvements to the Cream framework ;) I have started work on a _devise:customize_ generator to facilitate some of these customization needs... 
 
+Currently there is support for seting up a Guest user and and option to use both username and password as valid credentials.
+
 h3. Design ideas
 
 Please see the "Design ideas":https://github.com/kristianmandrup/cream/wiki/Design-ideas section on the wiki for possible enhancements you might want to add and/or ideas for further improvments to the framework. Feel free to add your own suggestions and ideas!
 
+Currently when the Cream config generator is given a set of roles, it both sets up the Roles creates Devise Users for all those roles. In real life scenarios, you will likely want a set of roles and a set of user types. The user types are distinct types of users, possibly with distinct data, registration pages, authentication rules (devise config) etc. The roles are more generic in nature, and users of various user types can each share one or more roles. The API should also include a DSL to easily customize this.     
+
+Please also see "Cream Guest user":https://github.com/kristianmandrup/cream/wiki/Cream-Guest-user for more info on the current approach and the inherent problems with this.
+
+Example idea:
+
+<pre>
+  class Editor < User
+    default_role :editor
+    
+    valid_roles_are :publisher, blog_editor
+    roles_config :multi
+  end
+</pre>   
+
+This way, any editor user created will always be given the :editor role on creation and he can later add the :publisher and/or :blog_editor roles, depending on whether Cream is set up as a single or multi role system. In the future, the framework might even allow some user types to have multiple roles and others to have only a single role (here indicated by the _roles_config :multi_ statement) ? What do you think?
+
+*Ideas and suggestions are most welcome!*
+
 h2. Cream edge, debugging and assisting developing the framework
 
 Cream edge (directly from trunk or a feature branch), might have some extra goodies you could be interested in. To help develop Cream or use the edge version, just do:
@@ -85,31 +110,7 @@ h2. Authentication systems
 
 Cream targets "Devise":http://github.com/plataformatec/devise as the Authentication system of choice
 
-Devise Configuration options:
-
-1. Database Authenticatable: encrypts and stores a password in the database to validate the authenticity of an user while signing in. The authentication can be done both through POST requests or HTTP Basic Authentication.
-2. Token Authenticatable: signs in an user based on an authentication token (also known as “single access token”). The token can be given both through query string or HTTP Basic Authentication.
-3. Oauthable: adds OAuth2 support
-4. Confirmable: sends emails with confirmation instructions and verifies whether an account is already confirmed during sign in.
-5. Recoverable: resets the user password and sends reset instructions.
-6. Registerable: handles signing up users through a registration process, also allowing them to edit and destroy their account.
-7. Rememberable: manages generating and clearing a token for remembering the user from a saved cookie.
-8. Trackable: tracks sign in count, timestamps and IP address.
-9. Timeoutable: expires sessions that have no activity in a specified period of time.
-10. Validatable: provides validations of email and password. It’s optional and can be customized, so you’re able to define your own validations.
-11. Lockable: locks an account after a specified number of failed sign-in attempts. Can unlock via email or after a specified time period.
-
-Configuration is done using the _devise_ statement in the User class (and subclasses). 
-
-Example: Use _Confirmable_ and _Validatable_ devise options/strategies
-
-<pre>
-class User
-  devise :confirmable, :validatable
-end
-</pre>
-
-Note: For Active Record your User table (via migration fx) must support the columns needed for the devise options you are using (See Devise documentation).
+See "Devise Configuration options":https://github.com/kristianmandrup/cream/wiki/Devise-Configuration-options for more details on configuring your devise User models.
 
 h3. Devise links
 

data/Rakefile

@@ -20,7 +20,7 @@ begin
     
     gem.add_dependency "devise-links",      ">= 0.2.1"
     gem.add_dependency "cancan-rest-links", ">= 0.2.1" 
-    gem.add_dependency "cancan-permits",    ">= 0.3.9" 
+    gem.add_dependency "cancan-permits",    ">= 0.3.10" 
 
     gem.add_dependency "devise",            ">= 1.1.5"
     gem.add_dependency "cancan",            ">= 1.4.1" 

data/VERSION

@@ -1 +1 @@
-0.8.9
+0.8.9.1

data/cream.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.8.9"
+  s.version = "0.8.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-01-10}
+  s.date = %q{2011-01-15}
   s.description = %q{An integrated Authentication, Authorization and Roles solution for your Rails 3 app with support for multiple ORMs}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -155,7 +155,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<colorize>, [">= 0.5.8"])
       s.add_runtime_dependency(%q<devise-links>, [">= 0.2.1"])
       s.add_runtime_dependency(%q<cancan-rest-links>, [">= 0.2.1"])
-      s.add_runtime_dependency(%q<cancan-permits>, [">= 0.3.9"])
+      s.add_runtime_dependency(%q<cancan-permits>, [">= 0.3.10"])
       s.add_runtime_dependency(%q<devise>, [">= 1.1.5"])
       s.add_runtime_dependency(%q<cancan>, [">= 1.4.1"])
       s.add_runtime_dependency(%q<rails>, [">= 3.0.1"])
@@ -186,7 +186,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<colorize>, [">= 0.5.8"])
       s.add_dependency(%q<devise-links>, [">= 0.2.1"])
       s.add_dependency(%q<cancan-rest-links>, [">= 0.2.1"])
-      s.add_dependency(%q<cancan-permits>, [">= 0.3.9"])
+      s.add_dependency(%q<cancan-permits>, [">= 0.3.10"])
       s.add_dependency(%q<devise>, [">= 1.1.5"])
       s.add_dependency(%q<cancan>, [">= 1.4.1"])
       s.add_dependency(%q<rails>, [">= 3.0.1"])
@@ -218,7 +218,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<colorize>, [">= 0.5.8"])
     s.add_dependency(%q<devise-links>, [">= 0.2.1"])
     s.add_dependency(%q<cancan-rest-links>, [">= 0.2.1"])
-    s.add_dependency(%q<cancan-permits>, [">= 0.3.9"])
+    s.add_dependency(%q<cancan-permits>, [">= 0.3.10"])
     s.add_dependency(%q<devise>, [">= 1.1.5"])
     s.add_dependency(%q<cancan>, [">= 1.4.1"])
     s.add_dependency(%q<rails>, [">= 3.0.1"])

data/lib/cream/controller/application_controller.rb

@@ -1,15 +1,15 @@
 class ApplicationController < ActionController::Base
+
   def current_user
-    cu = super           
     if defined? Cream::Role
       # Try to get instance of any of the available roles as the current user
       Cream::Role.available.each do |role|
         method = :"current_#{role}"
-        cu ||= send method if respond_to?(method)
+        @cu ||= send method if respond_to?(method)
       end
     end    
-    # if all else fails, the user is likely not signed in so create a Guest user for now    
-    cu ||= Guest.create if defined?(Guest)
+    return @cu if @cu
+    session[:guest] ||= Guest.create if defined?(Guest)
   end
 
   def user_signed_in?

data/lib/generators/cream/app/app_generator.rb

@@ -74,7 +74,13 @@ require "rails/test_unit/railtie"
       def create_guest_user
         remove_model :guest if has_model?(:guest)
         create_model :guest do
-          %Q{
+          %Q{ 
+  # modify this as needed for now!
+  # attr_accessor :login, :username, :email
+  # attr_accessor :password            
+  # 
+  # attr_accessible :login
+            
   def self.create
     Guest.new
   end
@@ -92,7 +98,7 @@ require "rails/test_unit/railtie"
   end  
 
   def has_any_role? *roles
-    roles.flat_uniq..to_symbols.include? :guest
+    roles.flat_uniq.to_symbols.include?(:guest)
   end  
 }
         end

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 8
   - 9
-  version: 0.8.9
+  - 1
+  version: 0.8.9.1
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-10 00:00:00 +01:00
+date: 2011-01-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -357,8 +358,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 9
-        version: 0.3.9
+        - 10
+        version: 0.3.10
   type: :runtime
   prerelease: false
   version_requirements: *id023