challah 0.3.0 → 0.3.1

data/CHANGELOG.md

@@ -1,3 +1,13 @@
-## Challah 0.1.0 (unreleased)
+## Challah 0.3.1
+
+* Removed namespacing of controllers and default routes. 
+* Added option to not include default routes
+
+## Challah 0.3.0
+
+* Documentation clean up. 
+* Added rake tasks for creating role, permission and user records.
+
+## Challah 0.2.0
 
 * Initial build. Basic functionality for session persistence and authentication.

data/README.md

@@ -175,6 +175,20 @@ And of course, you can stack up multiple restrictions get very specific about wh
 
 Whichever method you use will yield the same results. Just make sure you are checking for a permission key, and not checking for a role. Checking for roles (i.e.: `user.role_id == 1`) is shameful practice. Use permissions!
 
+## Default Routes
+
+By default, there are a few routes included with the Challah engine. These routes provide a basic method for a username- and password-based login page. These routes are:
+
+    GET   /login        # => SessionsController#new
+    POST  /login        # => SessionsController#create
+    GET   /logout       # => SessionsController#new
+    
+Feel free to override the `SessionsController` with something more appropriate for your app.
+
+If you'd prefer to set up your own login/logout actions, you can skip the inclusion of the default routes by adding the following line to an initializer file in your app:
+
+    Challah.options[:skip_routes] = true
+
 ## Full documentation
 
 Documentation is available at: [http://rubydoc.info/gems/challah](http://rubydoc.info/gems/challah/frames)

data/app/controllers/{challah/sessions_controller.rb → sessions_controller.rb}

@@ -1,4 +1,4 @@
-class Challah::SessionsController < ApplicationController
+class SessionsController < ApplicationController
   before_filter :destroy_session, :except => :create
   
   unloadable

data/lib/challah.rb

@@ -54,8 +54,9 @@ module Challah
     def options
       @options ||= {
         :cookie_prefix => 'challah',
-        :access_denied_view => 'challah/sessions/access_denied',
-        :storage_class => CookieStore
+        :access_denied_view => 'sessions/access_denied',
+        :storage_class => CookieStore,
+        :skip_routes => false
       }
     end
   end

data/lib/challah/routes.rb

@@ -1,10 +1,12 @@
-Rails.application.routes.draw do  
-  match '/_', :to => 'session#index', :as => 'base'
+Rails.application.routes.draw do
+  unless Challah.options[:skip_routes]
+    match '/login' => 'sessions#create', :as => 'authenticate', :via => :post
+    match '/login' => 'sessions#new', :as => 'login', :via => :get
+    match '/logout' => 'sessions#destroy', :as => 'logout'
+  end
   
-  match '/login' => 'challah/sessions#create', :as => 'authenticate', :via => :post
-  match '/login' => 'challah/sessions#new', :as => 'login', :via => :get
-  match '/logout' => 'challah/sessions#destroy', :as => 'logout'
-  
-  # These are used for testing purposes only.
-  match '/__challah__/:action', :controller => 'challah/test/restrictions'
+  if Rails.env.test?
+    # These are used for testing purposes only.
+    match '/challah/:action', :controller => 'challah/test/restrictions'
+  end
 end

data/lib/challah/version.rb

@@ -1,3 +1,3 @@
 module Challah
-  VERSION = "0.3.0" unless defined?(::Challah::VERSION)
+  VERSION = "0.3.1" unless defined?(::Challah::VERSION)
 end

data/test/restrictions_controller_test.rb

@@ -52,7 +52,7 @@ class RestrictionsControllerTest < ActionController::TestCase
       should "not get to the new page" do
         get :new
         
-        assert_template 'challah/sessions/access_denied'
+        assert_template 'sessions/access_denied'
         assert_response :unauthorized
       end
     end

data/test/routes_test.rb

@@ -3,9 +3,9 @@ require 'helper'
 class RoutesTest < ActionDispatch::IntegrationTest
   context "The routing engine" do
     should "have login and logout routes" do
-      assert_generates '/login', :controller => 'challah/sessions', :action => 'new'
-      assert_generates '/logout', :controller => 'challah/sessions', :action => 'destroy'      
-      assert_routing({ :method => 'post', :path => '/login' }, { :controller => 'challah/sessions', :action => 'create' })
+      assert_generates '/login', :controller => 'sessions', :action => 'new'
+      assert_generates '/logout', :controller => 'sessions', :action => 'destroy'      
+      assert_routing({ :method => 'post', :path => '/login' }, { :controller => 'sessions', :action => 'create' })
     end
   end
 end

data/test/sessions_controller_test.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 class SessionsControllerTest < ActionController::TestCase
-  tests Challah::SessionsController
+  tests SessionsController
   
   context "The sessions controller" do
     setup do

data/vendor/bundle/gems/{factory_girl-2.5.0 → factory_girl-2.5.1}/Changelog

@@ -1,3 +1,12 @@
+2.5.1 (February 3, 2012)
+  Fix attribute evaluation when the attribute isn't defined in the factory but
+    is a private method on Object
+  Update rubygems on Travis before running tests
+  Fix spec name
+  Update GETTING_STARTED with correct usage of build_stubbed
+  Update README with more info on initialize_with
+  Honor :parent on factory over block nesting
+
 2.5.0 (January 20, 2012)
   Revert 'Deprecate build_stubbed and attributes_for'
   Implement initialize_with to allow overriding object instantiation

data/vendor/bundle/gems/{factory_girl-2.5.0 → factory_girl-2.5.1}/GETTING_STARTED.md

@@ -487,7 +487,7 @@ factory\_girl makes available three callbacks for injecting some code:
 
 * after_build  - called after a factory is built   (via FactoryGirl.build)
 * after_create - called after a factory is saved   (via FactoryGirl.create)
-* after_stub   - called after a factory is stubbed (via FactoryGirl.stub)
+* after_stub   - called after a factory is stubbed (via FactoryGirl.build_stubbed)
 
 Examples:
 
@@ -593,10 +593,10 @@ twenty_year_olds = FactoryGirl.build_list(:user, 25, :date_of_birth => 20.years.
 Custom Construction
 -------------------
 
-Instantiating objects can be overridden in the case where you'd rather not
-call `new` on your build class or you have some other factory method that
-you'd prefer to use. Using custom construction also allows for your objects to
-be instantiated with any number of arguments.
+If you want to use factory_girl to construct an object where some attributes
+are passed to `initialize` or if you want to do something other than simply
+calling `new` on your build class, you can override the default behavior by
+defining `to_initialize` on your factory. Example:
 
 ```ruby
 # user.rb
@@ -626,6 +626,19 @@ FactoryGirl.build(:user).name # Bob Hope
 Notice that I ignored the `name` attribute. If you don't want attributes
 reassigned after your object has been instantiated, you'll want to `ignore` them.
 
+Although factory_girl is written to work with ActiveRecord out of the box, it
+can also work with any Ruby class. For maximum compatibiltiy with ActiveRecord,
+the default initializer builds all instances by calling new on your build class
+without any arguments. It then calls attribute writer methods to assign all the
+attribute values. While that works fine for ActiveRecord, it actually doesn't
+work for almost any other Ruby class.
+
+You can override the initializer in order to:
+
+* Build non-ActiveRecord objects that require arguments to `initialize`
+* Use a method other than `new` to instantiate the instance
+* Do crazy things like decorate the instance after it's built
+
 Cucumber Integration
 --------------------
 

data/vendor/bundle/gems/{factory_girl-2.5.0 → factory_girl-2.5.1}/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (2.5.0)
+    factory_girl (2.5.1)
       activesupport
 
 GEM

data/vendor/bundle/gems/{factory_girl-2.5.0 → factory_girl-2.5.1}/gemfiles/2.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.5.0)
+    factory_girl (2.5.1)
       activesupport
 
 GEM

data/vendor/bundle/gems/{factory_girl-2.5.0 → factory_girl-2.5.1}/gemfiles/2.3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.5.0)
+    factory_girl (2.5.1)
       activesupport
 
 GEM

data/vendor/bundle/gems/{factory_girl-2.5.0 → factory_girl-2.5.1}/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.5.0)
+    factory_girl (2.5.1)
       activesupport
 
 GEM

data/vendor/bundle/gems/{factory_girl-2.5.0 → factory_girl-2.5.1}/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.5.0)
+    factory_girl (2.5.1)
       activesupport
 
 GEM

data/vendor/bundle/gems/{factory_girl-2.5.0 → factory_girl-2.5.1}/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (2.5.0)
+    factory_girl (2.5.1)
       activesupport
 
 GEM

data/vendor/bundle/gems/{factory_girl-2.5.0 → factory_girl-2.5.1}/lib/factory_girl/evaluator.rb

@@ -11,13 +11,21 @@ module FactoryGirl
         end
       end
     end
-    undef_method(:id) if method_defined?(:id)
+
+    private_instance_methods.each do |method|
+      undef_method(method) unless method =~ /^__|initialize/
+    end
 
     def initialize(build_strategy, overrides = {})
       @build_strategy    = build_strategy
       @overrides         = overrides
       @cached_attributes = overrides
 
+      singleton = class << self; self end
+      @overrides.each do |name, value|
+        singleton.send :define_method, name, lambda { value }
+      end
+
       @build_strategy.add_observer(CallbackRunner.new(self.class.callbacks, self))
     end
 

data/vendor/bundle/gems/{factory_girl-2.5.0 → factory_girl-2.5.1}/lib/factory_girl/syntax/default.rb

@@ -24,7 +24,8 @@ module FactoryGirl
           FactoryGirl.register_factory(factory)
 
           proxy.child_factories.each do |(child_name, child_options, child_block)|
-            factory(child_name, child_options.merge(:parent => name), &child_block)
+            parent_factory = child_options.delete(:parent) || name
+            factory(child_name, child_options.merge(:parent => parent_factory), &child_block)
           end
         end
 

data/vendor/bundle/gems/{factory_girl-2.5.0 → factory_girl-2.5.1}/lib/factory_girl/version.rb

@@ -1,4 +1,4 @@
 module FactoryGirl
-  VERSION = "2.5.0"
+  VERSION = "2.5.1"
 end