sinatra-assetpack 0.0.12.pre1 → 0.1.0

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "1.9.2"
+  - "1.8.7"
+branches:
+  only:
+    - master

data/HISTORY.md

@@ -1,3 +1,16 @@
+v0.1.0 - Jan 14, 2013
+----------------------
+
+### Changed
+  * Using `file` utility instead `identify` utility. (#26)
+
+### Fixed
+  * Deal with different encodings in combined assets. (#47)
+  * Serve files with dots in name. (#32, #66)
+  * Deal with character encoding issues in ruby 1.8. (#51)
+  * Add missing depedency for development unit test. (#63)
+  * Deal with binary files copy (ex. images), fix errors like `"\x89" from ASCII-8BIT to UTF-8"`. (#38, #67)
+
 v0.0.11 - Feb 21, 2012
 ----------------------
 

data/README.md

@@ -9,11 +9,13 @@ render Sass or whatever. No-siree!
    * JavaScript/CoffeeScript files in `/app/js`
    * CSS/Sass/Less/CSS files in `/app/css`
    * Images into `/app/images`
-3. Add `register Sinatra::AssetPack` and set up options to your app (see below)
-4. Use `<%= css :application %>` to your layouts. Use this instead of
-   messy *script* and *link* tags
+3. Add `register Sinatra::AssetPack` and set up options to your app (see below).
+4. Use `<%= js :app %>` and `<%= css :application %>` to your layouts. Use these instead of
+   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/image.rb

@@ -30,8 +30,8 @@ module Sinatra
       def dimensions
         return @dimensions  unless @dimensions.nil?
 
-         _, _, dim = `identify "#{@file}"`.split(' ')
-         w, h = dim.split('x')
+        dim = /(\d+) x (\d+)/.match(`file "#{@file}"`)
+        w, h = dim[1,2]
 
          if w.to_i != 0 && h.to_i != 0
            @dimensions = [w.to_i, h.to_i]

data/lib/sinatra/assetpack/options.rb

@@ -170,7 +170,7 @@ module Sinatra
         @css_compression_options = options  if options.is_a?(Hash)
         @css_compression
       end
-      
+
       # =====================================================================
       # Stuff
 
@@ -237,14 +237,19 @@ module Sinatra
       # Returns the local file for a given URI path. (for dynamic files)
       # Returns nil if a file is not found.
       # TODO: consolidate with local_file_for
-      def dyn_local_file_for(file, from)
+      def dyn_local_file_for(requested_file, from)
         # Remove extension
-        file = $1  if file =~ /^(.*)(\.[^\.]+)$/
+        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]+$/
 
-        Dir[File.join(app.root, from, "#{file}.*")].first
+        matches = Dir[File.join(app.root, from, "#{file}.*")]
+        # Fix for filenames with dots (can't do this with glob)
+        matches.select { |f| f =~ /#{file}\.[^.]+$/ }.first
       end
 
       # Writes `public/#{path}` based on contents of `output`.
@@ -255,7 +260,7 @@ module Sinatra
         yield path  if block_given?
 
         FileUtils.mkdir_p File.dirname(path)
-        File.open(path, 'w') { |f| f.write output }
+        File.open(path, 'wb') { |f| f.write output }
 
         if mtime
           File.utime mtime, mtime, path

data/lib/sinatra/assetpack/package.rb

@@ -96,9 +96,12 @@ module Sinatra
         session = Rack::Test::Session.new(@assets.app)
         paths.map { |path|
           result = session.get(path)
-          response_encoding = result.content_type.split(/;\s*charset\s*=\s*/).last.upcase rescue 'ASCII-8BIT'
-          # p [:combined, path, result.body.encoding.name, response_encoding]
-          result.body.force_encoding(response_encoding).encode(Encoding.default_external || 'ASCII-8BIT')  if result.status == 200
+          if result.body.respond_to?(:force_encoding)
+            response_encoding = result.content_type.split(/;\s*charset\s*=\s*/).last.upcase rescue 'ASCII-8BIT'
+            result.body.force_encoding(response_encoding).encode(Encoding.default_external || 'ASCII-8BIT')  if result.status == 200
+          else
+            result.body  if result.status == 200
+          end
         }.join("\n")
       end
 

data/lib/sinatra/assetpack/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module AssetPack
     def self.version
-      "0.0.12.pre1"
+      "0.1.0"
     end
   end
 end

data/sinatra-assetpack.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "mocha"
   s.add_development_dependency "stylus"
   s.add_development_dependency "uglifier"
+  s.add_development_dependency "rake"
 end

data/test/app/app/js/hello.2.js

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

data/test/unit_test.rb

@@ -5,7 +5,7 @@ class AppTest < UnitTest
     get '/js/hello.js'
     assert body == '$(function() { alert("Hello"); });'
   end
-  
+
   test '/js/hi.js (coffeescript)' do
     get '/js/hi.js'
     assert body.include? 'yo'
@@ -17,11 +17,16 @@ class AppTest < UnitTest
     assert last_response.status == 404
   end
 
-  test '/js/hi.2834987.js (with cache buster)' do
+  test '/js/hello.2834987.js (with cache buster)' do
     get '/js/hello.283947.js'
     assert body == '$(function() { alert("Hello"); });'
   end
 
+  test '/js/hello.2.2834987.js (with cache buster)' do
+    get '/js/hello.2.283947.js'
+    assert body == '$(function() { alert("Hello.2"); });'
+  end
+
   test '/js/hi.2834987.js (coffeescript with cache buster)' do
     get '/js/hi.283947.js'
     assert last_response.status == 200
@@ -33,12 +38,12 @@ class AppTest < UnitTest
     get '/js/hello.css'
     assert last_response.status == 404
   end
-  
+
   test 'matches only from the site root' do
     get '/not-the-root/js/hello.js'
     assert last_response.status == 404
   end
-  
+
   test 'wrong extension for dynamic coffeescript file' do
     get '/js/hi.css'
     assert last_response.status == 404

metadata

@@ -1,148 +1,224 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.0.12.pre1
-  prerelease: 7
+  version: 0.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Rico Sta. Cruz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2152235760 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.0
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2152235760
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    none: false
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2152235300 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2152235300
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &2152234800 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2152234800
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152234320 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2152234320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &2152233840 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *2152233840
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2152233320 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *2152233320
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2152232700 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *2152232700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2152231900 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *2152231900
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: contest
-  requirement: &2152246000 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *2152246000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152245260 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *2152245260
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: stylus
-  requirement: &2152244580 !ruby/object:Gem::Requirement
-    none: false
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *2152244580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2152243720 !ruby/object:Gem::Requirement
-    none: false
+  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
+- !ruby/object:Gem::Dependency
+  name: rake
   prerelease: false
-  version_requirements: *2152243720
+  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
@@ -151,6 +227,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - HISTORY.md
 - README.md
@@ -219,6 +296,7 @@ files:
 - test/app/app/images/background.jpg
 - test/app/app/images/email.png
 - test/app/app/js/_ignoreme.js
+- test/app/app/js/hello.2.js
 - test/app/app/js/hello.js
 - test/app/app/js/helloe.js
 - test/app/app/js/hi.coffee
@@ -260,21 +338,22 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Asset packager for Sinatra.
 test_files: []
+has_rdoc: