sinatra-assetpack 0.1.2 → 0.1.3

data/.travis.yml

@@ -1,8 +1,15 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "1.9.2"
   - "1.8.7"
-branches:
-  only:
-    - master
+  - "1.9.2"
+  - "1.9.3"
+  - rbx-18mode
+  - rbx-19mode
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: jruby-head
+    - rvm: ruby-head

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-assetpack (0.1.1)
+    sinatra-assetpack (0.1.2)
       jsmin
       rack-test
       sinatra
@@ -18,16 +18,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.4.0)
-    columnize (0.3.6)
     commonjs (0.2.6)
     contest (0.1.3)
-    debugger (1.2.4)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.1.1)
-      debugger-ruby_core_source (~> 1.1.7)
-    debugger-linecache (1.1.2)
-      debugger-ruby_core_source (>= 1.1.1)
-    debugger-ruby_core_source (1.1.7)
     execjs (1.4.0)
       multi_json (~> 1.0)
     haml (3.1.7)
@@ -35,22 +27,22 @@ GEM
     less (2.2.2)
       commonjs (~> 0.2.6)
     metaclass (0.0.1)
-    mocha (0.13.1)
+    mocha (0.13.2)
       metaclass (~> 0.0.1)
     multi_json (1.5.0)
     open4 (1.3.0)
-    rack (1.4.4)
+    rack (1.5.0)
     rack-protection (1.3.2)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.0.3)
     sass (3.2.5)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
