devisable 0.1.1 → 0.1.2

data/README.rdoc

@@ -9,21 +9,23 @@ It is a quick and easy generator that sets up devise,cancan and/or oauth on your
 * Has a user and roles tool so you can change permissions inside a gui
 * Supports all devise options
 * Contains rspec and cucumber test options
-* Can be added to existing project that don't already have devise.
+* Can be added to existing project that don't already have devise.  More work will be required here because you will have to move around files to match your project.
 
 == Installation
 
 Devisable supports rails 3 with ruby >= 1.9.2.
 
-  gem install devisable
+  Add devisable to your gemfile
   
-  Then Add devisable to your gemfile
+  Run bundle
 
   rails generate devisable --help
   
 == Usage
 
-It is always good practice to start a new branch in your repo before making major updates like when using devisable.
+  It is always good practice to start a new branch in your repo before making major updates like when using devisable.  
+
+  At least make sure you have committed all updates prior, in case you have to rollback.
 
 Use --help to see a list of complete options
   
@@ -59,6 +61,10 @@ To just setup Basic authentication with devisable
   rails generate devisable
   
   This will setup with the devise options 1,4,5,7,8,10
+  
+Starting a project - Use the -n option
+
+  rails generate devisable -n
 
 Twitter Oauth - Note you will need to setup your app in twitter before running this
 
@@ -75,11 +81,7 @@ Facebook Oauth
 All three (normal authentication,twitter_oauth, facebook_oauth)
 
   rails generate devisable -c 1,2,3,5,6,7,8 -t asdf489fhkbnajbsdf,2uh3uh383493hkjdf -o asdf489fhkbnajbsdf,2uh3uh383493hkjdf,10100101001 -u http://dev.yoururl.com
-  
-Starting a project - Use the -n option
-
-  rails generate devisable -c 1,2,3,5,6,7,8 -t asdf489fhkbnajbsdf,2uh3uh383493hkjdf -o asdf489fhkbnajbsdf,2uh3uh383493hkjdf,10100101001 -n -u http://dev.yoururl.com
-  
+    
 Add Cucumber tests - use the -C option
   
   rails generate devisable -c 1,2,3,5,6,7,8 -t asdf489fhkbnajbsdf,2uh3uh383493hkjdf -o asdf489fhkbnajbsdf,2uh3uh383493hkjdf,10100101001 -n -C -u http://dev.yoururl.com 
@@ -87,6 +89,11 @@ Add Cucumber tests - use the -C option
 Add extra fields to the user model
 
   rails generate devisable -e first_name:string,last_name:string
+  
+After running the generator you will most likely need to do a migration.
+
+  rake db:migrate
+  
 
 == Contributing to devisable
  
@@ -104,8 +111,29 @@ Add extra fields to the user model
 * Support for haml and sass instead of erb
 * Add Facebook javascript autologin option
 
