compressible 0.0.2.6 → 0.0.3

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 # http://docs.rubygems.org/read/chapter/20
 spec = Gem::Specification.new do |s|
   s.name              = "compressible"
-  s.version           = "0.0.2.6"
+  s.version           = "0.0.3"
   s.author            = "Lance Pollard"
   s.summary           = "Compressible: Quick asset compression for Ruby - Perfect for Heroku"
   s.homepage          = "http://github.com/viatropos/compressible"

data/lib/compressible.rake

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake'
 require 'yui/compressor'
-
+raise 'stop'
 namespace :compress do
   
   desc "Compress JS"

data/lib/compressible.rb

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'yaml'
+require 'open-uri'
 require 'active_support'
+require 'active_support/core_ext'
 
 this = File.dirname(__FILE__)
 require File.join(this, "ext.rb")

data/lib/compressible/assetable.rb

@@ -7,39 +7,39 @@ module Compressible
     
     module ClassMethods
     
-      def javascripts(hash)
+      def javascripts(hash, &block)
         hash.each do |to, paths|
           paths << {:to => to}
-          javascript(*paths)
+          javascript(*paths, &block)
         end
       end
       alias_method :add_javascripts, :javascripts
 
-      def stylesheets(hash)
+      def stylesheets(hash, &block)
         hash.each do |to, paths|
           paths << {:to => to}
-          stylesheet(*paths)
+          stylesheet(*paths, &block)
         end
       end
       alias_method :add_stylesheets, :stylesheets
   
-      def javascript(*args)
-        paths = args.dup
+      def javascript(*args, &block)
+        paths = args.dup.flatten
         options = paths.extract_options!
         to = asset_name(options[:to])
-        add_to_config(:js, to, paths.flatten)
-        write_javascript(*args) unless config[:read_only] == true
+        add_to_config(:js, to, paths)
+        write_javascript(*args, &block) unless config[:read_only] == true
         to
       end
       alias_method :add_javascript, :javascript
       alias_method :js, :javascript
 
-      def stylesheet(*args)
-        paths = args.dup
+      def stylesheet(*args, &block)
+        paths = args.dup.flatten
         options = paths.extract_options!
         to = asset_name(options[:to])
-        add_to_config(:css, to, paths.flatten)
-        write_stylesheet(*args) unless config[:read_only] == true
+        add_to_config(:css, to, paths)
+        write_stylesheet(*args, &block) unless config[:read_only] == true
         to
       end
       alias_method :add_stylesheet, :stylesheet

data/lib/compressible/builder.rb

@@ -14,6 +14,23 @@ module Compressible
       Compressible.configure(:read_only => value)
     end
     
+    def stylesheet_path(value)
+      Compressible.configure(:stylesheet_path => value)
+    end
+    
+    def javascript_path(value)
+      Compressible.configure(:javascript_path => value)
+    end
+    
+    # used to customize the output
+    def format(context = nil, &block)
+      if block_given?
+        context ||= @context
+        @format ||= {}
+        @format[context] = block
+      end
+    end
+    
     def stylesheets(&block)
       @context = "stylesheet"
       instance_eval(&block) if block_given?
@@ -28,10 +45,20 @@ module Compressible
     
     def method_missing(meth, *args, &block)
       if @context
-        Compressible.send(@context, args, :to => [meth])
+        Compressible.send(@context, args, :to => [meth]) do |name, output|
+          modify(name, output)
+        end
       else
         super(meth, *args, &block)
       end
     end
+    
+    protected
+    def modify(name, output)
+      if @format
+        return @format[@context].call(name, output) if @format[@context]
+      end
+      output
+    end
   end
 end

data/lib/compressible/configurable.rb

@@ -34,7 +34,7 @@ module Compressible
           :read_only => false
         }
       end
-
+      
       def config
         @config ||= defaults
       end

data/lib/compressible/readable.rb

@@ -13,17 +13,17 @@ module Compressible
       def uncached_javascript_paths(*keys)
         uncached_paths_for(:js, *keys)
       end
-
+      
       def uncached_paths_for(type, *keys)
-        returning [] do |result|
-          config[type].each do |item|
-            keys.each do |key|
-              result.concat(item[:paths]) if item[:to] == key.to_s
-            end
+        result = []
+        config[type].each do |item|
+          keys.each do |key|
+            result.concat(item[:paths]) if item[:to] == key.to_s
           end
         end
+        result.flatten
       end
-
+      
       def stylesheets_for(*keys)
         assets_for(:stylesheet, *keys)
       end
@@ -34,12 +34,21 @@ module Compressible
 
       def assets_for(type, *keys)
         options = keys.extract_options!
-        environment = defined?(Rails) ? Rails.env.to_s : (options[:current] || "production")
-        environment = environment.to_s
+        keys.map!(&:to_s)
+        if !options[:current].blank?
+          environment = options[:current].to_s
+        elsif defined?(::Rails)
+          environment = Rails.env.to_s
+        elsif defined?(::Sinatra::Application)
+          environment = Sinatra::Application.environment.to_s
+        else
+          environment = "production"
+        end
+        puts "ENV #{environment}"
         cache_environments = options[:environments] || "production"
         cache_environments = [cache_environments] unless cache_environments.is_a?(Array)
         cache_environments = cache_environments.collect(&:to_s)
