sinatra-assetpack 0.1.5 → 0.1.6

data/.gitignore

@@ -1,3 +1,4 @@
 /.rvmrc
 /.sass-cache
 /doc/
+*.gem

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - "1.8.7"
-  - "1.9.2"
-  - "1.9.3"
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
   - rbx-18mode
   - rbx-19mode
   - jruby-18mode
@@ -12,4 +13,5 @@ rvm:
 matrix:
   allow_failures:
     - rvm: jruby-head
-    - rvm: ruby-head
+    - rvm: ruby-head
+    - rvm: 2.0.0

data/CONTRIBUTING.md

@@ -0,0 +1,27 @@
+# Contributing
+
+> If I have seen further it is by standing on the shoulders of giants. - Isaac Newton
+
+Please follow theses simples steps to contribute to this project :
+
+1. Fork the repo.
+
+2. Run the tests before doing anything.
+
+3. Add test(s) for your code modification.
+
+4. Rebase your code onto upstream master (this repository) if not up to date.
+
+5. Squash or fixup your commits to achieve a clean commit log.
+
+6. Submit a pull request and ensure tests passes on travis-ci for all supported ruby versions.
+
+## Running the tests
+
+As simple as running the `rake` command.
+
+The default `rake` task is `rake test`.
+
+## Syntax
+
+Follow [Ruby Styleguide](https://github.com/styleguide/ruby) by Github and existing code.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-assetpack (0.1.4)
+    sinatra-assetpack (0.1.6)
       jsmin
       rack-test
       sinatra
@@ -32,13 +32,13 @@ GEM
     multi_json (1.6.0)
     open4 (1.3.0)
     rack (1.5.2)
-    rack-protection (1.3.2)
+    rack-protection (1.4.0)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.0.3)
     sass (3.2.5)
-    sinatra (1.3.4)
+    sinatra (1.3.5)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
@@ -46,7 +46,7 @@ GEM
       execjs
       stylus-source
     stylus-source (0.31.0)
-    tilt (1.3.3)
+    tilt (1.3.4)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)

data/HISTORY.md

@@ -1,8 +1,15 @@
+v0.1.6 - March 1, 2013
+----------------------
+
+### Fixed
+
+  * Do not use instance helpers for environment check. (#79)
+
 v0.1.5 - Feb 12, 2013
 ----------------------
 
 ### Fixed
-  * Fixed stylus 0.7.1 support.
+  *  Stylus 0.7.1 support.
 
 v0.1.4 - Feb 12, 2013
 ----------------------

data/README.md

@@ -672,25 +672,28 @@ class Main
 end
 ```
 
-Running the tests
----------------
+Contributing
+------------
 
-    rake
+See [CONTRIBUTING.md](https://github.com/rstacruz/sinatra-assetpack/blob/master/CONTRIBUTING.md) for details on contributing and running test.
 
 Acknowledgements
 ----------------
 
-© 2011, Rico Sta. Cruz. Released under the [MIT 
+© 2011-2013, Rico Sta. Cruz. Released under the [MIT
 License](http://www.opensource.org/licenses/mit-license.php).
 
-Sinatra-AssetPack is authored and maintained by [Rico Sta. Cruz][rsc] with help 
-from it's [contributors][c]. It is sponsored by my startup, [Sinefunc, Inc][sf].
+Sinatra-AssetPack is authored by [Rico Sta. Cruz][rsc] with help
+from it's [contributors][c]. It is sponsored by [Sinefunc, Inc][sf].
+
+Sinatra-AssetPack is maintained by [Jean-Philipe Doyle][j15e] at [Hookt Studios][hookt].
+
+Github : [@rstacruz](http://github.com/rstacruz), [@j15e](http://github.com/j15e)
 
- * [My website](http://ricostacruz.com) (ricostacruz.com)
- * [Sinefunc, Inc.](http://sinefunc.com) (sinefunc.com)
- * [Github](http://github.com/rstacruz) (@rstacruz)
- * [Twitter](http://twitter.com/rstacruz) (@rstacruz)
+Twitter : [@rstacruz](http://twitter.com/rstacruz), [@j15e](http://twitter.com/j15e)
 
 [rsc]: http://ricostacruz.com
 [c]:   http://github.com/rstacruz/sinatra-assetpack/contributors
 [sf]:  http://sinefunc.com
+[j15e]: http://github.com/j15e
+[hookt]: http://github.com/hooktstudios

data/lib/sinatra/assetpack/helpers.rb

@@ -44,7 +44,7 @@ module Sinatra
         pack = settings.assets.packages["#{name}.#{type}"]
         return ""  unless pack
 
-        if settings.production?
+        if settings.environment == :production
           pack.to_production_html options
         else
           pack.to_development_html options

data/lib/sinatra/assetpack/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module AssetPack
     def self.version
-      "0.1.5"
+      "0.1.6"
     end
   end
 end

data/test/img_test.rb

@@ -13,14 +13,14 @@ class ImgTest < UnitTest
     assert_equal last_response.headers['Content-Length'], File.size(r("/app/images/email.png")).to_s
   end
 
-  test "Image[]" do
+  test "compare" do
     i = Image['/app/images/email.png']
     j = Image['/app/images/email.png']
 
     assert j === i
   end
 
-  test "Image[]" do
+  test "dimensions" do
     i = Image['/app/images/email.png']
     j = Image['/app/images/email.png']
 

data/test/mime_type_test.rb

@@ -50,9 +50,4 @@ class AppTest < UnitTest
     get '/fonts/cantarell-regular-webfont.woff'
     assert last_response.content_type =~ %r[^application/font-woff]
   end
-
-  test 'woff' do
-    get '/fonts/cantarell-regular-webfont.woff'
-    assert last_response.content_type =~ %r[^application/font-woff]
-  end
 end

data/test/unit_test.rb

@@ -77,7 +77,7 @@ class AppTest < UnitTest
   end
 
   test "helpers in production (compressed html thingie)" do
-    app.expects(:production?).returns(true)
+    app.expects(:environment).returns(:production)
     get '/index.html'
     assert body =~ /<script src='\/js\/app.[0-9]+.js'><\/script>/
   end
@@ -130,7 +130,7 @@ class AppTest < UnitTest
     assert_equal (Time.now + (86400*30)).httpdate, last_response.headers['Expires']
   end
 
-  test 'custom expiration of single assets' do
+  test 'custom expiration of packed assets' do
     app.settings.assets.expires 86400*365, :public
 
     get '/js/app.js'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-assetpack
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -244,6 +244,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - HISTORY.md