sinatra-support 1.2.0 → 1.2.1

data/HISTORY.md

@@ -1,3 +1,15 @@
+Latest version - Aug 19, 2011
+-----------------------------
+
+### Fixed:
+  * Fixed `Sinatra::CompressedJS` to link to the production version on 
+  production.
+
+### Misc changes:
+  * Make tests more forgiving to account for different Compass/CS/etc versions.
+  * Improve CompressedJS docs.
+  * Updated gem dependencies to have a required version.
+
 v1.2.0 - May 27, 2011
 ---------------------
 

data/lib/sinatra/support/compasssupport.rb

@@ -65,12 +65,6 @@ module Sinatra::CompassSupport
   end
 
 private
-  def self.lol(app)
-    Compass.configuration do |c|
-      c.project_path = app.root
-      c.sass_dir     = app.views
-    end
-  end
 
   def self.add_compass_engine_options(app)
     options = Compass.sass_engine_options

data/lib/sinatra/support/compressedjs.rb

@@ -3,7 +3,7 @@
 # == Usage example
 #
 # Assuming you have JavaScript files stored in +./app/js+, and you want to serve
-# the compressed JS in +http://yoursite.com/js/compressed.js+:
+# the compressed JS in +yoursite.com/js/compressed.js+:
 #
 #   # CompressedJS is recommended to be used alongside JsSupport to serve
 #   # raw JS files in development mode. This will make your /app/js/*.js
@@ -11,14 +11,12 @@
 #
 #   register Sinatra::JsSupport
 #   serve_js '/js', from: './app/js'
-#
-# Then load the {CompressedJS} plugin:
-#
-#   register Sinatra::CompressedJS
+#   
+#   register Sinatra::CompressedJS        # Load the CompressedJS plugin
 #
 #   serve_compressed_js :app_js,          # The name (used later in your views)
-#     :prefix => '/js',                   # Where the individual files can be accessed at
-#     :root   => './app/js',              # The root of your files
+#     :prefix => '/js',                   # Where the individual JS files can be accessed at
+#     :root   => './app/js',              # The root of your JS files
 #     :path   => '/js/compressed.js',     # The URL where the compressed JS will served at
 #     :files  =>                          # List of files
 #       Dir['./app/js/vendor/*.js'] +
@@ -27,11 +25,12 @@
 # Note that +:prefix+ and +:root+ are the same things passed onto {JsSupport#serve_js serve_js}.
 #
 # In your template view, add this before +</body>+:
+# (The name +app_js+ comes from the first parameter passed to
+# {#serve_compressed_js}.)
 #
 #   <%= settings.app_js.to_html %>
 #
-# (The name +app_js+ comes from the first parameter passed to
-# {#serve_compressed_js}.)
+# == Example output
 #
 # In development mode, this will probably output:
 #
@@ -57,6 +56,11 @@
 #   # Gemfile
 #   gem "coffee-script", require: "coffee_script"
 #
+# == More functions
+#
+# Doing +settings.app_js+ returns a {JsFiles} instance. See the {JsFiles} class
+# for more info on things you can do.
+#
 # == Caching
 #
 # CompressedJS will cache compressed and combined scripts. This means that compression
@@ -88,7 +92,7 @@ module Sinatra::CompressedJS
   end
 
   def serve_compressed_js(name, options={})
-    jsfiles = JsFiles.new(options)
+    jsfiles = JsFiles.new(options.merge(:app => self))
 
     set name.to_sym, jsfiles
 
@@ -119,15 +123,26 @@ end
 #
 # === Usage example
 #
-#   files  = Dir['public/js/jquery.*.js']
-#   files += Dir['public/js/app.*.js']
+# In Sinatra, doing {CompressedJS#serve_compressed_js} will make a
+# JsFiles instance:
+#
+#   serve_compressed_js :js_files,
+#     :prefix => '/javascript',
+#     :path   => '/javascript/combined.js',
+#     :root   => './app/js'
+#     files   =>
+#       Dir['public/js/jquery.*.js'].sort +
+#       Dir['public/js/app.*.js'].sort
+#
+#   js_files.is_a?(JsFiles)  #=> true
+#   js_files.mtime           #=> (Time) 2010-09-02 8:00PM
 #
+# Or outside Sinatra, just instanciate it as so:
+# 
 #   js_files = JsFiles.new(:files => files,
 #     :prefix => '/javascript',
 #     :root => './app/js')
 #
