truck 0.8.6 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12ec59f7f4fdb83b6b260880588fd189f638d081
-  data.tar.gz: e04dc9fca539ebe977945703ec321e47cc64e41e
+  metadata.gz: bd4cb8f4aee7a5e8a38bfb6c3118082430a4274a
+  data.tar.gz: d19a9524b1e2c96c9a975b61c685a0156b3f12fb
 SHA512:
-  metadata.gz: f49b2f62c5e9115194a9abc72054960c0ea13ddbdf97698b0831a846872dd13315fbb02dc3d6bb15f6cc8f0f1f41904fc4bd7c43c53c69ca8046e1ee0247a504
-  data.tar.gz: ee7ca5be0089784b9ce8e0537721572b1af8ecebe4e464f93f801e4d926f66dc2c50a174f92c35e2faf555102337e077e22993547104fe77e7c6e3b81f60861a
+  metadata.gz: 8ab2b86d092a8ba57a9f2dbcf26358273106dc426c8dc090bfe3be3c51063155c76692f93fa36467c9c63b0a348e6be5a846fc9cbe744095ae61b012354d6016
+  data.tar.gz: 5439b3c696fc640f65714d92e54ad45240bdd9b48ffbfbf118ac657fb56536f4bc08c75995e9f93eb488df21c8eefc3c32b37167c6634eb24a0c7521f7ac6471

data/lib/truck.rb

@@ -12,8 +12,14 @@ module Truck
 
   attr_accessor :debug_mode
 
-  def define_context(name, **params)
-    contexts[name] = Context.new(name, **params)
+  def define_context(name, params = {})
+    root, parent, autoload_paths = extract_args!(
+      params,
+      :root,
+      parent: nil,
+      autoload_paths: ['.'],
+    )
+    contexts[name] = Context.new(name, root, parent, autoload_paths)
   end
 
   def boot!
@@ -38,6 +44,17 @@ module Truck
     return to_enum(:each_booted_context) unless block_given?
     contexts.each_value.select(&:booted?).each(&block)
   end
+
+  def extract_args!(hsh, *mandatory)
+    optional = mandatory.pop if mandatory.last.is_a? Hash
+    args = mandatory.map do |key|
+      hsh.fetch key do raise ArgumentError, "missing keyword: #{key}" end
+    end
+    optional.each do |key, default|
+      args.<< hsh.fetch key, default
+    end
+    args
+  end
 end
 
 # Load this last so that when truck itself has unresolvable constants, we throw

data/lib/truck/autoloader.rb

@@ -1,6 +1,4 @@
 module Truck
-  using Truck::StringInflections
-
   class Autoloader
     attr :base_nibbles, :context, :file, :from, :dir_paths
 
@@ -14,7 +12,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, skip: file
+        resolved_const = context.resolve_const possible_const, file
         throw :const, resolved_const if resolved_const
         new_paths << possible_const if possible_namespace?(possible_const)
         new_paths
@@ -31,7 +29,8 @@ module Truck
     end
 
     def possible_namespace?(possible_const)
-      context.root.join(possible_const.to_snake_case).directory?
+      snaked = StringInflections.to_snake_case possible_const
+      context.root.join(snaked).directory?
     end
 
     def constify(*nibbles)
@@ -74,10 +73,14 @@ module Truck
         autoloaders[current_thread_id]
       end
 
-      def set_current_autoloader(to:)
+      def set_current_autoloader(to)
         autoloaders[current_thread_id] = to
       end
 
+      def unset_current_autoloader
+        set_current_autoloader nil
+      end
+
       def current_thread_id
         Thread.current.object_id
       end
@@ -92,13 +95,13 @@ module Truck
         throw :const, found_const
       rescue NameError => name_error; raise name_error
       ensure
-        set_current_autoloader(to: nil) if found_const or name_error
+        unset_current_autoloader if found_const or name_error
       end
 
-      def handle!(const_name, current_file: nil, from:)
+      def handle!(const_name, from, current_file = nil)
         autoloader = current_autoloader || new(from, current_file)
         autoloader << String(const_name)
-        set_current_autoloader to: autoloader
+        set_current_autoloader autoloader
       end
     end
     extend HandleConstMissing
@@ -109,7 +112,7 @@ module Truck
       def method_missing(*)
         Autoloader.current_autoloader.raise_name_error!
       ensure
-        Autoloader.set_current_autoloader to: nil
+        Autoloader.unset_current_autoloader
       end
     end
   end

data/lib/truck/const_resolver.rb

