rails_asset_packager 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,4 +1,19 @@
 ------------------------------------------------------------------------
+v0.1.3 | plainprogrammer | 2011-01-25
+
+* Fixed issue with *_merged helpers that was causing calls to error out.
+* Fixed issue with *_merged helpers that was causing calls to get escaped by Rails instead of rendering properly.
+------------------------------------------------------------------------
+v0.1.2 | plainprogrammer | 2011-01-25
+
+* Fixed test suite.
+------------------------------------------------------------------------
+v0.1.1 | plainprogrammer | 2011-01-18
+
+* Fixed issues with development dependencies.
+* Updated Rakefile to properly include testing and documentation tasks.
+* Did some minor refactoring inside caching tasks.
+------------------------------------------------------------------------
 v0.1.0 | plainprogrammer | 2011-01-16
 
 * Converted project into Gem

data/TODO

@@ -1,11 +1,9 @@
 TODO
 ====
 * FEATURE: Add means to track which files that have been uploaded to S3 have been
-  modified to prevent uploading all assets every time you call 
+  modified to prevent uploading all assets every time you call
   'rake asset:cache:production.'
 * BUG: Make it so that the asset:cache rake tasks execute properly when called
   from other rake tasks outside rails_asset_packager rake file.
 * FEATURE: Add capability to ignore assets already included in packaged assets
   when uploading to S3.
-* BUG: Fix inability to use the two helpers, stylesheet_link_merged and
-  javascript_include_merged. Start by fixing test suite.

data/lib/rails_asset_packager/asset_package.rb

@@ -1,20 +1,30 @@
 module RailsAssetPackager
   class AssetPackage
 
-    @asset_base_path    = "#{Rails.root}/public"
-    @asset_packages_yml = File.exists?("#{Rails.root}/config/asset_packages.yml") ? YAML.load_file("#{Rails.root}/config/asset_packages.yml") : nil
-  
     # singleton methods
     class << self
-      attr_accessor :asset_base_path,
-                    :asset_packages_yml
-
       attr_writer   :merge_environments
-      
+
+      def asset_base_path
+        @@asset_base_path ||= "#{Rails.root}/public"
+      end
+
+      def asset_base_path=(path)
+        @@asset_base_path = path
+      end
+
+      def asset_packages_yml
+        @@asset_packages_yml ||= File.exists?("#{Rails.root}/config/asset_packages.yml") ? YAML.load_file("#{Rails.root}/config/asset_packages.yml") : nil
+      end
+
+      def asset_packages_yml=(path)
+        @@asset_packages_yml = path
+      end
+
       def merge_environments
         @merge_environments ||= ["production"]
       end
-      
+
       def parse_path(path)
         /^(?:(.*)\/)?([^\/]+)$/.match(path).to_a
       end
@@ -89,10 +99,10 @@ module RailsAssetPackager
       end
 
     end
-    
+
     # instance methods
     attr_accessor :asset_type, :target, :target_dir, :sources
-  
+
     def initialize(asset_type, package_hash)
       target_parts = self.class.parse_path(package_hash.keys.first)
       @target_dir = target_parts[1].to_s
@@ -104,7 +114,7 @@ module RailsAssetPackager
       @file_name = "#{@target}_packaged.#{@extension}"
       @full_path = File.join(@asset_path, @file_name)
     end
-  
+
     def package_exists?
       File.exists?(@full_path)
     end
@@ -138,14 +148,14 @@ module RailsAssetPackager
 
       def merged_file
         merged_file = ""
