thoughtbot-clearance 0.6.1 → 0.6.2

data/CHANGELOG.textile

@@ -1,9 +1,14 @@
-h1. 0.6.1 (04/21/2009)
+h2. 0.6.2 (04/22/2009)
+
+* Insert Clearance::User into User model if it exists. (Nick Quaranto)
+* World(NavigationHelpers) Cucumber 3.0 style. (Shay Arnett & Mark Cornick)
+
+h2. 0.6.1 (04/21/2009)
 * Scope operators are necessary to keep Rails happy. Reverting the original
 revert so they're back in the library now for constants referenced inside of
 the gem. (Nick Quaranto)
 
-h1. 0.6.0 (04/21/2009)
+h2. 0.6.0 (04/21/2009)
 
 * Converted Clearance to a Rails engine. (Dan Croak & Joe Ferris)
 * Include Clearance::User in User model in app. (Dan Croak & Joe Ferris)
@@ -32,7 +37,7 @@ h2. 0.5.6 (4/11/2009)
 * [#57] Step definition changed for "User should see error messages" so
 features won't fail for certain validations. (Nick Quaranto)
 
-h1. 0.5.5 (3/23/2009)
+h2. 0.5.5 (3/23/2009)
 
 * Removing duplicate test to get rid of warning. (Nick Quaranto)
 

data/README.textile

@@ -17,7 +17,7 @@ In config/environment.rb:
     config.gem "thoughtbot-clearance", 
       :lib     => 'clearance', 
       :source  => 'http://gems.github.com', 
-      :version => '0.6.1'
+      :version => '0.6.2'
 
 Vendor the gem:
 
@@ -95,7 +95,7 @@ h2. Authors
 
 Clearance was extracted out of "Hoptoad":http://hoptoadapp.com. We merged the authentication code from two of thoughtbot's client's Rails apps. The following people have made significant contributions, suggestions, and generally improved the library. Thank you!
 
-Dan Croak, Mike Burns, Jason Morrison, Joe Ferris, Eugene Bolshakov, Nick Quaranto, Josh Nichols, Mike Breen, Marcel Görner, Bence Nagy, Ben Mabey, Eloy Duran, Tim Pope, Mihai Anca, & Mark Cornick.
+Dan Croak, Mike Burns, Jason Morrison, Joe Ferris, Eugene Bolshakov, Nick Quaranto, Josh Nichols, Mike Breen, Marcel Görner, Bence Nagy, Ben Mabey, Eloy Duran, Tim Pope, Mihai Anca, Mark Cornick, & Shay Arnett.
 
 h2. Questions?
 

data/Rakefile

@@ -51,7 +51,7 @@ task :default => ['test:all', 'test:features']
 
 gem_spec = Gem::Specification.new do |gem_spec|
   gem_spec.name        = "clearance"
-  gem_spec.version     = "0.6.1"
+  gem_spec.version     = "0.6.2"
   gem_spec.summary     = "Rails authentication with email & password."
   gem_spec.email       = "support@thoughtbot.com"
   gem_spec.homepage    = "http://github.com/thoughtbot/clearance"
@@ -60,7 +60,8 @@ gem_spec = Gem::Specification.new do |gem_spec|
                           "Joe Ferris", "Eugene Bolshakov", "Nick Quaranto",
                           "Josh Nichols", "Mike Breen", "Marcel Görner",
                           "Bence Nagy", "Ben Mabey", "Eloy Duran",
-                          "Tim Pope", "Mihai Anca", "Mark Cornick"]
+                          "Tim Pope", "Mihai Anca", "Mark Cornick",
+                          "Shay Arnett"]
   gem_spec.files       = FileList["[A-Z]*", "{app,config,generators,lib,shoulda_macros,rails}/**/*"]
 end
 

data/generators/clearance/clearance_generator.rb

@@ -9,8 +9,13 @@ class ClearanceGenerator < Rails::Generator::Base
       m.insert_into "app/controllers/application_controller.rb",
                     "include Clearance::Authentication"
 
-      m.directory File.join("app", "models")
-      m.file "user.rb", "app/models/user.rb"
+      user_model = "app/models/user.rb"
+      if File.exists?(user_model)
+        m.insert_into user_model, "include Clearance::User"
+      else
+        m.directory File.join("app", "models")
+        m.file "user.rb", user_model
+      end
 
       m.directory File.join("test", "factories")
       m.file "factories.rb", "test/factories/clearance.rb"

data/generators/clearance/templates/README

@@ -3,13 +3,7 @@
 
 Ok, enough fancy automatic stuff. Time for some old school monkey copy-pasting.
 
-1. If you already had a User model, include the Clearance::User module now:
-
-    class User < ActiveRecord::Base
-      include Clearance::User
-    end
-
-2. Define a HOST constant in your environments files.
+1. Define a HOST constant in your environments files.
 In config/environments/test.rb and config/environments/development.rb it can be:
 
     HOST = "localhost"
@@ -17,11 +11,11 @@ In config/environments/test.rb and config/environments/development.rb it can be:
 In production.rb it must be the actual host your application is deployed to.
 The constant is used by mailers to generate URLs in emails.
 
-3. In config/environment.rb:
+2. In config/environment.rb:
 
     DO_NOT_REPLY = "donotreply@example.com"
 
-4. Define root_url to *something* in your config/routes.rb:
+3. Define root_url to *something* in your config/routes.rb:
 
     map.root :controller => 'home'
 

data/generators/clearance_features/templates/features/support/paths.rb

@@ -19,7 +19,4 @@ module NavigationHelpers
   end
 end
  
-World do |world|
-  world.extend NavigationHelpers
-  world
-end
+World(NavigationHelpers)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: thoughtbot-clearance
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Dan Croak
@@ -19,11 +19,12 @@ authors:
 - Tim Pope
 - Mihai Anca
 - Mark Cornick
+- Shay Arnett
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-04-20 21:00:00 -07:00
+date: 2009-04-21 21:00:00 -07:00
 default_executable: 
 dependencies: []