sphere 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/sphere/config.rb

@@ -18,7 +18,11 @@ module Sphere
     end
 
     def asset_path
-      @asset_path || public_path.join(definitions['asset_path'] || 'assets')
+      @asset_path || definitions['asset_path'] || 'assets'
+    end
+
+    def asset_root
+      public_path.join(asset_path)
     end
 
     def backend

data/lib/sphere/package/base.rb

@@ -14,7 +14,7 @@ module Sphere
       end
 
       def file
-        @file ||= Sphere.config.asset_path.join("#{name}.#{self.class.extension}")
+        @file ||= Sphere.config.asset_root.join("#{name}.#{self.class.extension}")
       end
 
       def public_file_name

data/lib/sphere/tasks/upload.rake

@@ -8,7 +8,7 @@ namespace :sphere do
     bucket  = config.delete(:bucket)
 
     AWS::S3::Base.establish_connection!(config)
-    Dir[Sphere.config.asset_path.join('**', '*')].sort.each do |source|
+    Dir[Sphere.config.asset_root.join('**', '*')].sort.each do |source|
       source  = Pathname.new(source)
       local   = source.to_s.sub(/^#{Regexp.escape(Sphere.config.public_path)}\//, '')
 
@@ -17,7 +17,7 @@ namespace :sphere do
         next
       end
 
-      target  = source.to_s.sub(/^#{Regexp.escape(Sphere.config.asset_path)}\//, '')
+      target  = source.to_s.sub(/^#{Regexp.escape(Sphere.config.asset_root)}\//, '')
       etag    = Digest::MD5.hexdigest(source.read)
 
       meta = AWS::S3::S3Object.about(target, bucket) rescue { "last-modified" => '01/01/1970' }

data/spec/sphere/helper_spec.rb

@@ -22,11 +22,11 @@ describe Sphere::Helper do
     end
 
     it 'should package JS' do
-      helper.include_javascripts(:application).should match(/\<script src=.+assets\/application.js.*/)
+      helper.include_javascripts(:application).should == %Q(<script src="/assets/application.js" type="text/javascript"></script>)
     end
 
     it 'should package CSS' do
-      helper.include_stylesheets(:screen).should match(/\<link href=.+assets\/screen.css.*/)
+      helper.include_stylesheets(:screen).should == %Q(<link href="/assets/screen.css" media="screen" rel="stylesheet" type="text/css" />)
     end
   end
 

data/sphere.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sphere}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dimitrij Denissenko"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Dimitrij Denissenko