RubyGems - sinatra-minify - Versions diffs - 0.0.1 → 0.1.1 - Mend

sinatra-minify 0.0.1 → 0.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

data/.gitignore +3 -0
data/.rvmrc +1 -0
data/README.md +108 -5
data/Rakefile +38 -2
data/VERSION +1 -1
data/lib/sinatra/minify.rb +14 -1
data/lib/sinatra/minify/builder.rb +91 -79
data/lib/sinatra/minify/helpers.rb +14 -0
data/sinatra-minify.gemspec +22 -6
data/test/fixtures/exampleapp/app.rb +30 -0
data/test/fixtures/exampleapp/config/assets.yml +6 -0
data/test/fixtures/exampleapp/public/css/style-default.css +86 -0
data/test/fixtures/exampleapp/public/js/script-1.js +1 -0
data/test/fixtures/exampleapp/public/js/script-2.js +1 -0
data/test/helper.rb +14 -0
data/test/test_minify.rb +52 -0
data/vendor/jsmin-1.0.1/HISTORY +9 -0
data/vendor/jsmin-1.0.1/lib/jsmin.rb +249 -0
metadata +21 -10

data/.gitignore CHANGED Viewed

@@ -1,2 +1,5 @@
 .DS_Store
 *~
+*.min.js
+*.min.css
+pkg

data/.rvmrc ADDED Viewed

	@@ -0,0 +1 @@
1	+ rvm 1.9.1@sinatra-minify

data/README.md CHANGED Viewed

@@ -1,10 +1,15 @@
-Usage
------
+sinatra-minify
+==============
-Add these to your `init.rb`;
+Quick-start guide
+-----------------
+First, install the `sinatra-minify` gem.
+Add these to your app's main file:
     require 'sinatra/minify'
-    class Main
+    class Main < Sinatra::Base
       register Sinatra::Minify
     end
@@ -12,4 +17,102 @@ Add this to your `Rakefile`:
     load 'vendor/sinatra-minify/lib/tasks.rake'
-Type `rake minify:build` to build the compressed JS/CSS files.
+Now add your JS/CSS packages in `config/assets.yml` (relative to your app's root path).
+The files are are assumed to be in `public/js` and `public/css` by default.
+    js:
+      base:
+        - jquery-1.4.2.js
+        - underscore-0.6.0.js
+        - app/*.js                 # Wildcards are allowed! ;)
+    css:
+      base:
+        - common.css
+        - app.*.css
+      homepage:
+        - home.*.css
+Now add the helpers to your templates:
+       ...
+       <%= css_assets 'base' %>
+       <%= css_assets 'homepage' %>
+    </head>
+    <body>
+        ...
+        <%= js_assets 'base' %>
+    </body>
+    </html>
+    <!-- The 'base' and 'homepage' above are the names of the
+         packages as defined in your config/assets.yml. -->
+This will include the scripts and stylesheets as individual `<script>` and `<link>` tags.
+To include the minified files instead, switch to the production environment and build
+the minified files by typing `rake minify:build`.
+Usage tips
+==========
+Building minified files
+-----------------------
+Minified files are built by typing:
+    rake minify:build
+This creates files called `<package_name>.min.js` (and `.css`) in your `public/js` and
+`public/css` folders.
+NOTE: Building of minified files is NOT done automatically! You must call this explicitly.
+Add it to your Capistrano deploy scripts or something.
+Adding sinatra-minify as a dependency (Monk)
+--------------------------------------------
+If your using Monk (or otherwise using the `dependency` gem), simply add the
+`sinatra-minify` GitHub repo to your dependencies file.
+    echo sinatra-minify git://github.com/sinefunc/sinatra-minify.git >> dependencies
+    dep vendor sinatra-minify
+Changing JS/CSS paths
+---------------------
+By default, sinatra-minify looks at `public/js` and `public/css` for your JS and CSS files,
+respectively. You can change them with:
+    class Main < Sinatra::Base
+        register Sinatra::Minify
+        set :js_path, 'public/javascripts'
+        set :js_url,  '/javascripts'
+        set :css_path, 'public/stylesheets'
+        set :css_url,  '/stylesheets'
+Forcing minification
+--------------------
+Minifying happens in the production environment only by default. You can force this behavior
+by enabling the `force_minify` option in your app:
+    class Main < Sinatra::Base
+        register Sinatra::Minify
+        # Always minify
+        enable :force_minify
+You can also define your own behavior for checking whether to minify or not.
+    class Main < Sinatra::Base
+        register Sinatra::Minify
+        def self.minify?
+          prodiction? or staging?
+        end
+Ignore minified files in source control
+---------------------------------------
+It'd be good practice to add `*.min.{css,js}` to your `.gitignore` file (or similar,
+for those not using Git).

data/Rakefile CHANGED Viewed

@@ -1,3 +1,6 @@
+require 'rubygems'
+require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
@@ -7,10 +10,43 @@ begin
     s.summary     = "CSS/JS compressor for Sinatra"
     s.homepage    = "http://www.github.com/sinefunc/sinatra-minify"
     s.description = "sinatra-minify is an extension for Sinatra to compress assets."
-    s.add_dependency('jsmin', '>= 1.0.1')
+    s.add_development_dependency 'rack-test'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+end
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
+begin
+  require 'rcov/rcovtask'
+  Rcov::RcovTask.new do |test|
+    test.libs << 'test'
+    test.pattern = 'test/**/test_*.rb'
+    test.verbose = true
+  end
+rescue LoadError
+  task :rcov do
+    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+  end
+end
+task :test => :check_dependencies
+task :default => :test
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "sinatra-minify #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.0.1
1	+ 0.1.1

data/lib/sinatra/minify.rb CHANGED Viewed

@@ -1,14 +1,27 @@
 require 'sinatra/base'
-require File.join(File.dirname(__FILE__), 'minify/builder')
+begin
+  require 'jsmin'
+rescue LoadError
+  require File.join(File.dirname(__FILE__), '..', '..', 'vendor/jsmin-1.0.1/lib/jsmin')
+end
 module Sinatra
   module Minify
+    autoload :Builder, 'sinatra/minify/builder'
+    autoload :Helpers, 'sinatra/minify/helpers'
     def self.registered( app )
       app.helpers Helpers
       app.set :js_url, '/js' # => http://site.com/js
       app.set :js_path, '/public/js' # => ~/myproject/public/js
       app.set :css_url, '/css'
       app.set :css_path, '/public/css'
+      app.disable :force_minify
+    end
+    def minify?
+      production? or force_minify
     end
   end
   register Minify

data/lib/sinatra/minify/builder.rb CHANGED Viewed

@@ -1,29 +1,40 @@
+require 'yaml'
 module Sinatra
   module Minify
-    module Helpers
-      def js_assets( set )
-        Builder.new(self.class).js_assets set
+    class Builder
+      # Returns the root path of the main Sinatra application.
+      # Mimins the root_path functionality of Monk.`
+      def root_path(*args)
+        File.join(File.dirname(settings.app_file), *args)
       end
-      def css_assets( set )
-        Builder.new(self.class).css_assets set
+      # Deletes all minified files.
+      def clean
+        [:js, :css].each do |type|
+          assets_config(type).keys.each do |set|
+            prefix = type == :js ? settings.js_path : settings.css_path
+            path = root_path File.join(prefix, "#{set}.min.#{type}")
+            File.unlink path  if File.exists? path
+          end
+        end
       end
-    end
-    class Builder
+      # Rebuilds the minified .min.js and .min.css files.
       def build
         out = []
         [:js, :css].each do |type|
           assets_config(type).keys.each do |set|
             prefix = type == :js ? settings.js_path : settings.css_path
-            path = root_path File.join(prefix, "#{set}.min." + type.to_s)
-            File.open(path, 'w') << compress(type, set)
+            path = root_path(prefix, "#{set}.min.#{type}")
+            File.open(path, 'w') { |f| f.write compress(type, set) }
             out << path
           end
         end
         out
       end
-      def initialize( app_class = ::Main )
+      def initialize(app_class = ::Main)
         @app_class = app_class
       end
@@ -34,13 +45,15 @@ module Sinatra
       # Returns the file sets for a given type as defined in the `assets.yml` config file.
       #
       # Params:
-      #  - `type` (Symbol/string) - Can be either `:javascripts` or `:stylesheets`
+      #  - `type` (Symbol/string) - Can be either `:js` or `:css`
       #
       def assets_config(type)
-        YAML::load(File.open(root_path "config/assets.yml")) [type.to_s]
+        YAML.load_file(root_path("config/assets.yml"))[type.to_s]
       end
       # Returns HTML code with `<script>` tags to include the scripts in a given `set`.
+      # In a production environment, this tries to include the minified version of the
+      # files. If it doesn't exist, it falls back to the original files.
       #
       # Params:
       #   - `set` (String) - The set name, as defined in `config/assets.yml`.
@@ -50,22 +63,25 @@ module Sinatra
       #   <%= js_assets 'base' %>
       #
       def js_assets( set )
-        if settings.production?
-          "<script src='#{settings.js_url}/#{set}.min.js' type='text/javascript'></script>\n"
+        min_file = root_path(settings.js_path, "#{set}.min.js")
+        min_path = "/#{settings.js_url}/#{set}.min.js".squeeze("/")
+        if settings.minify? and File.exists? min_file
+          mtime = File.mtime(min_file).to_i
+          "<script src='#{min_path}?#{mtime}' type='text/javascript'></script>\n"
         else
           js_assets_all set
         end
       end
-      def js_assets_all( set )
-        ret = ''
-        assets(:js, set).each do |script|
-          ret << "<script src=\"#{script[:url]}\" type=\"text/javascript\"></script>\n"
-        end
-        ret
+      def js_assets_all(set)
+        assets(:js, set).map { |script|
+          "<script src='#{script[:url]}' type='text/javascript'></script>"
+        }.join("\n")
       end
       # Returns HTML code with `<link>` tags to include the stylesheets in a given `set`.
+      # In a production environment, this tries to include the minified version of the
+      # files. If it doesn't exist, it falls back to the original files.
       #
       # Params:
       #   - `set` (String) - The set name, as defined in `config/assets.yml`.
@@ -75,50 +91,52 @@ module Sinatra
       #   <%= css_assets 'base' %>
       #
       def css_assets( set )
-        if settings.production?
-          "<link rel='stylesheet' href='#{settings.css_url}/#{set}.min.css' media='screen' />\n"
+        min_file = root_path settings.css_path, "#{set}.min.css"
+        min_path = "/#{settings.css_url}/#{set}.min.css".squeeze("/")
+        if settings.minify? and File.exists? min_file
+          mtime = File.mtime(file).to_i
+          "<link rel='stylesheet' href='#{min_path}?#{mtime}' media='screen' />\n"
         else
           css_assets_all set
         end
       end
       def css_assets_all(set)
-        ret = ''
-        (assets_config :css) [set].each do |filename|
-          ret << "<link rel='stylesheet' href='#{settings.css_url}/#{filename}' media='screen' />\n"
-        end
-        ret
+        assets(:css, set).map { |sheet|
+          "<link rel='stylesheet' href='#{sheet[:url]}' media='screen' />"
+        }.join("\n")
       end
       # Returns the raw consolidated CSS/JS contents of a given type/set
-      def combine( type, set )
-        assets(type, set).map { |asset| File.open(asset[:path]).read }.join "\n"
+      def combine(type, set)
+        assets(type, set).map { |asset| File.open(asset[:path]).read }.join("\n").strip
       end
       # Returns compressed code
-      def compress( type, set )
-        code = combine type, set
+      def compress(type, set)
+        code = combine(type, set)
         if type == :js
           minify_js code
         elsif type == :css
           minify_css code
         else
-          raise Exception.new
+          raise ArgumentError, "type should be one of :js or :css"
         end
       end
       def minify_css( src )
-        src.gsub!(/\s+/, " ")
-        src.gsub!(/\/\*(.*?)\*\//, "")
-        src.gsub!(/\} /, "}\n")
-        src.gsub!(/\n$/, "")
-        src.gsub!(/ \{ /, " {")
-        src.gsub!(/; \}/, "}")
-        src
-      end
-      def minify_js( src )
-        require 'jsmin'
+        src.gsub! /\s+/, " "
+        src.gsub! /\/\*(.*?)\*\//, ""
+        src.gsub! /\} /, "}\n"
+        src.gsub! /\n$/, ""
+        src.gsub! /[ \t]*\{[ \t]*/, "{"
+        src.gsub! /;[ \t]*\}/, "}"
+        src.gsub! /[ \t]*([,|{|}|>|:|;])[ \t]*/,"\\1" # Tersify
+        src.gsub! /[ \t]*\n[ \t]*/, "" # Hardcore mode (no NLs)
+        src.strip
+      end
+      def minify_js(src)
         JSMin.minify src
       end
