lockdown 0.6.3 → 0.7.0

data/.gitignore

@@ -0,0 +1,5 @@
+*.DS_Store
+*.swp
+pkg/**
+doc/**
+email.txt

data/History.txt

@@ -1,3 +1,7 @@
+== 0.7.0 2009-01-xx
+* Removed lockdown as an executable.  Will always go through the generator used by the framework.
+* Removed references to classy inheritance.  Directly coded some of classy inheritance's functionality into User model.
+
 == 0.6.3 2008-12-02
 * Fixed: Database sync was failing.  Cause of refactor. Apologies
 

data/Manifest.txt

@@ -1,14 +1,8 @@
+.gitignore
 History.txt
-License.txt
 Manifest.txt
-PostInstall.txt
 README.txt
 Rakefile
-app_generators/lockdown/USAGE
-app_generators/lockdown/lockdown_generator.rb
-app_generators/lockdown/templates/init.rb
-app_generators/lockdown/templates/session.rb
-bin/lockdown
 lib/lockdown.rb
 lib/lockdown/classy-inheritance.rb
 lib/lockdown/controller.rb
@@ -25,8 +19,6 @@ lib/lockdown/orms/data_mapper.rb
 lib/lockdown/rights.rb
 lib/lockdown/session.rb
 lib/lockdown/system.rb
-lib/lockdown/version.rb
-rails_generators/lockdown/USAGE
 rails_generators/lockdown/lockdown_generator.rb
 rails_generators/lockdown/templates/app/controllers/permissions_controller.rb
 rails_generators/lockdown/templates/app/controllers/sessions_controller.rb
@@ -39,41 +31,22 @@ rails_generators/lockdown/templates/app/models/permission.rb
 rails_generators/lockdown/templates/app/models/profile.rb
 rails_generators/lockdown/templates/app/models/user.rb
 rails_generators/lockdown/templates/app/models/user_group.rb
-rails_generators/lockdown/templates/app/views/permissions/_data.html.erb
 rails_generators/lockdown/templates/app/views/permissions/index.html.erb
 rails_generators/lockdown/templates/app/views/permissions/show.html.erb
 rails_generators/lockdown/templates/app/views/sessions/new.html.erb
-rails_generators/lockdown/templates/app/views/user_groups/_data.html.erb
-rails_generators/lockdown/templates/app/views/user_groups/_form.html.erb
 rails_generators/lockdown/templates/app/views/user_groups/edit.html.erb
 rails_generators/lockdown/templates/app/views/user_groups/index.html.erb
 rails_generators/lockdown/templates/app/views/user_groups/new.html.erb
 rails_generators/lockdown/templates/app/views/user_groups/show.html.erb
-rails_generators/lockdown/templates/app/views/users/_data.html.erb
-rails_generators/lockdown/templates/app/views/users/_form.html.erb
 rails_generators/lockdown/templates/app/views/users/edit.html.erb
 rails_generators/lockdown/templates/app/views/users/index.html.erb
 rails_generators/lockdown/templates/app/views/users/new.html.erb
 rails_generators/lockdown/templates/app/views/users/show.html.erb
+rails_generators/lockdown/templates/config/initializers/lockit.rb
 rails_generators/lockdown/templates/db/migrate/create_admin_user.rb
 rails_generators/lockdown/templates/db/migrate/create_permissions.rb
 rails_generators/lockdown/templates/db/migrate/create_profiles.rb
 rails_generators/lockdown/templates/db/migrate/create_user_groups.rb
 rails_generators/lockdown/templates/db/migrate/create_users.rb
-script/console
-script/destroy
-script/generate
-script/txt2html
-setup.rb
-test/test_generator_helper.rb
-test/test_helper.rb
-test/test_lockdown.rb
-test/test_lockdown_all_generator.rb
-test/test_lockdown_generator.rb
-test/test_lockdown_models_generator.rb
-website/index.html
-website/index.txt
-website/javascripts/rounded_corners_lite.inc.js
-website/model.jpg
-website/stylesheets/screen.css
-website/template.html.erb
+rails_generators/lockdown/templates/lib/lockdown/init.rb
+rails_generators/lockdown/templates/lib/lockdown/session.rb

data/README.txt

@@ -1,45 +1,20 @@
-= lockdown
-
-http://stonean.com/wiki/lockdown
+lockdown
+    by Andrew Stone
+    http://stonean.com
 
 == DESCRIPTION:
 
-Lockdown is a authentication/authorization system for RubyOnRails. (Merb compatibility coming soon).
-
-For more information please visit stonean.com
-
-== REQUIREMENTS:
-
-Lockdown currently supports:
-
-Frameworks: RubyOnRails 
-
-ORMs: ActiveRecord 
+Lockdown is a authentication/authorization system for RubyOnRails (ver >= 2.1).
 
 == INSTALL:
 
-# Install the gem
-
-sudo gem install lockdown
-
-# Go to your application root directory
-
-cd <your application>
-
-# Install lockdown to your application
-
-lockdown .
-
-# Modify lib/lockdown/init.rb to set defaults and grant access 
-  to your application
-
-# Modify lib/lockdown/session.rb to add/remove session information
+sudo gem install lockdown 
 
 == LICENSE:
 
 (The MIT License)
 
-Copyright (c) 2008 Andrew Stone
+Copyright (c) 2009 Andrew Stone
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,28 +1,26 @@
-%w[rubygems rake rake/clean fileutils newgem rubigen].each { |f| require f }
-require File.dirname(__FILE__) + '/lib/lockdown/version'
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new('lockdown', Lockdown::VERSION::STRING) do |p|
-  p.developer('Andrew Stone', 'andy@stonean.com')
-  
-  p.changes                 = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.post_install_message    = 'PostInstall.txt'
-  p.rubyforge_name          = p.name
-  p.extra_deps              = [ ['classy-inheritance', '>=0.6.2'] ]
-  p.extra_dev_deps          = [ ['newgem', ">= #{::Newgem::VERSION}"] ]
-  
-  p.clean_globs |= %w[**/.DS_Store tmp *.log]
-  
-  path = (p.rubyforge_name == p.name) ? p.rubyforge_name : "\#{p.rubyforge_name}/\#{p.name}"
-  
-  p.remote_rdoc_dir = File.join(path.gsub(/^#{p.rubyforge_name}\/?/,''), 'rdoc')
-  
-  p.rsync_args = '-av --delete --ignore-errors'
-end
-
-require 'newgem/tasks' # load /tasks/*.rake
-Dir['tasks/**/*.rake'].each { |t| load t }
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# task :default => [:spec, :features]
+# Look in the tasks/setup.rb file for the various options that can be
+# configured in this Rakefile. The .rake files in the tasks directory
+# are where the options are used.
+
+begin
+  require 'bones'
+  Bones.setup
+rescue LoadError
+  load 'tasks/setup.rb'
+end
+
+ensure_in_path 'lib'
+require 'lockdown'
+
+task :default => 'spec:run'
+
+PROJ.name = 'lockdown'
+PROJ.authors = 'Andrew Stone'
+PROJ.email = 'andy@stonean.com'
+PROJ.url = 'http://stonean.com/wiki/lockdown'
+PROJ.version = Lockdown::VERSION
+PROJ.rubyforge.name = 'lockdown'
+
+PROJ.spec.opts << '--color'
+
+# EOF

data/lib/lockdown.rb

@@ -1,34 +1,62 @@
-require File.join(File.dirname(__FILE__), "lockdown", "classy-inheritance")
 require File.join(File.dirname(__FILE__), "lockdown", "helper")
 
 module Lockdown
+  # :stopdoc:
+  VERSION = '0.7.0'
+  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
+  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
+  # :startdoc:
+  
   class << self
     include Lockdown::Helper
 
+    # Returns the version string for the library.
+    #
+    def version
+      VERSION
+    end
+ 
+    # Returns the qualified path to the init file
+    #
+    def init_file
+     "#{Dir.pwd}/lib/lockdown/init.rb"
+    end
+
+    # Mixin Lockdown code to the appropriate Controller and ORM
+    #
     def mixin
       if mixin_resource?("frameworks")
         unless mixin_resource?("orms")
           raise NotImplementedError, "ORM unknown to Lockdown!"
         end
+
+        if File.exists?(Lockdown.init_file)
+          puts "=> Requiring Lockdown rules engine: #{Lockdown.init_file} \n"
+          require Lockdown.init_file
+        else
+          puts "=> Note:: Lockdown couldn't find init file: #{Lockdown.init_file}\n"
+        end
       else
-        raise NotImplementedError, "Framework unknown to Lockdown!"
+        puts "=> Note:: Lockdown cannot determine framework and therefore is not active.\n"
       end
-    end
+    end # mixin
 
+    # :stopdoc:
     private
 
     def mixin_resource?(str)
-      Dir["#{File.dirname(__FILE__)}/lockdown/#{str}/*.rb"].each do |f|
-        require "#{f}"
-        mod = File.basename(f).split(".")[0]
-        mklass = eval("Lockdown::#{str.capitalize}::#{Lockdown.camelize(mod)}")
-        if mklass.use_me?
-          include mklass
+      wildcard_path = File.join( File.dirname(__FILE__), 'lockdown', str , '*.rb' ) 
+      Dir[wildcard_path].each do |f|
+        require f
+        module_name = File.basename(f).split(".")[0]
+        module_class = eval("Lockdown::#{str.capitalize}::#{Lockdown.camelize(module_name)}")
+        if module_class.use_me?
+          include module_class
           return true
         end
       end
       false
-    end
+    end # mixin_resource?
   end # class block
 end # Lockdown
 
@@ -37,4 +65,6 @@ require File.join(File.dirname(__FILE__), "lockdown", "system")
 require File.join(File.dirname(__FILE__), "lockdown", "controller")
 require File.join(File.dirname(__FILE__), "lockdown", "session")
 
+puts "=> Mixing in Lockdown version: #{Lockdown.version} \n"
 Lockdown.mixin
+

data/lib/lockdown/controller.rb

@@ -22,10 +22,7 @@ module Lockdown
       
       def path_allowed?(url)
         session[:access_rights] ||= Lockdown::System.public_access
-        session[:access_rights].each do |ar|
-          return true if url == ar
-        end
-        false
+        session[:access_rights].include?(url)
       end
         
       def check_session_expiry
@@ -64,4 +61,4 @@ module Lockdown
       end
     end # Core
    end # Controller
-end # Lockdown
+end # Lockdown

data/lib/lockdown/database.rb

@@ -17,7 +17,6 @@ module Lockdown
         maintain_user_groups
       rescue Exception => e
         puts ">> Lockdown sync failed: #{e}" 
-        puts ">> #{e.backtrace.join("\n")}"
       end
 
       private
@@ -106,4 +105,4 @@ module Lockdown
 
     end # class block
   end # Database
-end #Lockdown
+end #Lockdown

data/lib/lockdown/frameworks/merb.rb

@@ -15,9 +15,15 @@ module Lockdown
         end
 
         def mixin
-          Lockdown.controller_parent.send :include, Lockdown::Frameworks::Merb::Controller::Lock
-          Lockdown.view_helper.send :include, Lockdown::Frameworks::Merb::View
-          Lockdown::System.send :extend, Lockdown::Frameworks::Merb::System
+          Lockdown.controller_parent.class_eval do
+            include Lockdown::Frameworks::Merb::Controller::Lock
+          end
+          Lockdown.view_helper.class_eval do
+            include Lockdown::Frameworks::Merb::View
+          end
+          Lockdown::System.class_eval do
+            extend Lockdown::Frameworks::Merb::System
+          end
         end
       end # class block
 
@@ -47,6 +53,10 @@ module Lockdown
       module System
         include Lockdown::Frameworks::Merb::Controller
 
+        def skip_sync?
+          Lockdown::System.fetch(:skip_db_sync_in).include?(Merb.environment)
+        end
+
         def load_controller_classes
           @controller_classes = {}
          
@@ -71,4 +81,4 @@ module Lockdown
       end # System
     end # Merb
   end # Frameworks
-end # Lockdown
+end # Lockdown

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

@@ -14,7 +14,9 @@ module Lockdown
         # Locking methods
         module Lock
           def self.included(base)
-            base.send :include, Lockdown::Frameworks::Merb::Controller::Lock::InstanceMethods
+            base.class_eval do 
+              include Lockdown::Frameworks::Merb::Controller::Lock::InstanceMethods
+            end
 
             base.before :set_current_user
             base.before :configure_lockdown
@@ -23,7 +25,9 @@ module Lockdown
 
           module InstanceMethods
             def self.included(base)
-              base.send :include, Lockdown::Controller::Core
+              base.class_eval do
+                include Lockdown::Controller::Core
+              end
             end
 
             def sent_from_uri
@@ -56,4 +60,4 @@ module Lockdown
       end # Controller
     end # Merb
   end # Frameworks
-end # Lockdown
+end # Lockdown

data/lib/lockdown/frameworks/merb/view.rb

@@ -3,8 +3,10 @@ module Lockdown
     module Merb
       module View
         def self.included(base)
-          base.send :alias_method, :link_to_open,  :link_to
-          base.send :alias_method, :link_to,  :link_to_secured
+          base.class_eval do
+            alias_method  :link_to_open,  :link_to
+            alias_method  :link_to,  :link_to_secured
+          end
         end
 
         def link_to_secured(name, url = '', options = {})
@@ -27,4 +29,4 @@ module Lockdown
       end # View
     end # Merb
   end # Frameworks
-end # Lockdown
+end # Lockdown

data/lib/lockdown/frameworks/rails.rb

@@ -15,9 +15,15 @@ module Lockdown
         end
 
         def mixin
-          Lockdown.controller_parent.send :include, Lockdown::Frameworks::Rails::Controller::Lock
-          Lockdown.view_helper.send :include, Lockdown::Frameworks::Rails::View
-          Lockdown::System.send :extend, Lockdown::Frameworks::Rails::System
+          Lockdown.controller_parent.class_eval do
+            include Lockdown::Frameworks::Rails::Controller::Lock
+          end
+          Lockdown.view_helper.class_eval do
+            include Lockdown::Frameworks::Rails::View
+          end
+          Lockdown::System.class_eval do 
+            extend Lockdown::Frameworks::Rails::System
+          end
         end
       end # class block
 
@@ -48,6 +54,10 @@ module Lockdown
       module System
         include Lockdown::Frameworks::Rails::Controller
 
+        def skip_sync?
+          Lockdown::System.fetch(:skip_db_sync_in).include?(ENV['RAILS_ENV'])
+        end
+
         def load_controller_classes
           @controller_classes = {}
          
@@ -90,4 +100,4 @@ module Lockdown
       end # System
     end # Rails
   end # Frameworks
-end # Lockdown
+end # Lockdown

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

@@ -18,7 +18,11 @@ module Lockdown
         # Locking methods
         module Lock
           def self.included(base)
-            base.send :include, Lockdown::Frameworks::Rails::Controller::Lock::InstanceMethods
+            base.class_eval do
+              include Lockdown::Frameworks::Rails::Controller::Lock::InstanceMethods
+
+              helper_method :authorized?
+            end
 
             base.before_filter do |c|
               c.set_current_user
@@ -26,7 +30,6 @@ module Lockdown
               c.check_request_authorization
             end
 
-            base.send :helper_method, :authorized?
 
             base.filter_parameter_logging :password, :password_confirmation
       
@@ -35,39 +38,37 @@ module Lockdown
 
           module InstanceMethods
             def self.included(base)
-              base.send :include, Lockdown::Controller::Core
+              base.class_eval do
+                include Lockdown::Controller::Core
+              end
             end
 
             def sent_from_uri
               request.request_uri
             end
         
-            def authorized?(url)
+            def authorized?(url, method = nil)
               return false unless url
+
               return true if current_user_is_admin?
 
+              method ||= request.method
+
               url_parts = URI::split(url.strip)
-              # remove id from path, e.g.: /users/1/edit to  users/edit
-              path = url_parts[5].split("/").collect do |p|
-                p unless p =~ /\A\d+\z/ || p.strip.length == 0
-              end.compact.join("/")
 
-              ## See if path is known
-              return true if path_allowed?(path)
+              url = url_parts[5]
+
+              return true if path_allowed?(url)
 
-              # Test for a named routed
               begin
-                hsh = ActionController::Routing::Routes.recognize_path(url_parts[5])
-                unless hsh.nil? || hsh[:id]
-                  return true if path_allowed?(path_from_hash(hsh)) 
-                end
-              rescue Exception 
+                hash = ActionController::Routing::Routes.recognize_path(url, :method => method)
+                return path_allowed?(path_from_hash(hash)) if hash
+              rescue Exception
                 # continue on
               end
 
               # Passing in different domain
-              return true if remote_url?(url_parts[2])
-              false
+              return remote_url?(url_parts[2])
             end
       
             def access_denied(e)
@@ -92,8 +93,8 @@ module Lockdown
               end
             end
 
-            def path_from_hash(hsh)
-              hsh[:controller].to_s + "/" + hsh[:action].to_s
+            def path_from_hash(hash)
+              hash[:controller].to_s + "/" + hash[:action].to_s
             end
 
             def remote_url?(domain = nil)