rack-scriptstacker 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc281f256f78497a6f6af1718b8d8c13826795aa
-  data.tar.gz: aa30c150530591876cc4b4275250b17ca2bee526
+  metadata.gz: a914ef1f5f89b0925e4ae1edc1ab4ac5440adf9b
+  data.tar.gz: 2714b80f7f59306baa672aa2cf005a3840dd9d80
 SHA512:
-  metadata.gz: 5904dc5fabccb038ae238e4f0a132713d61027ee6445fcee5075558a2b13f739398f1aba8ea96648c2e4269e4a25b3741d67c0c5cea3f98547717ba73adbb454
-  data.tar.gz: 7acc8417e626b0322b3efc02ba4e4e431ed6d5c3d5647415013a62e863cbbfaf2abdc01cb3bd11d61326f3b8a3610b9f5f2e8cfd9179acef1a6b8a47924673fb
+  metadata.gz: c26c47ebd502140d558b493a664ee7e32ce6d35fbe210bbd89b43e9e85e77256c5f48afeeac9f613d74227eb746c481b20a1b15ab99d1e90eb25d8fc3ed010cc
+  data.tar.gz: f357d5aa3aa3bb3e04e2bf1dab8e310553a4326c0728bd27950bc0a10418c22c00f1af4028c66e15c88476af5da285f7824042012766d593873d3a3ea32771e9

data/.gitignore

@@ -1 +1,2 @@
 Gemfile.lock
+pkg/

data/lib/rack/scriptstacker/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class ScriptStacker
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/rack/scriptstacker.rb

@@ -1,14 +1,8 @@
-require 'rack/scriptstacker/version'
 require 'rack'
 
-class ::Hash
-  def recursive_merge other
-    merger = proc do |key, v1, v2|
-      Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2
-    end
-    self.merge(other, &merger)
-  end
-end
+require 'cantrips/hash/recursive_merge'
+
+require 'rack/scriptstacker/version'
 
 module Rack
   class ScriptStacker

data/rack-scriptstacker.gemspec

@@ -4,22 +4,23 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rack/scriptstacker/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "rack-scriptstacker"
+  spec.name          = 'rack-scriptstacker'
   spec.version       = Rack::ScriptStacker::VERSION
-  spec.authors       = ["Max Cantor"]
-  spec.email         = ["max@maxcantor.net"]
+  spec.authors       = ['Max Cantor']
+  spec.email         = ['max@maxcantor.net']
   spec.summary       = %q{Quickly inject static file lists into served HTML.}
-  spec.homepage      = "http://github.com/mcantor/rack-scriptstacker"
-  spec.license       = "MIT"
+  spec.homepage      = 'http://github.com/mcantor/rack-scriptstacker'
+  spec.license       = 'WTFPL'
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "rack", "~> 1.6"
+  spec.add_dependency 'rack', '~> 1.6'
+  spec.add_dependency 'cantrips'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.3"
+  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-scriptstacker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Max Cantor
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2015-07-22 00:00:00.000000000 Z
+date: 2015-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,20 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: cantrips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +70,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
 description: 
 email:
 - max@maxcantor.net
@@ -76,17 +90,14 @@ files:
 - ".gitignore"
 - ".rspec"
 - Gemfile
-- LICENSE.txt
 - README.md
 - Rakefile
 - lib/rack/scriptstacker.rb
 - lib/rack/scriptstacker/version.rb
 - rack-scriptstacker.gemspec
-- spec/scriptstacker_spec.rb
-- spec/spec_helper.rb
 homepage: http://github.com/mcantor/rack-scriptstacker
 licenses:
-- MIT
+- WTFPL
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -108,6 +119,4 @@ rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Quickly inject static file lists into served HTML.
-test_files:
-- spec/scriptstacker_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2015 Max Cantor
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/spec/scriptstacker_spec.rb

@@ -1,204 +0,0 @@
-require 'pry'
-require 'rack/scriptstacker'
-
-def smart_deindent str
-  first_line_indent = str.match(/^\s*/).to_s.size
-  str.gsub(/^\s{#{first_line_indent}}/, '')
-end
-
-def app_with_body body
-  lambda { |env| [200, {'Content-Type' => 'text/html'}, [body]] }
-end
-
-describe Rack::ScriptStacker do
-  let(:js_files) { ['main.js', 'util.js'] }
-  let(:vendor_js_files) { ['jquery.js', 'blogo_web.js'] }
-  let(:css_files) { ['main.css', '_whatever.css'] }
-  let(:config) do
-    {
-      configure_static: false,
-      inject_mode: Rack::ScriptStacker::InjectMode::SLOT
-    }
-  end
-  let(:stack_spec) do
-    Proc.new {
-      css 'static/css'
-      javascript 'static/javascripts'
-    }
-  end
-  let(:middleware) do
-    Rack::ScriptStacker.new app_with_body(body), config, &stack_spec
-  end
-
-  before :each do
-    allow_any_instance_of(Rack::ScriptStackerUtils::Stacker).to receive(:files_for).with('static/css/').and_return(css_files)
-    allow_any_instance_of(Rack::ScriptStackerUtils::Stacker).to receive(:files_for).with('static/javascripts/').and_return(js_files)
-    allow_any_instance_of(Rack::ScriptStackerUtils::Stacker).to receive(:files_for).with('vendor/javascripts/').and_return(vendor_js_files)
-    if middleware
-      @response = middleware.call nil
-      @response_body = @response[2][0]
-    end
-  end
-
-  context 'inactive' do
-    let(:body) { '<div>whatever</div>' }
-    it 'does not change without replacement slots' do
-      expect(@response_body).to eq('<div>whatever</div>')
-    end
-  end
-
-  context 'javascript' do
-    let(:body) do
-      smart_deindent(<<-HTML)
-        <body>
-          <div>lmao</div>
-          <!-- ScriptStacker: JAVASCRIPT //-->
-        </body>
-      HTML
-    end
-    it 'injects tags' do
-      expect(@response_body).to eq(smart_deindent(<<-HTML))
-        <body>
-          <div>lmao</div>
-          <script type="text/javascript" src="/static/javascripts/main.js"></script>
-          <script type="text/javascript" src="/static/javascripts/util.js"></script>
-        </body>
-      HTML
-    end
-  end
-
-  context 'css' do
-    let(:body) do
-      smart_deindent(<<-HTML)
-        <head>
-          <!-- ScriptStacker: CSS //-->
-        </head>
-      HTML
-    end
-    it 'injects tags' do
-      expect(@response_body).to eq(smart_deindent(<<-HTML))
-        <head>
-          <link rel="stylesheet" type="text/css" href="/static/css/main.css" />
-          <link rel="stylesheet" type="text/css" href="/static/css/_whatever.css" />
-        </head>
-      HTML
-    end
-  end
-
-  context 'multiple specs for one stacker' do
-    let(:stack_spec) do
-      Proc.new {
-        javascript 'vendor/javascripts'
-        javascript 'static/javascripts'
-      }
-    end
-    let(:body) do
-      smart_deindent(<<-HTML)
-        <body>
-          <div>lmao</div>
-          <!-- ScriptStacker: JAVASCRIPT //-->
-        </body>
-      HTML
-    end
-    it 'injects tags in order' do
-      expect(@response_body).to eq(smart_deindent(<<-HTML))
-        <body>
-          <div>lmao</div>
-          <script type="text/javascript" src="/vendor/javascripts/jquery.js"></script>
-          <script type="text/javascript" src="/vendor/javascripts/blogo_web.js"></script>
-          <script type="text/javascript" src="/static/javascripts/main.js"></script>
-          <script type="text/javascript" src="/static/javascripts/util.js"></script>
-        </body>
-      HTML
-    end
-  end
-
-  context 'static file auto-configuration' do
-    let(:body) { '<div>whatever</div>' }
-    it 'configures static automatically' do
-      expect(Rack::Static).to receive(:new).with(
-        duck_type(:call), {
-          urls: ['/static/css/', '/static/javascripts/']
-        }
-      )
-      Rack::ScriptStacker.new app_with_body(body), configure_static: true do
-        css 'static/css'
-        javascript 'static/javascripts'
-      end
-    end
-  end
-
-  context 'auto-inject' do
-    let(:config) do
-      {
-        configure_static: false,
-        inject_mode: Rack::ScriptStacker::InjectMode::TAG
-      }
-    end
-    let(:body) do
-      smart_deindent(<<-HTML)
-        <html>
-          <head>
-            <title>OH RLY</title>
-          </head>
-          <body>
-            <div>ya rly</div>
-          </body>
-        </html>
-      HTML
-    end
-    it 'injects before the <head> and <body> tags' do
-      expect(@response_body).to eq(smart_deindent(<<-HTML))
-        <html>
-          <head>
-            <title>OH RLY</title>
-            <link rel="stylesheet" type="text/css" href="/static/css/main.css" />
-            <link rel="stylesheet" type="text/css" href="/static/css/_whatever.css" />
-          </head>
-          <body>
-            <div>ya rly</div>
-            <script type="text/javascript" src="/static/javascripts/main.js"></script>
-            <script type="text/javascript" src="/static/javascripts/util.js"></script>
-          </body>
-        </html>
-      HTML
-    end
-  end
-end
-
-describe Rack::ScriptStackerUtils::PathSpec do
-  let(:css_spec) { Rack::ScriptStackerUtils::PathSpec.new(
-    'static/css/' => '/stylesheets'
-  )}
-  let(:js_spec) { Rack::ScriptStackerUtils::PathSpec.new(
-    'static/javascripts' => 'static/js/'
-  )}
-
-  context 'serve path' do
-    it 'always serves with absolute paths' do
-      expect(js_spec.serve_path).to start_with('/')
-    end
-    it 'appends a slash when there is none, for concatenation simplicity' do
-      expect(css_spec.serve_path).to end_with('/')
-    end
-    it 'does not prepend a redundant slash' do
-      expect(css_spec.serve_path[0..1]).to_not start_with('//')
-    end
-    it 'does not append a redundant slash' do
-      expect(js_spec.serve_path[-2..-1]).to_not end_with('//')
-    end
-  end
-
-  context 'source path' do
-    it 'appends a slash when there is none, for concatenation simplicity' do
-      expect(js_spec.source_path).to end_with('/')
-    end
-    it 'does not prepend a slash, because local files are relative to pwd' do
-      expect(css_spec.source_path).to_not start_with('/')
-    end
-    it 'does not append a redundant slash' do
-      expect(css_spec.source_path).to_not end_with('//')
-    end
-  end
-end
-

data/spec/spec_helper.rb

@@ -1,96 +0,0 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need
-# it.
-#
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-=begin
-  # These two settings work together to allow you to limit a spec run
-  # to individual examples or groups you care about by tagging them with
-  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
-  # get run.
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
-
-  # Allows RSpec to persist some state between runs in order to support
-  # the `--only-failures` and `--next-failure` CLI options. We recommend
-  # you configure your source control system to ignore this file.
-  config.example_status_persistence_file_path = "spec/examples.txt"
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
-end