lockdown 0.9.5 → 0.9.7

data/lib/lockdown/frameworks/rails/controller.rb

@@ -69,17 +69,19 @@ module Lockdown
 
             url_parts = URI::split(url.strip)
 
-            url = url_parts[5]
+            path = url_parts[5]
 
-            return true if path_allowed?(url)
+            return true if path_allowed?(path)
 
             begin
-              hash = ActionController::Routing::Routes.recognize_path(url, :method => method)
+              hash = ActionController::Routing::Routes.recognize_path(path, :method => method)
               return path_allowed?(path_from_hash(hash)) if hash
             rescue Exception
               # continue on
             end
 
+            return true if url =~ /^mailto:/
+
             # Passing in different domain
             return remote_url?(url_parts[2])
           end

data/lib/lockdown/frameworks/rails.rb

@@ -55,11 +55,11 @@ module Lockdown
         end
 
         def controller_parent
-          ActionController::Base
+          ::ActionController::Base
         end
 
         def view_helper
-          ActionView::Base 
+          ::ActionView::Base 
         end
 
         def controller_class_name(str)

data/lib/lockdown/rules.rb

@@ -263,18 +263,50 @@ module Lockdown
     def parse_permissions
       permission_objects.each do |name, perm|
         @permissions[perm.name] ||= []
-        perm.controllers.each do |name, controller|
-          @permissions[perm.name] |= controller.access_methods
 
-          if perm.public_access?
-            @public_access |= controller.access_methods
-          elsif perm.protected_access?
-            @protected_access |= controller.access_methods
-          end
+        set_controller_access(perm)
+
+        set_model_access(perm)
+      end
+    end
+
+    def set_controller_access(perm)
+      perm.controllers.each do |name, controller|
+        @permissions[perm.name] |= controller.access_methods
+
+        if perm.public_access?
+          @public_access |= controller.access_methods
+        elsif perm.protected_access?
+          @protected_access |= controller.access_methods
         end
       end
     end
 
+    def set_model_access(perm)
+      perm.models.each do |model|
+        # Create inherited method on Lockdown.orm_parent that 
+        # will create a list of controller/actions the model
+      end
+
+      # Create method to access that list for link_to call validation
+      #Lockdown.orm_parent.instance_eval <<-RUBY, __FILE__,__LINE__ + 1
+      #  def self.inherited(klass)
+      #    super
+      #
+      #  end
+      #RUBY
+
+      # Create inherited method on Lockdown.controller_parent that
+      # will setup before_filter 
+      #Lockdown.controller_parent.instance_eval <<-RUBY, __FILE__,__LINE__ + 1
+      #  def self.inherited(klass)
+      #    super
+      #
+      #  end
+      #RUBY
+    end
+
+
     def validate_user_groups
       user_groups.each do |user_group, perms|
         perms.each do |perm|

data/lib/lockdown.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), "lockdown", "helper")
 module Lockdown
   extend Lockdown::Helper
 
-  VERSION = '0.9.5'
+  VERSION = '0.9.7'
 
   # Returns the version string for the library.
   def self.version

data/spec/lockdown/frameworks/rails/controller_spec.rb

@@ -133,6 +133,7 @@ describe Lockdown::Frameworks::Rails::Controller::Lock do
 
       request = mock("request")
       request.stub!(:method).and_return(:get)
+      @controller.stub!(:params).and_return({})
       @controller.stub!(:request).and_return(request)
 
       stonean_parts = ["http", nil, "stonean.com", nil, nil, "posts/index", nil, nil, nil]

data/spec/lockdown/frameworks/rails_spec.rb

@@ -30,6 +30,11 @@ describe Lockdown::Frameworks::Rails do
 
       ActionView::Base.should_receive(:class_eval)
 
+      ActionController::Base.should_receive(:helper_method)
+      ActionController::Base.should_receive(:before_filter)
+      ActionController::Base.should_receive(:filter_parameter_logging)
+      ActionController::Base.should_receive(:rescue_from)
+
       ActionController::Base.should_receive(:class_eval)
 
       Lockdown::System.should_receive(:class_eval)

data/tasks/setup.rb

@@ -147,7 +147,7 @@ RCOV = "#{RUBY} -S rcov"
 RDOC = "#{RUBY} -S rdoc"
 GEM  = "#{RUBY} -S gem"
 
-%w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
+%w(rcov spec/rake/spectask rubyforge bones facets/ansicode zentest).each do |lib|
   begin
     require lib
     Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", true}

data/tasks/zentest.rake

@@ -0,0 +1,36 @@
+if HAVE_ZENTEST
+
+# --------------------------------------------------------------------------
+if test(?e, PROJ.test.file) or not PROJ.test.files.to_a.empty?
+require 'autotest'
+
+namespace :test do
+  task :autotest do
+    Autotest.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'test:autotest'
+
+end  # if test
+
+# --------------------------------------------------------------------------
+if HAVE_SPEC_RAKE_SPECTASK and not PROJ.spec.files.to_a.empty?
+require 'autotest/rspec'
+
+namespace :spec do
+  task :autotest do
+    load '.autotest' if test(?f, '.autotest')
+    Autotest::Rspec.run
+  end
+end
+
+desc "Run the autotest loop"
+task :autotest => 'spec:autotest'
+
+end  # if rspec
+
+end  # if HAVE_ZENTEST
+
+# EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.7
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-26 00:00:00 -04:00
+date: 2009-06-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.2
+        version: 2.5.1
     version: 
 description: Lockdown is an authorization system for RubyOnRails (ver >= 2.1).
 email: andy@stonean.com
@@ -102,8 +102,11 @@ files:
 - tasks/spec.rake
 - tasks/svn.rake
 - tasks/test.rake
+- tasks/zentest.rake
 has_rdoc: true
 homepage: http://stonean.com/wiki/lockdown
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -125,9 +128,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: lockdown
-rubygems_version: 1.3.1
+rubygems_version: 1.3.3
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Lockdown is an authorization system for RubyOnRails (ver >= 2
 test_files: []