bonsai 1.4.7 → 1.4.8

data/.rbenv-version

@@ -0,0 +1 @@
+1.9.3-p362

data/.travis.yml

@@ -3,10 +3,8 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby-18mode
-  - jruby-19mode
   - rbx-18mode
-  
+
 # These implementations are failing as of writing  
 #  - rbx-19mode # Has an encoding issue.
 #  - ruby-head  # Has a YAML parser issue.

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    bonsai (1.4.6)
+    bonsai (1.4.8)
       activesupport (>= 3.0.3)
-      bonsai
       builder (>= 3.0.0)
       i18n (>= 0.5.0)
       launchy (>= 0.3.7)
@@ -14,36 +13,33 @@ PATH
       sinatra (>= 1.0)
       tilt (>= 1.3)
       watch (>= 0.1.0)
+      yui-compressor
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.6)
+    POpen4 (0.1.4)
+      Platform (>= 0.4.0)
+      open4
+    Platform (0.4.0)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    addressable (2.2.8)
-    builder (3.0.0)
+    addressable (2.3.2)
+    builder (3.1.4)
     diff-lcs (1.1.3)
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.3)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
-    liquid (2.3.0)
-    maruku (0.6.0)
+    i18n (0.6.1)
+    launchy (2.1.2)
+      addressable (~> 2.3)
+    liquid (2.4.1)
+    maruku (0.6.1)
       syntax (>= 1.0.0)
-    multi_json (1.3.6)
-    rack (1.4.1)
-    rack-protection (1.2.0)
+    multi_json (1.5.0)
+    open4 (1.3.0)
+    rack (1.4.4)
+    rack-protection (1.3.2)
       rack
     rake (0.8.7)
-    rdoc (3.12)
-      json (~> 1.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -52,22 +48,23 @@ GEM
     rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.8.0)
-    sass (3.1.19)
-    sinatra (1.3.2)
-      rack (>= 1.3.6, ~> 1.3)
+    sass (3.2.5)
+    sinatra (1.3.3)
+      rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
-      tilt (>= 1.3.3, ~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
     syntax (1.0.0)
     tilt (1.3.3)
     watch (0.1.0)
     yard (0.7.5)
+    yui-compressor (0.9.6)
+      POpen4 (>= 0.1.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bonsai!
-  jeweler (= 1.8.4)
   rake
   rspec (~> 2.8.0)
   yard (~> 0.7.5)

data/bonsai.gemspec

@@ -22,8 +22,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 2.8.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "yard", "~> 0.7.5"
-  s.add_development_dependency "jeweler", "1.8.4"
-  s.add_development_dependency "rdoc-data"
   
   s.add_dependency "rack"
   s.add_dependency "sinatra", ">= 1.0"
@@ -35,6 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency "launchy", ">= 0.3.7"
   s.add_dependency "activesupport", ">= 3.0.3"
   s.add_dependency "i18n", ">= 0.5.0"
+  s.add_dependency "yui-compressor"
   s.add_dependency "sass"
   
   s.post_install_message = %q{

data/lib/bonsai/exporter.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'sass'
+require 'yui/compressor'
 
 module Bonsai
   class Exporter
@@ -36,15 +37,21 @@ module Bonsai
       end
       
       def compress_assets
-        yui_compressor = File.expand_path("#{File.dirname(__FILE__)}/../../vendor/yui-compressor/yuicompressor-2.4.2.jar")
-        
         Bonsai.log "Compressing javascript and stylesheets"
-        Dir["#{path}/**/*.{js,css}"].each do |asset|
-          system "java -jar #{yui_compressor} #{File.expand_path(asset)} -o #{File.expand_path(asset)}"
-        end
+        compress_asset_path("#{path}/**/*.js", YUI::JavaScriptCompressor.new)
+        compress_asset_path("#{path}/**/*.css", YUI::CssCompressor.new)
       end
       
       protected 
+      def compress_asset_path(paths, compressor)
+        Dir[paths].each do |path|
+          uncompressed = File.read(path)
+          File.open(path, "w") do |buffer|
+            buffer << compressor.compress(uncompressed)
+          end
+        end
+      end
+
       def teardown
         FileUtils.rm_rf path
       end

data/lib/bonsai/version.rb

@@ -1,3 +1,3 @@
 module Bonsai
-  VERSION = "1.4.7"
+  VERSION = "1.4.8"
 end

data/spec/bonsai/exporter_spec.rb

@@ -71,7 +71,7 @@ describe Bonsai::Exporter do
       
       # Compressed CSS      
       it "should be processed with sass" do
-        File.read("#{Bonsai::Exporter.path}/stylesheets/sassy.css").should == "#content{display:block;}"
+        File.read("#{Bonsai::Exporter.path}/stylesheets/sassy.css").should == "#content{display:block}"
       end
 
       it "should create the output directory" do
@@ -109,15 +109,11 @@ describe Bonsai::Exporter do
       
       describe "asset compression" do
         it "should compress the css file" do
-          File.read("#{Bonsai::Exporter.path}/stylesheets/sassy.css").should == "#content{display:block;}"
-        end
-        
-        it "should compress the css file" do
-          File.read("#{Bonsai::Exporter.path}/stylesheets/sassy.css").should == "#content{display:block;}"
+          File.read("#{Bonsai::Exporter.path}/stylesheets/sassy.css").should == "#content{display:block}"
         end
         
         it "should compress the js file" do
-          File.read("#{Bonsai::Exporter.path}/js/script.js").should == "$(function(){$(\".default-value\").each(function(){var a=this.value;$(this).focus(function(){if(this.value==a){this.value=\"\"}});$(this).blur(function(){if(this.value==\"\"){this.value=a}})});$(\".details dd:empty\").hide().prev(\"dt\").hide()});"
+          File.read("#{Bonsai::Exporter.path}/js/script.js").should == "$(function(){$(\".default-value\").each(function(){var default_value=this.value;$(this).focus(function(){if(this.value==default_value){this.value=\"\"}});$(this).blur(function(){if(this.value==\"\"){this.value=default_value}})});$(\".details dd:empty\").hide().prev(\"dt\").hide()});"
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bonsai
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-01 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -59,38 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.5
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.8.4
-- !ruby/object:Gem::Dependency
-  name: rdoc-data
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +219,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: yui-compressor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +262,7 @@ files:
 - .bundle/config
 - .document
 - .gitignore
+- .rbenv-version
 - .rspec
 - .rvmrc
 - .travis.yml
@@ -377,7 +362,6 @@ files:
 - spec/support/templates/images.liquid
 - spec/support/templates/partials/_inserted.liquid
 - spec/support/templates/partials/_magic.liquid
-- vendor/yui-compressor/yuicompressor-2.4.2.jar
 homepage: http://github.com/benschwarz/bonsai
 licenses: []
 post_install_message: ! "\n\n    盆栽\n    bonsai, tiny and beautiful\n\n\n\n    type
@@ -399,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: bonsai
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A static site generator that uses the best toolset available