assets_booster 0.0.6 → 0.0.7

data/asset_booster.gemspec

@@ -21,9 +21,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rails", "~>3.0.5"
   s.add_dependency "rainpress", "~>1.0"
-  s.add_dependency "yui-compressor", "~>0.9.4"
-  s.add_dependency "yui-compressor", ">=0.9.6"
+  s.add_dependency "yui-compressor", "~>0.9.6"
 
   s.add_development_dependency "rspec", "~>2.5.0"
+  s.add_development_dependency "rspec-rails", "~>2.5.0"
 end
-

data/lib/assets_booster/package/base.rb

@@ -51,9 +51,8 @@ module AssetsBooster
         save(code)
       end
 
-      def view_helper(packager)
-        sources = packager.boosted_environment? ? [name] : assets
-        [view_helper_method, sources]
+      def view_helper_sources
+        AssetsBooster::Railtie.packager.boosted_environment? ? [name] : assets
       end
 
       private

data/lib/assets_booster/package/javascript.rb

@@ -11,8 +11,12 @@ module AssetsBooster
         path = File.join(path, name+".js") if name
       end
       
-      def view_helper_method
-        :javascript_include_tag
+      def view_helper(view, options)
+        if options[:inline]
+          view.javascript_tag(read(assets))
+        else
+          view.javascript_include_tag(view_helper_sources, options)
+        end
       end
     end
   end

data/lib/assets_booster/package/stylesheet.rb

@@ -11,8 +11,12 @@ module AssetsBooster
         path = File.join(path, name+".css") if name
       end
       
-      def view_helper_method
-        :stylesheet_link_tag
+      def view_helper(view, options)
+        if options[:inline]
+          view.style_tag(read(assets))
+        else
+          view.stylesheet_link_tag(view_helper_sources, options)
+        end
       end
     end
   end

data/lib/assets_booster/version.rb

@@ -1,3 +1,3 @@
 module AssetsBooster
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/assets_booster/view_helper.rb

@@ -1,12 +1,14 @@
 module AssetsBooster
   module ViewHelper
+    def style_tag(css)
+      content_tag(:style, css, :type => Mime::CSS)
+    end
+
     def assets_booster_tag(type, *names)
       options = names.extract_options!
-      packager = AssetsBooster::Railtie.packager
-      packages = packager.packages[type]
+      packages = AssetsBooster::Railtie.packager.packages[type]
       html = names.map do |name|
-        methode, sources = packages[name].view_helper(packager)
-        send(methode, sources, options)
+        packages[name].view_helper(self, options)
       end*"\n"
       html.html_safe
     end

data/spec/package/base.rb

@@ -15,9 +15,19 @@ module AssetsBooster
         end
       end
       
-      describe "view_helper_method" do
-        it "should return a symbol" do
-          subject.view_helper_method.should be_an_instance_of(Symbol)
+      describe "view_helper_sources" do
+        before do
+          AssetsBooster::Railtie.packager = double("Packager")
+        end
+        
+        it "should return a the package if running in a boosted environment" do
+          AssetsBooster::Railtie.packager.should_receive(:boosted_environment?).and_return(true)
+          subject.view_helper_sources.should == [subject.name]
+        end
+
+        it "should return the package's sources if running in a non-boosted environment" do
+          AssetsBooster::Railtie.packager.should_receive(:boosted_environment?).and_return(false)
+          subject.view_helper_sources.should == subject.assets
         end
       end
     end

data/spec/package/javascript_spec.rb

@@ -9,6 +9,32 @@ module AssetsBooster
             subject.asset_path("lala").should match(/javascripts\/lala\.js/) 
           end
         end
