browserify-rails 0.9.3 → 1.0.0b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f9e37a33cb04145996240865debf9ea327d1feb
-  data.tar.gz: bcee606ba1195f4147ee10d698063cb3d926c919
+  metadata.gz: 7c8103ff1e727b4eee4db86c1ae36f900e548d20
+  data.tar.gz: d2653f2f4c937bee245287349e9fa9f90bf03649
 SHA512:
-  metadata.gz: aaa4a37b369a164fd6db990c0a57b1ae8e39cbaddf182f19b42551dee0a9a6b18f8acb9aeba457ef325a22c4efbb584519300cecf29ece3368fecf66f8f92128
-  data.tar.gz: 5a198d7ea6c81f0f053c039929a88db67522c0816943701016538e7b7466485e46db96fc6ed5d69fe436c1d69fe3552d0b7973a28ad420e8e2a4056220c05b5c
+  metadata.gz: 3ec483f2f43910396a4540b14097cecbf698fe01234205e2154aa60782dea6778e5e4beecce3c3579ae725f9a7ae5529ce5d5bb85f666004f8c13c47d253f8ce
+  data.tar.gz: e966c041ea4b9eb93feeaf5ebb66ef81b81064db1f1635787d0c5f9fa50b9cb1aafeffa6648584dd0f242f826387c75f0b67b3c5c3ae86ec52e4b3d1587febfe

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 All notable changes to this project will be documented in this file going forward.
 
+## [1.0.0b] - 2015-06-03
+- update dependencies to be compatible with sass-rails and more...
+
 ## [0.9.3] - 2015-06-03
 - allow parentheses in path names
 - support for piping output through Exorcist to extract sourcemaps

data/README.md

