stffn-declarative_authorization 0.2.3 → 0.2.4

data/init.rb

@@ -1,15 +1,5 @@
-require File.dirname(__FILE__) + "/lib/rails_legacy.rb"
-require File.dirname(__FILE__) + "/lib/helper.rb"
-require File.dirname(__FILE__) + "/lib/in_controller.rb"
-require File.dirname(__FILE__) + "/lib/in_model.rb"
-require File.dirname(__FILE__) + "/lib/obligation_scope.rb"
-
-min_rails_version = "2.1.0"
-if Rails::VERSION::STRING < min_rails_version
-  raise "declarative_authorization requires Rails #{min_rails_version}.  You are using #{Rails::VERSION::STRING}."
+begin
+  require File.join(File.dirname(__FILE__), 'lib', 'declarative_authorization') # From here
+rescue LoadError
+  require 'declarative_authorization' # From gem
 end
-
-ActionController::Base.send :include, Authorization::AuthorizationInController
-ActionController::Base.helper Authorization::AuthorizationHelper
-
-ActiveRecord::Base.send :include, Authorization::AuthorizationInModel

data/lib/declarative_authorization.rb

@@ -0,0 +1,15 @@
+require File.join(%w{declarative_authorization rails_legacy})
+require File.join(%w{declarative_authorization helper})
+require File.join(%w{declarative_authorization in_controller})
+require File.join(%w{declarative_authorization in_model})
+require File.join(%w{declarative_authorization obligation_scope})
+
+min_rails_version = "2.1.0"
+if Rails::VERSION::STRING < min_rails_version
+  raise "declarative_authorization requires Rails #{min_rails_version}.  You are using #{Rails::VERSION::STRING}."
+end
+
+ActionController::Base.send :include, Authorization::AuthorizationInController
+ActionController::Base.helper Authorization::AuthorizationHelper
+
+ActiveRecord::Base.send :include, Authorization::AuthorizationInModel

data/lib/{authorization.rb → declarative_authorization/authorization.rb}

@@ -124,7 +124,7 @@ module Authorization
       #
       # Example: permit!( :edit, :object => user.posts )
       #
-      if options[:object].respond_to?( :proxy_reflection )
+      if options[:object].respond_to?( :proxy_reflection ) && options[:object].respond_to?( :new )
         options[:object] = options[:object].new
       end
       

data/test/helper_test.rb

@@ -1,6 +1,5 @@
 require File.join(File.dirname(__FILE__), 'test_helper.rb')
-require File.dirname(__FILE__) + '/../lib/in_controller.rb'
-require File.dirname(__FILE__) + '/../lib/helper.rb'
+require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization helper})
 
 
 class HelperMocksController < MocksController

data/test/maintenance_test.rb

@@ -1,5 +1,5 @@
 require File.join(File.dirname(__FILE__), 'test_helper.rb')
-require File.join(File.dirname(__FILE__), %w{.. lib maintenance})
+require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization maintenance})
 
 class MaintenanceTest < Test::Unit::TestCase
 

data/test/model_test.rb

@@ -1,5 +1,5 @@
 require File.join(File.dirname(__FILE__), 'test_helper.rb')
-require File.join(File.dirname(__FILE__), '..', 'lib', 'in_model.rb')
+require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization in_model})
 
 ActiveRecord::Base.send :include, Authorization::AuthorizationInModel
 #ActiveRecord::Base.logger = Logger.new(STDOUT)
@@ -533,6 +533,33 @@ class ModelTest < Test::Unit::TestCase
     TestAttr.delete_all
   end
   
+  def test_permit_with_has_one_raises_no_name_error
+    reader = Authorization::Reader::DSLReader.new
+    reader.parse %{
+      authorization do :test_attr_has_one
+        role :test_role do
+          has_permission_on :test_attrs, :to => :update do
+            if_attribute :id => is { user.test_attr.id }
+          end
+        end
+      end
+    }
+    instance = Authorization::Engine.instance(reader)
+    
+    test_model = TestModel.create!
+    test_attr = test_model.create_test_attr_has_one
+    assert !test_attr.new_record?
+    
+    user = MockUser.new(:test_role, :test_attr => test_attr)
+    
+    assert_nothing_raised do
+      assert instance.permit?(:update, :user => user, :object => test_model.test_attr_has_one) 
+    end
+    
+    TestModel.delete_all
+    TestAttr.delete_all
+  end
+  
   def test_named_scope_with_is_and_has_one_through_conditions
     reader = Authorization::Reader::DSLReader.new
     reader.parse %{

data/test/test_helper.rb

@@ -1,8 +1,8 @@
 require 'test/unit'
-RAILS_ROOT = File.dirname(__FILE__) + '/../../../../'
-require File.dirname(__FILE__) + '/../lib/rails_legacy.rb'
-require File.dirname(__FILE__) + '/../lib/authorization.rb'
-require File.dirname(__FILE__) + '/../lib/in_controller.rb'
+RAILS_ROOT = File.join(File.dirname(__FILE__), %w{.. .. .. ..})
+require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization rails_legacy})
+require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization authorization})
+require File.join(File.dirname(__FILE__), %w{.. lib declarative_authorization in_controller})
 
 unless defined?(ActiveRecord)
   if File.directory? RAILS_ROOT + 'config'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stffn-declarative_authorization
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Steffen Bartsch
@@ -46,14 +46,15 @@ files:
 - app/views/authorization_rules/graph.dot.erb
 - app/views/authorization_rules/graph.html.erb
 - config/routes.rb
-- lib/in_controller.rb
-- lib/reader.rb
-- lib/rails_legacy.rb
-- lib/obligation_scope.rb
-- lib/in_model.rb
-- lib/helper.rb
-- lib/authorization.rb
-- lib/maintenance.rb
+- lib/declarative_authorization.rb
+- lib/declarative_authorization/in_controller.rb
+- lib/declarative_authorization/reader.rb
+- lib/declarative_authorization/rails_legacy.rb
+- lib/declarative_authorization/obligation_scope.rb
+- lib/declarative_authorization/in_model.rb
+- lib/declarative_authorization/helper.rb
+- lib/declarative_authorization/authorization.rb
+- lib/declarative_authorization/maintenance.rb
 - test/authorization_test.rb
 - test/schema.sql
 - test/maintenance_test.rb