hyperloop-config 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f732c8828c572f731b2515c7e4feef8cf1a63ce
-  data.tar.gz: 40b1671bcfa35dea5db6d2c9185901b831961509
+  metadata.gz: c7d761c3c7af9c35b5834489e56fa78ef7a1107b
+  data.tar.gz: 96ff715e58fd5f36f23e2b989de319d166022b21
 SHA512:
-  metadata.gz: e9ba99620f956083f59a4bd0b1829c341366b5c0f3c7a3e6b69c790ec7f0743e3ccb3348fff5f7b372700f7857068d9ea069802f1ff5cf207ed4c03b0ddaaf54
-  data.tar.gz: a015d311cd0127c840684fbcb4d9a1b7907becc073ca580a3747162b3e9374ac6837e95f9e1f6a0f67fe1250008f73fb8338156364f9edd3634204a8ffd5d39f
+  metadata.gz: afc90a2b2247d849e5ab5e9c6bac0acce151b848c6361ca0da8d336a2154b8019439c2552457c3c3a53bb538df754baedc6875fb2f385db83b08ac2ccc4d5afe
+  data.tar.gz: 828c40c24b43d37c924041811a055b5539acf6c1635949946b9bc13099889f6dd7a7609d3697bc780e139ed219b86e3deb541e06d39cff3923a7fb3c753f8611

data/hyperloop-config.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "hyperloop-config"
-  spec.version       = "0.9.1"
+  spec.version       = "0.9.2"
   spec.authors       = ["catmando"]
   spec.email         = ["mitch@catprint.com"]
 

data/lib/hyperloop-config.rb

@@ -4,11 +4,11 @@ if RUBY_ENGINE == 'opal'
 else
   require 'opal'
   require 'hyperloop/config_settings'
-  require 'hyperloop/requires'
+  require 'hyperloop/imports'
   require 'hyperloop/client_readers'
   require 'hyperloop/on_client'
   require 'hyperloop/rail_tie' if defined? Rails
-  Hyperloop.require 'opal', gem: true
-  Hyperloop.require 'hyperloop-config', gem: true
+  Hyperloop.import 'opal', gem: true
+  Hyperloop.import 'hyperloop-config', gem: true
   Opal.append_path(File.expand_path('../', __FILE__).untaint)
 end

data/lib/hyperloop/client_stubs.rb

@@ -1,12 +1,12 @@
 module Hyperloop
   class << self
-    def require(value, gem: nil, override_with: nil, client_only: nil, tree: nil)
+    def import(*args)
     end
 
-    def require_tree(value, override_with: nil, client_only: nil)
+    def imports(*args)
     end
 
-    def require_gem(value, override_with: nil, client_only: nil)
+    def import_tree(*args)
     end
   end
 end

data/lib/hyperloop/{requires.rb → imports.rb}

@@ -1,46 +1,44 @@
 module Hyperloop
   class << self
-    def requires
-      @requires ||= []
+    def import_list
+      @import_list ||= []
     end
 
-    def require(value, gem: nil, instead_of: nil, client_only: nil, server_only: nil, tree: nil)
+    def import(value, gem: nil, instead_of: nil, client_only: nil, server_only: nil, tree: nil)
       if instead_of
-        current_spec = requires.detect { |old_value, *_rest| instead_of == old_value }
+        current_spec = import_list.detect { |old_value, *_rest| instead_of == old_value }
         if current_spec
           current_spec[0] = value
         else
           raise [
-            "Could not substitute require '#{instead_of}' with '#{value}'.  '#{instead_of}' not found.",
-            'The following requires are listed:',
-            *requires.collect { |old_value, *_rest| old_value }
+            "Could not substitute import '#{instead_of}' with '#{value}'.  '#{instead_of}' not found.",
+            'The following files are currently being imported:',
+            *import_list.collect { |old_value, *_rest| old_value }
           ].join("\n")
         end
       else
-        kind = if gem
-                 :gem
-               elsif tree
+        kind = if tree
                  :tree
+               else
+                 :gem
                end
-        requires << [value, !client_only, !server_only, kind]
+        import_list << [value, !client_only, !server_only, kind]
       end
     end
 
-    def unrequire(value)
-      require(nil, instead_of: value)
-    end
+    alias imports import
 
-    def require_tree(value, instead_of: nil, client_only: nil, server_only: nil)
-      require(value, instead_of: instead_of, client_only: client_only, server_only: server_only, tree: true)
+    def import_tree(value, instead_of: nil, client_only: nil, server_only: nil)
+      import(value, instead_of: instead_of, client_only: client_only, server_only: server_only, tree: true)
     end
 
-    def require_gem(value, instead_of: nil, client_only: nil, server_only: nil)
-      require(value, instead_of: instead_of, client_only: client_only, server_only: server_only, gem: true)
+    def cancel_import(value)
+      import(nil, instead_of: value)
     end
 
     def generate_requires(mode, file)
       puts "***** generating requires for #{mode} - #{file}"
-      requires.collect do |value, render_on_server, render_on_client, kind|
+      import_list.collect do |value, render_on_server, render_on_client, kind|
         next unless value
         next if mode == :client && !render_on_client
         next if mode == :server && !render_on_server

data/lib/hyperloop/rail_tie.rb

@@ -45,7 +45,7 @@ module Hyperloop
 
     config.after_initialize do |app|
       next unless config.hyperloop.auto_config
-      Hyperloop.require_tree('hyperloop')
+      Hyperloop.import_tree('hyperloop')
       next unless config.respond_to?(:react)
       if (opts = config.react.server_renderer_options)
         opts.merge! FILES

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperloop-config
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - catmando
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -185,9 +185,9 @@ files:
 - lib/hyperloop/client_readers.rb
 - lib/hyperloop/client_stubs.rb
 - lib/hyperloop/config_settings.rb
+- lib/hyperloop/imports.rb
 - lib/hyperloop/on_client.rb
 - lib/hyperloop/rail_tie.rb
-- lib/hyperloop/requires.rb
 homepage: http://ruby-hyperloop.io
 licenses:
 - MIT