+
+        describe "view_helper" do
+          before do
+            @view = double("View")
+          end
+
+          describe "with the inline option enabled" do
+            it "should return a javascript tag with inline javascript" do
+              assets = ["a.js", "b.js", "c.js"]
+              subject.stub(:assets).and_return(assets)
+              subject.should_receive(:read).with(assets).and_return("javascript code")
+              @view.should_receive(:javascript_tag).with("javascript code")
+              subject.view_helper(@view, :inline => true)
+            end
+          end
+
+          describe "with no options" do
+            it "should return html tags" do
+              options = {}
+              sources = ["source1.js", "source2.js"]
+              subject.should_receive(:view_helper_sources).and_return(sources)
+              @view.should_receive(:javascript_include_tag).with(sources, options)
+              subject.view_helper(@view, options)
+            end
+          end
+        end
       end
     end
   end

data/spec/package/stylesheet_spec.rb

@@ -9,6 +9,32 @@ module AssetsBooster
             subject.asset_path("lala").should match(/stylesheets\/lala\.css/) 
           end
         end
+
+        describe "view_helper" do
+          before do
+            @view = double("View")
+          end
+
+          describe "with the inline option enabled" do
+            it "should return a style tag with inline css" do
+              assets = ["a.css", "b.css", "c.css"]
+              subject.stub(:assets).and_return(assets)
+              subject.should_receive(:read).with(assets).and_return("css code")
+              @view.should_receive(:style_tag).with("css code")
+              subject.view_helper(@view, :inline => true)
+            end
+          end
+
+          describe "with no options" do
+            it "should return html tags" do
+              options = {}
+              sources = ["source1.css", "source2.css"]
+              subject.should_receive(:view_helper_sources).and_return(sources)
+              @view.should_receive(:stylesheet_link_tag).with(sources, options)
+              subject.view_helper(@view, options)
+            end
+          end
+        end
       end
     end
   end

data/spec/packager_spec.rb

@@ -33,12 +33,12 @@ module AssetsBooster
       it "should compile all assets of all packages" do
         YAML.should_receive(:load_file).with(subject.configuration_filename).and_return(
           'packages' => {
-            'javascript' => {
-              'base' => %w(jquery rails),
-            },
             'stylesheet' => {
               'base' => %w(screen),
             },
+            'javascript' => {
+              'base' => %w(jquery rails),
+            },
           },
           'options' => {
             'javascript' => {

data/spec/view_helper_spec.rb

@@ -1,10 +1,22 @@
 require 'spec_helper'
 require 'assets_booster/view_helper'
 module AssetsBooster
-  describe ViewHelper do
+  describe ViewHelper, :type => :helper do
+    describe "style_tag" do
+      it "should return a style tag with inline css" do
+        pending "don't know how to write view helper specs"
+        puts helper.style_tag("body{background:#ff0}")
+        helper.style_tag("body{background:#ff0}").should == <<-EOT
+          <style type="text/css">
+            body{background:#ff0}
+          </style>
+        EOT
+      end
+    end
+
     describe "assets_booster_tag" do
       it "should return html tags" do
-        pending
+        pending "don't know how to write view helper specs"
       end
     end
   end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: assets_booster
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 6
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Corin Langosch
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +02:00
-default_executable: 
+date: 2011-04-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -26,11 +20,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 3
-        - 0
-        - 5
         version: 3.0.5
   type: :runtime
   version_requirements: *id001
@@ -42,10 +31,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
         version: "1.0"
   type: :runtime
   version_requirements: *id002
@@ -57,43 +42,28 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 9
-        - 4
-        version: 0.9.4
+        version: 0.9.6
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: yui-compressor
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 9
-        - 6
-        version: 0.9.6
-  type: :runtime
+        version: 2.5.0
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rspec-rails
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 2
-        - 5
-        - 0
         version: 2.5.0
   type: :development
   version_requirements: *id005
@@ -153,7 +123,6 @@ files:
 - spec/packager_spec.rb
 - spec/spec_helper.rb
 - spec/view_helper_spec.rb
-has_rdoc: true
 homepage: http://github.com/gucki/assets_booster
 licenses: []
 
@@ -167,23 +136,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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: assets_booster
-rubygems_version: 1.5.3
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Assets (javascripts, css) compression for rails applications