webpacker_lite 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e2db317915bebedc04ee628df5ebb0d007cafd5
-  data.tar.gz: '047779354717394e059550b300f6b86f7e0653b4'
+  metadata.gz: 8ea5e5942f1f281d39534cc47a456e51e2257108
+  data.tar.gz: 89a00ce6bf138f78f8e381687c69d3932480f08c
 SHA512:
-  metadata.gz: 8a1f1f0931790a5004fbde87baa04ded96dcf69270f19c17a6e7459c0343b91439efa2ec7afccbb7c8a0d39b92e2814c4454dff8d8d728d40feb0652c124d3db
-  data.tar.gz: 24e05588ada561572186806b1e18e4fdd889072b525b485b8f2a8d2d9013837224834b5b193ed69ad85c9528737f42d64c0ac0cb0e92e8b49407cdf608d9ea3f
+  metadata.gz: d6124cf538517d2af41017c756fdfe95bb362eda73923314a44be3fa92db5016d6a3c212874d486226087fb9d86293fad1c0cab30106192e5872311208d26982
+  data.tar.gz: 3314e35bd8dc6118b891f4e51e6467c4d17e3a12f059925f8ce736e0dd81136c5c161aa9f82fb8fbd3c19df9e76494066b3d93c28f5201a16475e0dc46a87db6

data/CHANGELOG.md

@@ -6,6 +6,10 @@ Contributors: please follow the recommendations outlined at [keepachangelog.com]
 ## [Unreleased]
 *Please add entries here for your pull requests.*
 
