canard 0.1.1 → 0.1.2

data/TODO

@@ -2,4 +2,5 @@
 * Test the ability class.
 * Test the generators.
 * Test the railtie
-* Add scopes by default and :scopes => false to acts_as_user
+* Add scopes by default and :scopes => false to acts_as_user
+* Expand the tests to produce all the standard abilities: index,show,read,new,create,edit,update,destroy.

data/lib/canard/version.rb

@@ -1,3 +1,3 @@
 module Canard
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/generators/ability_definition.rb

@@ -6,12 +6,12 @@ class AbilityDefinition
   
   def self.parse(definitions)
     @@ability_definitions ||= {}
-    limitation, ability_names, model_names = *definitions.split(':')
-    abilities, models = extract(ability_names), extract(model_names)
-    models.each do |model|
-      definition = @@ability_definitions[model] || AbilityDefinition.new
-      definition.merge(limitation.pluralize, abilities)
-      @@ability_definitions[model] = definition
+    limitation, ability_list, model_list = *definitions.split(':')
+    ability_names, model_names = extract(ability_list), extract(model_list)
+    model_names.each do |model_name|
+      definition = @@ability_definitions[model_name] || AbilityDefinition.new
+      definition.merge(limitation.pluralize, ability_names)
+      @@ability_definitions[model_name] = definition
     end
   end
   
@@ -27,9 +27,9 @@ class AbilityDefinition
     @cans, @cannots = [], []
   end
   
-  def merge(limitation, abilities)
-    combined_abilities = instance_variable_get("@#{limitation}") | abilities
-    instance_variable_set("@#{limitation}", combined_abilities)
+  def merge(limitation, ability_names)
+    combined_ability_names = instance_variable_get("@#{limitation}") | ability_names
+    instance_variable_set("@#{limitation}", combined_ability_names)
   end
   
   def can

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

@@ -8,15 +8,11 @@ module Rspec
       argument :ability_definitions, :type => :array, :default => [], :banner => "can:abilities:models cannot:abilities:models"
 
       def generate_ability_spec
-        template "abilities_spec.rb.erb", "spec/abilities/#{file_name}_spec.rb"
+        template "abilities_spec.rb.erb", "spec/abilities/#{file_name.pluralize}_spec.rb"
       end
       
       private
       
-      def add_new_abilities
-        gsub_file "spec/abilities/#{file_name}_spec.rb", /^(\s*end\s*\Z)/, 'wibble' + '\1'
-      end
-      
       def definitions(&block)
         ability_definitions.each { |definition| AbilityDefinition.parse(definition) }
         

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canard
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-02 00:00:00.000000000Z
+date: 2011-10-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2153881520 !ruby/object:Gem::Requirement
+  requirement: &2153302940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2153881520
+  version_requirements: *2153302940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2153881100 !ruby/object:Gem::Requirement
+  requirement: &2153302520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153881100
+  version_requirements: *2153302520
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2153880640 !ruby/object:Gem::Requirement
+  requirement: &2153302060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153880640
+  version_requirements: *2153302060
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2153880220 !ruby/object:Gem::Requirement
+  requirement: &2153301640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153880220
+  version_requirements: *2153301640
 - !ruby/object:Gem::Dependency
   name: role_model
-  requirement: &2153879800 !ruby/object:Gem::Requirement
+  requirement: &2153301220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153879800
+  version_requirements: *2153301220
 description: Wraps CanCan and RoleModel up with a generator and makes role based authorisation
   really easy in Rails 3.x.
 email: