sphere 0.1.6 → 0.2.0

data/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_DISABLE_SHARED_GEMS: "1"

data/Gemfile

@@ -0,0 +1,7 @@
+source "http://rubygems.org"
+
+gem "rails", ">= 3.0.0"
+group :test do
+  gem "rspec", "~> 2.0.0.beta"
+  gem "fakeweb"
+end

data/Gemfile.lock

@@ -0,0 +1,85 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.0)
+      actionpack (= 3.0.0)
+      mail (~> 2.2.5)
+    actionpack (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4.1)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.12)
+      rack-test (~> 0.5.4)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.0)
+      activesupport (= 3.0.0)
+      builder (~> 2.1.2)
+      i18n (~> 0.4.1)
+    activerecord (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+      arel (~> 1.0.0)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.0)
+      activemodel (= 3.0.0)
+      activesupport (= 3.0.0)
+    activesupport (3.0.0)
+    arel (1.0.1)
+      activesupport (~> 3.0.0)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    fakeweb (1.3.0)
+    i18n (0.4.1)
+    mail (2.2.6.1)
+      activesupport (>= 2.3.6)
+      mime-types
+      treetop (>= 1.4.5)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.5)
+      rack (>= 1.0)
+    rails (3.0.0)
+      actionmailer (= 3.0.0)
+      actionpack (= 3.0.0)
+      activerecord (= 3.0.0)
+      activeresource (= 3.0.0)
+      activesupport (= 3.0.0)
+      bundler (~> 1.0.0)
+      railties (= 3.0.0)
+    railties (3.0.0)
+      actionpack (= 3.0.0)
+      activesupport (= 3.0.0)
+      rake (>= 0.8.4)
+      thor (~> 0.14.0)
+    rake (0.8.7)
+    rspec (2.0.0.beta.22)
+      rspec-core (= 2.0.0.beta.22)
+      rspec-expectations (= 2.0.0.beta.22)
+      rspec-mocks (= 2.0.0.beta.22)
+    rspec-core (2.0.0.beta.22)
+    rspec-expectations (2.0.0.beta.22)
+      diff-lcs (>= 1.1.2)
+    rspec-mocks (2.0.0.beta.22)
+      rspec-core (= 2.0.0.beta.22)
+      rspec-expectations (= 2.0.0.beta.22)
+    thor (0.14.1)
+    treetop (1.4.8)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  fakeweb
+  rails (>= 3.0.0)
+  rspec (~> 2.0.0.beta)

data/Rakefile

@@ -1,15 +1,13 @@
 require 'rubygems'
-require 'spec/rake/spectask'
-require 'spec/version'
+require 'rake'
+require 'rspec/mocks/version'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
 
 desc 'Default: run specs.'
 task :default => :spec
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['--colour', '--format', 'profile', '--timeout', '20']
-end
-
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
@@ -19,6 +17,7 @@ begin
     gemspec.email = "dimitrij@blacksquaremedia.com"
     gemspec.homepage = "http://github.com/dim/sphere"
     gemspec.authors = ["Dimitrij Denissenko"]
+    gemspec.add_runtime_dependency "rails", ">= 3.0.0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/lib/sphere.rb

@@ -31,4 +31,4 @@ module Sphere
   end
 end
 
-ActionController::Base.helper(Sphere::Helper) if Object.const_defined?(:ActionController)
+ActionView::Base.send(:include, Sphere::Helper) if Object.const_defined?(:ActionView)

data/lib/sphere/config.rb

@@ -41,6 +41,10 @@ module Sphere
       defined?(@compress) ? !!@compress : (definitions.key?('compress') ? !!definitions['compress'] : (self.env == 'production'))
     end
 
+    def compass?
+      definitions.key?('compass') ? !!definitions['compass'] : false
+    end
+
     def package?
       defined?(@package) ? !!@package : (definitions.key?('package') ? !!definitions['package'] : (self.env == 'production'))
     end

data/lib/sphere/css_minifier.rb

@@ -1,7 +1,6 @@
 module Sphere
   class CSSMinifier < String
 
-
     def initialize(css)
       super(css.dup)
     end
