canard 0.2.2 → 0.2.3

data/README.rdoc

@@ -16,18 +16,18 @@ A User model with :admin and :manger roles would be defined:
 Lets generate some abilities for the User.
 
     $ rails g canard:ability user can:[read,create]:[account,statement] cannot:destroy:account
-    create  abilities/users.rb
+    create  app/abilities/users.rb
     invoke  rspec
     create    spec/abilities/user_spec.rb
 
 Generates an ability folder in Rails root and an associated spec;
 
-    abilities/
+    app.abilities/
       users.rb
     spec/abilities/
       users_spec.rb
 
-The resulting abilities/users.rb will look something like this;
+The resulting app/abilities/users.rb will look something like this;
 
     abilities_for(:user) do
     

data/Rakefile

@@ -7,3 +7,5 @@ Rake::TestTask.new do |t|
  t.pattern = 'test/*_test.rb'
  t.verbose = true
 end
+
+task :default => ["test"]

data/lib/canard/abilities.rb

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

data/lib/canard/version.rb

@@ -1,3 +1,3 @@
 module Canard
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/generators/canard/ability/ability_generator.rb

@@ -7,7 +7,7 @@ module Canard
       argument :ability_definitions, :type => :array, :default => [], :banner => "can:[read,update]:[user,account] cannot:[create,destroy]:user"
 
       def generate_ability
-        template "abilities.rb.erb", Canard.abilities_path + "/#{file_name.pluralize}.rb"
+        template "abilities.rb.erb", Abilities.default_path + "/#{file_name.pluralize}.rb"
       end
     
       hook_for :test_framework, :as => 'ability'

data/lib/generators/canard/ability/templates/abilities.rb.erb

@@ -1,4 +1,4 @@
-abilities_for(<%= ":#{name}" -%>) do
+Canard::Abilities.for(<%= ":#{name}" -%>) do
 
 <% if ability_definitions.empty? -%>
   # Define abilities for the user role here. For example:

data/test/abilities_test.rb

@@ -24,6 +24,21 @@ describe 'Canard::Abilities' do
 
   end
   
+  describe "default_path" do
+    
+    it "defaults to app/abilities" do
+      subject.default_path.must_equal 'app/abilities'
+    end
+
+    it "can be changhed" do
+      subject.default_path = 'other_abilities'
+      
+      subject.default_path.must_equal 'other_abilities'
+    end
+
+    
+  end
+  
   describe "define" do
     
     it "adds the block to the definitions" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canard
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2156167760 !ruby/object:Gem::Requirement
+  requirement: &2157009700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2156167760
+  version_requirements: *2157009700
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2156166640 !ruby/object:Gem::Requirement
+  requirement: &2157009160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156166640
+  version_requirements: *2157009160
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2156165600 !ruby/object:Gem::Requirement
+  requirement: &2157008240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156165600
+  version_requirements: *2157008240
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156164620 !ruby/object:Gem::Requirement
+  requirement: &2157007780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156164620
+  version_requirements: *2157007780
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2156156800 !ruby/object:Gem::Requirement
+  requirement: &2157007360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156156800
+  version_requirements: *2157007360
 - !ruby/object:Gem::Dependency
   name: role_model
-  requirement: &2156155940 !ruby/object:Gem::Requirement
+  requirement: &2156992120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156155940
+  version_requirements: *2156992120
 description: Wraps CanCan and RoleModel up to make role based authorisation really
   easy in Rails 3.x.
 email: