sphere 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/sphere/tasks/upload.rake

@@ -10,25 +10,23 @@ namespace :sphere do
     AWS::S3::Base.establish_connection!(config)
     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)}\//, '')
+      target  = source.to_s.sub(/^#{Regexp.escape(Sphere.config.public_path)}\//, '')
 
       if source.directory?
-        puts " ignoring #{local}"
+        puts " ignoring #{target}"
         next
       end
 
-      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' }
 
-      meta = AWS::S3::S3Object.about(target, bucket) rescue { "last-modified" => '01/01/1970' }
-      if meta['etag'] != etag && Time.parse(meta["last-modified"]) < source.mtime
-        puts "\e[32m S3/store #{local}\e[0m"
+      if meta['etag'] != etag || Time.parse(meta["last-modified"]) < source.mtime
+        puts "\e[32m S3/store #{target}\e[0m"
         AWS::S3::S3Object.store(target, source.open, bucket, :access => :public_read)
       else
         puts "  S3/skip #{local}"
       end
     end
-
   end
 
   desc "Compile and deploy assets to AWS/S3"

data/spec/scenario/config/sphere.yml

@@ -14,3 +14,5 @@ stylesheets:
     - stylesheets/compiled/*.css
   print:
     - http://www.blueprintcss.org/blueprint/src/print.css
+  sub/folder/screen:
+    - stylesheets/sub/folder/*.css

data/spec/scenario/public/stylesheets/sub/folder/custom.css

@@ -0,0 +1 @@
+h1 { color: #000; }

data/spec/sphere/helper_spec.rb

@@ -28,6 +28,10 @@ describe Sphere::Helper do
     it 'should package CSS' do
       helper.include_stylesheets(:screen).should == %Q(<link href="/assets/screen.css" media="screen" rel="stylesheet" type="text/css" />)
     end
+
+    it 'should package files in sub-directories' do
+      helper.include_stylesheets('sub/folder/screen').should == %Q(<link href="/assets/sub/folder/screen.css" media="screen" rel="stylesheet" type="text/css" />)
+    end
   end
 
   describe "with packaging disabled" do
@@ -51,6 +55,13 @@ describe Sphere::Helper do
         "/stylesheets/compiled/custom.css", "/stylesheets/compiled/print.css"
       ]
     end
+
+    it 'should package files in sub-directories' do
+      helper.include_stylesheets('sub/folder/screen').scan(/link href=\"([^"]+\.css)/).flatten.should == [
+        "/stylesheets/sub/folder/custom.css"
+      ]
+    end
+
   end
 
 end

data/spec/sphere/package/base_spec.rb

@@ -9,6 +9,12 @@ describe Sphere::Package::Base do
   it 'should have a target file location' do
     javascripts['application'].file.should be_a(Pathname)
     javascripts['application'].file.to_s.should include('/public/assets/application.js')
+    stylesheets['sub/folder/screen'].file.to_s.should include('/public/assets/sub/folder/screen.css')
+  end
+
+  it 'should have a public file name' do
+    javascripts['application'].public_file_name.should == 'assets/application.js'
+    stylesheets['sub/folder/screen'].public_file_name.should == 'assets/sub/folder/screen.css'
   end
 
   it 'should have source locations' do
@@ -17,6 +23,9 @@ describe Sphere::Package::Base do
       "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js",
       "http://jquery-ui.googlecode.com/svn/tags/latest/ui/minified/jquery.ui.core.min.js",
       "javascripts/custom/file_a.js", "javascripts/custom/file_b.js", "javascripts/file.js"]
+
+    stylesheets['sub/folder/screen'].should have(1).source
+    stylesheets['sub/folder/screen'].sources.should == ["stylesheets/sub/folder/custom.css"]
   end
 
   it 'should separate URLs and files' do

data/spec/sphere/packager_spec.rb

@@ -5,8 +5,8 @@ describe Sphere::Packager do
   it 'should create packages from configuration content' do
     Sphere::Packager.instance.send(:javascripts).should have(2).items
     Sphere::Packager.instance.send(:javascripts).values.map(&:name).sort.should == ['application', 'mobile']
-    Sphere::Packager.instance.send(:stylesheets).should have(2).items
-    Sphere::Packager.instance.send(:stylesheets).values.map(&:name).sort.should == ['print', 'screen']
+    Sphere::Packager.instance.send(:stylesheets).should have(3).items
+    Sphere::Packager.instance.send(:stylesheets).values.map(&:name).sort.should == ['print', 'screen', 'sub/folder/screen']
   end
 
   it 'should check if any of the packages is out of date' do
@@ -29,14 +29,16 @@ describe Sphere::Packager do
   end
 
   it 'should package all CSS packages' do
-    css_files.should have(2).items
+    css_files.should have(3).items
     css_files.first.exist?.should be(false)
     css_files.last.exist?.should be(false)
     Sphere::Packager.instance.compile(:css)
-    css_files.first.exist?.should be(true)
-    css_files.first.size.should == 933
-    css_files.last.exist?.should be(true)
-    css_files.last.size.should == 22
+    css_files[0].exist?.should be(true)
+    css_files[0].size.should == 933
+    css_files[1].exist?.should be(true)
+    css_files[1].size.should == 22
+    css_files[2].exist?.should be(true)
+    css_files[2].size.should == 20
     Sphere::Packager.instance.out_of_date?(:css).should be(false)
   end
 

data/sphere.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sphere}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dimitrij Denissenko"]
-  s.date = %q{2010-07-13}
+  s.date = %q{2010-07-15}
   s.description = %q{Rails asset packer and compressor. Supports Compass, built (primarily) to be used with Heroku & AWS/S3}
   s.email = %q{dimitrij@blacksquaremedia.com}
   s.extra_rdoc_files = [
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
      "spec/scenario/public/javascripts/file.js",
      "spec/scenario/public/stylesheets/compiled/custom.css",
      "spec/scenario/public/stylesheets/compiled/print.css",
+     "spec/scenario/public/stylesheets/sub/folder/custom.css",
      "spec/spec_helper.rb",
      "spec/sphere/config_spec.rb",
      "spec/sphere/css_minifier_spec.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Dimitrij Denissenko
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 +01:00
+date: 2010-07-15 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -58,6 +58,7 @@ files:
 - spec/scenario/public/javascripts/file.js
 - spec/scenario/public/stylesheets/compiled/custom.css
 - spec/scenario/public/stylesheets/compiled/print.css
+- spec/scenario/public/stylesheets/sub/folder/custom.css
 - spec/spec_helper.rb
 - spec/sphere/config_spec.rb
 - spec/sphere/css_minifier_spec.rb