+    sinatra (1.3.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    stylus (0.6.2)
+    stylus (0.7.0)
       execjs
       stylus-source
     stylus-source (0.31.0)
@@ -62,12 +54,12 @@ GEM
       POpen4 (>= 0.1.4)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   coffee-script
   contest
-  debugger
   haml
   less
   mocha

data/HISTORY.md

@@ -1,3 +1,13 @@
+v0.1.3 - Feb 3, 2013
+----------------------
+
+### Added
+  * JRuby 1.9 and 1.8 now supported.
+
+### Fixed:
+  * Deal with assets with exact same name but extensions. (#75)
+  * Ruby 1.8 support (broken in previous v0.1 releases).
+
 v0.1.2 - Jan 20, 2013
 ----------------------
 
@@ -39,7 +49,7 @@ v0.0.11 - Feb 21, 2012
   * Built files from 'rake assetpack:build' now match the mtimes of their sources. (#12)
   * Update the readme with a note on SASS compression.
   * Use regular expression route matcher instead of splat pattern for Padrino compatibility. (#19)
-  * Made <link> and <script> tags (generated by helpers) be more HTML5-like.
+  * Made `link` and `script` tags (generated by helpers) be more HTML5-like.
 
 ### Fixed:
   * Sinatra >= 1.3.0 compatibility. Use 'public_folder' in Sinatra >=1.3.0. (#25)

data/README.md

@@ -1,5 +1,13 @@
 # [Sinatra AssetPack](http://ricostacruz.com/sinatra-assetpack)
-#### Asset packer for Sinatra
+
+>  Package your assets transparently in Sinatra.
+
+[![Build Status](https://travis-ci.org/rstacruz/sinatra-assetpack.png)](https://travis-ci.org/rstacruz/sinatra-assetpack)
+[![Dependency Status](https://gemnasium.com/rstacruz/sinatra-assetpack.png)](https://gemnasium.com/rstacruz/sinatra-assetpack)
+[![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/rstacruz/sinatra-assetpack)
+
+How it works
+------------
 
 This is *the* most convenient way to set up your CSS/JS (and images) in a 
 [Sinatra](http://sinatrarb.com) app. Seriously. No need for crappy routes to 
@@ -14,8 +22,6 @@ render Sass or whatever. No-siree!
    messy *script* and *link* tags.
 5. BOOM! You're in business baby!
 
-[![Build Status](https://travis-ci.org/rstacruz/sinatra-assetpack.png)](https://travis-ci.org/rstacruz/sinatra-assetpack)
-
 Installation
 ------------
 

data/lib/sinatra/assetpack.rb

@@ -1,4 +1,5 @@
 require 'rack/test'
+require 'backports' if RUBY_VERSION < "1.9"
 
 module Sinatra
   module AssetPack
@@ -47,7 +48,6 @@ module Sinatra
     autoload :Image,         "#{PREFIX}/assetpack/image"
     autoload :Css,           "#{PREFIX}/assetpack/css"
     autoload :Configurator,  "#{PREFIX}/assetpack/configurator"
-    autoload :HashArray,     "#{PREFIX}/assetpack/hasharray"
 
     include ClassMethods
 

data/lib/sinatra/assetpack/options.rb

@@ -246,22 +246,21 @@ module Sinatra
       # Returns nil if a file is not found.
       # TODO: consolidate with local_file_for
       def dyn_local_file_for(requested_file, from)
-        # Remove extension
         file = requested_file
-        extension = ''
-
-        file.sub(/^(.*)(\.[^\.]+)$/) { file, extension = $1, $2 }
-
-        # Remove cache-buster (/js/app.28389.js => /js/app)
-        file = $1 if file =~ /^(.*)\.[0-9]+$/
-
+        extension = File.extname(requested_file)
+        # Remove extension
+        file.gsub!(/#{extension}$/, "")
+        # Remove cache-buster (/js/app.28389 => /js/app)
+        file.gsub!(/\.[0-9]+$/, "")
         matches = Dir[File.join(app.root, from, "#{file}.*")]
 
         # Fix for filenames with dots (can't do this with glob)
         matches.select! { |f| f =~ /#{file}\.[^.]+$/ }
 
-        # Sort static file match first
-        matches.sort! { |f| File.basename(f) == "#{file}#{extension}" ? -1 : 1 }
+        # Sort static file match, weighting exact file extension matches
+        matches.sort! do |f, _| 
+          (File.basename(f) == "#{file}#{extension}" || File.extname(f) == extension) ? -1 : 1
+        end
         matches.first
       end
 
@@ -320,7 +319,7 @@ module Sinatra
         paths  = paths.uniq
         tuples = paths.map { |key| [key, files[key]] }
 
-        HashArray[*tuples.flatten]
+        Hash[*tuples.flatten]
       end
 
     private

data/lib/sinatra/assetpack/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module AssetPack
     def self.version
-      "0.1.2"
+      "0.1.3"
     end
   end
 end

data/sinatra-assetpack.gemspec

@@ -15,6 +15,9 @@ Gem::Specification.new do |s|
   s.add_dependency "sinatra"
   s.add_dependency "jsmin"
   s.add_dependency "rack-test"
+  if RUBY_VERSION < "1.9"
+    s.add_runtime_dependency "backports"
+  end
   s.add_development_dependency "yui-compressor"
   s.add_development_dependency "sass"
   s.add_development_dependency "haml"
@@ -25,5 +28,4 @@ Gem::Specification.new do |s|
   s.add_development_dependency "uglifier"
   s.add_development_dependency "rake"
   s.add_development_dependency "less"
-  s.add_development_dependency "debugger"
 end

data/test/app/app.rb

@@ -14,10 +14,15 @@ class Main < Sinatra::Base
   disable :show_exceptions
 
   assets {
-    #serve '/js',     :from => 'app/js'
+    serve '/js',     :from => 'app/js'
     serve '/css',    :from => 'app/css'
     serve '/images', :from => 'app/images'
     serve '/fonts',    :from => 'app/fonts'
+    serve '/packages',    :from => 'app/packages'
+
+    js :a_package, '/packages/a_package.js', [
+      '/packages/a_package/package.js',
+    ]
 
     js :skitch, '/skitch.js', [
       '/js/hi.js',

data/test/app/app/js/jquery-1.8.0.min.js

@@ -0,0 +1 @@
+$(function() { alert("Hello"); });

data/test/app/app/packages/a_package/package.css

@@ -0,0 +1 @@
+.hi { color: red; }

data/test/app/app/packages/a_package/package.js

@@ -0,0 +1 @@
+$(function() { alert("Hello"); });

data/test/arity_test.rb

@@ -17,8 +17,14 @@ class ArityTest < UnitTest
 
   test "arity in #assets" do
     paths = App.assets.packages['a.css'].paths
-    assert_equal paths,
-      [ "/css/screen.css", "/css/sqwishable.css", "/css/style.css", "/css/stylus.css", "/css/js2c.css" ]
+    expect = [ "/css/screen.css", "/css/sqwishable.css", "/css/style.css", "/css/stylus.css", "/css/js2c.css" ]
+    if RUBY_VERSION < "1.9"
+      # In 1.8.7 glob returns inconsitent files order so just check array are equivalents
+      assert_equal expect.size, paths.size
+      assert_equal 0, paths.reject{ |p| expect.include?(p) }.size
+    else
+      assert_equal expect, paths
+    end
 
     assert App.assets.js_compression == :closure
     assert App.assets.css_compression == :yui

data/test/cache_test.rb

@@ -1,8 +1,24 @@
 require File.expand_path('../test_helper', __FILE__)
 
 class CacheTest < UnitTest
+  class App < UnitTest::App
+    register Sinatra::AssetPack
+
+    set :reload_templates, false
+    assets {
+      js :app, '/js/app.js', [
+        '/js/vendor/**/*.js',
+        '/js/assets/**/*.js',
+        '/js/hi.js',
+        '/js/hell*.js'
+      ]
+      js_compression :jsmin
+    }
+  end
+
+  def app() App; end
+
   test "Compressed js caching" do
-    app.set :reload_templates, false
     JSMin.expects(:minify).times(1).returns ""
     3.times { get '/js/app.js' }
   end

data/test/ignore_test.rb

@@ -20,8 +20,8 @@ class IgnoreTest < UnitTest
 
   test "ignore in package" do
     get '/main.js'
-    assert body.size > 0
-    assert !body.include?("BUMBLEBEE")
+    assert last_response.body.size > 0
+    assert !last_response.body.include?("BUMBLEBEE")
   end
 
   test "package files" do

data/test/sqwish_test.rb

@@ -2,6 +2,7 @@ require File.expand_path('../test_helper', __FILE__)
 
 class SqwishTest < UnitTest
   setup do
+    app.set :reload_templates, true
     app.assets.css_compression :sqwish, :strict => true
   end
 
@@ -20,10 +21,10 @@ class SqwishTest < UnitTest
 
   if sqwish?
     test "build" do
-      Sinatra::AssetPack::Compressor
-      Sinatra::AssetPack::SqwishEngine.any_instance.expects(:css)
-
+      swqished_css = '#bg{background:green;color:red}'
+      Sinatra::AssetPack::SqwishEngine.any_instance.expects(:css).returns swqished_css
       get '/css/sq.css'
+      assert body == swqished_css
     end
   else
     puts "(No Sqwish found; skipping sqwish tests)"

data/test/test_helper.rb

@@ -1,11 +1,12 @@
 require 'contest'
 require 'jsmin'
 require 'tilt'
+require 'haml'
+require 'sass'
 require 'stylus'
 require 'rack/test'
 require 'yaml'
 require 'mocha/setup'
-require 'debugger'
 
 require File.expand_path('../app/app.rb', __FILE__)
 

data/test/unit_test.rb

@@ -49,6 +49,11 @@ class AppTest < UnitTest
     assert last_response.status == 404
   end
 
+  test 'returns file of requested type when mixed type assets of varying extension are present' do
+    get '/packages/a_package.010101.js'
+    assert body.include? 'function(){alert("Hello");'
+  end
+
   test 'static css' do
     get '/css/style.css'
     assert body.include?('div { color: red; }')
@@ -77,10 +82,9 @@ class AppTest < UnitTest
     assert body =~ /<script src='\/js\/app.[0-9]+.js'><\/script>/
   end
 
-  test "compressed js" do
-    get '/js/app.js'
-    assert body.include? 'function(){alert("Hello");'
-    assert_includes body, "var x;x=function(){"
+  test "file with multiple dots in name" do
+    get '/js/jquery-1.8.0.min.js'
+    assert body.include? '$(function() { alert("Hello"); });'
   end
 
   test "compressed js with cache bust" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -235,22 +235,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
-- !ruby/object:Gem::Dependency
-  name: debugger
-  prerelease: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
 description: Package your assets for Sinatra.
 email:
 - rico@sinefunc.com
@@ -308,7 +292,6 @@ files:
 - lib/sinatra/assetpack/engines/sqwish.rb
 - lib/sinatra/assetpack/engines/uglify.rb
 - lib/sinatra/assetpack/engines/yui.rb
-- lib/sinatra/assetpack/hasharray.rb
 - lib/sinatra/assetpack/helpers.rb
 - lib/sinatra/assetpack/html_helpers.rb
 - lib/sinatra/assetpack/image.rb
@@ -338,11 +321,15 @@ files:
 - test/app/app/js/hello.js
 - test/app/app/js/helloe.js
 - test/app/app/js/hi.coffee
+- test/app/app/js/jquery-1.8.0.min.js
 - test/app/app/js/ugly.js
 - test/app/app/js/yoe.coffee
 - test/app/app/js_glob/a/b/c1/hello.js
 - test/app/app/js_glob/a/b/c2/hi.js
 - test/app/app/js_glob/a/b/c2/hola.js
+- test/app/app/packages/a_package/package.css
+- test/app/app/packages/a_package/package.js
+- test/app/app/packages/a_package/package.png
 - test/app/app/views/index.haml
 - test/app/config.ru
 - test/arity_test.rb

data/lib/sinatra/assetpack/hasharray.rb

@@ -1,66 +0,0 @@
-module Sinatra
-  module AssetPack
-    # Class: HashArray
-    # A stopgap solution to Ruby 1.8's lack of ordered hashes.
-    #
-    # A HashArray, for all intents and purposes, acts like an array. However, the
-    # common stuff are overloaded to work with hashes.
-    #
-    # ## Basic usage
-    #
-    # #### Creating
-    # You can create a HashArray by passing it an array.
-    #
-    #     dict = HashArray.new([
-    #       { :good_morning => "Bonjour" },
-    #       { :goodbye      => "Au revoir" },
-    #       { :good_evening => "Bon nuit" }
-    #     ])
-    #
-    # #### Converting
-    # You may also use it like so:
-    #
-    #     letters = [ { :a => "Aye"}, { :b => "Bee" } ].to_hash_array
-    #
-    # #### Iterating
-    # Now you can use the typical enumerator functions:
-    #
-    #     dict.each do |(key, value)|
-    #       puts "#{key} is #{value}"
-    #     end
-    #
-    #     #=> :good_morning is "Bonjour"
-    #     #   :goodbye is "Au revoir"
-    #     #   :good_evening is "Bon nuit"
-    #
-    class HashArray < Array
-      def self.[](*arr)
-        new arr.each_slice(2).map { |(k, v)| Hash[k, v] }
-      end
-
-      # Works like Hash#values.
-      def values
-        inject([]) { |a, (k, v)| a << v; a }
-      end
-
-      # Returns everything as a hash.
-      def to_hash
-        inject({}) { |hash, (k, v)| hash[k] = v; hash }
-      end
-
-      def keys
-        inject([]) { |a, (k, v)| a << k; a }
-      end
-
-      [:each, :map, :map!, :reject, :reject!, :select, :select!].each do |meth|
-        send(:define_method, meth) { |*a, &block|
-          if block.respond_to?(:call)
-            super(*a) { |hash| block.call *hash.to_a }
-          else
-            super(*a)
-          end
-        }
-      end
-    end
-  end
-end