rad_assets 0.2.0 → 0.2.1

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake_ext'
 project(
   name: "assets",
   official_name: "rad_assets",
-  version: "0.2.0",
+  gem: true,
   summary: "Assets for Rad Framework",
 
   author: "Alexey Petrushin",

data/lib/components/assets.rb

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

data/lib/components/assets.yml

@@ -0,0 +1 @@
+static_path_prefix: '/static'

data/lib/rad/assets/assets.rb

@@ -0,0 +1,45 @@
+class Rad::Assets  
+  inject logger: :logger, environment: :environment 
+  
+  # 
+  # Config
+  # 
+  attr_accessor :static_path_prefix
+  require_attr :static_path_prefix
+  
+  
+  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?
+p path, "#{rad.http.public_path}#{static_path_prefix}"      
+      path.copy_to! "#{rad.http.public_path}#{static_path_prefix}".to_dir
+    end
+  end
+  
+  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?
+    end
+end

data/lib/{assets → rad/assets}/compressor.rb

@@ -1,9 +1,9 @@
-class Assets::Compressor
+class Rad::Assets::Compressor
   COMPRESSORS = {
-    js: -> path, packaged_path {
-      jsmin = "#{__FILE__.dirname}/vendor/jsmin.rb"
-      `ruby #{jsmin} <#{path} >#{packaged_path} \n`
-    },
+    # js: -> path, packaged_path {
+    #   jsmin = "#{__FILE__.dirname}/../vendor/jsmin.rb"
+    #   `ruby #{jsmin} <#{path} >#{packaged_path} \n`
+    # },
     css: -> path, packaged_path {
       data = path.to_file.read      
       data.gsub!(/\s+/, " ")           # collapse space

data/lib/{assets → rad/assets}/packaged_resource.rb

@@ -1,18 +1,19 @@
-class Assets::PackagedResource < Assets::Resource  
+class Rad::Assets::PackagedResource < Rad::Assets::Resource  
   PACKAGED_POSTFIX = 'packaged'
-  inject config: :config
   
   def resolved_http_paths
-    fs_path = assets.fs_path http_path
+    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|
-      res = Assets::PackagedResource.new(dependency_http_path.first)
+      res = Rad::Assets::PackagedResource.new(dependency_http_path.first)
       http_paths.push *res.resolved_http_paths
     end
-    http_paths << http_path    
+    http_paths << http_path
     
-    fs_paths = http_paths.collect{|path| "#{config.public_dir!}#{path}"}    
-    packaged_file = "#{config.public_dir!}#{packaged_http_path}".to_file
+    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
@@ -20,11 +21,15 @@ class Assets::PackagedResource < Assets::Resource
     )
     rebuild! packaged_file, fs_paths if rebuild
     
-    [packaged_http_path]
+    [packaged_http_path(http_path)]
   end
   
   protected
-    def packaged_http_path
+    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}"
@@ -41,6 +46,6 @@ class Assets::PackagedResource < Assets::Resource
       end
       
       # packing
-      Assets::Compressor.pack! packaged_file.path
+      Rad::Assets::Compressor.pack! packaged_file.path
     end
 end

data/lib/rad/assets/require.rb

@@ -0,0 +1,18 @@
+require 'rad/assets/gems'
+
+require 'vfs'
+require 'rad'
+
+class Rad::Assets
+  autoload :StaticFiles, 'rad/assets/static_files'
+end
+
+%w(
+  compressor
+  assets
+  resource
+  packaged_resource
+  view_helper
+).each{|f| require "rad/assets/#{f}"}
+
+Rad::Template::Context.include Rad::Assets::ViewHelper

data/lib/{assets → rad/assets}/resource.rb

@@ -1,4 +1,4 @@
-class Assets::Resource  
+class Rad::Assets::Resource  
   attr_reader :http_path
   inject assets: :assets
   
@@ -10,13 +10,13 @@ class Assets::Resource
   end
 
   def resolved_http_paths
-    fs_path = assets.fs_path http_path
+    fs_path = assets.fs_path(http_path) || raise("no asset #{http_path}!")
     paths = []
     fs_path.to_file.read.scan ASSET_REQUIRE_RE do |dependency_http_path|
-      res = Assets::Resource.new(dependency_http_path.first)
+      res = Rad::Assets::Resource.new(dependency_http_path.first)
       paths.push *res.resolved_http_paths
     end
-    paths << http_path
+    paths << "#{assets.static_path_prefix}#{http_path}"
     paths.uniq
   end
 end

data/lib/rad/assets/static_files.rb

@@ -0,0 +1,24 @@
+class Rad::Assets::StaticFiles < Rack::File
+  def initialize(app, filter = nil)
+    @app, @filter = app, filter
+  end
+
+  def call(env)    
+    path = env["PATH_INFO"]
+    if path != '/' and (!@filter or (@filter and @filter =~ path)) and (resolved_path = find_file(path))
+      @path = resolved_path
+      serving(env)
+    else
+      @app.call(env)
+    end
+  end
+
+  protected
+    inject assets: :assets
+  
+    def find_file http_path      
+      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
+end

data/lib/rad/assets/tasks.rb

@@ -0,0 +1,6 @@
+namespace :assets do
+  desc "Copy assets to public folder"
+  task copy_to_public: :environment do
+    rad.assets.copy_to_public!
+  end
+end

data/lib/rad/assets/view_helper.rb

@@ -0,0 +1,21 @@
+module Rad::Assets::ViewHelper
+  def packaged_assets *http_paths
+    resolved_http_paths = []
+    http_paths.each do |http_path|
+      if rad.assets.asset? http_path
+        resolved_http_paths.push *rad.assets.resolve_http_paths(http_path)
+      else
+        resolved_http_paths << http_path
+      end
+    end
+    resolved_http_paths
+  end
+  
+  def stylesheet_link_tag *a
+    super(*packaged_assets(*a))
+  end
+
+  def javascript_include_tag *a
+    super(*packaged_assets(*a))
+  end
+end

data/spec/assets_spec/app/lib/app/init.rb

@@ -0,0 +1,2 @@
+load 'plugin_a/init.rb'
+load 'plugin_b/init.rb'

data/spec/assets_spec/plugin_b/lib/plugin_b/init.rb

@@ -0,0 +1,3 @@
+plugin_dir = File.expand_path "#{__FILE__}/../../.."
+
+rad.assets.paths << "#{plugin_dir}/static"

data/spec/assets_spec.rb

@@ -1,46 +1,23 @@
 require 'spec_helper'
 
 describe 'Assets' do
-  with_tmp_spec_dir    
-  isolate :config
+  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
-    config.merge!({public_dir: spec_dir}, override: true)
-    assets.stub!(:fs_path){|http_path| "#{spec_dir}#{http_path}"}
+    rad.stub!(:runtime_path).and_return("#{spec_dir}/app/runtime")
+    load "app/init.rb"
   end
 
-  describe "development" do
-    before{assets.stub!(:pack?).and_return(false)}
-    
-    it "resolved_http_paths" do      
-      assets.resolved_http_paths('/app.js').should == %w(/vendor/jquery.js /lib/tools.js /app.js)
-    end
-  end
-  
-  describe "production" do
-    before{assets.stub!(:pack?).and_return(true)}
-    
-    it "resolved_http_paths" do
-      assets.resolved_http_paths('/app.js').should == %w(/app.packaged.js)
-      
-      packaged_file = "#{spec_dir}/app.packaged.js".to_file
-      packaged_file.should exist
-      packaged_file.read.should =~ /jQuery.*Tools.*App/m
-      
-      "#{spec_dir}/lib/tools.packaged.js".to_file.should exist
-      "#{spec_dir}/vendor/jquery.packaged.js".to_file.should exist
-    end
-    
-    it "should create new packed version if sources are updated" do
-      assets.resolved_http_paths('/app.js').should == %w(/app.packaged.js)
-      packaged_file = "#{spec_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
-      "#{spec_dir}/vendor/jquery.js".to_file.write "newQuery"
-      assets.resolved_http_paths('/app.js').should == %w(/app.packaged.js)
-      packaged_file.read.should =~ /newQuery.*Tools.*App/m
-    end
+  it "should copy assets" do
+    rad.assets.copy_to_public!
+    "#{spec_dir}/app/runtime/public/static/app.js".to_file.should exist
+    "#{spec_dir}/app/runtime/public/static/lib/vendor.js".to_file.should exist
   end
 end

data/spec/resources_spec/production/public/static/app.js

@@ -0,0 +1,3 @@
+// rad.assets.require '/vendor/jquery.js'
+// rad.assets.require '/lib/tools.js'
+App

data/spec/resources_spec/production/public/static/lib/tools.js

@@ -0,0 +1,2 @@
+// rad.assets.require '/vendor/jquery.js'
+Tools

data/spec/resources_spec/production/public/static/vendor/jquery.js

@@ -0,0 +1 @@
+jQuery

data/spec/resources_spec.rb

@@ -0,0 +1,47 @@
+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      
+      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)
+      packaged_file.read.should =~ /newQuery.*Tools.*App/m
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require 'assets/require'
+require 'rad'
 
 require 'rspec_ext'
 require 'rad/spec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rad_assets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,31 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-17 00:00:00.000000000 +04:00
