canard 0.2.0 → 0.2.1

data/TODO

@@ -2,4 +2,6 @@
 * Test the ability class.
 * Test the generators.
 * Test the railtie
-* Expand the tests to produce all the standard abilities: index,show,read,new,create,edit,update,destroy.
+* Expand the tests to produce all the standard abilities: index,show,read,new,create,edit,update,destroy.
+* Take the Factory references out of the generated tests.
+* Add some rdocs.

data/canard.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Canard::VERSION
   s.authors     = ["James McCarthy"]
   s.email       = ["james2mccarthy@gmail.com"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/james2m/canard"
   s.summary     = %q{Adds RoleModel roles to CanCan.}
   s.description = %q{Wraps CanCan and RoleModel up with a generator and makes role based authorisation really easy in Rails 3.x.}
 
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "minitest", "~> 2"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "activerecord"
+  s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency "cancan"
   s.add_runtime_dependency "role_model"
 end

data/lib/ability.rb

@@ -31,7 +31,7 @@ class Ability
   end
   
   def ability_definitions
-    Canard.ability_definitions
+    Canard::Abilities.definitions
   end
   
   def load_abilities(role)

data/lib/canard.rb

@@ -1,12 +1,10 @@
 require 'cancan'
 require 'role_model'
-require "canard/version"
+require 'canard/abilities'
+require 'canard/version'
+require 'canard/user_model'
 require "canard/find_abilities"
 require "ability"
 
-module Canard
-  autoload :UserModel, 'canard/user_model'
-end
-
 require 'canard/railtie' if defined?(Rails) && Rails::VERSION::MAJOR >= 3
 

data/lib/canard/abilities.rb

@@ -0,0 +1,22 @@
+module Canard
+  class Abilities
+  
+    @definitions = {}
+    @definition_paths = ['app/abilities']
+
+    class << self
+
+      attr_accessor :definition_paths
+      
+      attr_reader :definitions
+      
+      def for(name, &block)
+        raise ArgumentError.new('No block of ability definitions given') unless block_given?
+        @definitions[name.to_sym] = block
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/canard/find_abilities.rb

@@ -7,13 +7,14 @@ module Canard
     attr_accessor :abilities_path
     
     def ability_definitions
-      @ability_definitions ||= {}
+      Abilities.definitions
     end
     
     def abilities_for(role, &block)
+      ::ActiveSupport::Deprecation.warn("abilities_for is deprecated and will be removed from Canard 0.4.0. Use Canard::Abilities.for and move the definitions to app/abilities.")
       ability_definitions[role] = block
     end
-    
+
   end
 
   def self.find_abilities #:nodoc:
@@ -25,7 +26,14 @@ module Canard
         self.class_eval File.read(file)
       end
     end
+    
+    Abilities.definition_paths.each do |path|
+      Dir[File.join(Rails.root, path, '**', '*.rb')].sort.each do |file|
+        load file
+      end
+    end
 
   end
   
+  
 end

data/lib/canard/version.rb

@@ -1,3 +1,3 @@
 module Canard
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/abilities_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+require 'canard'
+
+describe 'Canard::Abilities' do
+
+  subject { Canard::Abilities }
+   
+  describe "ability_paths" do
+     
+    it "defaults to app/abilities" do
+      subject.definition_paths.must_include 'app/abilities'
+    end
+     
+    it "appends paths" do
+      subject.definition_paths << 'other_abilities'
+      subject.definition_paths.must_include 'other_abilities'
+    end
+
+    it "can be overwritten" do
+      subject.definition_paths = ['other_abilities']
+      
+      subject.definition_paths.must_equal ['other_abilities']
+    end
+
+  end
+  
+  describe "define" do
+    
+    it "adds the block to the definitions" do
+      block = lambda { puts 'some block' }
+      
+      subject.for(:definition, &block)
+
+      assert_equal block, subject.definitions[:definition]
+    end
+    
+    it "normalises the key to a symbol" do
+      subject.for('definition') { puts 'a block' }
+      
+      subject.definitions.keys.must_include :definition
+    end
+    
+    it "rasises ArgumentError if no block is provided" do
+      proc { subject.for(:definition) }.must_raise ArgumentError
+    end
+    
+  end
+      
+end

data/test/app/abilities/moderators.rb

@@ -0,0 +1,9 @@
+Canard::Abilities.for(:moderator) do
+    
+  can :manage, [Post]
+  
+  cannot :destroy, User do |u|
+    (user == u)
+  end
+    
+end

data/test/canard_test.rb

@@ -1,21 +1,8 @@
 require 'test_helper'
-require_relative '../lib/canard.rb'
+require 'canard'
 
 describe Canard do
-  
-  before do
-    class User < ActiveRecord::Base
-    end
-  
-    Canard.abilities_path = File.expand_path('../abilities', __FILE__)
-  end
-  
-  # Sanity test
-  it "must be an user" do
-    user = User.new
-    user.must_be_instance_of User
-  end
-  
+    
   describe "abilities_path" do
     
     it "should be mutable" do
@@ -36,15 +23,5 @@ describe Canard do
     end
     
   end  
-  
-  describe "find_abilities" do
     
-    it "should load the abilities into ability_definitions" do
-      Canard.find_abilities
-
-      Canard.ability_definitions.keys.must_include :admin
-    end
-    
-  end
-  
 end

data/test/find_abilities_test.rb

@@ -0,0 +1,49 @@
+require 'test_helper'
+require 'active_support/testing/deprecation'
+
+describe Canard do
+  
+  include ActiveSupport::Testing::Deprecation
+  
+  before do
+    # Stop the deprecation warnings coming to stderr for these tests.
+    ActiveSupport::Deprecation.behavior = :notify
+    
+    Canard.abilities_path = File.expand_path('../abilities', __FILE__)
+  end
+  
+  describe "find_abilities" do
+    
+    it "loads the abilities into ability_definitions" do
+      Canard.find_abilities
+
+      Canard.ability_definitions.keys.must_include :admin
+    end
+    
+    it "finds the abilities with the new syntax" do
+      Canard.find_abilities
+      
+      Canard.ability_definitions.keys.must_include :moderator
+    end
+    
+    it "reloads existing abilities" do
+      Canard.find_abilities
+      Canard::Abilities.send(:instance_variable_set, '@definitions', {})
+      Canard.find_abilities
+      
+      Canard.ability_definitions.keys.must_include :moderator
+      Canard.ability_definitions.keys.must_include :admin
+    end
+    
+  end
+  
+  describe "abilities_for" do
+    
+    it "raises a deprecation warning" do
+      assert_deprecated do
+        Canard.abilities_for(:this) { puts 'that' }
+      end
+    end
+    
+  end
+end

data/test/test_helper.rb

@@ -2,6 +2,18 @@ require 'rubygems'
 gem     'minitest'
 require 'active_record'
 require 'minitest/autorun'
+require 'pathname'
+
+module Rails
+  
+  module VERSION
+    MAJOR = 0
+  end
+  
+  def self.root
+    Pathname.new(File.expand_path('..', __FILE__))
+  end
+end
 
 module MiniTestWithHooks
   class Unit < MiniTest::Unit
@@ -55,4 +67,21 @@ module MiniTestWithActiveRecord
   end
 end
 
-MiniTest::Unit.runner = MiniTestWithActiveRecord::Unit.new
+MiniTestWithActiveRecord::Unit::TestCase.add_teardown_hook do
+  Object.send(:remove_const, 'Canard') if Object.const_defined?('Canard')
+  GC.start
+end
+
+MiniTestWithActiveRecord::Unit::TestCase.add_setup_hook do
+  [ 'canard/abilities.rb',
+    'canard/user_model.rb',
+    "canard/find_abilities.rb"
+  ].each do |file|
+    file_path = File.join(File.expand_path('../../lib', __FILE__), file)
+    load file_path
+  end
+  
+end
+
+MiniTest::Unit.runner = MiniTestWithActiveRecord::Unit.new
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canard
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000Z
+date: 2012-03-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2160840240 !ruby/object:Gem::Requirement
+  requirement: &2157922760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2160840240
+  version_requirements: *2157922760
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2160839820 !ruby/object:Gem::Requirement
+  requirement: &2157922340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160839820
+  version_requirements: *2157922340
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2160839360 !ruby/object:Gem::Requirement
+  requirement: &2157921880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160839360
+  version_requirements: *2157921880
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2157921460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157921460
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2160838940 !ruby/object:Gem::Requirement
+  requirement: &2157913300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160838940
+  version_requirements: *2157913300
 - !ruby/object:Gem::Dependency
   name: role_model
-  requirement: &2160838520 !ruby/object:Gem::Requirement
+  requirement: &2157912440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160838520
+  version_requirements: *2157912440
 description: Wraps CanCan and RoleModel up with a generator and makes role based authorisation
   really easy in Rails 3.x.
 email:
@@ -83,6 +94,7 @@ files:
 - canard.gemspec
 - lib/ability.rb
 - lib/canard.rb
+- lib/canard/abilities.rb
 - lib/canard/find_abilities.rb
 - lib/canard/railtie.rb
 - lib/canard/user_model.rb
@@ -94,13 +106,16 @@ files:
 - lib/generators/rspec/ability/ability_generator.rb
 - lib/generators/rspec/ability/templates/abilities_spec.rb.erb
 - test/abilities/admins.rb
+- test/abilities_test.rb
+- test/app/abilities/moderators.rb
 - test/canard_test.rb
+- test/find_abilities_test.rb
 - test/models/user.rb
 - test/models/user_without_role.rb
 - test/models/user_without_role_mask.rb
 - test/test_helper.rb
 - test/user_model_test.rb
-homepage: ''
+homepage: https://github.com/james2m/canard
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -120,13 +135,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: canard
-rubygems_version: 1.8.6
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Adds RoleModel roles to CanCan.
 test_files:
 - test/abilities/admins.rb
+- test/abilities_test.rb
+- test/app/abilities/moderators.rb
 - test/canard_test.rb
+- test/find_abilities_test.rb
 - test/models/user.rb
 - test/models/user_without_role.rb
 - test/models/user_without_role_mask.rb