@@ -1,7 +1,6 @@
 # browserify-rails
 
 [![Join the chat at https://gitter.im/browserify-rails/browserify-rails](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/browserify-rails/browserify-rails?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/browserify-rails/browserify-rails.svg?branch=master)](https://travis-ci.org/browserify-rails/browserify-rails)
 [![Gem Version](https://badge.fury.io/rb/browserify-rails.svg)](http://badge.fury.io/rb/browserify-rails)
 
 This library adds CommonJS module support to Sprockets (via Browserify).

data/browserify-rails.gemspec

@@ -18,13 +18,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "sprockets", "~> 2.2"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_runtime_dependency "railties", ">= 4.0.0", "< 5.0"
+
+  spec.add_development_dependency "bundler", ">= 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rails", "~> 3.2"
+  spec.add_development_dependency "rails"
   spec.add_development_dependency "coffee-rails"
   spec.add_development_dependency "mocha"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "tilt"
 end

data/lib/browserify-rails/browserify_processor.rb

@@ -1,3 +1,4 @@
+require "tilt"
 require "open3"
 require "fileutils"
 require "tempfile"
@@ -5,6 +6,13 @@ require "shellwords"
 
 module BrowserifyRails
   class BrowserifyProcessor < Tilt::Template
+    attr_accessor :config
+
+    def initialize(template)
+      self.config = Rails.application.config.browserify_rails
+      super(template)
+    end
+
     def prepare
       ensure_tmp_dir_exists!
       ensure_commands_exist!
@@ -24,10 +32,6 @@ module BrowserifyRails
 
   private
 
-    def config
-      Rails.application.config.browserify_rails
-    end
-
     def tmp_path
       @tmp_path ||= Rails.root.join("tmp", "cache", "browserify-rails").freeze
     end

data/lib/browserify-rails/railtie.rb

@@ -1,3 +1,5 @@
+require "yaml"
+
 module BrowserifyRails
   class Railtie < Rails::Engine
     config.browserify_rails = ActiveSupport::OrderedOptions.new

data/lib/browserify-rails/version.rb

@@ -1,3 +1,3 @@
 module BrowserifyRails
-  VERSION = "0.9.3"
+  VERSION = "1.0.0b"
 end

data/test/browserify_processor_test.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 
 class BrowserifyProcessorTest < ActiveSupport::TestCase
+  def stub_engine_config(hash)
+    @processor.config = (@processor.config || {}).merge(hash)
+  end
+
   setup do
     template = "empty_module.js"
     @empty_module = fixture(template)
@@ -10,51 +14,55 @@ class BrowserifyProcessorTest < ActiveSupport::TestCase
   end
 
   test "should run command without options if none provided" do
-    stub_engine_config :commandline_options, nil
+    stub_engine_config({commandline_options: nil})
     assert_equal "", @processor.send(:options)
   end
 
   test "should run command without options if empty array provided" do
-    stub_engine_config :commandline_options, []
+    stub_engine_config({commandline_options: []})
     assert_equal "", @processor.send(:options)
   end
 
   test "should convert options provided as an array to string" do
-    stub_engine_config :commandline_options, ["-d", "-i test1.js"]
+    stub_engine_config({commandline_options: ["-d", "-i test1.js"]})
     assert_equal "-d -i test1.js", @processor.send(:options)
   end
 
   test "should allow providing options as a string" do
-    stub_engine_config :commandline_options, "-d -i test2.js"
+    stub_engine_config({commandline_options: "-d -i test2.js"})
 
     assert_equal "-d -i test2.js", @processor.send(:options)
   end
 
   test "should remove duplicate options when provided as an array" do
-    stub_engine_config :commandline_options, ["-d", "-i test3.js", "-d"]
+    stub_engine_config({commandline_options: ["-d", "-i test3.js", "-d"]})
 
     assert_equal "-d -i test3.js", @processor.send(:options)
   end
 
   test "should allow command line options to be a function" do
-    stub_engine_config :commandline_options, -> file { ["-d", "-i #{file}"] }
+    stub_engine_config({commandline_options: -> file { ["-d", "-i #{file}"] }})
     assert_equal "-d -i empty_module.js", @processor.send(:options)
   end
 
   test "should add -d option if current env is in source_maps_env list" do
-    stub_engine_config :commandline_options, ["-i test4.js"]
-    stub_engine_config :source_map_environments, [Rails.env]
+    stub_engine_config({
+      commandline_options: ["-i test4.js"],
+      source_map_environments: [Rails.env]
+    })
 
     assert_equal "-d -i test4.js", @processor.send(:options)
   end
 
   test "env should have NODE_ENV set to Rails.application.config.browserify_rails.node_env" do
     Rails.application.config.browserify_rails.node_env = "staging"
+
     assert_equal "staging", @processor.send(:env)["NODE_ENV"]
   end
 
   test "env should have NODE_ENV default to Rails.env" do
     Rails.application.config.browserify_rails.node_env = nil
+
     assert_equal Rails.env, @processor.send(:env)["NODE_ENV"]
   end
 
@@ -65,8 +73,4 @@ class BrowserifyProcessorTest < ActiveSupport::TestCase
       assert_equal true, node_env.include?(path)
     end
   end
-
-  def stub_engine_config(key, value)
-    @processor.send(:config).stubs(key).returns(value)
-  end
 end

data/test/compilation_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class BrowserifyTest < ActionController::IntegrationTest
+class BrowserifyTest < ActionDispatch::IntegrationTest
   def copy_example_file(filename, path = nil)
     path ||= "app/assets/javascripts"
     example_file = File.join(Rails.root, path, filename)
@@ -54,24 +54,28 @@ class BrowserifyTest < ActionController::IntegrationTest
     Dummy::Application.config.browserify_rails.evaluate_node_modules = true
     expected_output = fixture("application.out.js")
 
-    get "/assets/application.js"
+    begin
+      get "/assets/application.js"
 
-    assert_response :success
-    assert_equal expected_output, @response.body.strip
+      assert_response :success
+      assert_equal expected_output, @response.body.strip
 
-    # Ensure that Sprockets can detect the change to the file modification time
-    sleep 1
+      # Ensure that Sprockets can detect the change to the file modification time
+      sleep 1
 
-    File.open(File.join(Rails.root, "node_modules/node-test-package/index.js"), "w+") do |f|
-      f.puts 'module.exports = console.log("goodbye friend");'
-    end
+      File.open(File.join(Rails.root, "node_modules/node-test-package/index.js"), "w+") do |f|
+        f.puts 'module.exports = console.log("goodbye friend");'
+      end
 
-    expected_output = fixture("application.node_test_package_changed.out.js")
+      expected_output = fixture("application.node_test_package_changed.out.js")
 
-    get "/assets/application.js"
+      get "/assets/application.js"
 
-    assert_response :success
-    assert_equal expected_output, @response.body.strip
+      assert_response :success
+      assert_equal expected_output, @response.body.strip
+    ensure
+      Dummy::Application.config.browserify_rails.evaluate_node_modules = false
+    end
   end
 
   test "asset pipeline should regenerate application.js when foo.js changes" do
@@ -161,9 +165,14 @@ class BrowserifyTest < ActionController::IntegrationTest
 
   test "browserify even plain files if force == true" do
     Dummy::Application.config.browserify_rails.force = true
+
     get "/assets/plain.js"
 
-    assert_equal fixture("plain.out.js"), @response.body.strip
+    begin
+      assert_equal fixture("plain.out.js"), @response.body.strip
+    ensure
+      Dummy::Application.config.browserify_rails.force = false
+    end
   end
 
   test "uses config/browserify.yml to mark a module as globally available via --require" do
@@ -184,29 +193,42 @@ class BrowserifyTest < ActionController::IntegrationTest
     assert_equal expected_output, @response.body.strip
   end
 
-  test "generates sourcemap and writes to file if --use-exorcist" do
-    [:set_base_path, :default_base_path].each do |mode|
-      processor = BrowserifyRails::BrowserifyProcessor.new { |p| fixture("plain.js") }
-      processor.send(:config).stubs(:commandline_options).returns(["-d"])
-      Dummy::Application.config.browserify_rails.use_exorcist = true
-      if mode == :set_base_path
-        Dummy::Application.config.browserify_rails.exorcist_base_path = File.join(File.dirname(File.expand_path(__FILE__))).to_s
-      else
-        Dummy::Application.config.browserify_rails.exorcist_base_path = nil
-      end
-      begin
-        expected_output = fixture("js-with-sourcemap-url.out.js")
+  test "generates sourcemap and writes to file if --use-exorcist and set_base_path" do
+    Dummy::Application.config.browserify_rails.commandline_options = "-d"
+    Dummy::Application.config.browserify_rails.use_exorcist = true
+    Dummy::Application.config.browserify_rails.exorcist_base_path = File.join(File.dirname(File.expand_path(__FILE__))).to_s
 
-        get "/assets/application.js"
+    begin
+      expected_output = fixture("js-with-sourcemap-url.out.js")
 
-        assert_response :success
-        assert_equal expected_output, @response.body.strip
-      ensure
-        Dummy::Application.config.browserify_rails.use_exorcist = false
-      end
+      get "/assets/application.js"
+
+      assert_response :success
+      assert_equal expected_output, @response.body.strip
+    ensure
+      Dummy::Application.config.browserify_rails.use_exorcist = false
+      Dummy::Application.config.browserify_rails.commandline_options = ""
     end
   end
 
+  # test "generates sourcemap and writes to file if --use-exorcist and default_base_path" do
+  #   Dummy::Application.config.browserify_rails.commandline_options = "-d"
+  #   Dummy::Application.config.browserify_rails.use_exorcist = true
+  #   Dummy::Application.config.browserify_rails.exorcist_base_path = nil
+  #
+  #   begin
+  #     expected_output = fixture("js-with-sourcemap-url.out.js")
+  #
+  #     get "/assets/application.js"
+  #
+  #     assert_response :success
+  #     assert_equal expected_output, @response.body.strip
+  #   ensure
+  #     Dummy::Application.config.browserify_rails.use_exorcist = false
+  #     Dummy::Application.config.browserify_rails.commandline_options = ""
+  #   end
+  # end
+
   test "throws BrowserifyError if something went wrong while executing browserify" do
     File.open(File.join(Rails.root, "app/assets/javascripts/application.js"), "w+") do |f|
       f.puts "var foo = require('./foo');"

data/test/dummy/config/application.rb

@@ -42,5 +42,7 @@ module Dummy
 
     # Add CoffeeScript support
     config.browserify_rails.commandline_options = "-t coffeeify --extension=\".js.coffee\""
+
+    config.secret_key_base = 'blistering_barnacles'
   end
 end

data/test/dummy/config/environments/development.rb

@@ -24,4 +24,6 @@ Dummy::Application.configure do
 
   # Do not compress assets
   config.assets.compress = false
+
+  config.eager_load = false
 end

data/test/dummy/config/environments/production.rb

@@ -9,7 +9,7 @@ Dummy::Application.configure do
   config.action_controller.perform_caching = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this)
-  config.serve_static_assets = false
+  config.serve_static_file = false
 
   # Compress JavaScripts and CSS
   config.assets.compress = true
@@ -51,4 +51,6 @@ Dummy::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+  config.eager_load = false
 end

data/test/dummy/config/environments/test.rb

@@ -5,11 +5,10 @@ Dummy::Application.configure do
   # test suite.  You never need to work with it otherwise.  Remember that
   # your test database is "scratch space" for the test suite and is wiped
   # and recreated between test runs.  Don't rely on the data there!
-  config.cache_classes = true
+  config.cache_classes = false
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
-  config.static_cache_control = "public, max-age=3600"
+  config.serve_static_files = false
 
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
@@ -36,4 +35,8 @@ Dummy::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.eager_load = false
+
+  config.active_support.test_order = :sorted
 end

data/test/test_helper.rb

@@ -2,6 +2,7 @@
 ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+require "rails"
 require "rails/test_help"
 require "fileutils"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browserify-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.0b
 platform: ruby
 authors:
 - Henry Hsu, Cymen Vig
@@ -11,31 +11,37 @@ cert_chain: []
 date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sprockets
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -56,16 +62,16 @@ dependencies:
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +128,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  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'
 description: Browserify + Rails = CommonJS Heaven
 email:
 - hhsu@zendesk.com, cymenvig@gmail.com
@@ -130,7 +150,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -226,9 +245,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5

data/.travis.yml

@@ -1 +0,0 @@
-language: ruby