lockdown 1.2.1 → 1.2.2

data/lib/lockdown.rb

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

data/lib/lockdown/frameworks/rails.rb

@@ -66,12 +66,16 @@ module Lockdown
         # cache_classes is true in production and testing, need to
         # modify the ApplicationController 
         def controller_parent
-          if ::Rails.configuration.cache_classes
+          if caching_classes?
             ApplicationController
           else
             ActionController::Base
           end
         end
+        
+        def caching_classes?
+          ::Rails.configuration.cache_classes
+        end
 
         # cache_classes is true in production and testing, need to
         # do an instance eval instead
@@ -97,7 +101,11 @@ module Lockdown
         include Lockdown::Frameworks::Rails::Controller
 
         def skip_sync?
-          Lockdown::System.fetch(:skip_db_sync_in).include?(ENV['RAILS_ENV'])
+          Lockdown::System.fetch(:skip_db_sync_in).include?(framework_environment)
+        end
+        
+        def framework_environment
+          ::Rails.env
         end
       end # System
     end # Rails

data/lib/lockdown/helper.rb

@@ -1,3 +1,5 @@
+require 'active_support'
+
 module Lockdown
   module Helper
     def class_name_from_file(str)
@@ -10,34 +12,42 @@ module Lockdown
       if str_sym.is_a?(Symbol)
         titleize(str_sym)
       else
-        underscore(str_sym).tr(' ','_').to_sym
+       str_sym.underscore.tr(' ','_').to_sym
       end
     end
 
     def user_group_class
-      eval(Lockdown::System.fetch(:user_group_model))
+      eval(user_group_model_string)
     end
 
     def user_groups_hbtm_reference
-      underscore(Lockdown::System.fetch(:user_group_model)).pluralize.to_sym
+      user_group_model_string.underscore.pluralize.to_sym
     end
 
     def user_group_id_reference
-      underscore(Lockdown::System.fetch(:user_group_model)) + "_id"
+      user_group_model_string.underscore + "_id"
     end
 
     def user_class
-      eval(Lockdown::System.fetch(:user_model))
+      eval(user_model_string)
     end
 
     def users_hbtm_reference
-      underscore(Lockdown::System.fetch(:user_model)).pluralize.to_sym
+      user_model_string.underscore.pluralize.to_sym
     end
 
     def user_id_reference
-      underscore(Lockdown::System.fetch(:user_model)) + "_id"
+      user_model_string.underscore + "_id"
     end
 
+    def user_group_model_string
+      Lockdown::System.fetch(:user_group_model) || "UserGroup"
+    end
+    
+    def user_model_string
+      Lockdown::System.fetch(:user_model) || "User"
+    end
+    
     def get_string(value)
       if value.respond_to?(:name)
         string_name(value.name)

data/lib/lockdown/rules.rb

@@ -18,7 +18,6 @@ module Lockdown
 
       @permission_objects = {}
 
-      @controller_classes = []
       @public_access      = []
       @protected_access   = []
 

data/rails_generators/lockdown/lockdown_generator.rb

@@ -47,7 +47,8 @@ class LockdownGenerator < Rails::Generator::Base
   end
 
   def manifest
-    record do |@m|
+    record do |m|
+      @m = m
       # Ensure appropriate folder(s) exists
       @m.directory @view_path
       @m.directory @controller_path

data/spec/lockdown/database_spec.rb

@@ -1,13 +1,19 @@
 require File.join(File.dirname(__FILE__), %w[.. spec_helper])
 
+class Permission; end;
+
 describe Lockdown::Database do
-  before do
+  before do    
     Lockdown::System.stub!(:get_permissions).and_return([:permission])
     Lockdown::System.stub!(:get_user_groups).and_return([:user_group])
+    @user_group_class = mock(:table_exists? => true, :find => false)
+    Lockdown.stub!(:user_group_class).and_return @user_group_class
+
   end
 
   describe "#sync_with_db" do
     it "should call create_new_permissions, delete_extinct_permissions and maintain_user_groups" do
+      Permission.stub!(:table_exists?).and_return(true)
       Lockdown::Database.should_receive :create_new_permissions
       Lockdown::Database.should_receive :delete_extinct_permissions
       Lockdown::Database.should_receive :maintain_user_groups
@@ -20,7 +26,6 @@ describe Lockdown::Database do
     it "should create permission from @permissions" do
       Lockdown::System.stub!(:permission_assigned_automatically?).and_return(false)
 
-      Permission = mock('Permission') unless defined?(Permission)
       Permission.stub!(:find).and_return(false)
       Permission.should_receive(:create).with(:name => 'Permission')
 
@@ -52,9 +57,7 @@ describe Lockdown::Database do
     end
 
     it "should create user group for non-existent user group" do
-      UserGroup.should_receive(:find).
-        with(:first, :conditions => ["name = ?", "User Group"]).
-        and_return(false)
+      @user_group_class.should_receive(:find).and_return(false)
       
       Lockdown::Database.should_receive(:create_user_group).
         with("User Group",:user_group)
@@ -65,7 +68,7 @@ describe Lockdown::Database do
     it "should sync user group permissions for existing user group" do
       ug = mock('user group')
 
-      UserGroup.should_receive(:find).
+     @user_group_class.should_receive(:find).
         with(:first, :conditions => ["name = ?", "User Group"]).
         and_return(ug)
       
@@ -84,9 +87,7 @@ describe Lockdown::Database do
       ug = mock('user group')
       ug.stub!(:id).and_return(123)
 
-      UserGroup = mock('UserGroup') unless defined?(UserGroup)
-
-      UserGroup.should_receive(:create).
+      @user_group_class.should_receive(:create).
         with(:name => "some group").
         and_return(ug)
 

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

@@ -14,24 +14,6 @@ describe Lockdown::Frameworks::Rails::Controller do
     @lockdown = mock("lockdown")
   end
 
-  describe "#available_actions" do
-    it "should return action_methods" do
-      post_controller = mock("PostController")
-      post_controller.stub!(:action_methods).and_return(@actions)
-
-      @controller.available_actions(post_controller).
-        should == @actions
-    end
-
-    it "should eql public_instance_methods - hidden_actions unless action_methods" do
-      post_controller = mock("PostController")
-      post_controller.stub!(:public_instance_methods).and_return(["m1", "m2", "h1"])
-      post_controller.stub!(:hidden_actions).and_return(["h1"])
-      @controller.available_actions(post_controller).
-        should == ["m1", "m2"]
-    end
-  end
-
   describe "#controller_name" do
     it "should return action_methods" do
       post_controller = mock("PostController")
@@ -122,7 +104,7 @@ describe Lockdown::Frameworks::Rails::Controller::Lock do
 
       @controller.stub!(:request).and_return(request)
 
-      @controller.sent(:sent_from_uri).should == "/blip"
+      @controller.send(:sent_from_uri).should == "/blip"
     end
   end
 
@@ -204,7 +186,7 @@ describe Lockdown::Frameworks::Rails::Controller::Lock do
   describe "#redirect_back_or_default" do
     it "should redirect to default without session[:prevpage]" do
       @controller.should_receive(:redirect_to).with("/")
-      @controller.redirect_back_or_default("/")
+      @controller.send :redirect_back_or_default, "/"
     end
 
     it "should redirect to session[:prevpage]" do
@@ -212,7 +194,7 @@ describe Lockdown::Frameworks::Rails::Controller::Lock do
       path.stub!(:blank?).and_return(false)
       @session[:prevpage] = path
       @controller.should_receive(:redirect_to).with(path)
-      @controller.redirect_back_or_default("/")
+      @controller.send :redirect_back_or_default, "/"
     end
   end
 

