aegis 2.0.1 → 2.0.2

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/aegis.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aegis}
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch", "Tobias Kraze"]

data/lib/aegis.rb

@@ -1,20 +1,2 @@
-require 'ostruct'
-
-#for file in Dir["#{File.dirname(__FILE__)}/*/*.rb"]
-#  p file
-#end
-
-# Dir["#{File.dirname(__FILE__)}/**/*.rb"].each {|f| require f}
-
 require 'aegis/loader'
-require 'aegis/access_denied'
-require 'aegis/action'
-require 'aegis/compiler'
-require 'aegis/has_role'
-require 'aegis/parser'
-require 'aegis/permissions'
-require 'aegis/role'
-require 'aegis/sieve'
-
-require 'rails/action_controller'
-require 'rails/active_record'
+Aegis::Loader.load_paths

data/lib/aegis/loader.rb

@@ -1,26 +1,35 @@
-class Aegis::Loader
-  class << self
+module Aegis
+  class Loader
+    class << self
 
-    def paths
-      [ 'aegis/access_denied',
-        'aegis/action',
-        'aegis/compiler',
-        'aegis/has_role',
-        'aegis/parser',
-        'aegis/permissions',
-        'aegis/resource',
-        'aegis/role',
-        'aegis/sieve',
+      def paths
+        [ 'ostruct',
 
-        'rails/action_controller',
-        'rails/active_record' ]
-    end
+          'aegis/access_denied',
+          'aegis/action',
+          'aegis/compiler',
+          'aegis/has_role',
+          'aegis/parser',
+          'aegis/permissions',
+          'aegis/resource',
+          'aegis/role',
+          'aegis/sieve',
+
+          'rails/action_controller',
+          'rails/active_record' ]
+      end
 
-    def load
-      for path in paths
-        require path
+      def load_paths
+        for path in paths
+          require path
+        end
+        @loaded = true
       end
+
+      def loaded?
+        @loaded
+      end
+
     end
-    
   end
-end
+end

data/spec/loader_spec.rb

@@ -7,12 +7,19 @@ describe Aegis::Loader do
     it "should return all paths in the lib folder" do
 
       root = "#{File.dirname(__FILE__)}/../lib/"
-      expected_paths = Dir["#{root}*/*.rb"].collect do |file|
-        file.sub(root, "").sub(/\.rb$/, "")
-      end - ['aegis/loader']
+      Dir["#{root}*/*.rb"].collect do |file|
+        path = file.sub(root, "").sub(/\.rb$/, "")
+        Aegis::Loader.paths.should include(path) unless path == 'aegis/loader'
+      end
 
-      Aegis::Loader.paths.should =~ expected_paths
+    end
+
+  end
+
+  describe 'loaded?' do
 
+    it "should be loaded" do
+      Aegis::Loader.should be_loaded
     end
 
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Henning Koch