-        @sources.each {|s| 
-          File.open("#{@asset_path}/#{s}.#{@extension}", "r") { |f| 
-            merged_file += f.read + "\n" 
+        @sources.each {|s|
+          File.open("#{@asset_path}/#{s}.#{@extension}", "r") { |f|
+            merged_file += f.read + "\n"
           }
         }
         merged_file
       end
-    
+
       def compressed_file
         case @asset_type
           when "javascripts" then compress_js(merged_file)
@@ -156,24 +166,24 @@ module RailsAssetPackager
       def compress_js(source)
         jsmin_path = File.dirname(__FILE__) + '/..'
         tmp_path = "#{Rails.root}/tmp/#{@target}_packaged"
-      
+
         # write out to a temp file
         File.open("#{tmp_path}_uncompressed.js", "w") {|f| f.write(source) }
-      
+
         # compress file with JSMin library
         `ruby #{jsmin_path}/jsmin.rb <#{tmp_path}_uncompressed.js >#{tmp_path}_compressed.js \n`
 
         # read it back in and trim it
         result = ""
         File.open("#{tmp_path}_compressed.js", "r") { |f| result += f.read.strip }
-  
+
         # delete temp files if they exist
         File.delete("#{tmp_path}_uncompressed.js") if File.exists?("#{tmp_path}_uncompressed.js")
         File.delete("#{tmp_path}_compressed.js") if File.exists?("#{tmp_path}_compressed.js")
 
         result
       end
-  
+
       def compress_css(source)
         source.gsub!(/\s+/, " ")           # collapse space
         source.gsub!(/\/\*(.*?)\*\//, "")  # remove comments - caution, might want to remove this if using css hacks
@@ -190,11 +200,11 @@ module RailsAssetPackager
           when "stylesheets" then "css"
         end
       end
-      
+
       def log(message)
         self.class.log(message)
       end
-      
+
       def self.log(message)
         puts message
       end
@@ -206,6 +216,6 @@ module RailsAssetPackager
         file_list.reverse! if extension == "js"
         file_list
       end
-   
+
   end
 end

data/lib/rails_asset_packager/asset_package_helper.rb

@@ -1,6 +1,6 @@
 module RailsAssetPackager
   module AssetPackageHelper
-    
+
     def should_merge?
       AssetPackage.merge_environments.include?(Rails.env)
     end
@@ -8,32 +8,32 @@ module RailsAssetPackager
     def javascript_include_merged(*sources)
       options = sources.last.is_a?(Hash) ? sources.pop.stringify_keys : { }
 
-      if sources.include?(:defaults) 
-        sources = sources[0..(sources.index(:defaults))] + 
-          ['prototype', 'effects', 'dragdrop', 'controls'] + 
-          (File.exists?("#{Rails.root}/public/javascripts/application.js") ? ['application'] : []) + 
+      if sources.include?(:defaults)
+        sources = sources[0..(sources.index(:defaults))] +
+          ['prototype', 'effects', 'dragdrop', 'controls'] +
+          (File.exists?("#{Rails.root}/public/javascripts/application.js") ? ['application'] : []) +
           sources[(sources.index(:defaults) + 1)..sources.length]
         sources.delete(:defaults)
       end
 
       sources.collect!{|s| s.to_s}
-      sources = (should_merge? ? 
-        AssetPackage.targets_from_sources("javascripts", sources) : 
+      sources = (should_merge? ?
+        AssetPackage.targets_from_sources("javascripts", sources) :
         AssetPackage.sources_from_targets("javascripts", sources))
-        
-      sources.collect {|source| javascript_include_tag(source, options) }.join("\n")
+
+      raw(sources.collect {|source| javascript_include_tag(source, options) }.join("\n"))
     end
 
     def stylesheet_link_merged(*sources)
       options = sources.last.is_a?(Hash) ? sources.pop.stringify_keys : { }
 
       sources.collect!{|s| s.to_s}
-      sources = (should_merge? ? 
-        AssetPackage.targets_from_sources("stylesheets", sources) : 
+      sources = (should_merge? ?
+        AssetPackage.targets_from_sources("stylesheets", sources) :
         AssetPackage.sources_from_targets("stylesheets", sources))
 
-      sources.collect { |source| stylesheet_link_tag(source, options) }.join("\n")    
+      raw(sources.collect { |source| stylesheet_link_tag(source, options) }.join("\n"))
     end
 
   end
-end
+end

data/lib/rails_asset_packager/version.rb

@@ -1,3 +1,3 @@
 module RailsAssetPackager
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_asset_packager
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Scott Becker