-#   js_files.mtime  #=> (Time) 2010-09-02 8:00PM
-#
 # You can use #to_html in views:
 #
 #   <!-- Shows <script> tags -->

data/lib/sinatra/support/multirender.rb

@@ -60,7 +60,8 @@ module Sinatra::MultiRender
       engines   = [*(options[:engine] || settings.multi_engines)].join(',')
 
       t = @template_cache.fetch template, options do
-        template = Dir["{#{paths}}/#{template}.{#{engines}}"].first  or raise Errno::ENOENT
+        spec = "{#{paths}}/#{template}.{#{engines}}"
+        template = Dir[spec].first  or raise Errno::ENOENT.new(spec)
 
         ext      = File.extname(template)[1..-1].to_sym
         options  = settings.send(ext).merge(options)  if settings.respond_to?(ext)

data/lib/sinatra/support/version.rb

@@ -1,6 +1,6 @@
 module Sinatra
   module Support
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
 
     def self.version
       VERSION

data/test/test_compass_app.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../helper', __FILE__)
 
-Encoding.default_external = 'utf-8'
+Encoding.default_external = 'utf-8'  if defined?(::Encoding)
 
 class CompassAppTest < Test::Unit::TestCase
   include Rack::Test::Methods
@@ -18,8 +18,6 @@ class CompassAppTest < Test::Unit::TestCase
   test "boogie" do
     get '/style.css'
 
-    control = "body{-ms-filter:\"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)\";filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=50);opacity:0.5}\n"
-    
-    assert_equal control, last_response.body
+    assert_includes last_response.body, 'filter:'
   end
 end

data/test/test_compressed_js_app.rb

@@ -53,7 +53,7 @@ class CompressedJSApp < Test::Unit::TestCase
     get '/js/yo.js'
     control = 'alert(2);';
 
-    assert_equal control, last_response.body.strip
+    assert_includes last_response.body.strip, control
   end
 
   test "compressed" do

data/test/test_htmlhelpers.rb

@@ -27,7 +27,7 @@ class HtmlHelpersTest < Test::Unit::TestCase
   
   test "h" do
     assert_equal "&lt;Foo&gt;", h("<Foo>")
-    assert_equal "&lt;Foo bar=&#39;baz&#39;&gt;", h("<Foo bar='baz'>")
+    assert_match /^&lt;Foo bar=&#.*?;baz&#.*?;&gt;$/, h("<Foo bar='baz'>")
     assert_equal "&lt;Foo bar=&quot;baz&quot;&gt;", h("<Foo bar=\"baz\">")
   end
 end

metadata

@@ -1,129 +1,137 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sinatra-support
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.2.1
   prerelease: 
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Cyril David
 - Rico Sta. Cruz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-27 00:00:00 +08:00
+date: 2011-08-19 00:00:00.000000000 +08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153502260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153502260
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &2153501840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ohm
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153501840
+- !ruby/object:Gem::Dependency
+  name: ohm
+  requirement: &2153501300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.38
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153501300
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &2153500800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.1.2
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2153500800
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2153500340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.12
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2153500340
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2153499880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *2153499880
+- !ruby/object:Gem::Dependency
   name: contest
+  requirement: &2153521920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2153521920
+- !ruby/object:Gem::Dependency
+  name: compass
+  requirement: &2153521460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.5
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: coffee-script
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2153521460
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: &2153521000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.1.1
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: jsmin
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2153521000
+- !ruby/object:Gem::Dependency
+  name: jsmin
+  requirement: &2153520540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :development
-  version_requirements: *id009
-description: Sinatra-support includes many helpers for forms, errors and many amazing things.
-email: 
+  prerelease: false
+  version_requirements: *2153520540
+description: Sinatra-support includes many helpers for forms, errors and many amazing
+  things.
+email:
 - cyx.ucron@gmail.com
 - rico@sinefunc.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/sinatra/support/compasssupport.rb
 - lib/sinatra/support/compat-1.8.6.rb
 - lib/sinatra/support/compressedjs.rb
@@ -175,30 +183,26 @@ files:
 has_rdoc: true
 homepage: http://github.com/sinefunc/sinatra-support
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A gem with many essential helpers for creating web apps with Sinatra.
 test_files: []
-