truck 0.8.4 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6550bf60079074a0644f6df1401efeff49ea3fa9
-  data.tar.gz: 0ce9473dd821156f8ecc5f0b6dea687758ab235c
+  metadata.gz: 12ec59f7f4fdb83b6b260880588fd189f638d081
+  data.tar.gz: e04dc9fca539ebe977945703ec321e47cc64e41e
 SHA512:
-  metadata.gz: 4ed94e3c7d982d972caa6197cc0c0efb4d25f2cb4737005bc589ae21b8a9435bd63ccc089d7332f4687e568906794a6b89220f9f9746b80feb9280386ebb79e4
-  data.tar.gz: 69070a911e5bd34d27578be9b1a8bab52e9f52e8dae705be85f3ca455810fd2928d388da54f4c632b5999c29188dd53ceaeb8870508d6262069deec8c9b25786
+  metadata.gz: f49b2f62c5e9115194a9abc72054960c0ea13ddbdf97698b0831a846872dd13315fbb02dc3d6bb15f6cc8f0f1f41904fc4bd7c43c53c69ca8046e1ee0247a504
+  data.tar.gz: ee7ca5be0089784b9ce8e0537721572b1af8ecebe4e464f93f801e4d926f66dc2c50a174f92c35e2faf555102337e077e22993547104fe77e7c6e3b81f60861a

data/README.md

@@ -52,7 +52,7 @@ end
 
 ```ruby
 # /path/to/context/root/bar.rb
-class Foo
+class Bar
   def self.hello_world
     "hello, world!"
   end
@@ -71,6 +71,12 @@ This works with namespaced constant names, too:
 MyContext.resolve_const("Foo::Bar::Baz")
 ```
 
+You can also directly reference them through their toplevel namespace:
+
+```ruby
+MyContext::Foo::Bar::Baz
+```
+
 ### Other
 
 `MyContext` has some other interesting methods on it:

data/bin/rake

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/lib/truck.rb

@@ -10,6 +10,8 @@ module Truck
   attr :contexts
   @contexts = {}
 
+  attr_accessor :debug_mode
+
   def define_context(name, **params)
     contexts[name] = Context.new(name, **params)
   end

data/lib/truck/autoloader.rb

@@ -2,10 +2,11 @@ module Truck
   using Truck::StringInflections
 
   class Autoloader
-    attr :base_nibbles, :context, :from, :dir_paths
+    attr :base_nibbles, :context, :file, :from, :dir_paths
 
-    def initialize(from)
+    def initialize(from, file)
       @from = from
+      @file = file
       @context, @base_nibbles = fetch_context_and_base_nibbles
       @dir_paths = [nil]
     end
@@ -13,7 +14,7 @@ module Truck
     def <<(const_name)
       raise_name_error!(const_name) unless context
       @dir_paths = each_possible_const(const_name).reduce [] do |new_paths, possible_const|
-        resolved_const = context.resolve_const possible_const
+        resolved_const = context.resolve_const possible_const, skip: file
         throw :const, resolved_const if resolved_const
         new_paths << possible_const if possible_namespace?(possible_const)
         new_paths
@@ -94,8 +95,8 @@ module Truck
         set_current_autoloader(to: nil) if found_const or name_error
       end
 
-      def handle!(const_name, from:)
-        autoloader = current_autoloader || new(from)
+      def handle!(const_name, current_file: nil, from:)
+        autoloader = current_autoloader || new(from, current_file)
         autoloader << String(const_name)
         set_current_autoloader to: autoloader
       end

data/lib/truck/const_resolver.rb

@@ -3,11 +3,12 @@ module Truck
 
   class Context
     class ConstResolver
-      attr :current_path, :context, :expanded_const
+      attr :current_path, :context, :expanded_const, :skip_files
 
-      def initialize(context:, expanded_const:)
+      def initialize(context:, expanded_const:, skip_files:)
         @context        = context
         @expanded_const = expanded_const
+        @skip_files     = skip_files
       end
 
       def resolve
@@ -26,6 +27,7 @@ module Truck
         each_autoload_path do
           base_path = current_path.join expanded_const.to_snake_case
           each_rb_file_from_base_path base_path do |rb_file|
