compressible 0.0.2.3 → 0.0.2.4

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.3"
+  s.version           = "0.0.2.4"
   s.author            = "Lance Pollard"
   s.summary           = "Compressible: Quick asset compression for Ruby - Perfect for Heroku"
   s.homepage          = "http://github.com/viatropos/compressible"
@@ -53,7 +53,7 @@ end
 
 desc "Install the gem locally"
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{spec.name}-#{spec.version} --no-ri --no-rdoc}
+  sh %{gem install pkg/#{spec.name}-#{spec.version} --no-ri --no-rdoc}
 end
 
 desc "Generate the rdoc"

data/lib/compressible.rb

@@ -25,4 +25,4 @@ Dir["#{this}/compressible/*"].each { |c| require c }
 Compressible.send(:include, Compressible::Configurable)
 Compressible.send(:include, Compressible::Assetable)
 Compressible.send(:include, Compressible::Readable)
-Compressible.send(:include, Compressible::Writable)
+Compressible.send(:include, Compressible::Writable)

data/lib/compressible/assetable.rb

@@ -6,7 +6,7 @@ module Compressible
     end
     
     module ClassMethods
-  
+    
       def javascripts(hash)
         hash.each do |to, paths|
           paths << {:to => to}
@@ -27,10 +27,7 @@ module Compressible
         paths = args.dup
         options = paths.extract_options!
         to = asset_name(options[:to])
-        raise "Please define a name for the cached javascript using ':to => :my_name'" unless to
-
         add_to_config(:js, to, paths)
-        
         write_javascript(*args) unless config[:read_only] == true
       end
       alias_method :add_javascript, :javascript

data/lib/compressible/configurable.rb

@@ -10,17 +10,15 @@ module Compressible
 
       def configure(value = nil)
         raise "invalid config" unless (value.is_a?(String) || value.is_a?(Hash))
-        @config = value.is_a?(String) ? YAML.load_file(value) : value
-        @config.recursively_symbolize_keys!
-
-        @config = defaults.merge(@config)
+        
+        config.merge!((value.is_a?(String) ? YAML.load_file(value) : value).recursively_symbolize_keys!)
 
         # normalize everything to an array
         [:js, :css].each do |type|
-          @config[type] = [@config[type]] unless @config[type].is_a?(Array)
+          config[type] = [config[type]] unless config[type].is_a?(Array)
         end
-
-        @config
+        
+        self
       end
 
       def defaults
@@ -36,13 +34,14 @@ module Compressible
       def config
         @config ||= defaults
       end
-
+      
       def add_to_config(type, key, value)
+        raise "Please define a name for the cached #{type.to_s} using ':to => :my_name'" unless key
         item = find_or_create(type, key)
         item[:paths] = value.collect {|i| asset_name(i)}
         item
       end
-
+      
       def find_or_create(type, key)
         result = config[type].detect {|i| i[:to].to_s == key.to_s}
         unless result
@@ -55,6 +54,10 @@ module Compressible
       def reset
         @config = defaults
       end
+      
+      def inspect
+        "<#Compressible @config=#{config.inspect}/>"
+      end
     end
     
   end

data/lib/compressible/readable.rb

@@ -44,10 +44,6 @@ module Compressible
         assets
       end
 
-      def read(type, from)
-        IO.read(path_for(type, from))
-      end
-
       def asset_name(path)
         result = path.to_s.split(".")
         if result.last =~ /(js|css)/
@@ -74,6 +70,24 @@ module Compressible
 
         path
       end
+      
+      def size(type, *paths)
+        result = paths.collect { |path| File.size(path_for(type, path)) }.inject(0) { |sum, x| sum + x }
+        by = "kb"
+        unless result <= 0
+          result = case by
+          when "kb"
+            result / 1_000
+          when "mb"
+            result / 1_000_000
+          end
+        end
+        return "#{result.to_s}#{by}"
+      end
+      
+      def read(type, from)
+        IO.read(path_for(type, from))
+      end
     end
     
   end

data/lib/compressible/writable.rb

@@ -28,44 +28,50 @@ module Compressible
       def write_javascript(*args)
         paths = args.dup
         options = paths.extract_options!
-        to = asset_name(options[:to])
-        require 'yui/compressor' unless defined?(YUI)
-
-        munge = options.has_key?(:munge) ? options[:munge] : true
-
-        compressor = YUI::JavaScriptCompressor.new(:munge => munge)
-
-        result = paths.collect do |path|
-          puts "Compressing #{path}..."
-          compressor.compress(read(:javascript, path))
-        end.join("\n\n")
-
-        write(:javascript, to, result) if to
-
-        result
+        options[:to] = asset_name(options[:to])
+        options[:munge] = options.has_key?(:munge) ? options[:munge] : true
+        paths << options
+        process(:javascript, *paths)
       end
       
       def write_stylesheet(*args)
         paths = args.dup
         options = paths.extract_options!
-        to = asset_name(options[:to])
-
-        add_to_config(:css, to, paths)
-
-        return if options[:read_only] == true
-    
-        require 'yui/compressor' unless defined?(YUI)
-
-        compressor = YUI::CssCompressor.new
-
-        result = paths.collect do |path|
-          puts "Compressing #{path}..."
-          compressor.compress(read(:stylesheet, path))
+        options[:to] = asset_name(options[:to])
+        paths << options
+        process(:stylesheet, *paths)
+      end
+      
+      def process(type, *paths)
+        require 'yui/compressor' unless defined?(::YUI)
+        options = paths.extract_options!
+        to      = options[:to]
+        
+        raise 'must define result file name via :to => name' unless to
+        
+        compressor = compressor_for(type, options)
+        
+        start_size = size(type, *paths)
+        
+        compressed = paths.collect do |path|
+          puts "Compressing '#{path}'... (#{size(type, path)})"
+          compressor.compress(read(type, path))
         end.join("\n\n")
-
-        write(:stylesheet, to, result) if to
-
-        result
+        
+        write(type, to, compressed)
+        
+        end_size = size(type, to)
+        
+        puts "Compressed to '#{to.to_s}' (#{end_size} from #{start_size})"
+        
+        compressed
+      end
+      
+      def compressor_for(type, options = {})
+        {
+          :javascript => YUI::JavaScriptCompressor,
+          :stylesheet => YUI::CssCompressor
+        }[type].new(options.reject {|k,v| k.to_s !~ /(munge|charset|linebreak|optimize|preserve_semicolons)/})
       end
       
       def write(type, to, result)

data/test/test_compressible.rb

@@ -6,8 +6,8 @@ class CompressibleTest < Test::Unit::TestCase
     
     context "configuration" do
             
-      should "load configuration file and result should be a hash" do
-        assert_kind_of Hash, Compressible.configure("test/config.yml")
+      should "load configuration file and result should be a Module" do
+        assert_kind_of Module, Compressible.configure("test/config.yml")
       end
       
       should "raise an RuntimeError if pass junk to config" do
@@ -115,6 +115,17 @@ class CompressibleTest < Test::Unit::TestCase
         assert_equal ["test/test-a", "test/test-b"], Compressible.config[:js][0][:paths]
       end
       
+      should "be able to add config dynamically" do
+        assert_equal Compressible.defaults, Compressible.config
+        Compressible.configure(:stylesheet_path => "public/stylesheets", :read_only => true)
+        assert_equal "public/stylesheets", Compressible.config[:stylesheet_path]
+        Compressible.stylesheets("test/result" => ["test/test-a", "test/test-b"])
+        assets = Compressible.assets_for(:stylesheet, 'test/result', :environments => "production", :current => "development")
+        assert_equal ["test/test-a", "test/test-b"], assets
+        result = {:js=>[], :javascript_path=>nil, :stylesheet_path=>"public/stylesheets", :read_only=>true, :css=>[{:paths=>["test/test-a", "test/test-b"], :to=>"test/result"}]}
+        assert_equal result, Compressible.config
+      end
+      
       teardown { Compressible.reset }
       
     end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: compressible
 version: !ruby/object:Gem::Version 
+  hash: 79
   prerelease: false
   segments: 
   - 0
   - 0
   - 2
-  - 3
-  version: 0.0.2.3
+  - 4
+  version: 0.0.2.4
 platform: ruby
 authors: 
 - Lance Pollard
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -07:00
+date: 2010-06-07 00:00:00 -07: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: 15
         segments: 
         - 2
         - 1
@@ -36,9 +39,11 @@ 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"
@@ -87,23 +92,27 @@ 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.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "Compressible: Quick asset compression for Ruby - Perfect for Heroku"