rad_assets 0.2.8 → 0.2.9

data/Rakefile

@@ -7,5 +7,5 @@ project(
   summary: "Assets for Rad Framework",
 
   author: "Alexey Petrushin",
-  homepage: "http://github.com/alexeypetrushin/rad_assets"  
+  homepage: "http://github.com/alexeypetrushin/rad_assets"
 )

data/lib/components/assets.rb

@@ -1,4 +1,4 @@
 rad.register :assets, depends_on: :environment do
-  require 'rad/assets/require'  
+  require 'rad/assets/require'
   Rad::Assets.new
 end

data/lib/rad/assets/assets.rb

@@ -1,42 +1,42 @@
-class Rad::Assets  
-  inject logger: :logger, environment: :environment 
-  
-  # 
+class Rad::Assets
+  inject logger: :logger, environment: :environment
+
+  #
   # Config
-  # 
+  #
   attr_accessor :static_path_prefix
   # attr_required :static_path_prefix
-  
-  
-  def resolve_http_paths http_path    
+
+
+  def resolve_http_paths http_path
     resource = pack? ? Rad::Assets::PackagedResource.new(http_path) : Rad::Assets::Resource.new(http_path)
     resource.resolved_http_paths
   end
   cache_method_with_params_in_production :resolve_http_paths
-  
+
   def paths
     @paths ||= []
   end
-  
+
   def copy_to_public!
     paths.each do |path|
       path = path.to_dir
       raise "asset path should exist (#{path})!" unless path.exist?
-      raise "asset path should be a directory (#{path})!" unless path.dir?      
-      path.copy_to! "#{rad.http.public_path}#{static_path_prefix}".to_dir
+      raise "asset path should be a directory (#{path})!" unless path.dir?
+      path.copy_to "#{rad.http.public_path}#{static_path_prefix}".to_dir
     end
   end
-  
-  def fs_path http_path    
+
+  def fs_path http_path
     http_path.must =~ /^\//
     environment.find_file http_path, paths
   end