data/spec/lockdown/frameworks/rails_spec.rb

@@ -3,9 +3,10 @@ require File.join(File.dirname(__FILE__), %w[.. .. spec_helper])
 describe Lockdown::Frameworks::Rails do
   before do
     @rails = Lockdown::Frameworks::Rails
+
     @rails.stub!(:use_me?).and_return(true)
 
-    @lockdown = mock("lockdown")
+    @lockdown = mock("lockdown")        
   end
 
 
@@ -36,6 +37,7 @@ describe Lockdown::Frameworks::Rails do
       ActionController::Base.should_receive(:rescue_from)
 
       ActionController::Base.should_receive(:class_eval)
+      ActionController::Base.should_receive(:hide_action)
 
       Lockdown::System.should_receive(:class_eval)
 
@@ -46,9 +48,16 @@ describe Lockdown::Frameworks::Rails do
   end
 end
 
+RAILS_ROOT = "/shibby/dibby/do"
+
+module ActionController; class Base; end end
+
+class ApplicationController; end
+
+module ActionView; class Base; end end
+
 describe Lockdown::Frameworks::Rails::Environment do
 
-  RAILS_ROOT = "/shibby/dibby/do"
   before do
     @env = class Test; extend Lockdown::Frameworks::Rails::Environment; end
   end
@@ -77,16 +86,20 @@ describe Lockdown::Frameworks::Rails::Environment do
   end
 
   describe "#controller_parent" do
-    it "should return ActionController::Base" do
-      module ActionController; class Base; end end
-
+    it "should return ActionController::Base if not caching classes" do
+      @env.should_receive(:caching_classes?).and_return(false)
       @env.controller_parent.should == ActionController::Base
     end
+
+    it "should return ApplicationController if caching classes" do
+      @env.should_receive(:caching_classes?).and_return(true)
+      @env.controller_parent.should == ApplicationController
+    end
+
   end
 
   describe "#view_helper" do
     it "should return ActionView::Base" do
-      module ActionView; class Base; end end
       
       @env.view_helper.should == ActionView::Base
     end
@@ -96,80 +109,27 @@ end
 describe Lockdown::Frameworks::Rails::System do
   class Test 
     extend Lockdown::Frameworks::Rails::System
-    class << self
-      attr_accessor :controller_classes
-    end
-  end
-
-  module Rails
-    module VERSION
-      MAJOR = 2
-      MINOR = 2
-      TINY  = 2
-    end    
   end
 
   before do
     @env = Test
-    @env.controller_classes = {}
   end
 
   describe "#skip_sync?" do
-  end
-
-  describe "#load_controller_classes" do
-  end
-
-  describe "#maybe_load_framework_controller_parent" do
-    it "should call require_or_load with application.rb < 2.3" do
-      @env.should_receive(:require_or_load).with("application.rb")
-
-      @env.maybe_load_framework_controller_parent
-    end
-
-    it "should call require_or_load with application_controller.rb >= 2.3" do
-      module Rails
-        module VERSION 
-          MINOR = 3
-          TINY  = 0
-        end    
-      end
-
-      @env.should_receive(:require_or_load).with("application_controller.rb")
-
-      @env.maybe_load_framework_controller_parent
+    it "should return true if env == skip sync" do
+      Lockdown::System.stub!(:fetch).with(:skip_db_sync_in).and_return(['test'])
+      @env.should_receive(:framework_environment).and_return("test")
+      
+      @env.skip_sync?.should == true
     end
-  end
-
-  describe "#lockdown_load" do
-    it "should add class to controller classes" do
-      @env.stub!(:class_name_from_file).and_return("controller_class")
-      Lockdown.stub!(:qualified_const_get).and_return(:controller_class)
-      @env.stub!(:require_or_load)
-
-      @env.lockdown_load("controller_file")
 
