role_up 0.1.4 → 0.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    role_up (0.1.4)
+    role_up (0.1.5)
       cancan (~> 1.6.5)
       rails (~> 3.0.0)
 

data/README.md

@@ -3,7 +3,7 @@ Role Up
 `CanCan` extension that adds some real-deal syntax and file organization lovin'!
 
 ### Warning
-* Changing rules in an ability class is not reflected on page reload in
+* THIS SHOULD BE FIXED - Changing rules in an ability class is not reflected on page reload in
   development mode
 
 ### TODO

data/lib/role_up.rb

@@ -6,7 +6,11 @@ module RoleUp
   # Lock 'n Load
   autoload :Errors , 'role_up/errors'
   require 'role_up/ability'
-  require 'role_up/engine' if defined? Rails
+  require 'role_up/railtie' if defined? Rails
+
+  # Our file match
+  mattr_reader :glob
+  @@glob = "**/*_ability.rb"
 
   # The class we'll authorize against
   mattr_accessor :authorization_class

data/lib/role_up/railtie.rb

@@ -0,0 +1,37 @@
+require "rails/railtie"
+
+module RoleUp
+
+  class Railtie < Rails::Railtie
+
+    # eager load our app/abilities directory
+    #
+    # HAPPENS FIRST
+    config.before_configuration do |app|
+      app.config.paths.app.abilities "app/abilities" , :eager_load => true , :glob => RoleUp.glob
+    end
+
+    # make sure our ability files are reloaded on each request in development
+    # ONLY if we are not caching classes
+    #
+    # HAPPENS SECOND
+    config.to_prepare do
+      RoleUp::Railtie.force_load_abilities if Rails.env.development? && !Rails.application.config.cache_classes
+    end
+
+    # force load our ability files if we are in a non-development environment and
+    # if we aren't caching classes
+    #
+    # HAPPENS THIRD
+    config.after_initialize do |app|
+      force_load_abilities if !Rails.env.development? && !app.config.cache_classes
+    end
+
+    def self.force_load_abilities
+      Dir[ "#{ Rails.root }/app/abilities/#{ RoleUp.glob }" ].each { |a| load a }
+    end
+
+  end
+
+end
+

data/lib/role_up/version.rb

@@ -1,5 +1,5 @@
 module RoleUp
   # Our gem version
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end
 

data/test/integration/dummy/app/controllers/application_controller.rb

@@ -1,7 +1,10 @@
+ActiveSupport::Dependencies.log_activity = true
+ActiveSupport::Dependencies.logger = Rails.logger
+
 class ApplicationController < ActionController::Base
 
   def home
-    render :text => "hello"
+    render :text => ( current_ability.can? :manage , Widget ).inspect
   end
 
   protect_from_forgery

data/test/integration/dummy/config/application.rb

@@ -1,45 +1,11 @@
 require File.expand_path('../boot', __FILE__)
-
-require "active_model/railtie"
-require "active_record/railtie"
 require "action_controller/railtie"
-require "action_view/railtie"
-require "action_mailer/railtie"
 
 Bundler.require
 require "role_up"
 
 module Dummy
   class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
-
-    # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
   end
 end

data/test/integration/dummy/config/environments/development.rb

@@ -1,26 +1,10 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
   config.cache_classes = false
-
-  # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
-
-  # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
-
-  # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
-
-  # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
-
-  # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 end
 

data/test/integration/dummy/config/environments/production.rb

@@ -1,49 +1,10 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # The production environment is meant for finished, "live" apps.
-  # Code is not reloaded between requests
   config.cache_classes = true
-
-  # Full error reports are disabled and caching is turned on
+  config.whiny_nils = false
   config.consider_all_requests_local       = false
+  config.action_view.debug_rjs             = false
   config.action_controller.perform_caching = true
-
-  # Specifies the header that your server uses for sending files
-  config.action_dispatch.x_sendfile_header = "X-Sendfile"
-
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
-
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
-
-  # See everything in the log (default is :info)
-  # config.log_level = :debug
-
-  # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
-
-  # Use a different cache store in production
-  # config.cache_store = :mem_cache_store
-
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-
-  # Enable serving of images, stylesheets, and javascripts from an asset server
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Disable delivery errors, bad email addresses will be ignored
-  # config.action_mailer.raise_delivery_errors = false
-
-  # Enable threaded mode
-  # config.threadsafe!
-
-  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found)
-  config.i18n.fallbacks = true
-
-  # Send deprecation notices to registered listeners
-  config.active_support.deprecation = :notify
+  config.active_support.deprecation = :log
+  config.action_dispatch.best_standards_support = :builtin
 end
+

data/test/integration/dummy/config/environments/test.rb

@@ -1,35 +1,9 @@
 Dummy::Application.configure do
-  # Settings specified here will take precedence over those in config/application.rb
-
-  # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
   config.cache_classes = true
-
-  # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
-
-  # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
-
-  # Raise exceptions instead of rendering exception templates
   config.action_dispatch.show_exceptions = false
-
-  # Disable request forgery protection in test environment
   config.action_controller.allow_forgery_protection    = false
-
-  # Tell Action Mailer not to deliver emails to the real world.
-  # The :test delivery method accumulates sent emails in the
-  # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
-
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
-  # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
 end

data/test/integration/dummy/config/routes.rb

@@ -1,59 +1,3 @@
 Dummy::Application.routes.draw do
   root :to => "application#home"
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => "welcome#index"
-
-  # See how all your routes lay out with "rake routes"
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id(.:format)))'
 end

data/test/integration/role_up_engine_test.rb

@@ -11,5 +11,12 @@ class RoleUp::EngineTest < MiniTest::Unit::TestCase
     refute_empty Ability.ability_definitions
   end
 