+## [2.0.3] - 2017-05-29
+### Fixed
+* Fixed caching of manifest.json for tests. [#14](https://github.com/shakacode/webpacker_lite/pull/14) by [justin808](https://github.com/justin808).
+
 ## [2.0.2] - 2017-05-26
 ### Fixed
 * Fixed rake assets:clobber. [#11](https://github.com/shakacode/webpacker_lite/pull/11) by [dpuscher](https://github.com/dpuscher).
@@ -30,7 +34,8 @@ All in [#9](https://github.com/shakacode/webpacker_lite/pull/9) by [justin808](h
 ## [1.0.0] - 2017-05-03
 Initial release
 
-[Unreleased]: https://github.com/shakacode/webpacker_lite/compare/2.0.2...master
+[Unreleased]: https://github.com/shakacode/webpacker_lite/compare/2.0.3...master
+[2.0.3]: https://github.com/shakacode/react_on_rails/compare/2.0.2...2.0.3
 [2.0.2]: https://github.com/shakacode/react_on_rails/compare/2.0.1...2.0.2
 [2.0.1]: https://github.com/shakacode/react_on_rails/compare/2.0.0...2.0.1
 [2.0.0]: https://github.com/shakacode/react_on_rails/compare/1.0.0...2.0.0

data/CONTRIBUTING.md

@@ -45,6 +45,10 @@ or to autofix:
 bundle exec rubocop -a
 ```
 
+### Debugging
+
+Enable pry by setting an ENV value for `USE_PRY`. When you use pry, you may get a useless warning about circular references.
+
 ### All ci
 
 ```sh
@@ -67,10 +71,15 @@ What do project maintainers do? What sort of work is involved? [sstephenson](htt
 
 # Releasing
 
-If the version to bump is `2.0.1`
+Using [gem-release](https://github.com/svenfuchs/gem-release).
+
+If the version to bump is `2.0.3`
 
 ```
-gem bump --tag --push --version 2.0.1
+git checkout master
+git pull --rebase
+gem bump --version 2.0.3
+bundle
+git commit -m "Update Gemfile.lock"
+gem release --tag --push
 ```
-
-

data/Gemfile

@@ -8,4 +8,13 @@ gem "rubocop", ">= 0.47", require: false
 
 group :test do
   gem "minitest", "~> 5.10", "!= 5.10.2"
+
+  if ENV["USE_PRY"]
+    gem "pry"
+    gem "pry-byebug"
+    gem "pry-doc"
+    gem "pry-rails"
+    gem "pry-rescue"
+    gem "pry-stack_explorer"
+  end
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    webpacker_lite (2.0.1)
+    webpacker_lite (2.0.3)
       activesupport (>= 4.2)
       multi_json (~> 1.2)
       railties (>= 4.2)
@@ -9,39 +9,39 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.0)
-      actionpack (= 5.1.0)
+    actioncable (5.1.1)
+      actionpack (= 5.1.1)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.0)
-      actionpack (= 5.1.0)
-      actionview (= 5.1.0)
-      activejob (= 5.1.0)
+    actionmailer (5.1.1)
+      actionpack (= 5.1.1)
+      actionview (= 5.1.1)
+      activejob (= 5.1.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.0)
-      actionview (= 5.1.0)
-      activesupport (= 5.1.0)
+    actionpack (5.1.1)
+      actionview (= 5.1.1)
+      activesupport (= 5.1.1)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.0)
-      activesupport (= 5.1.0)
+    actionview (5.1.1)
+      activesupport (= 5.1.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.0)
-      activesupport (= 5.1.0)
+    activejob (5.1.1)
+      activesupport (= 5.1.1)
       globalid (>= 0.3.6)
-    activemodel (5.1.0)
-      activesupport (= 5.1.0)
-    activerecord (5.1.0)
-      activemodel (= 5.1.0)
-      activesupport (= 5.1.0)
+    activemodel (5.1.1)
+      activesupport (= 5.1.1)
+    activerecord (5.1.1)
+      activemodel (= 5.1.1)
+      activesupport (= 5.1.1)
       arel (~> 8.0)
-    activesupport (5.1.0)
+    activesupport (5.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -65,42 +65,44 @@ GEM
     mini_portile2 (2.1.0)
     minitest (5.10.1)
     multi_json (1.12.1)
-    nio4r (2.0.0)
+    nio4r (2.1.0)
     nokogiri (1.7.2)
       mini_portile2 (~> 2.1.0)
+    parallel (1.11.2)
     parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
-    rack (2.0.2)
+    rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.1.0)
-      actioncable (= 5.1.0)
-      actionmailer (= 5.1.0)
-      actionpack (= 5.1.0)
-      actionview (= 5.1.0)
-      activejob (= 5.1.0)
-      activemodel (= 5.1.0)
-      activerecord (= 5.1.0)
-      activesupport (= 5.1.0)
+    rails (5.1.1)
+      actioncable (= 5.1.1)
+      actionmailer (= 5.1.1)
+      actionpack (= 5.1.1)
+      actionview (= 5.1.1)
+      activejob (= 5.1.1)
+      activemodel (= 5.1.1)
+      activerecord (= 5.1.1)
+      activesupport (= 5.1.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.1.0)
+      railties (= 5.1.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.1.0)
-      actionpack (= 5.1.0)
-      activesupport (= 5.1.0)
+    railties (5.1.1)
+      actionpack (= 5.1.1)
+      activesupport (= 5.1.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.2.2)
       rake
     rake (12.0.0)
-    rubocop (0.48.1)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)

data/README.md

@@ -1,6 +1,9 @@
 # Webpacker Lite
 ![Gem Version](https://badge.fury.io/rb/webpacker_lite.svg)
 
+**VERSION 8 of [React on Rails](https://github.com/shakacode/react_on_rails) is super close!!!** [VERSION 8.0.0-beta.3](https://rubygems.org/gems/react_on_rails/versions/8.0.0.beta.3) has shipped with [webpacker_lite](https://github.com/shakacode/webpacker_lite) support! Please try [the 8.0.0-beta.3 beta](https://rubygems.org/gems/react_on_rails/versions/8.0.0.beta.3) and please report issues! We're **SUPER** close as we've also upgraded the [shakacode/react-webpack-rails-tutorial](https://github.com/shakacode/react-webpack-rails-tutorial) with [PR #395](https://github.com/shakacode/react-webpack-rails-tutorial/pull/395). That PR shows the changes needed to go to Webpacker Lite.
+
+
 *A slimmer version of Webpacker*
 
 Webpacker Lite provides similar webpack enabled view helpers from [Webpacker](https://github.com/rails/webpacker).

data/lib/webpacker_lite/configuration.rb

@@ -38,7 +38,7 @@ class WebpackerLite::Configuration < WebpackerLite::FileLoader
     end
 
     def configuration
-      load_instance if WebpackerLite::Env.development?
+      load_instance
       raise WebpackerLite::FileLoader::FileLoaderError.new("WebpackerLite::Configuration.load_instance must be called first") unless instance
       instance.data
     end

data/lib/webpacker_lite/env.rb

@@ -8,10 +8,6 @@ class WebpackerLite::Env < WebpackerLite::FileLoader
       instance.data
     end
 
-    def development?
-      current == "development"
-    end
-
     def hot_loading?
       (ENV["HOT_RELOADING"].present? && (
       ENV["HOT_RELOADING"].upcase == "YES" ||

data/lib/webpacker_lite/file_loader.rb

@@ -4,21 +4,34 @@ class WebpackerLite::FileLoader
   class FileLoaderError < StandardError; end
 
   class_attribute :instance
-  attr_accessor :data
+  attr_accessor :data, :mtime
 
   class << self
     def load_instance(path = file_path)
+      # Assume production is 100% cached
+      return if self.instance && # if we have a singleton
+        (env == "production" || # skip if production bc always cached
+          self.instance.mtime == File.mtime(path)) # skip if mtime not changed
+
       self.instance = new(path)
     end
 
     def file_path
       raise FileLoaderError.new("Subclass of WebpackerLite::FileLoader should override this method")
     end
+
+    private
+
+    # Prefer the NODE_ENV to the rails env.
+    def env
+      ENV["NODE_ENV"].presence || Rails.env
+    end
   end
 
   private
     def initialize(path)
       @path = path
+      @mtime = File.mtime(path)
       @data = load_data
     end
 

data/lib/webpacker_lite/manifest.rb

@@ -41,7 +41,7 @@ class WebpackerLite::Manifest < WebpackerLite::FileLoader
     def lookup(name)
       instance.confirm_manifest_exists
 
-      load_instance if WebpackerLite::Env.development? || instance.data.empty?
+      load_instance
       raise WebpackerLite::FileLoader::FileLoaderError.new("WebpackerLite::Manifest.load must be called first") unless instance
       instance.data[name.to_s]
     end

data/lib/webpacker_lite/version.rb

@@ -1,3 +1,3 @@
 module WebpackerLite
-  VERSION = "2.0.2".freeze
+  VERSION = "2.0.3".freeze
 end

data/test/configuration_test.rb

@@ -2,12 +2,12 @@ require "webpacker_test"
 
 class ConfigurationTest < Minitest::Test
   def test_manifest_path
-    manifest_path = File.join(File.dirname(__FILE__), "test_app/public/webpack", "manifest.json").to_s
-    assert_equal WebpackerLite::Configuration.manifest_path.to_s, manifest_path
+    manifest_path = File.join(File.dirname(__FILE__), "test_app/public/webpack/test", "manifest.json").to_s
+    assert_equal manifest_path, WebpackerLite::Configuration.manifest_path.to_s
   end
 
   def test_output_path
-    output_path = File.join(File.dirname(__FILE__), "test_app/public/webpack").to_s
-    assert_equal WebpackerLite::Configuration.webpack_public_output_dir.to_s, output_path
+    output_path = File.join(File.dirname(__FILE__), "test_app/public/webpack/test").to_s
+    assert_equal output_path, WebpackerLite::Configuration.webpack_public_output_dir.to_s
   end
 end

data/test/env_test.rb

@@ -2,11 +2,11 @@ require "webpacker_test"
 
 class EnvTest < Minitest::Test
   def test_current_env
-    assert_equal WebpackerLite::Env.current, "production"
+    assert_equal Rails.env, WebpackerLite::Env.current
   end
 
   def test_file_path
-    correct_path = File.join(File.dirname(__FILE__), "test_app/config", "webpacker_lite.yml").to_s
-    assert_equal WebpackerLite::Env.file_path.to_s, correct_path
+    correct_path = File.join(File.dirname(__FILE__), "test_app", "config", "webpacker_lite.yml").to_s
+    assert_equal correct_path, WebpackerLite::Env.file_path.to_s
   end
 end

data/test/helper_test.rb

@@ -7,17 +7,17 @@ class HelperTest < ActionView::TestCase
   end
 
   def test_asset_pack_path
-    assert_equal @view.asset_pack_path("bootstrap.js"), "/webpack/bootstrap-300631c4f0e0f9c865bc.js"
-    assert_equal @view.asset_pack_path("bootstrap.css"), "/webpack/bootstrap-c38deda30895059837cf.css"
+    assert_equal @view.asset_pack_path("bootstrap.js"), "/webpack/test/bootstrap-300631c4f0e0f9c865bc.js"
+    assert_equal @view.asset_pack_path("bootstrap.css"), "/webpack/test/bootstrap-c38deda30895059837cf.css"
   end
 
   def test_javascript_pack_tag
-    script = %(<script src="/webpack/bootstrap-300631c4f0e0f9c865bc.js"></script>)
+    script = %(<script src="/webpack/test/bootstrap-300631c4f0e0f9c865bc.js"></script>)
     assert_equal @view.javascript_pack_tag("bootstrap.js"), script
   end
 
   def test_stylesheet_pack_tag
-    expected_style = %(<link rel="stylesheet" media="screen" href="/webpack/bootstrap-c38deda30895059837cf.css" />)
+    expected_style = %(<link rel="stylesheet" media="screen" href="/webpack/test/bootstrap-c38deda30895059837cf.css" />)
     assert_equal @view.stylesheet_pack_tag("bootstrap.css"), expected_style
   end
 end

data/test/manifest_test.rb

@@ -2,12 +2,12 @@ require "webpacker_test"
 
 class ManifestTest < Minitest::Test
   def test_file_path
-    file_path = File.join(File.dirname(__FILE__), "test_app/public/webpack", "manifest.json").to_s
+    file_path = File.join(File.dirname(__FILE__), "test_app/public/webpack/test", "manifest.json").to_s
     assert_equal WebpackerLite::Manifest.file_path.to_s, file_path
   end
 
   def test_lookup_exception
-    manifest_path = File.join(File.dirname(__FILE__), "test_app/public/webpack", "manifest.json").to_s
+    manifest_path = File.join(File.dirname(__FILE__), "test_app/public/webpack/test", "manifest.json").to_s
     asset_file = "calendar.js"
     msg = <<-MSG
         WebpackerLite can't find #{asset_file} in your manifest #{manifest_path}. Possible causes:

data/test/test_app/config/webpacker_lite.yml

@@ -0,0 +1,27 @@
+# Note: Base output directory of /public is assumed for static files
+default: &default
+  manifest: manifest.json
+  # Used in your webpack configuration. Must be created in the
+  # webpack_public_output_dir folder
+
+development:
+  <<: *default
+  # generated files for development, in /public/webpack/development
+  webpack_public_output_dir: webpack/development
+
+  # Default is localhost:3500
+  hot_reloading_host: localhost:3500
+
+  # Developer note: considering removing this option so it can ONLY be turned by using an ENV value.
+  # Default is false, ENV 'HOT_RELOAD' will always override
+  hot_reloading_enabled_by_default: false
+
+test:
+  <<: *default
+  # generated files for tests, in /public/webpack/test
+  webpack_public_output_dir: webpack/test
+
+production:
+  <<: *default
+  # generated files for tests, in /public/webpack/production
+  webpack_public_output_dir: webpack/production

data/test/webpacker_test.rb

@@ -1,10 +1,16 @@
 # frozen_string_literal: true
 
+if ENV["USE_PRY"]
+  require "pry"
+end
+
 require "minitest/autorun"
 require "rails"
 require "rails/test_help"
 require "webpacker_lite"
 
+Rails.env = "test"
+
 module TestApp
   class Application < ::Rails::Application
     config.root = File.join(File.dirname(__FILE__), "test_app")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webpacker_lite
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - David Heinemeier Hansson, Justin Gordon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-27 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -100,7 +100,8 @@ files:
 - test/helper_test.rb
 - test/manifest_test.rb
 - test/test_app/config/secrets.yml
-- test/test_app/public/webpack/manifest.json
+- test/test_app/config/webpacker_lite.yml
+- test/test_app/public/webpack/test/manifest.json
 - test/webpacker_test.rb
 - webpacker.gemspec
 - yarn.lock
@@ -124,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Asset Helpers for Webpack
@@ -134,5 +135,6 @@ test_files:
 - test/helper_test.rb
 - test/manifest_test.rb
 - test/test_app/config/secrets.yml
-- test/test_app/public/webpack/manifest.json
+- test/test_app/config/webpacker_lite.yml
+- test/test_app/public/webpack/test/manifest.json
 - test/webpacker_test.rb