canard 0.4.0 → 0.4.1

data/.travis.yml

@@ -7,3 +7,6 @@ rvm:
   - jruby-19mode # JRuby in 1.9 mode
   - rbx-18mode
   - rbx-19mode
+services:
+  - mongodb
+

data/README.rdoc

@@ -141,7 +141,7 @@ to accept pull requests for tested Rails 2.x updates if anybody is game.
 Canard is ORM agnostic. ActiveRecord and Mongoid (thanks David Butler) adapters are currently implemented.
 New adapters can easily be added, but you'd need to check CanCan can also support your adapter.
 
-=== Further reading
+== Further reading
 
 Canard stands on the sholders of Ryan Bates' CanCan and Martin Rehfeld's RoleModel. You can read more
 about defining abilities on the CanCan wiki (https://github.com/ryanb/cancan/wiki). Canard implements

data/lib/canard/adapters/active_record.rb

@@ -5,11 +5,13 @@ module Canard
       private
 
       def add_role_scopes
+        # TODO change to check has_roles_attribute?
         if active_record_table?
           valid_roles.each do |role|
             define_scopes_for_role role
           end
 
+          # TODO change hard coded :role_mask to roles_attribute_name
           define_scope_method(:with_any_role) do |*roles|
             where("#{role_mask_column} & :role_mask > 0", { :role_mask => mask_for(*roles) })
           end
@@ -28,6 +30,7 @@ module Canard
         respond_to?(:table_exists?) && table_exists?
       end
 
+      # TODO extract has_roles_attribute? and change to has_roles_attribute? || super
       def has_roles_mask_accessors?
         active_record_table? && column_names.include?(roles_attribute_name.to_s) || super
       end

data/lib/canard/railtie.rb

@@ -10,6 +10,9 @@ module Canard
       app.config.eager_load_paths = app.config.eager_load_paths.reject do |path|
         Canard.load_paths.include?(path)
       end
+      if app.config.respond_to?(:watchable_dirs)
+        app.config.watchable_dirs.merge! Hash[ Canard.load_paths.product([[:rb]]) ]
+      end
     end
 
     initializer "canard.active_record" do |app|
@@ -20,7 +23,7 @@ module Canard
         Canard.find_abilities
       end
     end
-    
+
     initializer "canard.mongoid" do |app|
       if defined?(Mongoid)
         require 'canard/adapters/mongoid'

data/lib/canard/version.rb

@@ -1,3 +1,3 @@
 module Canard
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canard
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-24 00:00:00.000000000 Z
+date: 2012-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest