impromptu 1.2.0 → 1.2.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.2.1 - Fix bug where namespaces were not removed after camelcasing a file name
+      - Simplify autoloading behaviour and fix a bug which affected autoloading
+        constants while in the middle of an existing autoload.
+
 1.2.0 - New method 'root?' which tests is symbols are prefixed with two colons
       - New 'namespace' option for folders allows you to override a components
         namespace with a namespace specific to a folder.

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/impromptu.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{impromptu}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Will Cannings"]
@@ -41,6 +41,7 @@ Gem::Specification.new do |s|
     "test/framework/ext/extensions.rb",
     "test/framework/ext/extensions/blog.rb",
     "test/framework/folder_namespace/stream.rb",
+    "test/framework/folder_namespace/two_names.rb",
     "test/framework/lib/group/klass2.rb",
     "test/framework/lib/klass.rb",
     "test/framework/other/also.rb",
@@ -77,6 +78,7 @@ Gem::Specification.new do |s|
     "test/framework/ext/extensions.rb",
     "test/framework/ext/extensions/blog.rb",
     "test/framework/folder_namespace/stream.rb",
+    "test/framework/folder_namespace/two_names.rb",
     "test/framework/lib/group/klass2.rb",
     "test/framework/lib/klass.rb",
     "test/framework/other/also.rb",

data/lib/impromptu/autoload.rb

@@ -1,41 +1,33 @@
-module Impromptu
-  module Autoload
-    # Impromptu implements the autoloading behaviour using this module
-    # and this method. Object is extended with this module so we can
-    # catch references to objects which don't exist. It first tries
-    # to determine if we know about the resource corresponding to name
-    # and if so loads and returns a reference to it. Otherwise, the usual
-    # NameError exception will be raised by Object. We also test to make
-    # sure a resource isn't already loaded before returning a reference
-    # 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(namespaced_symbol)
-      
-      # if we don't know about the symbol, send the method to
-      # Object which will raise an exception
-      super(symbol) if resource.nil?
-      
-      # ensure the resource hasn't already been loaded
-      raise "Illegal condition: const_missing called after a resource has been loaded" if resource.loaded?
-      
-      # load the resource and return a reference to it. this
-      # assumes that the source files will correctly define
-      # the resource. otherwise nil will be returned.
-      resource.reload
-      resource.reference
-    end
+# Impromptu implements the autoloading behaviour using const_missing.
+# Module's const_missing definition is replaced with the one below to
+# catch references to objects which don't exist. It first tries
+# to determine if we know about the resource corresponding to name
+# and if so loads and returns a reference to it. Otherwise, the usual
+# NameError exception will be raised. We also test to make sure a
+# resource isn't already loaded before returning a reference to it. If
+# it is, then something very screwy has gone on and Ruby cannot locate
+# an already loaded resource.
+Module.send(:remove_method, :const_missing)
+Module.send(:define_method, :const_missing) do |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(namespaced_symbol)
+  raise NameError if resource.nil?
+  
+  # ensure the resource hasn't already been loaded
+  raise "Illegal condition: const_missing called after a resource has been loaded" if resource.loaded?
+  
+  # load the resource and return a reference to it. this
+  # assumes that the source files will correctly define
+  # the resource. otherwise nil will be returned.
+  resource.reload
+  resource.reference
 end
-
-Object.extend(Impromptu::Autoload)

data/lib/impromptu/file.rb

@@ -206,7 +206,10 @@ module Impromptu
         name.gsub!(/\/(.?)/) {|character| "::#{character[1].upcase}" }
         
         # upcase the first character, and any characters following an underscore
-        name.gsub(/(?:^|_)(.)/) {|character| character.upcase}.to_sym
+        name.gsub!(/(?:^|_)(.)/) {|character| character.upcase}
+        
+        # remove underscores
+        name.gsub('_', '').to_sym
       end
       
       def combine_symbol_with_namespace(symbol)

data/lib/impromptu/resource.rb

@@ -53,7 +53,6 @@ module Impromptu
       else
         @files.first.reload
       end
-      self.reference.extend(Impromptu::Autoload)
     end
     
     # Unload the resource by undefining the constant representing it.

data/test/framework/folder_namespace/two_names.rb

@@ -0,0 +1,4 @@
+module Namespace
+  module TwoNames
+  end
+end

data/test/test_integration.rb

@@ -35,15 +35,15 @@ class TestIntegration < Test::Unit::TestCase
       assert_equal nil, Impromptu.components['other'].namespace
     end
     
-    should "05 start tracking 10 files" do
+    should "05 start tracking 11 files" do
       assert_equal 2, Impromptu.components['framework'].folders.first.files.size
       assert_equal 2, Impromptu.components['framework.extensions'].folders.first.files.size
       assert_equal 3, Impromptu.components['other'].folders.first.files.size
       assert_equal 2, Impromptu.components['private'].folders.first.files.size
-      assert_equal 1, Impromptu.components['folder_namespace'].folders.first.files.size
+      assert_equal 2, Impromptu.components['folder_namespace'].folders.first.files.size
     end
     
-    should "06 load definitions for 12 resources" do
+    should "06 load definitions for 13 resources" do
       assert Impromptu.root_resource.child?(:Framework)
       assert Impromptu.root_resource.child(:Framework).child?(:Extensions)
       assert Impromptu.root_resource.child(:Framework).child(:Extensions).child?(:Blog)
@@ -56,6 +56,7 @@ class TestIntegration < Test::Unit::TestCase
       assert Impromptu.root_resource.child?(:Another)
       assert Impromptu.root_resource.child(:Namespace)
       assert Impromptu.root_resource.child(:Namespace).child?(:Stream)
+      assert Impromptu.root_resource.child(:Namespace).child?(:TwoNames)
     end
     
     should "07 correctly mark namespace resources" do
@@ -71,6 +72,7 @@ class TestIntegration < Test::Unit::TestCase
       assert_equal false, Impromptu.root_resource.child(:Another).namespace?
       assert_equal true, Impromptu.root_resource.child(:Namespace).namespace?
       assert_equal false, Impromptu.root_resource.child(:Namespace).child(:Stream).namespace?
+      assert_equal false, Impromptu.root_resource.child(:Namespace).child(:TwoNames).namespace?
     end
     
     should "08 keep all resources unloaded to start with" do
@@ -86,6 +88,7 @@ class TestIntegration < Test::Unit::TestCase
       assert_equal false, Impromptu.root_resource.child(:'Another').loaded?
       assert_equal false, Impromptu.root_resource.child(:'Namespace').loaded?
       assert_equal false, Impromptu.root_resource.child(:'Namespace::Stream').loaded?
+      assert_equal false, Impromptu.root_resource.child(:'Namespace::TwoNames').loaded?
     end
     
     should "09 have all resources specified by the correct number of files" do
@@ -101,6 +104,7 @@ class TestIntegration < Test::Unit::TestCase
       assert_equal 1, Impromptu.root_resource.child(:'ModTwo').files.size
       assert_equal 1, Impromptu.root_resource.child(:'Another').files.size
       assert_equal 1, Impromptu.root_resource.child(:'Namespace::Stream').files.size
+      assert_equal 1, Impromptu.root_resource.child(:'Namespace::TwoNames').files.size
       assert_equal true, Impromptu.root_resource.child(:'Framework').implicitly_defined?
       assert_equal true, Impromptu.root_resource.child(:'Namespace').implicitly_defined?
     end
@@ -180,10 +184,15 @@ class TestIntegration < Test::Unit::TestCase
       
       # folder namespace
       Impromptu.root_resource.child(:'Namespace::Stream').reload
+      Impromptu.root_resource.child(:'Namespace::TwoNames').reload
       assert_equal true, Impromptu.root_resource.child(:'Namespace::Stream').loaded?
+      assert_equal true, Impromptu.root_resource.child(:'Namespace::TwoNames').loaded?
       assert_nothing_raised do
         Namespace::Stream
       end
+      assert_nothing_raised do
+        Namespace::TwoNames
+      end
     end
     
     should "12 load multiple files for a resource when required" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Will Cannings
@@ -64,6 +64,7 @@ files:
 - test/framework/ext/extensions.rb
 - test/framework/ext/extensions/blog.rb
 - test/framework/folder_namespace/stream.rb
+- test/framework/folder_namespace/two_names.rb
 - test/framework/lib/group/klass2.rb
 - test/framework/lib/klass.rb
 - test/framework/other/also.rb
@@ -127,6 +128,7 @@ test_files:
 - test/framework/ext/extensions.rb
 - test/framework/ext/extensions/blog.rb
 - test/framework/folder_namespace/stream.rb
+- test/framework/folder_namespace/two_names.rb
 - test/framework/lib/group/klass2.rb
 - test/framework/lib/klass.rb
 - test/framework/other/also.rb