+date: 2011-07-04 00:00:00.000000000 +04:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rad_core
-  requirement: &2763970 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2763970
-- !ruby/object:Gem::Dependency
-  name: vfs
-  requirement: &2763660 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2763660
+dependencies: []
 description: 
 email: 
 executables: []
@@ -42,19 +20,33 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - readme.md
-- lib/assets/assets.rb
-- lib/assets/compressor.rb
-- lib/assets/gems.rb
-- lib/assets/packaged_resource.rb
-- lib/assets/require.rb
-- lib/assets/resource.rb
-- lib/assets/vendor/jsmin.rb
-- lib/assets/view_helper.rb
 - lib/components/assets.rb
-- spec/assets_spec/app.js
-- spec/assets_spec/lib/tools.js
-- spec/assets_spec/vendor/jquery.js
+- lib/components/assets.yml
+- lib/rad/assets/assets.rb
+- lib/rad/assets/compressor.rb
+- lib/rad/assets/gems.rb
+- lib/rad/assets/packaged_resource.rb
+- lib/rad/assets/require.rb
+- lib/rad/assets/resource.rb
+- lib/rad/assets/static_files.rb
+- lib/rad/assets/tasks.rb
+- lib/rad/assets/view_helper.rb
+- lib/rad/vendor/jsmin.rb
+- spec/assets_spec/app/lib/app/init.rb
+- spec/assets_spec/app/runtime/emptygit
+- spec/assets_spec/app/runtime/public/emptygit
+- spec/assets_spec/plugin_a/lib/plugin_a/init.rb
+- spec/assets_spec/plugin_b/lib/plugin_b/init.rb
+- spec/assets_spec/plugin_b/static/app.js
+- spec/assets_spec/plugin_b/static/lib/vendor.js
 - spec/assets_spec.rb