+== Gems
+
+devisable uses the following gems:
+
+* devise (https://github.com/plataformatec/devise)
+* cancan (https://github.com/ryanb/cancan.git)
+* warden_oauth (https://github.com/scottsampson/warden_oauth)
+* json_pure (https://github.com/flori/json)
+* twitter_oauth (https://github.com/moomerman/twitter_oauth.git)
+* cucumber (https://github.com/aslakhellesoy/cucumber)
+* cucumber-rails (https://github.com/aslakhellesoy/cucumber-rails)
+* capybara (https://github.com/jnicklas/capybara)
+* database_cleaner (https://github.com/bmabey/database_cleaner)
+* rspec-rails (https://github.com/rspec/rspec-rails)
+
+== Maintainers
+
+* cloudspace (http://www.cloudspace.com - https://github.com/cloudspace)
+* Scott Sampson (http://github.com/scottsampson)
+* Jeremiah Hemphill (http://github.com/jeremiahishere)
+
 == Copyright
 
-Copyright (c) 2011 Scott. See LICENSE.txt for
+Copyright (c) 2011 cloudspace. See LICENSE.txt for
 further details.
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/devisable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devisable}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Sampson", "Jeremiah Hemphill"]
-  s.date = %q{2011-03-23}
+  s.date = %q{2011-06-28}
   s.description = %q{Generates initial code for a devise install.  Gives the options for oauth, using cancan, and creating a user tool to manage the users.}
   s.email = %q{scott@cloudspace.com}
   s.extra_rdoc_files = [
@@ -79,6 +79,8 @@ Gem::Specification.new do |s|
     "lib/generators/devisable/templates/spec/models/role_spec.erb",
     "lib/generators/devisable/templates/spec/models/user_spec.erb",
     "pkg/devisable-0.1.0.gem",
+    "pkg/devisable-0.1.1.gem",
+    "pkg/devisable-0.1.2.gem",
     "pkg/devise_generator-0.1.0.gem",
     "test/helper.rb",
     "test/test_devise_generator.rb"

data/lib/generators/devisable/devisable_generator.rb

@@ -169,6 +169,9 @@ class DevisableGenerator < Rails::Generators::Base
     end
     rep_str = '  devise ' + rep_str[1..-1] + "\n"
     gsub_file "app/models/user.rb" , /^[ ]*(devise)([^\n]*)(\n)(.*)(\s)/, rep_str
+
+    str = "attr_accessible :username\n"
+    insert_into_file "app/models/user.rb", str, :after => "# Setup accessible (or protected) attributes for your model\n"  
     
     rep_str = load_erb_string('partials/_user_model_methods.erb')
     replace_last_end_in_file_with("app/models/user.rb",rep_str)
@@ -246,15 +249,15 @@ class DevisableGenerator < Rails::Generators::Base
       insert_into_file user_migration_file, fields, :after => "t.token_authenticatable\n"
       
       #add correct fields to user model
-      str = "attr_accessible :default_provider, :username\n"
-      insert_into_file "app/models/user.rb", str, :after => "# Setup accessible (or protected) attributes for your model\n"  
+      str = "attr_accessible :default_provider\n"
+      insert_into_file "app/models/user.rb", str, :after => "attr_accessible :username\n"  
       
       generate("model", "oauth_profile user_id:integer provider:string token:string secret:string username:string email:string name:string img_url:string")
             
       insert_into_file "app/models/oauth_profile.rb", "belongs_to :user\n", :after => "class OauthProfile < ActiveRecord::Base\n"
       
       insert_into_file "app/models/user.rb", "has_many :oauth_profiles\n", :after => "class User < ActiveRecord::Base\n"  
-      
+    
     end
     
     # Link to "Login With Twitter/Facebook" somewhere in your view

data/lib/generators/devisable/templates/cucumber/step_definitions/authentication_steps.rb

@@ -28,6 +28,6 @@ end
 
 Given /^I am signed out$/ do
   Given %{I am on the sign out page}
-  Then %{I should be on the homepage page}
+  Then %{I should be on the homepage}
   #And %{I should see "Sign out successful"}
 end

data/lib/generators/devisable/templates/cucumber/user.feature

@@ -13,7 +13,7 @@ Feature: Manage users
     Given I am signed in as "user@cloudspace.com"
     And I only have the role "GeneralUser"
     When I go to the users page
-    When I should be on the home page
+    When I should be on the homepage
     And I should see "You are not authorized to access this page."
 
   Scenario: Editing a User

data/lib/generators/devisable/templates/spec/models/ability_spec.erb

@@ -7,35 +7,28 @@ describe Ability do
       :name => 'SuperAdmin'
     })
     
-    @role2 = Role.new({
-      :name => 'RoleUser'
-    })
-    
-    @user = User.new({:email => 'fred@testsite.com'})
-    @user2 = User.new({:email => 'terry@testsite.com'})
+    @user = User.new({:email => 'fred@testsite.com', :username=>'fred', :password=>'pwfred'})
     @user.roles << @role
-    @user2.roles << @role2
-    
     @role.permissions << Permission.new({:model => 'Role',:ability => 'Add'})
     @role.permissions << Permission.new({:model => 'Role',:ability => 'Edit'})
     @role.permissions << Permission.new({:model => 'Role',:ability => 'Delete'})
     @role.permissions << Permission.new({:model => 'Role',:ability => 'View'})
-    @role.save
-    @user.save
+    @role.save!
+    @user.save!
     @user_ability = Ability.new(@user)
     
     @role2 = Role.new({
       :name => 'RoleUser'
     })
     
-    @user2 = User.new({:email => 'terry@testsite.com'})
+    @user2 = User.new({:email => 'terry@testsite.com', :username=>'terry', :password=>'pwterry'})
     @user2.roles << @role2
     @role2.permissions << Permission.new({:model => 'Role',:ability => 'add'})
     @role2.permissions << Permission.new({:model => 'Role',:ability => 'edit'})
     @role2.permissions << Permission.new({:model => 'Role',:ability => 'delete'})
     @role2.permissions << Permission.new({:model => 'Role',:ability => 'View'})
-    @role2.save
-    @user2.save
+    @role2.save!
+    @user2.save!
     @user_ability2 = Ability.new(@user2)
     
   end

data/lib/generators/devisable/templates/spec/models/user_spec.erb

@@ -8,16 +8,14 @@ describe User do
     @role2 = Role.new({
       :name => 'SuperAdmin'
     })
-    @role.save
-    @role2.save
-    @user = User.new({:email => 'fred@testsite.com'})
-    @user2 = User.new({:email => 'fred2@testsite.com',:username => 'fred2'})
-    @user3 = User.new({:username => 'fred3'})
-    @user4 = User.new()
+    @role.save!
+    @role2.save!
+    @user = User.new({:email => 'fred@testsite.com', :password=>'pwfred'})
+    @user2 = User.new({:email => 'fred2@testsite.com',:username => 'fred2', :password=>'fred2pw'})
     @user.roles << @role
-    @user.save
+    @user.save!
     @user2.roles << @role2
-    @user2.save
+    @user2.save!
   end
   
   it "should have the role Admin if assigned the Admin Role" do
@@ -32,12 +30,7 @@ describe User do
     (@user.display_name == 'fred@testsite.com').should be_true
   end
   
-  it "should have username fred if there is a username and an email" do
-    (@user2.display_name == 'fred2').should be_true
-  end
-  
-  it "should have username fred if there is a username and no email" do
-    @user2.email = ''
+  it "should have username fred2 if there is a username and an email" do
     (@user2.display_name == 'fred2').should be_true
   end
   
@@ -46,14 +39,6 @@ describe User do
     User.superadmins.include?(@user).should be_false
   end
   
-  it "should require a username or email" do
-    @user4.should_not be_valid
-  end
-  
-  it "should be valid with a username" do
-    @user3.should be_valid
-  end
-  
   it "should be valid with an email" do
     @user.should be_valid
   end

metadata

@@ -2,7 +2,7 @@
 name: devisable
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Scott Sampson
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -04:00
+date: 2011-06-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,6 +130,8 @@ files:
 - lib/generators/devisable/templates/spec/models/role_spec.erb
 - lib/generators/devisable/templates/spec/models/user_spec.erb
 - pkg/devisable-0.1.0.gem
+- pkg/devisable-0.1.1.gem
+- pkg/devisable-0.1.2.gem
 - pkg/devise_generator-0.1.0.gem
 - test/helper.rb
 - test/test_devise_generator.rb
@@ -147,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -4424740514264629431
+      hash: -2159356801736187739
       segments: 
       - 0
       version: "0"