webpack_rails 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24eb2d5b3f17a410dd75aaefd6e0e4203df63f30
-  data.tar.gz: a2c3d47d9286ffee33128a6489d68e48ffb5427d
+  metadata.gz: d2d0ada939f5edb55688dd0f9cdc7fc7b1978a36
+  data.tar.gz: 8594f00093d00e47869054500632562d15781ff5
 SHA512:
-  metadata.gz: e125bf7ef05f97af37333b81bafcccf0c9f3dc136668d2fbf16222efea388ba0b9475c83197178459879a7a774b9c245389e84db965abea20eebf7125fee456f
-  data.tar.gz: 1c11739dc521a5c47b1d60e489ef1cc3b3770f0bd5a596a74f57d8c52bb045e15df0c8c2ef585a8330a200e56356e3831d30b58639ae78224c0744a26cf3cf20
+  metadata.gz: 5fede1ccbff8d7554256e9996c0a220e399a2cf2c8588c3e18e5a5834c96e7a3b461828dbe495b8776088fc672713f7ecbf2251f7f8167875b2ee7a470052a90
+  data.tar.gz: f99da52900194cf2737946b6d24ed33085a33993d02776c0a3bd78d3d352cef56d4cb18e3c0be424c04c023c81bf2c6537d701fd374ad74b9a71a141f068f8a3

data/lib/webpack_rails.rb

@@ -2,5 +2,6 @@ module WebpackRails
   require_relative './webpack_rails/require_directive_processor'
   require_relative './webpack_rails/task'
   require_relative './webpack_rails/processor'
+  require_relative './webpack_rails/helper'
   require_relative './webpack_rails/engine'
 end

data/lib/webpack_rails/config.rb

@@ -0,0 +1,8 @@
+module WebpackRails::Config
+  DEFAULT_CONFIG = {
+    dev_server: false,
+    protocol: 'http',
+    host: 'localhost',
+    port: 9876,
+  }
+end

data/lib/webpack_rails/engine.rb

@@ -1,10 +1,15 @@
 require_relative './sprockets_environment'
+require_relative './helper'
+require_relative './config'
 
 module WebpackRails
   class Engine < ::Rails::Engine
     engine_name 'webpack'
 
     config.webpack_rails = ActiveSupport::OrderedOptions.new
+    WebpackRails::Config::DEFAULT_CONFIG.each do |k, v|
+      config.webpack_rails.[]= k, v
+    end
 
     initializer :setup_webpack_rails, after: 'sprockets.environment', group: :all do |app|
       app.config.assets.configure do |env|
@@ -15,6 +20,12 @@ module WebpackRails
       end
     end
 
+    config.after_initialize do
+      ActiveSupport.on_load(:action_view) do
+        include WebpackRails::Helper
+      end
+    end
+
     rake_tasks do
       load 'webpack_rails/webpack.rake'
     end

data/lib/webpack_rails/helper.rb

@@ -0,0 +1,14 @@
+# view helper to resolve bundle asset file url (falling back to sprockets)
+
+module WebpackRails
+  module Helper
+    def webpack_bundle_asset(bundle_filename)
+      webpack_config = Rails.application.config.webpack_rails
+      if webpack_config.dev_server
+        "#{webpack_config[:protocol]}://#{webpack_config[:host]}:#{webpack_config[:port]}/#{bundle_filename}"
+      else
+        asset_path bundle_filename
+      end
+    end
+  end
+end

data/lib/webpack_rails/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack_rails",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "",
   "main": "webpack-dev-server.js",
   "scripts": {

data/lib/webpack_rails/sprockets_environment.rb

@@ -2,23 +2,17 @@ require 'sprockets'
 require 'webpack_rails/sprockets_cached_environment'
 require 'webpack_rails/require_directive_processor'
 require 'webpack_rails/processor'
+require 'webpack_rails/config'
 
 module WebpackRails
   class SprocketsEnvironment
-    DEFAULT_WEBPACK_TASK_CONFIG = {
-      dev_server: false,
-      protocol: 'http',
-      host: 'localhost',
-      port: 9876,
-    }
-
     module EnvironmentWebpackInstanceMethods
       def webpack_task_config=(new_webpack_task_config)
         @webpack_task_config = new_webpack_task_config
       end
 
       def webpack_task_config
-        @webpack_task_config.merge(DEFAULT_WEBPACK_TASK_CONFIG).merge(@webpack_task_config)
+        WebpackRails::Config::DEFAULT_CONFIG.clone.merge(@webpack_task_config)
       end
 
       def install_webpack_task_processors!

data/lib/webpack_rails/task.rb

@@ -66,7 +66,7 @@ module WebpackRails
       def build_once(webpack_task_config)
         WebpackRails::Task.with_app_node_path do
           webpack_cmd_script = `#{WebpackRails::Task.node_command} -e "process.stdout.write(require.resolve('webpack/bin/webpack.js'))"`
-          system "#{WebpackRails::Task.node_command} #{webpack_cmd_script} --config #{webpack_task_config[:webpack_config_file]}"
+          system "#{WebpackRails::Task.node_command} '#{webpack_cmd_script}' --config #{webpack_task_config[:webpack_config_file]}"
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpack_rails
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - James Friend
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-31 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: node_task
@@ -52,7 +52,9 @@ extra_rdoc_files: []
 files:
 - lib/webpack_rails.rb
 - lib/webpack_rails/ErrorMessagePlugin.js
+- lib/webpack_rails/config.rb
 - lib/webpack_rails/engine.rb
+- lib/webpack_rails/helper.rb
 - lib/webpack_rails/log.js
 - lib/webpack_rails/node_modules/cors/CONTRIBUTING.md
 - lib/webpack_rails/node_modules/cors/LICENSE