+            next if skip_files.include? rb_file.to_s
             yield rb_file if File.exist?(rb_file)
           end
         end

data/lib/truck/context.rb

@@ -40,7 +40,8 @@ module Truck
     end
 
     def load_file(rb_file)
-      mod.module_eval File.read(rb_file), rb_file.to_s
+      ruby_code = File.read rb_file
+      mod.module_eval ruby_code, rb_file.to_s
     end
 
     def parent
@@ -48,8 +49,8 @@ module Truck
       Truck.contexts.fetch(@parent.to_sym).mod
     end
 
-    def resolve_const(expanded_const)
-      build_const_resolver(expanded_const).resolve
+    def resolve_const(expanded_const, skip: nil)
+      build_const_resolver(expanded_const, Array[skip]).resolve
     end
 
     def shutdown!
@@ -58,10 +59,11 @@ module Truck
 
     private
 
-    def build_const_resolver(expanded_const)
+    def build_const_resolver(expanded_const, skip_files)
       ConstResolver.new(
         context: self,
         expanded_const: String(expanded_const).dup.freeze,
+        skip_files: skip_files,
       )
     end
 

data/lib/truck/core_ext.rb

@@ -1,7 +1,9 @@
 class Module
   def const_missing(const)
+    offending_file = caller_locations.fetch(0).path
+    $stderr.puts "Module#const_missing: const=#{const.inspect}, self=#{inspect}, file=#{offending_file}" if Truck.debug_mode
     catch :const do
-      Truck::Autoloader.handle const, from: self
+      Truck::Autoloader.handle const, from: self, current_file: offending_file
     end
   rescue NameError => name_error
     if name_error.class == NameError

data/lib/truck/version.rb

@@ -1,3 +1,3 @@
 module Truck
-  VERSION = "0.8.4"
+  VERSION = "0.8.6"
 end

data/test/integration/autoloading_test.rb

@@ -44,4 +44,12 @@ class AutoloadingTest < Minitest::Test
   def test_reference_constants_in_included_class
     assert_equal 'hello from B::BA', MyApp::IncludesFoo.message
   end
+
+  def test_reference_constants_in_external_class_that_includes_module
+    TOPLEVEL_BINDING.eval File.read "/ext.rb"
+
+    assert_equal 'hello from A', MyExtClass.new.message
+  ensure
+    Object.send :remove_const, :MyExtClass
+  end
 end

data/test/support/fakes_filesystem.rb

@@ -197,6 +197,34 @@ module B
       "hello from MyApp::B::BA"
     end
   end
+end
+      FILE
+
+      File.write "/ext.rb", <<-FILE
+class MyExtClass
+  include Foo
+
+  def message
+    A.message
+  end
+end
+      FILE
+
+      Dir.mkdir "/extend"
+      Dir.mkdir "/extend/lib"
+      Dir.mkdir "/extend/app"
+
+      File.write "/extend/app/my_model.rb", <<-FILE
+module MyModel
+  extend MyMixin
+end
+      FILE
+
+      File.write "/extend/lib/my_mixin.rb", <<-FILE
+module MyMixin
+  def message
+    'hello from MyMixin'
+  end
 end
       FILE
     end

data/test/support/tests_autoloading.rb

@@ -4,6 +4,7 @@ module TestsAutoloading
     @bar = Truck.define_context :Bar, root: '/bar', parent: :Foo
     @my_app = Truck.define_context :MyApp, root: "/my_app", autoload_paths: %w(lib)
     @multi = Truck.define_context :MultipleAutoloadPaths, root: "/", autoload_paths: %w(foo bar)
+    @extend = Truck.define_context :Extend, root: "/extend", autoload_paths: %w(app lib)
     Truck.boot!
     assert_nil Truck::Autoloader.current_autoloader
   end

data/truck.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = []
   spec.test_files    = spec.files.grep(%r{^test/})
   spec.require_paths = ["lib"]
 
@@ -22,5 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "fakefs", "~> 0.5"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "minitest-reporters", "~> 1.0"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: truck
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.6
 platform: ruby
 authors:
 - ntl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +106,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/rake
 - lib/truck.rb
 - lib/truck/autoloader.rb
 - lib/truck/const_resolver.rb