-  
+
   def asset? http_path
     !!((http_path =~ /^\//) and fs_path(http_path))
   end
   cache_method_with_params_in_production :asset?
-  
+
   protected
     def pack?
       rad.production?

data/lib/rad/assets/compressor.rb

@@ -5,7 +5,7 @@ class Rad::Assets::Compressor
     #   `ruby #{jsmin} <#{path} >#{packaged_path} \n`
     # },
     css: -> path, packaged_path {
-      data = path.to_file.read      
+      data = path.to_file.read
       data.gsub!(/\s+/, " ")           # collapse space
       data.gsub!(/\/\*(.*?)\*\//, "")  # remove comments - caution, might want to remove this if using css hacks
       data.gsub!(/\} /, "}\n")         # add line breaks
@@ -15,7 +15,7 @@ class Rad::Assets::Compressor
       packaged_path.to_file.write data
     }
   }
-  
+
   def self.pack! path
     file = path.to_file.must.exist
     packager = COMPRESSORS[file.extension.to_sym]

data/lib/rad/assets/gems.rb

@@ -1,4 +1,4 @@
-if respond_to? :fake_gem  
+if respond_to? :fake_gem
   fake_gem 'rad_core'
   fake_gem 'vfs'
 end

data/lib/rad/assets/packaged_resource.rb

@@ -1,9 +1,9 @@
-class Rad::Assets::PackagedResource < Rad::Assets::Resource  
+class Rad::Assets::PackagedResource < Rad::Assets::Resource
   PACKAGED_POSTFIX = 'packaged'
-  
+
   def resolved_http_paths
     http_path = "#{assets.static_path_prefix}#{self.http_path}"
-    
+
     fs_path = self.fs_path http_path
     http_paths = []
     fs_path.to_file.read.scan ASSET_REQUIRE_RE do |dependency_http_path|
@@ -11,40 +11,40 @@ class Rad::Assets::PackagedResource < Rad::Assets::Resource
       http_paths.push *res.resolved_http_paths
     end
     http_paths << http_path
-    
-    fs_paths = http_paths.collect{|path| self.fs_path path}    
+
+    fs_paths = http_paths.collect{|path| self.fs_path path}
     packaged_file = self.fs_path(packaged_http_path(http_path)).to_file
-    
+
     rebuild = (
       !packaged_file.exist? or
       fs_paths.any?{|path| path.to_file.updated_at > packaged_file.updated_at}
     )
     rebuild! packaged_file, fs_paths if rebuild
-    
+
     [packaged_http_path(http_path)]
   end
-  
+
   protected
     def fs_path http_path
       "#{rad.http.public_path}#{http_path}"
     end
-  
+
     def packaged_http_path http_path
       extension = File.extname(http_path)
       base = http_path[0..(http_path.size - extension.size - 1)]
       "#{base}.packaged#{extension}"
     end
-  
-    def rebuild! packaged_file, fs_paths      
+
+    def rebuild! packaged_file, fs_paths
       # merging
-      packaged_file.write! do |writer|
+      packaged_file.write do |writer|
         fs_paths.each do |path|
-          path.to_file.read do |buff|            
-            writer.call buff
+          path.to_file.read do |buff|
+            writer.write buff
           end
         end
       end
-      
+
       # packing
       Rad::Assets::Compressor.pack! packaged_file.path
     end

data/lib/rad/assets/resource.rb

@@ -1,9 +1,9 @@
-class Rad::Assets::Resource  
+class Rad::Assets::Resource
   attr_reader :http_path
   inject assets: :assets
-  
+
   ASSET_REQUIRE_RE = /rad\.assets\.require[ \t]+['"]([a-zA-Z0-9_\-\.\/]+)['"]/
-  
+
   def initialize http_path
     raise "resources path should be absolute (#{http_path})!" unless http_path =~ /^\//
     @http_path = http_path

data/lib/rad/assets/static_files.rb

@@ -5,8 +5,8 @@ class Rad::Assets::StaticFiles < Rack::File
 
   def call(env)
     path = env["PATH_INFO"]
-    
-    if path != '/' and (!@filter or (@filter and @filter =~ path)) and (resolved_path = find_file(path))      
+
+    if path != '/' and (!@filter or (@filter and @filter =~ path)) and (resolved_path = find_file(path))
       @path = resolved_path
       serving(env)
     else
@@ -16,13 +16,16 @@ class Rad::Assets::StaticFiles < Rack::File
 
   protected
     inject assets: :assets
-  
+
     def find_file http_path
-      if rad.production? and rad.http.public_path?        
+      http_path = http_path.url_unescape
+      if rad.http.public_path?
         fs_path = "#{rad.http.public_path}#{http_path}"
-        fs_path if fs_path.to_file.exist?
-      else
-        http_path = http_path.sub rad.assets.static_path_prefix, ''      
+        return fs_path if fs_path.to_file.exist?
+      end
+
+      if rad.development?
+        http_path = http_path.sub rad.assets.static_path_prefix, ''
         fs_path = assets.fs_path http_path
         fs_path.sub rad.http.public_path, '' if fs_path
       end

data/lib/rad/assets/view_helper.rb

@@ -10,7 +10,7 @@ module Rad::Assets::ViewHelper
     end
     resolved_http_paths
   end
-  
+
   def stylesheet_link_tag *a
     super(*packaged_assets(*a))
   end

data/spec/assets_spec.rb

@@ -1,15 +1,15 @@
 require 'spec_helper'
 
 describe 'Assets' do
-  the_spec_dir = with_tmp_spec_dir          
+  the_spec_dir = with_tmp_spec_dir
   with_load_path(
     "#{the_spec_dir}/app/lib",
     "#{the_spec_dir}/plugin_a/lib",
     "#{the_spec_dir}/plugin_b/lib",
   )
-  
+
   inject assets: :assets
-  
+
   before do
     rad.stub!(:runtime_path).and_return("#{spec_dir}/app/runtime")
     load "app/init.rb"

data/spec/resources_spec.rb

@@ -3,41 +3,41 @@ require 'spec_helper'
 describe 'Resources' do
   with_tmp_spec_dir
   inject assets: :assets
-  
+
   describe "development" do
     before do
       assets.stub!(:fs_path){|http_path| "#{spec_dir}/development#{http_path}"}
       assets.stub!(:pack?).and_return(false)
     end
-    
-    it "resolve_http_paths" do      
+
+    it "resolve_http_paths" do
       assets.resolve_http_paths('/app.js').should == %w(/static/vendor/jquery.js /static/lib/tools.js /static/app.js)
     end
   end
-  
+
   describe "production" do
     before do
       rad.http.stub!(:public_path).and_return("#{spec_dir}/production/public")
       assets.stub!(:pack?).and_return(true)
       @static_dir = "#{spec_dir}/production/public/static"
     end
-    
+
     it "resolve_http_paths" do
       assets.resolve_http_paths('/app.js').should == %w(/static/app.packaged.js)
-      
+
       packaged_file = "#{@static_dir}/app.packaged.js".to_file
       packaged_file.should exist
       packaged_file.read.should =~ /jQuery.*Tools.*App/m
-      
+
       "#{@static_dir}/lib/tools.packaged.js".to_file.should exist
       "#{@static_dir}/vendor/jquery.packaged.js".to_file.should exist
     end
-    
+
     it "should create new packed version if sources are updated" do
       assets.resolve_http_paths('/app.js').should == %w(/static/app.packaged.js)
       packaged_file = "#{@static_dir}/app.packaged.js".to_file
       packaged_file.read.should =~ /jQuery.*Tools.*App/m
-      
+
       sleep 1.1 # file system can't notice smaller difference in file update time
       "#{@static_dir}/vendor/jquery.js".to_file.write "newQuery"
       assets.resolve_http_paths('/app.js').should == %w(/static/app.packaged.js)

metadata

@@ -1,28 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rad_assets
-version: !ruby/object:Gem::Version 
-  version: 0.2.8
+version: !ruby/object:Gem::Version
+  version: 0.2.9
   prerelease: 
 platform: ruby
-authors: 
+authors:
 - Alexey Petrushin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-08 00:00:00 +04:00
-default_executable: 
+date: 2011-09-22 00:00:00.000000000Z
 dependencies: []
-
 description: 
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - readme.md
 - lib/components/assets.rb
@@ -53,33 +47,28 @@ files:
 - spec/resources_spec/production/public/static/vendor/jquery.js
 - spec/resources_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/alexeypetrushin/rad_assets
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Assets for Rad Framework
 test_files: []
-