@@ -15,7 +14,7 @@ module Sphere
       end
       gsub!(/\{(.+?)\}/m) do |m|
         styles = $1.split(';').map do |style|
-          key, values = style.split(':')
+          key, values = style.scan(/^([^:]+)\:(.*)$/).flatten
           next nil unless key && values
           "#{key.strip}:#{values.split(',').map(&:strip).reject(&:blank?).join(',')}"
         end.compact.join(';')

data/lib/sphere/tasks/compass.rake

@@ -1,15 +1,20 @@
 namespace :sphere do
   namespace :compass do
 
-    task :base => 'sphere:base' do
+    desc "Compile compass assets"
+    task :compile => 'sphere:base' do
       require 'compass'
       require 'compass/exec'
-      Compass.add_project_configuration(Sphere.config.root.join("config", "compass.config"))
-    end
 
-    desc "Compile compass assets"
-    task :compile => 'sphere:compass:base' do
+      config  = Sphere.config.send(:definitions)['compass']
+      config  = {} unless config.is_a?(Hash)
+
       project = Compass::Commands::UpdateProject.new(Sphere.config.root.to_s, :quiet => false, :force => false)
+      Compass.configuration do |c|
+        c.environment   = :production
+        c.css_dir       = config['css_dir'] || 'public/stylesheets/compact'
+        c.output_style  = config['output_style'] || :compact
+      end
       project.perform
     end
 

data/spec/scenario/config.ru

@@ -0,0 +1 @@
+# Just a dummy file to identify Rails.root

data/spec/scenario/config/application.rb

@@ -0,0 +1,13 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module Scenario
+  class Application < Rails::Application
+  end
+end
+

data/spec/scenario/config/boot.rb

@@ -1,110 +1,13 @@
-# Don't change this file!
-# Configure your app in config/environment.rb and config/environments/*.rb
-
-RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
-
-module Rails
-  class << self
-    def boot!
-      unless booted?
-        preinitialize
-        pick_boot.run
-      end
-    end
-
-    def booted?
-      defined? Rails::Initializer
-    end
-
-    def pick_boot
-      (vendor_rails? ? VendorBoot : GemBoot).new
-    end
-
-    def vendor_rails?
-      File.exist?("#{RAILS_ROOT}/vendor/rails")
-    end
-
-    def preinitialize
-      load(preinitializer_path) if File.exist?(preinitializer_path)
-    end
-
-    def preinitializer_path
-      "#{RAILS_ROOT}/config/preinitializer.rb"
-    end
-  end
-
-  class Boot
-    def run
-      load_initializer
-      Rails::Initializer.run(:set_load_path)
-    end
-  end
-
-  class VendorBoot < Boot
-    def load_initializer
-      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-      Rails::Initializer.run(:install_gem_spec_stubs)
-      Rails::GemDependency.add_frozen_gem_path
-    end
-  end
-
-  class GemBoot < Boot
-    def load_initializer
-      self.class.load_rubygems
-      load_rails_gem
-      require 'initializer'
-    end
-
-    def load_rails_gem
-      if version = self.class.gem_version
-        gem 'rails', version
-      else
-        gem 'rails'
-      end
-    rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
-    end
-
-    class << self
-      def rubygems_version
-        Gem::RubyGemsVersion rescue nil
-      end
-
-      def gem_version
-        if defined? RAILS_GEM_VERSION
-          RAILS_GEM_VERSION
-        elsif ENV.include?('RAILS_GEM_VERSION')
-          ENV['RAILS_GEM_VERSION']
-        else
-          parse_gem_version(read_environment_rb)
-        end
-      end
-
-      def load_rubygems
-        min_version = '1.3.2'
-        require 'rubygems'
-        unless rubygems_version >= min_version
-          $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
-          exit 1
-        end
-
-      rescue LoadError
-        $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org)
-        exit 1
-      end
-
-      def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
-      end
-
-      private
-        def read_environment_rb
-          File.read("#{RAILS_ROOT}/config/environment.rb")
-        end
-    end
-  end
-end
-
-# All that for this:
-Rails.boot!
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+gemfile = File.expand_path("../../../../Gemfile", __FILE__)
+begin
+  ENV['BUNDLE_GEMFILE'] = gemfile
+  require 'bundler'
+  Bundler.setup
+rescue Bundler::GemNotFound => e
+  STDERR.puts e.message
+  STDERR.puts "Try running `bundle install`."
+  exit!
+end if File.exist?(gemfile)

data/spec/scenario/config/compass.config

@@ -0,0 +1,12 @@
+# Require any additional compass plugins here.
+project_type = :rails
+project_path = Rails.root if defined?(Rails)
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "public/stylesheets/compiled"
+sass_dir = "app/stylesheets"
+images_dir = "public/images"
+javascripts_dir = "public/javascripts"
+http_images_path = "/images"
+http_stylesheets_path = "/stylesheets"
+http_javascripts_path = "/javascripts"

data/spec/scenario/public/stylesheets/compiled/print.css

@@ -38,3 +38,5 @@ div hr {
 
 h1,h2,h3,h4,  h5,h6 { font-family: "Helvetica Neue", Arial, "Lucida Grande", sans-serif; }
 code { font:.9em "Courier New", Monaco, Courier, monospace; }
+.remote-a { background: url(http://example.com/remote/image/?a=1&b=2&c=3|0|0|100) repeat-x scroll 50% 50%; }
+.remote-b { background: url(http://example.com/remote/image/?a=1&b=2&c=3|0|0|100) repeat-x scroll 50% 50%; }

data/spec/spec_helper.rb

@@ -1,14 +1,8 @@
 ENV["RAILS_ENV"] ||= 'test'
 $: << File.join(File.dirname(__FILE__),'..', 'lib')
 
-require File.join(File.dirname(__FILE__), 'scenario', 'config', 'boot')
-require 'active_record'
-require 'action_controller'
-
+require File.join(File.dirname(__FILE__), 'scenario', 'config', 'application')
 require File.join(File.dirname(__FILE__),'..', 'rails', 'init.rb')
-require 'spec/autorun'
-require 'spec/mocks'
-ActiveRecord::Base.stub(:establish_connection)
 
 require 'fakeweb'
 FakeWeb.allow_net_connect = false
@@ -18,7 +12,21 @@ FakeWeb.register_uri :get, "http://www.blueprintcss.org/blueprint/src/typography
 FakeWeb.register_uri :get, "http://www.blueprintcss.org/blueprint/src/print.css", :body => "a img { border:none; }"
 FakeWeb.register_uri :post, "http://closure-compiler.appspot.com/compile", :body => "(function(){})(window);(function(a){a.ui=a.ui||{}})(jQuery);(function(a){a.extend({blank:function(b){return!b||!/\S/.test(b)}})})(JQuery)(function(a){a.extend({present:function(b){return b||/\S/.test(b)}})})(JQuery)(function(a){a.extend({square:function(b){return b*b}})})(JQuery);"
 
-class Spec::Example::ExampleGroup
+module Sphere::ExampleGroup
+  extend ActiveSupport::Concern
+
+  included do
+    before do
+      ActiveRecord::Base.stub!(:establish_connection)
+      Sphere.reset!
+    end
+
+    after do
+      (js_files + css_files).each do |file|
+        FileUtils.rm file, :force => true
+      end
+    end
+  end
 
   def javascripts
     Sphere.packager.packages(:js)
@@ -36,15 +44,11 @@ class Spec::Example::ExampleGroup
     stylesheets.values.map(&:file)
   end
 
-  before do
-    Sphere.reset!
-  end
-
-  after do
-    (js_files + css_files).each do |file|
-      FileUtils.rm file, :force => true
-    end
-  end
+end
 
+require 'rspec'
+RSpec.configure do |c|
+  c.mock_with :rspec
+  c.include(Sphere::ExampleGroup)
 end
 

data/spec/sphere/css_minifier_spec.rb

@@ -8,9 +8,9 @@ describe Sphere::CSSMinifier do
 
   it "should minify CSS" do
     minifier = Sphere::CSSMinifier.new(css_content)
-    minifier.size.should == 881
+    minifier.size.should == 1099
     minifier.minify!
-    minifier.size.should == 279
+    minifier.size.should == 487
   end
 
 end

data/spec/sphere/helper_spec.rb

@@ -5,7 +5,9 @@ describe Sphere::Helper do
   end
 
   def helper
-    @helper ||= SphereDummyHelper.new
+    @helper ||= SphereDummyHelper.new.tap do |h|
+      h.config['assets_dir'] = Rails.root.join('public')
+    end
   end
 
   it 'should have method to load javascript packages' do

data/spec/sphere/package/stylesheet_spec.rb

@@ -11,7 +11,7 @@ describe Sphere::Package::Stylesheet do
     stylesheets['screen'].file.exist?.should be(false)
     stylesheets['screen'].compile
     stylesheets['screen'].file.exist?.should be(true)
-    stylesheets['screen'].file.size.should == 322
+    stylesheets['screen'].file.size.should == 530
     stylesheets['screen'].should_not be_out_of_date
   end
 

data/spec/sphere/packager_spec.rb

@@ -34,7 +34,7 @@ describe Sphere::Packager do
     css_files.last.exist?.should be(false)
     Sphere::Packager.instance.compile(:css)
     css_files[0].exist?.should be(true)
-    css_files[0].size.should == 933
+    css_files[0].size.should == 1151
     css_files[1].exist?.should be(true)
     css_files[1].size.should == 22
     css_files[2].exist?.should be(true)

data/sphere.gemspec

@@ -5,18 +5,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sphere}
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dimitrij Denissenko"]
-  s.date = %q{2010-08-17}
+  s.date = %q{2010-09-24}
   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 = [
     "README.markdown"
   ]
   s.files = [
-    ".gitignore",
+    ".bundle/config",
+     ".gitignore",
+     "Gemfile",
+     "Gemfile.lock",
      "README.markdown",
      "Rakefile",
      "VERSION",
@@ -36,7 +39,10 @@ Gem::Specification.new do |s|
      "lib/sphere/tasks/sphere.rake",
      "lib/sphere/tasks/upload.rake",
      "rails/init.rb",
+     "spec/scenario/config.ru",
+     "spec/scenario/config/application.rb",
      "spec/scenario/config/boot.rb",
+     "spec/scenario/config/compass.config",
      "spec/scenario/config/database.yml",
      "spec/scenario/config/environment.rb",
      "spec/scenario/config/sphere.yml",
@@ -74,6 +80,7 @@ Gem::Specification.new do |s|
      "spec/sphere/css_minifier_spec.rb",
      "spec/sphere_spec.rb",
      "spec/spec_helper.rb",
+     "spec/scenario/config/application.rb",
      "spec/scenario/config/environment.rb",
      "spec/scenario/config/boot.rb"
   ]
@@ -83,9 +90,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
     else
+      s.add_dependency(%q<rails>, [">= 3.0.0"])
     end
   else
+    s.add_dependency(%q<rails>, [">= 3.0.0"])
   end
 end
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dimitrij Denissenko
@@ -15,10 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-17 00:00:00 +01:00
+date: 2010-09-24 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id001
 description: Rails asset packer and compressor. Supports Compass, built (primarily) to be used with Heroku & AWS/S3
 email: dimitrij@blacksquaremedia.com
 executables: []
@@ -28,7 +43,10 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
+- .bundle/config
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - README.markdown
 - Rakefile
 - VERSION
@@ -48,7 +66,10 @@ files:
 - lib/sphere/tasks/sphere.rake
 - lib/sphere/tasks/upload.rake
 - rails/init.rb
+- spec/scenario/config.ru
+- spec/scenario/config/application.rb
 - spec/scenario/config/boot.rb
+- spec/scenario/config/compass.config
 - spec/scenario/config/database.yml
 - spec/scenario/config/environment.rb
 - spec/scenario/config/sphere.yml
@@ -114,5 +135,6 @@ test_files:
 - spec/sphere/css_minifier_spec.rb
 - spec/sphere_spec.rb
 - spec/spec_helper.rb
+- spec/scenario/config/application.rb
 - spec/scenario/config/environment.rb
 - spec/scenario/config/boot.rb