+- spec/resources_spec/development/app.js
+- spec/resources_spec/development/lib/tools.js
+- spec/resources_spec/development/vendor/jquery.js
+- spec/resources_spec/production/public/static/app.js
+- spec/resources_spec/production/public/static/lib/tools.js
+- 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

data/lib/assets/assets.rb

@@ -1,18 +0,0 @@
-class Assets
-  inject logger: :logger, config: :config
-  
-  def resolved_http_paths http_path
-    resource = pack? ? PackagedResource.new(http_path) : Resource.new(http_path)
-    resource.resolved_http_paths
-  end
-  cache_method_with_params_in_production :resolved_http_paths
-  
-  def fs_path http_path
-    http.fs_path http_path
-  end
-  
-  protected
-    def pack?
-      rad.production?
-    end
-end

data/lib/assets/require.rb

@@ -1,16 +0,0 @@
-require 'assets/gems'
-
-require 'vfs'
-require 'rad'
-
-class Assets; end
-
-%w(
-  compressor
-  assets
-  resource
-  packaged_resource
-  view_helper
-).each{|f| require "assets/#{f}"}
-
-Rad::Template::Context.include Assets::ViewHelper

data/lib/assets/view_helper.rb

@@ -1,9 +0,0 @@
-module Assets::ViewHelper
-  def packaged_assets *http_paths
-    resolved_http_paths = []
-    http_paths.each do |http_path|
-      resolved_http_paths.push *rad.assets.resolved_http_paths(http_path)
-    end
-    resolved_http_paths
-  end
-end