impromptu 1.0.0 → 1.0.1

data/README.rdoc

@@ -23,7 +23,7 @@ A simple component DSL is used to define components:
   component 'other' do
     folder 'other' do
       file 'load.rb'
-      file 'mods.rb', :provides => [:ModOne, :ModTwo]
+      file 'mods.rb', provides: [:ModOne, :ModTwo]
     end
   end
 

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/impromptu.gemspec

@@ -1,93 +1,91 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{impromptu}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Will Cannings"]
-  s.date = %q{2010-09-30}
+  s.date = %q{2010-11-16}
   s.description = %q{Component and dependency manager for Ruby}
   s.email = %q{me@willcannings.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "impromptu.gemspec",
-     "lib/impromptu.rb",
-     "lib/impromptu/autoload.rb",
-     "lib/impromptu/component.rb",
-     "lib/impromptu/component_set.rb",
-     "lib/impromptu/file.rb",
-     "lib/impromptu/folder.rb",
-     "lib/impromptu/impromptu.rb",
-     "lib/impromptu/ordered_set.rb",
-     "lib/impromptu/resource.rb",
-     "lib/impromptu/symbol.rb",
-     "test/framework/copies/extra_klass2.rb",
-     "test/framework/copies/new_klass.rb",
-     "test/framework/copies/new_unseen.rb",
-     "test/framework/copies/original_klass.rb",
-     "test/framework/ext/extensions.rb",
-     "test/framework/ext/extensions/blog.rb",
-     "test/framework/lib/group/klass2.rb",
-     "test/framework/lib/klass.rb",
-     "test/framework/other/also.rb",
-     "test/framework/other/ignore.rb",
-     "test/framework/other/load.rb",
-     "test/framework/other/two.rb",
-     "test/framework/private/klass.rb",
-     "test/framework/test.components",
-     "test/helper.rb",
-     "test/test_autoload.rb",
-     "test/test_component.rb",
-     "test/test_component_set.rb",
-     "test/test_folder.rb",
-     "test/test_impromptu.rb",
-     "test/test_integration.rb",
-     "test/test_ordered_set.rb",
-     "test/test_resource.rb",
-     "test/test_symbol.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "impromptu.gemspec",
+    "lib/impromptu.rb",
+    "lib/impromptu/autoload.rb",
+    "lib/impromptu/component.rb",
+    "lib/impromptu/component_set.rb",
+    "lib/impromptu/file.rb",
+    "lib/impromptu/folder.rb",
+    "lib/impromptu/impromptu.rb",
+    "lib/impromptu/ordered_set.rb",
+    "lib/impromptu/resource.rb",
+    "lib/impromptu/symbol.rb",
+    "test/framework/copies/extra_klass2.rb",
+    "test/framework/copies/new_klass.rb",
+    "test/framework/copies/new_unseen.rb",
+    "test/framework/copies/original_klass.rb",
+    "test/framework/ext/extensions.rb",
+    "test/framework/ext/extensions/blog.rb",
+    "test/framework/lib/group/klass2.rb",
+    "test/framework/lib/klass.rb",
+    "test/framework/other/also.rb",
+    "test/framework/other/ignore.rb",
+    "test/framework/other/load.rb",
+    "test/framework/other/two.rb",
+    "test/framework/private/klass.rb",
+    "test/framework/test.components",
+    "test/helper.rb",
+    "test/test_autoload.rb",
+    "test/test_component.rb",
+    "test/test_component_set.rb",
+    "test/test_folder.rb",
+    "test/test_impromptu.rb",
+    "test/test_integration.rb",
+    "test/test_ordered_set.rb",
+    "test/test_resource.rb",
+    "test/test_symbol.rb"
   ]
   s.homepage = %q{http://github.com/willcannings/impromptu}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Component and dependency manager for Ruby}
   s.test_files = [
     "test/framework/copies/extra_klass2.rb",
-     "test/framework/copies/new_klass.rb",
-     "test/framework/copies/new_unseen.rb",
-     "test/framework/copies/original_klass.rb",
-     "test/framework/ext/extensions/blog.rb",
-     "test/framework/ext/extensions.rb",
-     "test/framework/lib/group/klass2.rb",
-     "test/framework/lib/klass.rb",
-     "test/framework/other/also.rb",
-     "test/framework/other/ignore.rb",
-     "test/framework/other/load.rb",
-     "test/framework/other/two.rb",
-     "test/framework/private/klass.rb",
-     "test/helper.rb",
-     "test/test_autoload.rb",
-     "test/test_component.rb",
-     "test/test_component_set.rb",
-     "test/test_folder.rb",
-     "test/test_impromptu.rb",
-     "test/test_integration.rb",
-     "test/test_ordered_set.rb",
-     "test/test_resource.rb",
-     "test/test_symbol.rb"
+    "test/framework/copies/new_klass.rb",
+    "test/framework/copies/new_unseen.rb",
+    "test/framework/copies/original_klass.rb",
+    "test/framework/ext/extensions.rb",
+    "test/framework/ext/extensions/blog.rb",
+    "test/framework/lib/group/klass2.rb",
+    "test/framework/lib/klass.rb",
+    "test/framework/other/also.rb",
+    "test/framework/other/ignore.rb",
+    "test/framework/other/load.rb",
+    "test/framework/other/two.rb",
+    "test/framework/private/klass.rb",
+    "test/helper.rb",
+    "test/test_autoload.rb",
+    "test/test_component.rb",
+    "test/test_component_set.rb",
+    "test/test_folder.rb",
+    "test/test_impromptu.rb",
+    "test/test_integration.rb",
+    "test/test_ordered_set.rb",
+    "test/test_resource.rb",
+    "test/test_symbol.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/impromptu/autoload.rb

@@ -10,9 +10,17 @@ module Impromptu
     # to it. If it is, then something very screwy has gone on and Ruby
     # cannot locate an already loaded resource.
     def const_missing(symbol)
+      # namespace the missing resource with the name of the
+      # current class or module
+      if self == Object
+        namespaced_symbol = symbol
+      else
+        namespaced_symbol = "#{self.name}::#{symbol}".to_sym
+      end
+      
       # walk the resource tree and get a reference to the
       # resource or nil if we're not tracking it
-      resource = Impromptu.root_resource.child(symbol)
+      resource = Impromptu.root_resource.child(namespaced_symbol)
       
       # if we don't know about the symbol, send the method to
       # Object which will raise an exception

data/lib/impromptu/resource.rb

@@ -52,6 +52,7 @@ module Impromptu
       else
         @files.first.reload
       end
+      self.reference.extend(Impromptu::Autoload)
     end
     
     # Unload the resource by undefining the constant representing it.
@@ -151,7 +152,7 @@ module Impromptu
     # resource doesn't exist, nil is returned
     def child(name)
       return nil unless name.is_a?(Symbol)
-      return @children[name] if name.unnested?
+      return @children[name.without_leading_colons.to_sym] if name.unnested?
       
       # if the name is nested, walk the resource tree to return the
       # resource under this branch. rerturn nil if we reach a

data/lib/impromptu/symbol.rb

@@ -4,7 +4,7 @@ class Symbol
   # True if this symbol contains namespaces (is a nested
   # symbol such as A::B).
   def nested?
-    self.to_s.include? '::'
+    self.without_leading_colons.include? '::'
   end
   
   # True if this symbol contains no namespaces (is a root
@@ -16,7 +16,7 @@ class Symbol
   # Split a symbol into its component names (A::B =>
   # [:A, :B])
   def nested_symbols
-    self.to_s.split('::').collect(&:to_sym)
+    self.without_leading_colons.split('::').collect(&:to_sym)
   end
   
   # Retrieve the base (end or final) symbol name from this
@@ -40,4 +40,17 @@ class Symbol
       name
     end
   end
+  
+  # Strip leading colons from a symbol name. Two leading
+  # colons indicate a symbol is relative to the root
+  # namespace (Object) but should be removed when determining
+  # nesting and nested symbols.
+  def without_leading_colons
+    str = self.to_s
+    if str.start_with?('::')
+      str[2..-1]
+    else
+      str
+    end
+  end
 end

data/test/framework/private/klass.rb

@@ -7,4 +7,9 @@ module Framework
       2
     end
   end
+  
+  module SubComponent
+    module Leaf
+    end
+  end
 end

data/test/test_autoload.rb

@@ -29,4 +29,48 @@ class TestAutload < Test::Unit::TestCase
       end
     end
   end
+  
+  context "The 'private' folder" do
+    setup do
+      Impromptu.reset
+      Impromptu.define_components do
+        component 'framework' do
+          namespace :Framework
+          folder 'test/framework/private' do
+            file 'klass.rb', :provides => [:Klass, :SubComponent, :'Subcomponent::Leaf']
+          end
+        end
+      end
+    end
+    
+    should "have a single component with a namespace" do
+      assert_equal 1, Impromptu.components.size
+      assert_equal :Framework, Impromptu.components['framework'].namespace
+      assert_not_nil Impromptu.root_resource.child(:Framework)
+    end
+    
+    should "be able to have the namespace loaded using the autoload extension" do
+      assert_nothing_raised do
+        ::Framework
+      end
+    end
+    
+    should "raise an appropriate exception when accessing a non existant resource" do
+      assert_raise NameError do
+        ::IDontExistSoRaiseAnException
+      end
+    end
+    
+    should "be able to load namespace subcomponents using the autoload extension" do
+      assert_nothing_raised do
+        ::Framework::Klass
+      end
+    end
+    
+    should "be able to load resource subcomponents using the autoload extension" do
+      assert_nothing_raised do
+        ::Framework::SubComponent::Leaf
+      end
+    end
+  end
 end

data/test/test_symbol.rb

@@ -95,5 +95,33 @@ class TestResource < Test::Unit::TestCase
         assert_equal [:TopLevel, :'TopLevel::BottomLevel'], symbols
       end
     end
+    
+    # ----------------------------------------
+    # Prefixed Symbol
+    # ----------------------------------------
+    context "which is prefixed" do
+      setup { @symbol = :'::A' }
+      should "return false for nested?" do
+        assert_equal false, @symbol.nested?
+      end
+      
+      should "return true for unnested?" do
+        assert_equal true, @symbol.unnested?
+      end
+      
+      should "return a single symbol from nested_symbols" do
+        assert_instance_of Array, @symbol.nested_symbols
+        assert_equal 1, @symbol.nested_symbols.size
+        assert_instance_of Symbol, @symbol.nested_symbols[0]
+      end
+      
+      should "return itself for base_symbol" do
+        assert_equal :A, @symbol.base_symbol
+      end
+      
+      should "return itself for root_symbol" do
+        assert_equal :A, @symbol.root_symbol
+      end
+    end
   end  
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Will Cannings
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-30 00:00:00 +10:00
+date: 2010-11-16 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,7 +41,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -86,8 +85,8 @@ homepage: http://github.com/willcannings/impromptu
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -118,8 +117,8 @@ test_files:
 - test/framework/copies/new_klass.rb
 - test/framework/copies/new_unseen.rb
 - test/framework/copies/original_klass.rb
-- test/framework/ext/extensions/blog.rb
 - test/framework/ext/extensions.rb
+- test/framework/ext/extensions/blog.rb
 - test/framework/lib/group/klass2.rb
 - test/framework/lib/klass.rb
 - test/framework/other/also.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC