sinatra-minify 0.2.0 → 0.2.2

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 Rico Sta. Cruz, Cyril David and Sinefunc, Inc.
+
+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 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.

data/README.md

@@ -13,13 +13,14 @@ Add these to your app's main file:
       register Sinatra::Minify
     end
 
-Add this to your `Rakefile`:
+Add this to your app's `Rakefile`:
 
     load 'vendor/sinatra-minify/lib/tasks.rake'
 
 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.
 
+    # config/assets.yml
     js:
       base:
         - jquery-1.4.2.js
@@ -34,6 +35,7 @@ The files are are assumed to be in `public/js` and `public/css` by default.
 
 Now add the helpers to your templates:
 
+    # views/layout.erb (for example)
        ...
        <%= css_assets 'base' %>
        <%= css_assets 'homepage' %>
@@ -116,3 +118,33 @@ 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).
 
+Using sinatra-minify with Less / Sass
+-------------------------------------
+
+Let's say you have some routes like
+
+    get '/css/:file.css' do
+      # some code here that opens the less file
+    end
+
+In order to properly minify this, the application must be running when
+you do `rake minify:build`. By default, we assume you have your app running in
+`http://localhost:4567`, but you can easily override this by doing:
+
+    # First let's run your application. Let's say it's a rack app:
+    rackup config.ru
+
+    # Now specify the URL via:
+    MINIFY_SITE_URL=http://localhost:9292 rake minify:build
+
+
+Authors
+=======
+
+Sinatra-minify is co-authored by Rico Sta. Cruz and Cyril David of Sinefunc, Inc.
+See more of our work on [www.sinefunc.com](http://www.sinefunc.com)!
+
+Copyright
+---------
+
+(c) 2010 Rico Sta. Cruz, Cyril David and Sinefunc, Inc. See the LICENSE file for more details.

data/Rakefile

@@ -5,7 +5,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name        = "sinatra-minify"
-    s.authors     = ["sinefunc"]
+    s.authors     = ["Rico Sta. Cruz", "Cyril David", "Sinefunc, Inc."]
     s.email       = "info@sinefunc.com"
     s.summary     = "CSS/JS compressor for Sinatra"
     s.homepage    = "http://www.github.com/sinefunc/sinatra-minify"

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.2

data/lib/sinatra/minify/compressor.rb

@@ -1,3 +1,6 @@
+require 'fileutils'
+require 'open-uri'
+
 module Sinatra
   module Minify
     class Compressor
@@ -8,12 +11,14 @@ module Sinatra
         @file        = file
         @package     = package
         @command     = :"minify_#{@type}"
+        @host        = ENV["MINIFY_SITE_URL"] || "http://localhost:4567"
 
         raise ArgumentError  if not ['js', 'css'].include?(type)
       end
 
       # Rebuilds the minified .min.* files.
       def build
+        FileUtils.mkdir_p(File.dirname(file))
         File.open(file, 'w') { |f| f.write minify(concatenated) }
         file
       end
@@ -26,7 +31,14 @@ module Sinatra
     private
       # TODO: decouple this further?
       def concatenated
-        package.files.map { |f| File.read(f) }.join("\n").strip
+        package.files.map { |f|
+          if File.exist?(f)
+            File.read(f)
+          else
+            path = f.split('public').last
+            open("#{ @host }#{ path}").read
+          end
+        }.join("\n").strip
       end
 
       def minify(src)

data/lib/sinatra/minify/config.rb

@@ -26,8 +26,12 @@ module Sinatra
         File.join(File.dirname(@settings.app_file), *args)
       end
 
+      def config_file
+        @settings.minify_config
+      end
+
       def sets
-        YAML.load_file(root_path("config/assets.yml"))[@type]
+        YAML.load_file(root_path(config_file))[@type]
       end
     end
   end

data/lib/sinatra/minify/package.rb

@@ -1,8 +1,6 @@
 module Sinatra
   module Minify
     class Package
-      GlobNoMatchError = Class.new(StandardError)
-
       attr :type, :set, :compressor, :filename
 
       class << self
@@ -47,7 +45,7 @@ module Sinatra
       def initialize(type, set, app_class = ::Main)
         @type       = type.to_s
         @app_class  = app_class 
-        @set        = set
+        @set        = set.to_s
         @config     = Config.new(@type, app_class)
         @filename   = "#{set}.min.#{type}" 
         @compressor = Compressor.new(@type, public_dir(@filename), self)
@@ -57,9 +55,7 @@ module Sinatra
       def html
         if @app_class.minify?
           file = public_dir(filename)
-          @compressor.build  unless File.exists?(file)
-          mtime = File.mtime(file).to_i
-
+          mtime = File.exists?(file) ? File.mtime(file).to_i : ''
           asset_include_tag public_url(filename), mtime
         else
           enumerate_all_assets
@@ -95,9 +91,9 @@ module Sinatra
       def asset_include_tag(path, mtime)
         case type
         when 'js'
-          "<script src='#{js_url}/#{path}?#{mtime}' type='text/javascript'></script>"
+          "<script src='#{path}?#{mtime}' type='text/javascript'></script>"
         when 'css'
-          "<link rel='stylesheet' href='#{css_url}/#{path}?#{mtime}' media='screen' />"
+          "<link rel='stylesheet' href='#{path}?#{mtime}' media='all' />"
         else
           raise ArgumentError, "only js/css are supported"
         end

data/lib/sinatra/minify.rb

@@ -15,12 +15,15 @@ module Sinatra
     autoload :Compressor, 'sinatra/minify/compressor'
     autoload :Helpers,    'sinatra/minify/helpers'
 
+    GlobNoMatchError = Class.new(StandardError)
+    
     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.set :minify_config, 'config/assets.yml'
       app.disable :force_minify
     end
 

data/sinatra-minify.gemspec

@@ -5,19 +5,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-minify}
-  s.version = "0.2.0"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["sinefunc"]
-  s.date = %q{2010-04-23}
+  s.authors = ["Rico Sta. Cruz", "Cyril David", "Sinefunc, Inc."]
+  s.date = %q{2010-05-22}
   s.description = %q{sinatra-minify is an extension for Sinatra to compress assets.}
   s.email = %q{info@sinefunc.com}
   s.extra_rdoc_files = [
-    "README.md"
+    "LICENSE",
+     "README.md"
   ]
   s.files = [
     ".gitignore",
      ".rvmrc",
+     "LICENSE",
      "README.md",
      "Rakefile",
      "VERSION",
@@ -30,6 +32,7 @@ Gem::Specification.new do |s|
      "sinatra-minify.gemspec",
      "test/fixtures/control/style-default-compressed.css",
      "test/fixtures/exampleapp/app.rb",
+     "test/fixtures/exampleapp/config/assets-glob_error.yml",
      "test/fixtures/exampleapp/config/assets.yml",
      "test/fixtures/exampleapp/public/css/style-default.css",
      "test/fixtures/exampleapp/public/js/script-1.js",

data/test/fixtures/exampleapp/config/assets-glob_error.yml

@@ -0,0 +1,3 @@
+js:
+  base:
+   nothing-*.js

data/test/helper.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'test/unit'
-#require 'shoulda'
 require 'contest'
 require 'rack/test'
 

data/test/test_minify.rb

@@ -92,4 +92,17 @@ class TestMinify < Test::Unit::TestCase
       assert_equal 9, unknown.index('aoeu=456;')
     end
   end
+
+  describe "second config file" do
+    def setup
+      app.set :minify_config, 'config/assets-glob_error.yml'
+    end
+
+    should "throw an error on an invalid glob" do
+      package = Sinatra::Minify::Package.new(:js, 'base', app)
+      assert_raise Sinatra::Minify::GlobNoMatchError do
+        package.html
+      end
+    end
+  end
 end

metadata

@@ -5,16 +5,18 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
-- sinefunc
+- Rico Sta. Cruz
+- Cyril David
+- Sinefunc, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-04-23 00:00:00 +08:00
+date: 2010-05-22 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,10 +38,12 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE
 - README.md
 files: 
 - .gitignore
 - .rvmrc
+- LICENSE
 - README.md
 - Rakefile
 - VERSION
@@ -52,6 +56,7 @@ files:
 - sinatra-minify.gemspec
 - test/fixtures/control/style-default-compressed.css
 - test/fixtures/exampleapp/app.rb
+- test/fixtures/exampleapp/config/assets-glob_error.yml
 - test/fixtures/exampleapp/config/assets.yml
 - test/fixtures/exampleapp/public/css/style-default.css
 - test/fixtures/exampleapp/public/js/script-1.js