+  # Check that our path helper naming was successful
+  def test_ability_path_name
+    refute_raises do
+      Dummy::Application.paths.app.abilities
+    end
+  end
+
 end
 

data/test/integration/support/assertion_helpers.rb

@@ -0,0 +1,37 @@
+class MiniTest::Unit::TestCase
+
+  def refute_raises *exp
+
+    msg = "#{exp.pop}\n" if String === exp.last
+
+    begin
+      yield
+
+    rescue MiniTest::Skip => e
+      if exp.include? MiniTest::Skip then
+        return e
+
+      else
+        raise e
+
+      end
+
+    rescue Exception => e
+      if exp.empty?
+        flunk "Unexpected exception :: #{msg}#{mu_pp(e)}"
+
+      else
+        details = "Unexpected #{msg}#{mu_pp(exp)} exception"
+        refute( exp.any? { |ex|
+                 ex.instance_of?(Module) ? e.kind_of?(ex) : ex == e.class
+               }, exception_details(e, details))
+        return e
+
+      end
+
+    end
+
+  end
+
+end
+

data/test/unit/role_up_spec_test.rb

@@ -10,6 +10,10 @@ describe RoleUp do
     RoleUp.must_respond_to :authorization_class
   end
 
+  it "should respond to glob" do
+    RoleUp.must_respond_to :glob
+  end
+
   it "should respond to setup" do
     RoleUp.must_respond_to :setup
   end

data/test/unit/role_up_test.rb

@@ -10,6 +10,10 @@ class RoleUpTest < MiniTest::Unit::TestCase
     assert defined? RoleUp::Errors
   end
 
+  def test_that_our_glob_is_as_intended
+    assert_equal "**/*_ability.rb" , RoleUp.glob
+  end
+
   def test_that_role_up_yields_self_on_setup
     RoleUp.setup do |config|
       assert_equal RoleUp , config

metadata

@@ -2,7 +2,7 @@
 name: role_up
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ryan Cook
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 Z
+date: 2011-06-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cancan
@@ -75,8 +75,8 @@ files:
 - Rakefile
 - lib/role_up.rb
 - lib/role_up/ability.rb
-- lib/role_up/engine.rb
 - lib/role_up/errors.rb
+- lib/role_up/railtie.rb
 - lib/role_up/version.rb
 - role_up.gemspec
 - test/integration/dummy/Rakefile
@@ -89,7 +89,6 @@ files:
 - test/integration/dummy/config.ru
 - test/integration/dummy/config/application.rb
 - test/integration/dummy/config/boot.rb
-- test/integration/dummy/config/database.yml
 - test/integration/dummy/config/environment.rb
 - test/integration/dummy/config/environments/development.rb
 - test/integration/dummy/config/environments/production.rb
@@ -100,7 +99,6 @@ files:
 - test/integration/dummy/config/initializers/secret_token.rb
 - test/integration/dummy/config/initializers/session_store.rb
 - test/integration/dummy/config/locales/en.yml
-- test/integration/dummy/config/regulate.yml
 - test/integration/dummy/config/routes.rb
 - test/integration/dummy/db/test.sqlite3
 - test/integration/dummy/public/404.html
@@ -116,6 +114,7 @@ files:
 - test/integration/dummy/public/stylesheets/.gitkeep
 - test/integration/dummy/script/rails
 - test/integration/role_up_engine_test.rb
+- test/integration/support/assertion_helpers.rb
 - test/integration/test_helper.rb
 - test/unit/ability_spec_test.rb
 - test/unit/ability_test.rb
@@ -150,7 +149,7 @@ rubyforge_project: role_up
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: role_up-0.1.4
+summary: role_up-0.1.5
 test_files: 
 - test/integration/dummy/Rakefile
 - test/integration/dummy/app/abilities/widget_ability.rb
@@ -162,7 +161,6 @@ test_files:
 - test/integration/dummy/config.ru
 - test/integration/dummy/config/application.rb
 - test/integration/dummy/config/boot.rb
-- test/integration/dummy/config/database.yml
 - test/integration/dummy/config/environment.rb
 - test/integration/dummy/config/environments/development.rb
 - test/integration/dummy/config/environments/production.rb
@@ -173,7 +171,6 @@ test_files:
 - test/integration/dummy/config/initializers/secret_token.rb
 - test/integration/dummy/config/initializers/session_store.rb
 - test/integration/dummy/config/locales/en.yml
-- test/integration/dummy/config/regulate.yml
 - test/integration/dummy/config/routes.rb
 - test/integration/dummy/db/test.sqlite3
 - test/integration/dummy/public/404.html
@@ -189,6 +186,7 @@ test_files:
 - test/integration/dummy/public/stylesheets/.gitkeep
 - test/integration/dummy/script/rails
 - test/integration/role_up_engine_test.rb
+- test/integration/support/assertion_helpers.rb
 - test/integration/test_helper.rb
 - test/unit/ability_spec_test.rb
 - test/unit/ability_test.rb

data/lib/role_up/engine.rb

@@ -1,13 +0,0 @@
-require 'rails/engine'
-
-module RoleUp
-
-  class Engine < Rails::Engine
-
-    # eager load our app/abilities directory
-    config.paths.add "app/abilities" , :eager_load => true , :glob => "**/*_ability.rb"
-
-  end
-
-end
-

data/test/integration/dummy/config/database.yml

@@ -1,22 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000

data/test/integration/dummy/config/regulate.yml

@@ -1,10 +0,0 @@
-development:
-  repo: db/repos/development.git
-test: &test
-  repo: db/repos/test.git
-production:
-  repo: db/repos/production.git
-daily:
-  repo: db/repos/daily.git
-cucumber:
-  <<: *test