sinatra-assetpack 0.0.11 → 0.0.12.pre1

data/lib/sinatra/assetpack/package.rb

@@ -96,7 +96,9 @@ module Sinatra
         session = Rack::Test::Session.new(@assets.app)
         paths.map { |path|
           result = session.get(path)
-          result.body  if result.status == 200
+          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
         }.join("\n")
       end
 

data/lib/sinatra/assetpack/version.rb

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

data/test/app/app/js/helloe.js

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

data/test/app/app/js/yoe.coffee

@@ -0,0 +1,2 @@
+x = ->
+  alert 'yö'

data/test/app/app.rb

@@ -29,6 +29,11 @@ class Main < Sinatra::Base
       '/js/hell*.js'
     ]
 
+    js :encoding, '/js/encoding.js', [
+      '/js/yoe.js',
+      '/js/helloe.js'
+    ]
+
     css :application, '/css/application.css', [
       '/css/screen.css'
     ]

data/test/combined_test.rb

@@ -0,0 +1,8 @@
+require File.expand_path('../test_helper', __FILE__)
+
+class AppTest < UnitTest
+  test 'encoding' do
+    app.set :reload_templates, false
+    get '/js/encoding.js'
+  end
+end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.0.11
-  prerelease: 
+  version: 0.0.12.pre1
+  prerelease: 7
 platform: ruby
 authors:
 - Rico Sta. Cruz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000Z
+date: 2012-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
-  requirement: &2152651000 !ruby/object:Gem::Requirement
+  requirement: &2152235760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152651000
+  version_requirements: *2152235760
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2152650180 !ruby/object:Gem::Requirement
+  requirement: &2152235300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152650180
+  version_requirements: *2152235300
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &2152649180 !ruby/object:Gem::Requirement
+  requirement: &2152234800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152649180
+  version_requirements: *2152234800
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &2152648100 !ruby/object:Gem::Requirement
+  requirement: &2152234320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152648100
+  version_requirements: *2152234320
 - !ruby/object:Gem::Dependency
   name: yui-compressor
-  requirement: &2152646860 !ruby/object:Gem::Requirement
+  requirement: &2152233840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152646860
+  version_requirements: *2152233840
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2152645840 !ruby/object:Gem::Requirement
+  requirement: &2152233320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152645840
+  version_requirements: *2152233320
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2152644700 !ruby/object:Gem::Requirement
+  requirement: &2152232700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152644700
+  version_requirements: *2152232700
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2152643520 !ruby/object:Gem::Requirement
+  requirement: &2152231900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152643520
+  version_requirements: *2152231900
 - !ruby/object:Gem::Dependency
   name: contest
-  requirement: &2152639780 !ruby/object:Gem::Requirement
+  requirement: &2152246000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152639780
+  version_requirements: *2152246000
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &2152639140 !ruby/object:Gem::Requirement
+  requirement: &2152245260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152639140
+  version_requirements: *2152245260
 - !ruby/object:Gem::Dependency
   name: stylus
-  requirement: &2152638260 !ruby/object:Gem::Requirement
+  requirement: &2152244580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152638260
+  version_requirements: *2152244580
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &2152637340 !ruby/object:Gem::Requirement
+  requirement: &2152243720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152637340
+  version_requirements: *2152243720
 description: Package your assets for Sinatra.
 email:
 - rico@sinefunc.com
@@ -220,8 +220,10 @@ files:
 - test/app/app/images/email.png
 - test/app/app/js/_ignoreme.js
 - test/app/app/js/hello.js
+- test/app/app/js/helloe.js
 - test/app/app/js/hi.coffee
 - 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
@@ -229,6 +231,7 @@ files:
 - test/arity_test.rb
 - test/build_test.rb
 - test/cache_test.rb
+- test/combined_test.rb
 - test/compressed_test.rb
 - test/glob_test.rb
 - test/helpers_test.rb
@@ -265,12 +268,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Asset packager for Sinatra.