sinatra-bundles 0.5.1 → 0.5.2

data/Gemfile.lock

@@ -1,38 +1,54 @@
 PATH
   remote: .
   specs:
-    sinatra-bundles (0.5.0)
+    sinatra-bundles (0.5.1)
       packr (~> 3.1.0)
       rack (~> 1.0)
       rainpress (~> 1.0)
-      sinatra (~> 1.1.0)
+      sinatra (~> 1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    columnize (0.3.3)
+    diff-lcs (1.1.2)
+    linecache (0.45)
     oyster (0.9.4)
     packr (3.1.0)
       oyster
-    rack (1.2.1)
-    rack-test (0.5.6)
+    rack (1.3.0)
+    rack-test (0.6.0)
       rack (>= 1.0)
     rainpress (1.0)
-    rspec (1.3.1)
-    sinatra (1.1.0)
+    rake (0.9.2)
+    require_relative (1.0.2)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    sinatra (1.2.6)
       rack (~> 1.1)
-      tilt (~> 1.1)
-    tilt (1.1)
-    yard (0.6.2)
+      tilt (< 2.0, >= 1.2.2)
+    tilt (1.3.2)
+    yard (0.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  packr (~> 3.1.0)
-  rack (~> 1.0)
   rack-test (>= 0.5.3)
-  rainpress (~> 1.0)
-  rspec (~> 1.3.0)
-  sinatra (~> 1.1.0)
+  rake
+  require_relative
+  rspec (~> 2.6)
+  ruby-debug
   sinatra-bundles!
   yard

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
-require 'rake'
 require 'bundler'
 require 'date'
+require 'ruby-debug'
 
 #############################################################################
 #
@@ -55,14 +55,14 @@ end
 #
 #############################################################################
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  # spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  # spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end

data/lib/sinatra/bundles.rb

@@ -1,7 +1,7 @@
 module Sinatra
   # Main Bundles Module
   module Bundles
-    Version = '0.5.1'
+    Version = '0.5.2'
 
     mypath = File.dirname(__FILE__)
     autoload :Helpers, "#{mypath}/bundles/helpers"

data/sinatra-bundles.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'sinatra-bundles'
-  s.version           = '0.5.1'
-  s.date              = '2010-11-18'
+  s.version           = '0.5.2'
+  s.date              = '2011-06-18'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -39,13 +39,16 @@ Gem::Specification.new do |s|
   s.add_dependency('rainpress', ['~> 1.0'])
   s.add_dependency('packr', ['~> 3.1.0'])
   s.add_dependency('rack', ['~> 1.0'])
-  s.add_dependency('sinatra', ['~> 1.1.0'])
+  s.add_dependency('sinatra', ['~> 1.0'])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
-  s.add_development_dependency('rspec', ['~> 1.3.0'])
+  s.add_development_dependency('rspec', ['~> 2.6'])
   s.add_development_dependency('rack-test', ['>= 0.5.3'])
   s.add_development_dependency('yard')
+  s.add_development_dependency('rake')
+  s.add_development_dependency('ruby-debug')
+  s.add_development_dependency('require_relative')
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -57,7 +60,6 @@ Gem::Specification.new do |s|
     LICENSE
     README.md
     Rakefile
-    VERSION
     lib/sinatra/bundles.rb
     lib/sinatra/bundles/bundle.rb
     lib/sinatra/bundles/helpers.rb
@@ -80,7 +82,6 @@ Gem::Specification.new do |s|
     spec/public/stylesheets/test1.css
     spec/public/stylesheets/test2.css
     spec/sinatra-bundles_spec.rb
-    spec/spec.opts
     spec/spec_helper.rb
   ]
   # = MANIFEST =

data/spec/sinatra-bundles_spec.rb

@@ -87,21 +87,27 @@ describe 'sinatra-bundles' do
 
     it 'should create a tag without a stamp if stamps are disabled' do
       app.new.instance_eval do
-        settings.disable(:stamp_bundles)
-        javascript_bundle_include_tag(:test)
+        @app.instance_eval do
+          settings.disable(:stamp_bundles)
+          javascript_bundle_include_tag(:test)
+        end
       end.should == "<script type='text/javascript' src='/javascripts/bundles/test.js'></script>"
     end
 
     it 'should create cusomized tag if path is CUSTOM' do
       app(:custom).new.instance_eval do
-        settings.disable(:stamp_bundles)
-        javascript_bundle_include_tag(:test)
+        @app.instance_eval do
+          settings.disable(:stamp_bundles)
+          javascript_bundle_include_tag(:test)
+        end
       end.should == "<script type='text/javascript' src='/s/js/bundles/test.js'></script>"
     end
 
     it 'should stamp bundles with the timestamp of the newest file in the bundle' do
       app.new.instance_eval do
-        javascript_bundle_include_tag(:test)
+        @app.instance_eval do
+          javascript_bundle_include_tag(:test)
+        end
       end.should == "<script type='text/javascript' src='/javascripts/bundles/test/#{js_stamp(%w(eval test1 test2))}.js'></script>"
     end
 
@@ -188,8 +194,10 @@ describe 'sinatra-bundles' do
 
     it 'should return a path' do
       app.new.instance_eval do
-        settings.disable(:stamp_bundles)
-        settings.javascript_bundles[:test].to_path
+        @app.instance_eval do
+          settings.disable(:stamp_bundles)
+          settings.javascript_bundles[:test].to_path
+        end
       end.should == '/javascripts/bundles/test.js'
     end
 
@@ -230,33 +238,43 @@ describe 'sinatra-bundles' do
 
     it 'should create a tag without a stamp if stamps are disabled' do
       app.new.instance_eval do
-        settings.disable(:stamp_bundles)
-        stylesheet_bundle_link_tag(:test)
+        @app.instance_eval do
+          settings.disable(:stamp_bundles)
+          stylesheet_bundle_link_tag(:test)
+        end
       end.should == "<link type='text/css' href='/stylesheets/bundles/test.css' rel='stylesheet' media='all' />"
     end
 
     it 'should create a tag without a stamp if stamps are disabled CUSTOM' do
       app(:custom).new.instance_eval do
-        settings.disable(:stamp_bundles)
-        stylesheet_bundle_link_tag(:test)
+        @app.instance_eval do
+          settings.disable(:stamp_bundles)
+          stylesheet_bundle_link_tag(:test)
+        end
       end.should == "<link type='text/css' href='/s/css/bundles/test.css' rel='stylesheet' media='all' />"
     end
 
     it 'should stamp bundles with the timestamp of the newest file in the bundle' do
       app.new.instance_eval do
-        stylesheet_bundle_link_tag(:test)
+        @app.instance_eval do
+          stylesheet_bundle_link_tag(:test)
+        end
       end.should == "<link type='text/css' href='/stylesheets/bundles/test/#{css_stamp(%w(test1 test2))}.css' rel='stylesheet' media='all' />"
     end
 
     it 'should create a tag with default media attribute set to all' do
       app.new.instance_eval do
-        stylesheet_bundle_link_tag(:test)
+        @app.instance_eval do
+          stylesheet_bundle_link_tag(:test)
+        end
       end.include?("media='all'").should be_true
     end
 
     it 'should create a tag with specified media attributes' do
       app.new.instance_eval do
-        stylesheet_bundle_link_tag(:test, [:screen, :print])
+        @app.instance_eval do
+          stylesheet_bundle_link_tag(:test, [:screen, :print])
+        end
       end.include?("media='screen, print'").should be_true
     end
 
@@ -318,8 +336,10 @@ describe 'sinatra-bundles' do
 
     it 'should return a path' do
       app.new.instance_eval do
-        settings.disable(:stamp_bundles)
-        settings.stylesheet_bundles[:test].to_path
+        @app.instance_eval do
+          settings.disable(:stamp_bundles)
+          settings.stylesheet_bundles[:test].to_path
+        end
       end.should == '/stylesheets/bundles/test.css'
     end
 

data/spec/spec_helper.rb

@@ -2,20 +2,12 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 require 'rack/test'
-
-begin
-  require 'ruby-debug'
-rescue LoadError
-end
-
-gem 'sinatra', '>= 1.0'
 require 'sinatra/base'
 require 'sinatra/bundles'
 
-Spec::Runner.configure do |c|
+RSpec.configure do |c|
   c.include Rack::Test::Methods
   c.include Sinatra::Bundles::Helpers
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-bundles
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Daniel Huckstep
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 -07:00
+date: 2011-06-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,12 +72,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15
         segments: 
         - 1
-        - 1
         - 0
-        version: 1.1.0
+        version: "1.0"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -88,12 +87,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 15
         segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+        - 2
+        - 6
+        version: "2.6"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -126,6 +124,48 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: require_relative
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id010
 description: Bundle CSS and Javascript assets to a single file, compress, and cache them for snappier web experiences.
 email: darkhelmet@darkhelmetlive.com
 executables: []
@@ -140,7 +180,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - lib/sinatra/bundles.rb
 - lib/sinatra/bundles/bundle.rb
 - lib/sinatra/bundles/helpers.rb
@@ -161,7 +200,6 @@ files:
 - spec/public/stylesheets/test1.css
 - spec/public/stylesheets/test2.css
 - spec/sinatra-bundles_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/darkhelmet/sinatra-bundles
@@ -193,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 2
 summary: Easy asset bundling for sinatra

data/VERSION

@@ -1 +0,0 @@
-0.5.0

data/spec/spec.opts

@@ -1,2 +0,0 @@
---color
---format nested