-      @env.controller_classes["ControllerFile"].should == :controller_class
+    it "should return false if env not in skip_sync" do
+      Lockdown::System.stub!(:fetch).with(:skip_db_sync_in).and_return(['test', 'ci'])
+      @env.should_receive(:framework_environment).and_return("qa")
+      
+      @env.skip_sync?.should == false
     end
+    
   end
 
-  describe "#require_or_load" do
-    it "should use Dependencies if not defined in ActiveSupport" do
-      module ActiveSupport; end
-      Dependencies = mock("dependencies") unless defined?(Dependencies)
-
-      Dependencies.should_receive(:require_or_load).with("controller_file")
-
-      @env.require_or_load("controller_file")
-    end
-
-    it "should use ActiveSupport::Dependencies if defined" do
-      module ActiveSupport; class Dependencies; end end
-
-      ActiveSupport::Dependencies.should_receive(:require_or_load).
-        with("controller_file")
-
-      @env.require_or_load("controller_file")
-    end
-  end
 end

data/spec/lockdown/rules_spec.rb

@@ -54,6 +54,8 @@ describe Lockdown::Rules do
 
   describe "#get_permissions" do
     it "should return array of permission names as symbols" do
+      Lockdown.should_receive(:add_controller_method)
+      
       @rules.set_permission(:home_page)
       @rules.set_permission(:user_management)
       @rules.process_rules
@@ -64,6 +66,8 @@ describe Lockdown::Rules do
 
   describe "#permission_exists?" do
     it "should return true if permission exists" do
+      Lockdown.should_receive(:add_controller_method)
+
       @rules.set_permission(:home_page)
       @rules.process_rules
       @rules.permission_exists?(:home_page).should be_true
@@ -99,6 +103,8 @@ describe Lockdown::Rules do
 
   describe "#process_rules" do
     it "should validate user_group permissions" do
+      Lockdown.should_receive(:add_controller_method)
+      
       @rules.set_user_group(:test_group, :a_perm)
       error =  "User Group: test_group, permission not found: a_perm"
 

data/spec/lockdown/session_spec.rb

@@ -64,7 +64,8 @@ describe Lockdown::Session do
     it "should set the access_rights from the user list" do
       array  = ["posts/index", "posts/show"]
       Lockdown::System.stub!(:access_rights_for_user).and_return(array)
-      @controller.stub!(:current_user).and_return(:user_object)
+      usr = mock(:id => 1234)
+      @controller.stub!(:current_user).and_return(usr)
       @controller.send(:add_lockdown_session_values)
       @session[:access_rights].should == array
     end

data/spec/lockdown/system_spec.rb

@@ -7,23 +7,13 @@ describe Lockdown::System do
     Lockdown::System.options['test'] = "my test"
     Lockdown::System.fetch('test').should == "my test"
   end
-
-  it "should fetch the controller class" do
-    klass = mock("User Controller Class")
-    Lockdown.stub!(:controller_class_name).and_return(:users)
-    Lockdown::System.controller_classes = {}
-    Lockdown::System.controller_classes[:users] = klass
-    Lockdown::System.fetch_controller_class(:users).should equal(klass)
-  end
-
+  
   describe "#configure" do
     it "should call the methods responsible for defining the rules" do
       Lockdown::System.stub!(:skip_sync?).and_return(false)
 
       Lockdown::System.should_receive :set_defaults 
  
-      Lockdown::System.should_receive :load_controller_classes
-
       Lockdown::System.should_receive :instance_eval
  
       Lockdown::System.should_receive :process_rules
@@ -48,7 +38,7 @@ describe Lockdown::System do
 
     it "should build the paths from the controller class if no methods specified" do
       methods = ["new","edit","create","update"]
-      Lockdown::System.stub!(:fetch_controller_class)
+      Lockdown.stub!(:fetch_controller_class)
       Lockdown::System.stub!(:available_actions).
         and_return(methods)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-13 00:00:00 -04:00
+date: 2009-08-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency