rubinjam 0.2.0 → 0.3.0

data/lib/rubinjam/version.rb

@@ -1,3 +1,3 @@
 module Rubinjam
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/rubinjam.rb

@@ -84,15 +84,91 @@ module Rubinjam
             #{libraries.map { |name,content| "#{name.inspect} => #{content.inspect}" }.join(",\n    ")}
           }
 
-          ROOT = File.expand_path("../", __FILE__) << "/lib/"
+          ROOT = File.expand_path("../", __FILE__) << "/rubinjam/"
 
-          module AutoloadFix
+          class << self
+            def normalize_file(file)
+              return file unless file.start_with?("/")
+              if file.start_with?(ROOT)
+                file.sub(ROOT, "")
+              else
+                file.split('/lib/').last
+              end
+            end
+
+            def file_from_nesting(mod, const)
+              if file = mod.rubinjam_autload[const]
+                return [mod, file]
+              end
+
+              nesting(mod.name)[1..-1].detect do |mod|
+                file = mod.rubinjam_autload[const]
+                break [mod, file] if file
+              end
+            end
+
+            # this does not reflect the actual Module.nesting of the caller,
+            # but it should be close enough
+            def nesting(name)
+              nesting = []
+              namespace = name.split("::")
+              namespace.inject(Object) do |base, n|
+                klass = base.const_get(n)
+                nesting << klass
+                klass
+              end
+              nesting.reverse
+            end
+          end
+
+          module ModuleAutoloadFix
             def self.included(base)
               base.class_eval do
+                def rubinjam_autload
+                  @rubinjam_autload ||= {}
+                end
+
                 alias autoload_without_rubinjam autoload
                 def autoload(const, file)
-                  if Rubinjam::LIBRARIES[file]
+                  normalized_file = Rubinjam.normalize_file(file)
+                  if Rubinjam::LIBRARIES[normalized_file]
+                    rubinjam_autload[const] = normalized_file
+                  else
+                    autoload_without_rubinjam(const, file)
+                  end
+                end
+
+                alias const_missing_without_rubinjam const_missing
+                def const_missing(const)
+                  # do not load twice / go into infitire loops
+                  @rubinjam_tried_const_missing ||= {}
+                  if @rubinjam_tried_const_missing[const]
+                    return const_missing_without_rubinjam(const)
+                  end
+                  @rubinjam_tried_const_missing[const] = true
+
+                  # try to find autoload in current module or nesting
+                  nesting, file = Rubinjam.file_from_nesting(self, const)
+                  if file
                     require file
+                    nesting.const_get(const)
+                  else
+                    const_missing_without_rubinjam(const)
+                  end
+                end
+              end
+            end
+          end
+
+          module BaseAutoloadFix
+            def self.included(base)
+              base.class_eval do
+                alias autoload_without_rubinjam autoload
+
+                def autoload(const, file)
+                  normalized_file = Rubinjam.normalize_file(file)
+                  if Rubinjam::LIBRARIES[normalized_file]
+                    require normalized_file
                   else
                     autoload_without_rubinjam(const, file)
                   end
@@ -102,11 +178,11 @@ module Rubinjam
           end
         end
 
-        Module.send(:include, Rubinjam::AutoloadFix)
-        include Rubinjam::AutoloadFix
+        Module.send(:include, Rubinjam::ModuleAutoloadFix)
+        include Rubinjam::BaseAutoloadFix
 
         def require(file)
-          normalized_file = file.sub(Rubinjam::ROOT, "")
+          normalized_file = Rubinjam.normalize_file(file)
           if code = Rubinjam::LIBRARIES[normalized_file]
             return if code == :loaded
             eval(code, TOPLEVEL_BINDING, "rubinjam/\#{normalized_file}.rb")

metadata

@@ -1,62 +1,81 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: rubinjam
-version: !ruby/object:Gem::Version
-  version: 0.2.0
+version: !ruby/object:Gem::Version 
+  hash: 19
+  prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
-authors:
+authors: 
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-12-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  prerelease: false
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
 description: 
 email: michael@grosser.it
-executables:
+executables: 
 - rubinjam
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - MIT-LICENSE
 - bin/rubinjam
 - lib/rubinjam.rb
 - lib/rubinjam/version.rb
 homepage: https://github.com/grosser/rubinjam
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.15
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Jam a gem into a universal binary that works with any ruby
 test_files: []
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 3ad8b2a441f97b43165b8de34a5d5f4f497d9252
-  data.tar.gz: ff1a5400580c19c7a302783fe2844ede15db39e9
-SHA512:
-  metadata.gz: eabcb9d642ad130f409c6518ded37d8ddd1a7e8794bc74f4351bbcc1f7fdefb4da6b68d4b627b3bdf405787619aa7c9912da809749233625e420b998ceb7811e
-  data.tar.gz: 1a1a9c87aecc77722ea5a2f3e12e1202462da8dac8e85d7eab9dcd6f9a4d69569b56bad82e31ca9ac9eb29e4bc61706e8285a46235411702e6662664119a6a3e