-
+        
         assets = cache_environments.include?(environment) ? keys : send("uncached_#{type.to_s}_paths", *keys)
         assets
       end
@@ -60,6 +69,9 @@ module Compressible
 
         if config && config[key]
           path = File.join(config[key], file.to_s)
+          
+        elsif remote?(file)
+          path = file.to_s
         elsif defined?(Rails)
           path = File.join(Rails.root.to_s, "public/#{type.to_s.pluralize}", file.to_s)
         else
@@ -86,7 +98,11 @@ module Compressible
       end
       
       def read(type, from)
-        IO.read(path_for(type, from))
+        open(path_for(type, from)).read
+      end
+      
+      def remote?(path)
+        !!(path =~ /^http(?:s)?/)
       end
     end
     

data/lib/compressible/writable.rb

@@ -25,24 +25,24 @@ module Compressible
       
       # figure out how to do alias_method_chain or something
       # otherwise the modules are tightly coupled
-      def write_javascript(*args)
-        paths = args.dup
+      def write_javascript(*args, &block)
+        paths = args.dup.flatten
         options = paths.extract_options!
         options[:to] = asset_name(options[:to])
         options[:munge] = options.has_key?(:munge) ? options[:munge] : true
         paths << options
-        process(:javascript, *paths)
+        process(:javascript, *paths, &block)
       end
       
-      def write_stylesheet(*args)
-        paths = args.dup
+      def write_stylesheet(*args, &block)
+        paths = args.dup.flatten
         options = paths.extract_options!
         options[:to] = asset_name(options[:to])
         paths << options
-        process(:stylesheet, *paths)
+        process(:stylesheet, *paths, &block)
       end
       
-      def process(type, *paths)
+      def process(type, *paths, &block)
         require 'yui/compressor' unless defined?(::YUI)
         options = paths.extract_options!
         to      = options[:to]
@@ -51,15 +51,22 @@ module Compressible
         
         compressor = compressor_for(type, options)
         
-        start_size = size(type, *paths)
+        paths = localize(to, type, *paths)
         
-        compressed = paths.collect do |path|
-          puts "Compressing '#{path}'... (#{size(type, path)})"
-          compressor.compress(read(type, path))
-        end.join("\n\n")
+        start_size = size(type, *paths.map(&:first))
+        
+        compressed = paths.collect do |path, print_path|
+          puts "Compressing '#{print_path}'... (#{size(type, path)})"
+          result = compressor.compress(read(type, path))
+          next if result.blank?
+          result = yield(path, result).to_s if block_given?
+          result
+        end.join("")
         
         write(type, to, compressed)
         
+        destroy(*paths)
+        
         end_size = size(type, to)
         
         puts "Compressed to '#{to.to_s}' (#{end_size} from #{start_size})"
@@ -77,6 +84,73 @@ module Compressible
       def write(type, to, result)
         File.open(path_for(type, to), "w") {|f| f.puts result}
       end
+      
+      def localize(to, type, *paths)
+        FileUtils.mkdir_p(to) unless File.exists?(to)
+        local_paths = paths.map do |path|
+          if remote?(path)
+            local = File.join(to, File.basename(path))
+            File.open(local, "w+") do |file|
+              begin
+                file.puts read(type, path)
+              rescue Exception => e
+                paths.delete(path)
+                puts "#{e.message}: #{path}"
+              end
+            end
+            [local, path]
+          else
+            [path, path]
+          end
+        end
+      end
+      
+      def remote_path(domain, path, asset)
+        # full
+        if asset =~ /^http(?:s)?:\/\//
+          asset
+        # absolute
+        elsif asset =~ /^\//
+          asset = "#{domain}#{asset}"
+        # relative
+        else
+          asset = "#{domain}#{path}/#{asset}"
+        end
+      end
+      
+      # returns css and javascripts {:js => [], :css => []}
+      # requires nokogiri
+      def scrape(page)
+        require 'nokogiri'
+        url = URI.parse(page)
+        domain =   "#{url.scheme}://#{url.host}"
+        domain <<  ":#{url.port.to_s}"
+        path = url.path.squeeze("/")
+        html = Nokogiri::HTML(open(page).read)
+        scripts = []
+        
+        html.css("script").each do |script|
+          next if script["src"].blank?
+          scripts << remote_path(domain, path, script["src"])
+        end
+        
+        csses = []
+        
+        html.css("link[rel=stylesheet]").each do |css|
+          next if css["href"].blank?
+          csses << remote_path(domain, path, css["href"])
+        end
+        
+        {:js => scripts, :css => csses}
+      end
+      
+      def destroy(*paths)
+        paths.each do |path, print_path|
+          if path != print_path
+            File.delete(path) if File.exists?(path)
+          end
+        end
+      end
     end
   end 
 end

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: compressible
 version: !ruby/object:Gem::Version 
-  hash: 75
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  - 6
-  version: 0.0.2.6
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Lance Pollard
@@ -16,18 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -07:00
+date: 2010-08-24 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 3
@@ -39,11 +35,9 @@ dependencies:
   name: yui-compressor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -93,27 +87,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: compressible
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "Compressible: Quick asset compression for Ruby - Perfect for Heroku"