walruz-rails 0.0.5 → 0.0.8

data/lib/walruz/controller_mixin.rb

@@ -62,7 +62,7 @@ module Walruz
                       error_message = "There is neither an instance variable @%s nor a instance method %s on the %s instance context" % [subject, subject, controller.class.name]
                       raise ArgumentError.new(error_message)
                     end
-          params = controller.send(:current_user).authorize!(action, subject_instance)
+          params = Walruz::Manager.authorize!(controller.send(:current_user), action, subject_instance)
           controller.set_policy_params!(params)
         end
       end
@@ -107,4 +107,4 @@ module Walruz
     end
     
   end
-end
+end

data/rails_generators/walruz_policy_generator.rb

@@ -1,4 +1,5 @@
 class WalruzPolicyGenerator < Rails::Generator::NamedBase
+  default_options :test => 'rspec'
   
   def manifest
     record do |m|
@@ -7,17 +8,17 @@ class WalruzPolicyGenerator < Rails::Generator::NamedBase
       m.template 'policy.rb', File.join('lib/walruz/policies', class_path, "#{file_name}.rb")
     
     
-      if options[:test]
+      case options[:test]
+      when 'rspec'
         # we generate the rSpec stub
         m.directory 'spec'
         m.directory 'spec/policies'
         m.template 'policy_spec.rb', File.join("spec/policies", "#{file_name}_spec.rb")
-      else
+      when 'testunit'
         m.directory 'test'
         m.directory 'test/policies'
         m.template 'policy_test.rb', File.join("test/policies", "#{file_name}_test.rb")
       end
-    
     end
   end
   
@@ -26,11 +27,11 @@ class WalruzPolicyGenerator < Rails::Generator::NamedBase
   def add_options!(opt)
     opt.separator ''
     opt.separator 'Options:'
-    opt.on('--spec', 'Add an rSpec test to the spec folder (DEFAULT)') { |v| options[:spec] = true }
-    opt.on('--test', 'Add a Test::Unit file to the test folder') { |v| options[:test] = true }
+    opt.on('--spec', 'Add a rSpec file to the spec folder') { options[:test] = 'rspec' }
+    opt.on('--test', 'Add a Test::Unit file to the test folder') { options[:test] = 'testunit' }
   end  
   
   def banner
     "Usage: #{$0} walruz_policy [--spec|--test]"
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: walruz-rails
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors: 
 - Roman Gonzalez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-13 00:00:00 -07:00
+date: 2009-08-21 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: walruz-rails
-rubygems_version: 1.3.3
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Gem for easy integration between walruz and the Ruby on Rails framework