@@ -132,13 +150,9 @@ module Sinatra
       #   get_path :js
       #   # Possible value: "/home/rsc/myproject/public/js"
       #
-      def get_path( type )
-        if type == :js
-          path = settings.js_path
-        else
-          path = settings.css_path
-        end
-        root_path(path.split('/').inject([]) { |arr, item| arr << item unless item.empty?; arr })
+      def get_path(type)
+        path = (type == :js) ? settings.js_path : settings.css_path
+        root_path path.squeeze('/')
       end
       # Returns the URL for a given filename and a type.
@@ -149,18 +163,10 @@ module Sinatra
       # Example:
       #   get_url :js, '/path/to/file.js'
       #
-      def get_url( type, filename )
-        if type == :js
-          prefix = settings.js_url
-        else
-          prefix = settings.css_url
-        end
-        # Remove the js_path from it (/home/rsc/project/public/js/aa/lol.js => aa/lol.js)
-        url = File.join(prefix, filename.split(get_path type).join(''))
-        # Remove duplicate slashes
-        url = url.split('/').inject([]) { |arr, item| arr << item unless item.empty?; arr }
-        '/' + url.join('/')
+      def get_url(type, filename)
+        prefix = (type == :js) ? settings.js_url : settings.css_url
+        path   = filename.gsub(/^#{Regexp.escape(get_path(type))}/, '')
+        File.join(prefix, path).squeeze('/')
       end
       # Returns a list of assets of a given type for a given set.
@@ -184,28 +190,34 @@ module Sinatra
       # See also:
       #   - js_assets
       #
-      def assets( type, set )
-        # type is either js or css
-        specs = (assets_config type) [set]
-        path = get_path type
-        ret = []
-        done = []
+      def assets(type, set)
+        # type is either :js or :css
+        specs = assets_config(type)[set]
+        path  = get_path(type)
+        done  = []
         # `specs` will be a list of filespecs. Find all files that
         # match all specs.
-        if specs.class == Array
-          specs.each do |spec|
-            Dir["#{path}/#{spec}"].each do |filename|
-              unless done.include? filename
-                ret << {
-                  :url => get_url(type, filename),
-                  :path => filename
-                }
-                done << filename
-              end
+        [specs].flatten.inject([]) do |ret, spec|
+          filepath = "#{path}/#{spec}"
+          files    = Dir[filepath]
+          # Add it anyway if it doesn't match anything
+          unless files.any? || done.include?(filepath) || filepath.include?('*')
+            ret  << { :url => get_url(type, filepath), :path => filepath }
+            done << filepath
+          end
+          files.each do |filename|
+            unless done.include? filename
+              ret << {
+                :url  => [get_url(type, filename), File.mtime(filename).to_i].join('?'),
+                :path => filename
+              }
+              done << filename
             end
           end
+          ret
         end
-        ret
       end
     end
   end

data/lib/sinatra/minify/helpers.rb ADDED Viewed

@@ -0,0 +1,14 @@
+module Sinatra
+  module Minify
+    module Helpers
+      def js_assets( set )
+        Builder.new(self.class).js_assets set
+      end
+      def css_assets( set )
+        Builder.new(self.class).css_assets set
+      end
+    end
+  end
+end

data/sinatra-minify.gemspec CHANGED Viewed

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{sinatra-minify}
-  s.version = "0.0.1"
+  s.version = "0.1.1"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["sinefunc"]
-  s.date = %q{2010-04-22}
+  s.date = %q{2010-04-23}
   s.description = %q{sinatra-minify is an extension for Sinatra to compress assets.}
   s.email = %q{info@sinefunc.com}
   s.extra_rdoc_files = [
@@ -17,31 +17,47 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     ".rvmrc",
      "README.md",
      "Rakefile",
      "VERSION",
      "lib/sinatra/minify.rb",
      "lib/sinatra/minify/builder.rb",
+     "lib/sinatra/minify/helpers.rb",
      "lib/tasks.rake",
-     "sinatra-minify.gemspec"
+     "sinatra-minify.gemspec",
+     "test/fixtures/exampleapp/app.rb",
+     "test/fixtures/exampleapp/config/assets.yml",
+     "test/fixtures/exampleapp/public/css/style-default.css",
+     "test/fixtures/exampleapp/public/js/script-1.js",
+     "test/fixtures/exampleapp/public/js/script-2.js",
+     "test/helper.rb",
+     "test/test_minify.rb",
+     "vendor/jsmin-1.0.1/HISTORY",
+     "vendor/jsmin-1.0.1/lib/jsmin.rb"
   ]
   s.homepage = %q{http://www.github.com/sinefunc/sinatra-minify}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{CSS/JS compressor for Sinatra}
+  s.test_files = [
+    "test/fixtures/exampleapp/app.rb",
+     "test/helper.rb",
+     "test/test_minify.rb"
+  ]
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<jsmin>, [">= 1.0.1"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
     else
-      s.add_dependency(%q<jsmin>, [">= 1.0.1"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
     end
   else
-    s.add_dependency(%q<jsmin>, [">= 1.0.1"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
   end
 end

data/test/fixtures/exampleapp/app.rb ADDED Viewed

@@ -0,0 +1,30 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'rubygems'
+require 'sinatra/base'
+require 'sinatra/minify'
+# ROOT_DIR = File.dirname(__FILE__)
+class App < Sinatra::Base
+  set :app_file, __FILE__
+  register Sinatra::Minify
+  get '/' do
+    "Hello"
+  end
+  get "/foo" do
+    output = ""
+    output << js_assets('base')
+  end
+  # Doesn't stop Sinatra::Application from running by default
+  def self.run?
+    false
+  end
+end
+App.run! if $0 == __FILE__

data/test/fixtures/exampleapp/config/assets.yml ADDED Viewed

@@ -0,0 +1,6 @@
+js:
+  base:
+   script-*.js
+css:
+  base:
+    style-*.css

data/test/fixtures/exampleapp/public/css/style-default.css ADDED Viewed

@@ -0,0 +1,86 @@
+/* Reset */
+div, dl, dt, dd, ul, ol, li, form,
+fieldset, input, th, td                 { margin: 0; padding: 0; }
+pre, p, blockquote, h1, h2, h3, h4, h5,
+h6                                      { margin: 1em 0 1em 0; }
+blockquote                              { border-left: solid 2px #ccc; padding: 0 1em; margin-left: 0.2em; color: #888; }
+h1                                      { font-size: 1.4em; }
+h2                                      { font-size: 1.3em; }
+h3                                      { font-size: 1.2em; }
+h4                                      { font-size: 1.1em; }
+h5                                      { font-size: 0.9em; }
+h6                                      { font-size: 0.9em; }
+ol, ul                                  { margin-left: 2em; }
+/* Body & wrapper */
+html, body                              { margin: 0; padding: 0; }
+body, td, input, textarea               { font-family: arial, helvetica, sans-serif; font-size: 1em; }
+body                                    { font-size: 0.85em; line-height: 1.6em; background: #6ba241; color: #333; }
+#all                                    { margin: 0 auto; width: auto; position: relative; }
+/* Links */
+a                                       { color: #393; text-decoration: none; font-weight: bold; padding: 1px; }
+a:visited                               { color: #393; }
+a:hover                                 { color: #393; text-decoration: underline; }
+a img                                   { border: 0; }
+/* Common layout */
+#what-we-do, #who-we-are, #content      { overflow: hidden; }
+#header>.c, #what-we-do>.c,
+#who-we-are>.c, #footer>.c              { width: 940px; margin: 0 auto; overflow: hidden; }
+/* Common styling */
+#header                                 { background: #f8fbf4 url(bg-header.png) center bottom repeat-x; padding: 10px 0 130px 0; }
+#what-we-do                             { background: #f0f6e9; padding: 30px 0 0 0; }
+#who-we-are                             { background: #6ba241 url(bg-stripe.png) center top repeat-x; padding: 90px 0 30px 0; color: #d3e3c6; text-shadow: 1px 1px #5c843d; }
+#footer                                 { background: #444; padding: 50px 0 50px 0; color: #bbb; }
+/* Header */
+#header                                 { overflow: hidden; }
+#header #logo                           { float: left; margin-right: 75px; margin-left: 75px; }
+#header h1                              { background: url(text.png) 0 0 no-repeat; width: 511px; height: 95px; text-indent: -9999px; margin: 0; padding: 0; display: block; float: left; }
+#contact-header                         { border-bottom: solid 1px #ccc; margin-bottom: 90px; padding: 0 0 4px 0; text-align: right; color: #aaa;
+                                          font-size: 0.9em; }
+#contact-header em                      { margin: 0 12px 0 10px; color: #ccc; }
+#contact-header a                       { color: #888; text-decoration: underline; }
+#contact-header a:hover                 { color: #6b6; }
+/* Content */
+#content h2                             { float: left; width: 240px; }
+#content ul, #content li                { margin: 0; padding: 0; display: block; }
+#what-we-do>.c ul                       { float: left; width: 700px; overflow: hidden; }
+/* What we do */
+#what-we-do li                          { float: left; width: 340px; }
+#what-we-do li.left                     { margin-right: 20px; }
+#what-we-do li h3                       { font-size: 1.4em; }
+#what-we-do li h4                       { font-family: georgia, times, serif; font-style: italic; color: #777; font-weight: normal;
+                                          font-size: 1.2em; line-height: 1.4em; margin: 0.8em 0 0 0; }
+#what-we-do li p                        { margin: 3px 0 2em 0; }
+#what-we-do #do-build,
+#what-we-do #do-scale                   { padding-bottom: 1.5em; }
+/* What we do: h2 */
+#what-we-do h2                          { background: url(text.png) 0 -400px no-repeat; height: 18px; text-indent: -9999px; margin: 0; padding: 0;
+                                          display: block; }
+/* What we do: h3 */
+#what-we-do h3                          { background: url(text.png) 0 0 no-repeat; height: 21px; text-indent: -9999px; margin: 0; padding: 0;
+                                          display: block; }
+#do-build h3                            { background-position: 0 -200px; }
+#do-scale h3                            { background-position: 0 -250px; }
+#do-craft h3                            { background-position: 0 -300px; }
+#do-train h3                            { background-position: 0 -350px; }
+/* Who we are */
+#who-we-are>.c div                      { float: left; width: 560px; overflow: hidden; }
+#who-we-are h3                          { font-size: 1.4em; line-height: 1.5em; color: white; background: url(text.png) 0 -550px no-repeat;
+                                          width: 521px; height: 73px; text-indent: -9999px; margin: 0; padding: 0; display: block; padding-bottom: 7px; }
+#who-we-are h2                          { background: url(text.png) 0 -450px no-repeat; height: 18px; text-indent: -9999px; margin: 0; padding: 0;
+                                          display: block; }
+/* Footer */
+#footer                                 { text-align: center; }
+#footer a                               { font-size: 1.3em; color: white; font-weight: normal; }
+#footer span { display: block; font-size: 1.2em; color: #888; margin-bottom: 3px; font-family: georgia; font-style: italic; }

data/test/fixtures/exampleapp/public/js/script-1.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ aoeu = 234 /* Test */;

data/test/fixtures/exampleapp/public/js/script-2.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ aoeu = 234 /* Test */;

data/test/helper.rb ADDED Viewed

@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'test/unit'
+#require 'shoulda'
+require 'contest'
+require 'rack/test'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'fixtures/exampleapp/app'
+class Test::Unit::TestCase
+  include Rack::Test::Methods
+end

data/test/test_minify.rb ADDED Viewed

@@ -0,0 +1,52 @@
+require 'helper'
+class TestMinify < Test::Unit::TestCase
+  def app
+    App
+  end
+  def output
+    last_response.body
+  end
+  def builder
+    Sinatra::Minify::Builder.new app
+  end
+  should "rock pants off" do
+    get '/'
+    assert_match "Hello", output
+  end
+  should "Include all scripts" do
+    get '/foo'
+    assert_match /\/js\/script-1.js\?/, output
+    assert_match /\/js\/script-2.js\?/, output
+  end
+  describe "In a production environment" do
+    def setup
+      app.enable :force_minify
+    end
+    def teardown
+      app.disable :force_minify
+    end
+    should "Include the minified script" do
+      get '/foo'
+      assert_match /\/js\/base.min.js\?/, output
+    end
+  end
+  describe "Building files" do
+    def setup
+      builder.clean
+      builder.build
+    end
+    should "Build properly" do
+      assert true
+    end
+  end
+end

data/vendor/jsmin-1.0.1/HISTORY ADDED Viewed

@@ -0,0 +1,9 @@
+JSMin History
+================================================================================
+Version 1.0.1 (2008-11-10)
+  * Ruby 1.9 compatibility.
+  * Minor performance improvements.
+Version 1.0.0 (2008-03-22)
+  * First release.

data/vendor/jsmin-1.0.1/lib/jsmin.rb ADDED Viewed

@@ -0,0 +1,249 @@
+#--
+# jsmin.rb - Ruby implementation of Douglas Crockford's JSMin.
+#
+# This is a port of jsmin.c, and is distributed under the same terms, which are
+# as follows:
+#
+# Copyright (c) 2002 Douglas Crockford  (www.crockford.com)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# The Software shall be used for Good, not Evil.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#++
+require 'strscan'
+# = JSMin
+#
+# Ruby implementation of Douglas Crockford's JavaScript minifier, JSMin.
+#
+# Author::    Ryan Grove (mailto:ryan@wonko.com)
+# Version::   1.0.1 (2008-11-10)
+# Copyright:: Copyright (c) 2008 Ryan Grove. All rights reserved.
+# Website::   http://github.com/rgrove/jsmin/
+#
+# == Example
+#
+#   require 'rubygems'
+#   require 'jsmin'
+#
+#   File.open('example.js', 'r') {|file| puts JSMin.minify(file) }
+#
+module JSMin
+  CHR_APOS       = "'".freeze
+  CHR_ASTERISK   = '*'.freeze
+  CHR_BACKSLASH  = '\\'.freeze
+  CHR_CR         = "\r".freeze
+  CHR_FRONTSLASH = '/'.freeze
+  CHR_LF         = "\n".freeze
+  CHR_QUOTE      = '"'.freeze
+  CHR_SPACE      = ' '.freeze
+  if RUBY_VERSION >= '1.9'
+    ORD_LF    = "\n".freeze
+    ORD_SPACE = ' '.freeze
+    ORD_TILDE = '~'.freeze
+  else
+    ORD_LF    = "\n"[0].freeze
+    ORD_SPACE = ' '[0].freeze
+    ORD_TILDE = '~'[0].freeze
+  end
+  class << self
+    # Reads JavaScript from +input+ (which can be a String or an IO object) and
+    # returns a String containing minified JS.
+    def minify(input)
+      @js = StringScanner.new(input.is_a?(IO) ? input.read : input.to_s)
+      @a         = "\n"
+      @b         = nil
+      @lookahead = nil
+      @output    = ''
+      action_get
+      while !@a.nil? do
+        case @a
+        when CHR_SPACE
+          if alphanum?(@b)
+            action_output
+          else
+            action_copy
+          end
+        when CHR_LF
+          if @b == CHR_SPACE
+            action_get
+          elsif @b =~ /[{\[\(+-]/
+            action_output
+          else
+            if alphanum?(@b)
+              action_output
+            else
+              action_copy
+            end
+          end
+        else
+          if @b == CHR_SPACE
+            if alphanum?(@a)
+              action_output
+            else
+              action_get
+            end
+          elsif @b == CHR_LF
+            if @a =~ /[}\]\)\\"+-]/
+              action_output
+            else
+              if alphanum?(@a)
+                action_output
+              else
+                action_get
+              end
+            end
+          else
+            action_output
+          end
+        end
+      end
+      @output
+    end
+    private
+    # Corresponds to action(1) in jsmin.c.
+    def action_output
+      @output << @a
+      action_copy
+    end
+    # Corresponds to action(2) in jsmin.c.
+    def action_copy
+      @a = @b
+      if @a == CHR_APOS || @a == CHR_QUOTE
+        loop do
+          @output << @a
+          @a = get
+          break if @a == @b
+          if @a[0] <= ORD_LF
+            raise "JSMin parse error: unterminated string literal: #{@a}"
+          end
+          if @a == CHR_BACKSLASH
+            @output << @a
+            @a = get
+            if @a[0] <= ORD_LF
+              raise "JSMin parse error: unterminated string literal: #{@a}"
+            end
+          end
+        end
+      end
+      action_get
+    end
+    # Corresponds to action(3) in jsmin.c.
+    def action_get
+      @b = nextchar
+      if @b == CHR_FRONTSLASH && (@a == CHR_LF || @a =~ /[\(,=:\[!&|?{};]/)
+        @output << @a
+        @output << @b
+        loop do
+          @a = get
+          if @a == CHR_FRONTSLASH
+            break
+          elsif @a == CHR_BACKSLASH
+            @output << @a
+            @a = get
+          elsif @a[0] <= ORD_LF
+            raise "JSMin parse error: unterminated regular expression " +
+                "literal: #{@a}"
+          end
+          @output << @a
+        end
+        @b = nextchar
+      end
+    end
+    # Returns true if +c+ is a letter, digit, underscore, dollar sign,
+    # backslash, or non-ASCII character.
+    def alphanum?(c)
+      c.is_a?(String) && !c.empty? && (c[0] > ORD_TILDE || c =~ /[0-9a-z_$\\]/i)
+    end
+    # Returns the next character from the input. If the character is a control
+    # character, it will be translated to a space or linefeed.
+    def get
+      c = @lookahead.nil? ? @js.getch : @lookahead
+      @lookahead = nil
+      return c if c.nil? || c == CHR_LF || c[0] >= ORD_SPACE
+      return "\n" if c == CHR_CR
+      return ' '
+    end
+    # Gets the next character, excluding comments.
+    def nextchar
+      c = get
+      return c unless c == CHR_FRONTSLASH
+      case peek
+      when CHR_FRONTSLASH
+        loop do
+          c = get
+          return c if c[0] <= ORD_LF
+        end
+      when CHR_ASTERISK
+        get
+        loop do
+          case get
+          when CHR_ASTERISK
+            if peek == CHR_FRONTSLASH
+              get
+              return ' '
+            end
+          when nil
+            raise 'JSMin parse error: unterminated comment'
+          end
+        end
+      else
+        return c
+      end
+    end
+    # Gets the next character without getting it.
+    def peek
+      @lookahead = get
+    end
+  end
+end

metadata CHANGED Viewed

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments:
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors:
 - sinefunc
@@ -14,22 +14,20 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-04-22 00:00:00 +08:00
+date: 2010-04-23 00:00:00 +08:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jsmin
+  name: rack-test
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         segments:
-        - 1
         - 0
-        - 1
-        version: 1.0.1
-  type: :runtime
+        version: "0"
+  type: :development
   version_requirements: *id001
 description: sinatra-minify is an extension for Sinatra to compress assets.
 email: info@sinefunc.com
@@ -41,13 +39,24 @@ extra_rdoc_files:
 - README.md
 files:
 - .gitignore
+- .rvmrc
 - README.md
 - Rakefile
 - VERSION
 - lib/sinatra/minify.rb
 - lib/sinatra/minify/builder.rb
+- lib/sinatra/minify/helpers.rb
 - lib/tasks.rake
 - sinatra-minify.gemspec
+- test/fixtures/exampleapp/app.rb
+- test/fixtures/exampleapp/config/assets.yml
+- test/fixtures/exampleapp/public/css/style-default.css
+- test/fixtures/exampleapp/public/js/script-1.js
+- test/fixtures/exampleapp/public/js/script-2.js
+- test/helper.rb
+- test/test_minify.rb
+- vendor/jsmin-1.0.1/HISTORY
+- vendor/jsmin-1.0.1/lib/jsmin.rb
 has_rdoc: true
 homepage: http://www.github.com/sinefunc/sinatra-minify
 licenses: []
@@ -78,5 +87,7 @@ rubygems_version: 1.3.6
 signing_key:
 specification_version: 3
 summary: CSS/JS compressor for Sinatra
-test_files: []
+test_files:
+- test/fixtures/exampleapp/app.rb
+- test/helper.rb
+- test/test_minify.rb