lockdown.rb in revo-lockdown-1.6.2

- old
+ new
@@ -1,70 +1,87 @@
-require File.join(File.dirname(__FILE__), "lockdown", "helper")
+$:.unshift File.dirname(__FILE__)
 
+require 'logger'
+
+require File.join("lockdown", "errors")
+require File.join("lockdown", "helper")
+require File.join("lockdown", "session")
+require File.join("lockdown", "context")
+require File.join("lockdown", "permission")
+require File.join("lockdown", "database")
+require File.join("lockdown", "rules")
+require File.join("lockdown", "system")
+require File.join("lockdown", "references")
+
 module Lockdown
+  extend Lockdown::References
   extend Lockdown::Helper
 
-  VERSION = '0.9.6'
+  VERSION = '1.6.2'
 
-  # Returns the version string for the library.
-  def self.version
-    VERSION
-  end
+  class << self
+    attr_accessor :logger
 
-  def self.major_version
-    version.split('.')[0].to_i
-  end
+    # Returns the version string for the library.
+    def version
+      VERSION
+    end
 
-  def self.minor_version
-    version.split('.')[1].to_i
-  end
+    def major_version
+      version.split('.')[0].to_i
+    end
 
-  def self.patch_version
-    version.split('.')[2].to_i
-  end
+    def minor_version
+      version.split('.')[1].to_i
+    end
 
-  # Mixin Lockdown code to the appropriate framework and ORM
-  def self.mixin
-    if mixin_resource?("frameworks")
-      unless mixin_resource?("orms")
-        raise NotImplementedError, "ORM unknown to Lockdown!"
+    def patch_version
+      version.split('.')[2].to_i
+    end
+
+    # Mixin Lockdown code to the appropriate framework and ORM
+    def mixin
+      if mixin_resource?("frameworks")
+        unless mixin_resource?("orms")
+          raise NotImplementedError, "ORM unknown to Lockdown!"
+        end
+      else
+        Lockdown.logger.info "=> Note:: Lockdown cannot determine framework and therefore is not active.\n"
       end
+    end # mixin
 
+    def maybe_parse_init
+      return if Lockdown::System.initialized?
+
       if File.exists?(Lockdown.init_file)
-        puts "=> Requiring Lockdown rules engine: #{Lockdown.init_file} \n"
-        require Lockdown.init_file
+        Lockdown.logger.info "=> Requiring Lockdown rules engine: #{Lockdown.init_file} \n"
+        load Lockdown.init_file
       else
-        puts "=> Note:: Lockdown couldn't find init file: #{Lockdown.init_file}\n"
+        Lockdown.logger.info "=> Note:: Lockdown couldn't find init file: #{Lockdown.init_file}\n"
       end
-    else
-      puts "=> Note:: Lockdown cannot determine framework and therefore is not active.\n"
     end
-  end # mixin
 
-  private
+    private
 
-  def self.mixin_resource?(str)
-    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
+    def mixin_resource?(str)
+      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
-    end
-    false
-  end # mixin_resource?
-end # Lockdown
+      false
+    end # mixin_resource?
+  end # class block
 
-require File.join(File.dirname(__FILE__), "lockdown", "session")
-require File.join(File.dirname(__FILE__), "lockdown", "context")
-require File.join(File.dirname(__FILE__), "lockdown", "permission")
-require File.join(File.dirname(__FILE__), "lockdown", "database")
-require File.join(File.dirname(__FILE__), "lockdown", "rules")
-require File.join(File.dirname(__FILE__), "lockdown", "system")
+  self.logger = Logger.new(STDOUT)
 
-puts "=> Mixing in Lockdown version: #{Lockdown.version} \n"
+end # Lockdown
 
+Lockdown.logger.info "=> Mixing in Lockdown version: #{Lockdown.version} \n"
 Lockdown.mixin
+
 