@@ -1,11 +1,9 @@
 module Truck
-  using StringInflections
-
   class Context
     class ConstResolver
       attr :current_path, :context, :expanded_const, :skip_files
 
-      def initialize(context:, expanded_const:, skip_files:)
+      def initialize(context, expanded_const, skip_files)
         @context        = context
         @expanded_const = expanded_const
         @skip_files     = skip_files
@@ -25,7 +23,8 @@ module Truck
 
       def each_possible_rb_file
         each_autoload_path do
-          base_path = current_path.join expanded_const.to_snake_case
+          snaked = StringInflections.to_snake_case expanded_const
+          base_path = current_path.join snaked
           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)
@@ -72,14 +71,14 @@ module Truck
         expected_const = expected_const_defined_in_rb_file rb_file
         walk_const_parts(expected_const).reduce context.mod do |mod, const_part|
           mod.const_defined?(const_part) or
-            raise AutoloadError.new(const: expected_const, rb_file: rb_file)
+            raise AutoloadError.new(expected_const, rb_file)
           mod.const_get const_part
         end
       end
 
-      def expected_const_defined_in_rb_file(rb_file, autoload_path: current_path)
-        rel_path = rb_file.sub_ext('').relative_path_from(autoload_path).to_s
-        matcher = %r{\A(#{rel_path.to_camel_case})}i
+      def expected_const_defined_in_rb_file(rb_file)
+        rel_path = rb_file.sub_ext('').relative_path_from(current_path).to_s
+        matcher = %r{\A(#{StringInflections.to_camel_case rel_path})}i
         expanded_const.match(matcher).captures.fetch 0
       end
     end

data/lib/truck/context.rb

@@ -2,7 +2,7 @@ module Truck
   class Context
     attr :autoload_paths, :name, :root
 
-    def initialize(name, parent: nil, root:, autoload_paths: ['.'])
+    def initialize(name, root, parent, autoload_paths)
       @name   = name
       @root   = Pathname(root)
       @parent = parent
@@ -49,7 +49,7 @@ module Truck
       Truck.contexts.fetch(@parent.to_sym).mod
     end
 
-    def resolve_const(expanded_const, skip: nil)
+    def resolve_const(expanded_const, skip = nil)
       build_const_resolver(expanded_const, Array[skip]).resolve
     end
 
@@ -60,11 +60,7 @@ module Truck
     private
 
     def build_const_resolver(expanded_const, skip_files)
-      ConstResolver.new(
-        context: self,
-        expanded_const: String(expanded_const).dup.freeze,
-        skip_files: skip_files,
-      )
+      ConstResolver.new self, String(expanded_const).dup.freeze, skip_files
     end
 
     def build_mod
@@ -84,7 +80,7 @@ module Truck
   class AutoloadError < NameError
     attr :const, :rb_file
 
-    def initialize(const:, rb_file:)
+    def initialize(const, rb_file)
       @const   = const
       @rb_file = rb_file
     end

data/lib/truck/core_ext.rb

@@ -1,9 +1,9 @@
 class Module
   def const_missing(const)
-    offending_file = caller_locations.fetch(0).path
+    offending_file = caller[0]
     $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, current_file: offending_file
+      Truck::Autoloader.handle const, self, offending_file
     end
   rescue NameError => name_error
     if name_error.class == NameError

data/lib/truck/string_inflections.rb

@@ -1,30 +1,30 @@
 module Truck
   module StringInflections
-    refine String do
-      def to_camel_case
-        str = "_#{self}"
-        str.gsub!(%r{_[a-z]}) { |snake| snake.slice(1).upcase }
-        str.gsub!('/', '::')
-        str
-      end
+    extend self
+
+    def to_camel_case(str)
+      str = "_#{str}"
+      str.gsub!(%r{_[a-z]}) { |snake| snake.slice(1).upcase }
+      str.gsub!('/', '::')
+      str
+    end
 
-      def to_snake_case
-        str = gsub '::', '/'
-        # Convert FOOBar => FooBar
-        str.gsub! %r{[[:upper:]]{2,}} do |uppercase|
-          bit = uppercase[0]
-          bit << uppercase[1...-1].downcase
-          bit << uppercase[-1]
-          bit
-        end
-        str.gsub! %r{[[:lower:]][[:upper:]]+[[:lower:]]} do |camel|
-          bit = camel[0]
-          bit << '_'
-          bit << camel[1..-1].downcase
-        end
-        str.downcase!
-        str
+    def to_snake_case(str)
+      str = str.gsub '::', '/'
+      # Convert FOOBar => FooBar
+      str.gsub! %r{[[:upper:]]{2,}} do |uppercase|
+        bit = uppercase[0]
+        bit << uppercase[1..-1].downcase
+        bit
+      end
+      # Convert FooBar => foo_bar
+      str.gsub! %r{[[:lower:]][[:upper:]]+[[:lower:]]} do |camel|
+        bit = camel[0]
+        bit << '_'
+        bit << camel[1..-1].downcase
       end
+      str.downcase!
+      str
     end
   end
 end

data/lib/truck/version.rb

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

data/test/test_helper.rb

@@ -2,15 +2,13 @@ require "bundler"
 Bundler.setup
 
 require "minitest/autorun"
-require "minitest/reporters"
+require "minitest/red_green"
 
 require "fakefs/safe"
 require "ostruct"
 require "pathname"
 require "stringio"
 
-Minitest::Reporters.use! Minitest::Reporters::DefaultReporter.new
-
 require_relative "../lib/truck"
 
 $LOAD_PATH << "test/support"

data/test/unit/autoloader_test.rb

@@ -6,41 +6,41 @@ class AutoloaderTest < Minitest::Test
 
   def test_throws_constant_when_found
     const = assert_catches :const do
-      Truck::Autoloader.handle :A, from: Foo
+      Truck::Autoloader.handle :A, Foo
     end
     assert_equal 'Foo::A', const.name
   end
 
   def test_raises_error_when_const_not_found
     exception = assert_raises NameError do
-      Truck::Autoloader.handle :Abracadabra, from: Foo
+      Truck::Autoloader.handle :Abracadabra, Foo
     end
     assert_equal 'uninitialized constant Abracadabra (in Foo)', exception.message
   end
 
   def test_simple_implicit_namespace_case
-    Truck::Autoloader.handle :B, from: Foo
+    Truck::Autoloader.handle :B, Foo
     const = assert_catches :const do
-      Truck::Autoloader.handle :BA, from: Foo
+      Truck::Autoloader.handle :BA, Foo
     end
     assert_equal 'Foo::B::BA', const.name
     assert_nil Truck::Autoloader.current_autoloader
   end
 
   def test_cleanup_after_implicit_namespace
-    Truck::Autoloader.handle :B, from: Foo
+    Truck::Autoloader.handle :B, Foo
     assert_raises NameError do
-      Truck::Autoloader.handle :Abracadabra, from: Foo
+      Truck::Autoloader.handle :Abracadabra, Foo
     end
     assert_nil Truck::Autoloader.current_autoloader
   end
 
   def test_deeply_nested_module_with_implicit_namespaces
-    %i(C CA CAA).each do |implicit_namespace|
-      Truck::Autoloader.handle implicit_namespace, from: Foo
+    [:C, :CA, :CAA].each do |implicit_namespace|
+      Truck::Autoloader.handle implicit_namespace, Foo
     end
     const = assert_catches :const do
-      Truck::Autoloader.handle :CAAA, from: Foo
+      Truck::Autoloader.handle :CAAA, Foo
     end
     assert_equal 'Foo::C::CA::CAA::CAAA', const.name
   end
@@ -49,7 +49,7 @@ class AutoloaderTest < Minitest::Test
     @foo.resolve_const 'A::AB::ABA'
 
     const = assert_catches :const do
-      Truck::Autoloader.handle :ABB, from: Foo::A::AB::ABA
+      Truck::Autoloader.handle :ABB, Foo::A::AB::ABA
     end
     assert_equal 'Foo::A::AB::ABB', const.name
   end

data/test/unit/define_context_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class DefineContextTest < Minitest::Test
+  def test_must_supply_required_options
+    error = assert_raises ArgumentError do
+      Truck.define_context "hey"
+    end
+
+    assert_equal "missing keyword: root", error.message
+  end
+end

data/truck.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   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 "minitest-red_green"
   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.6
+  version: 0.8.7
 platform: ruby
 authors:
 - ntl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-04 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: minitest-red_green
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,7 @@ files:
 - test/test_helper.rb
 - test/unit/autoloader_test.rb
 - test/unit/context_test.rb
+- test/unit/define_context_test.rb
 - truck.gemspec
 homepage: https://github.com/ntl/truck
 licenses:
@@ -154,3 +155,4 @@ test_files:
 - test/test_helper.rb
 - test/unit/autoloader_test.rb
 - test/unit/context_test.rb
+- test/unit/define_context_test.rb