middleman-sprockets 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e38b12a9c8ab12b7ae6e0be0c492c8aaba8d6bd
-  data.tar.gz: 6cc6c0b7ab1c046bad148904706708126b381407
+  metadata.gz: de5f620a31b69f84a132da4b42c0abc735265980
+  data.tar.gz: 3a0c1e28fe64a848685725357778d61b9fa8d202
 SHA512:
-  metadata.gz: 1531bc2d4691b05f64228c61d9ed35478dee6865e72e33054fb371c9f7eab179f1abdfc74f57a05e7477a9aa811c19a4117fc48df91ec102b32bc5a1a97f893b
-  data.tar.gz: 6290fac59b1bd578d18ca1ccadcfd6f1d7e45f03786c6097fbb1768ffee8f0d1f8fbe0c52b77e8877b48d1361fbf0eb91005b29af5768636baed661b72711235
+  metadata.gz: f52ec2f098d000e6d3b46f59294860095d6e61e9b6ea109d716047b6530609b576c1072fe44351aa6f856ebc92072c26adcdfb5ae2cee16abdb8496a558ea2db
+  data.tar.gz: 50ae54d05c95c2e5f4a9bfa1047e25f4253136f805a8e4e0b66f5a5d8a0c3b8c7a582b74e16e2ce8a03a170a5788f6a274ef92dd03e1e97deaecf295366639d6

data/Gemfile

@@ -19,7 +19,7 @@ gem "builder", "~> 3.0"
 # For actual tests
 # Make sure to lock down the versions of the asset gems
 # so they don't cause asset hashes to change.
-gem "railties", "~> 4.0.0"
+gem "railties", "~> 4.1.0"
 gem "jquery-rails", "3.1.0", :require => false
 gem "bootstrap-sass", "3.1.1.0", :require => false
 gem "jquery_mobile_rails", "1.4.1", :require => false

data/Gemfile-v4

@@ -20,7 +20,7 @@ gem "builder", "~> 3.0"
 # For actual tests
 # Make sure to lock down the versions of the asset gems
 # so they don't cause asset hashes to change.
-gem "railties", "~> 4.0.0"
+gem "railties", "~> 4.1.0"
 gem "jquery-rails", "3.1.0", :require => false
 gem "bootstrap-sass", "3.1.1.0", :require => false
 

data/lib/middleman-sprockets/sass_function_hack.rb

@@ -1,25 +1,7 @@
-# sprockets-sass implements an image_url function that calls over to image_path. But bootstrap-sass
-# defines an image_path function that calls image_url! To avoid the probem in bootstrap-sass (and anyone
-# who tries something similar, this redefines sprockets-sass' function to not refer to image_path.
-#
-# See https://github.com/middleman/middleman/issues/864 for more info.
-#
 if defined?(Sass)
   module Sass::Script::Functions
-    def image_url(source, options = {}, cache_buster = nil)
-      # Work with the Compass #image_url API
-      if options.respond_to? :value
-        case options.value
-        when true
-          return ::Sass::Script::String.new sprockets_context.image_path(source.value).to_s, :string
-        else
-          options = {}
-        end
-      end
-      ::Sass::Script::String.new "url(\"#{sprockets_context.image_path(source.value, map_options(options)).to_s}\")"
-    end
-
-    # Also override generated_image_url to use Sprockets a la https://github.com/Compass/compass-rails/blob/98e4b115c8bb6395a1c3351926d574321396778b/lib/compass-rails/patches/3_1.rb
+    # Override generated_image_url to use Sprockets
+    # a la https://github.com/Compass/compass-rails/blob/master/lib/compass-rails/patches/4_0.rb
     def generated_image_url(path, only_path = nil)
       asset_url(path, Sass::Script::String.new("image"))
     end

data/lib/middleman-sprockets/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Sprockets
-    VERSION = "3.3.2"
+    VERSION = "3.3.3"
   end
 end

data/middleman-sprockets.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name = "middleman-sprockets"
   s.version = Middleman::Sprockets::VERSION
   s.platform = Gem::Platform::RUBY
-  s.authors = ["Thomas Reynolds", "Ben Hollis"]
-  s.email = ["me@tdreyno.com", "ben@benhollis.net"]
+  s.authors = ['Thomas Reynolds', 'Ben Hollis', 'Karl Freeman']
+  s.email = ['me@tdreyno.com', 'ben@benhollis.net', 'karlfreeman@gmail.com']
   s.homepage = "https://github.com/middleman/middleman-sprockets"
   s.summary = %q{Sprockets support for Middleman}
   s.description = %q{Sprockets support for Middleman}
@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_dependency("middleman-core", [">= 3.2"])
   s.add_dependency("sprockets", ["~> 2.2"])
-  s.add_dependency("sprockets-sass", ["~> 1.0.0"])
+  s.add_dependency("sprockets-sass", ["~> 1.1.0"])
   s.add_dependency("sprockets-helpers", ["~> 1.1.0"])
 end

metadata

@@ -1,82 +1,84 @@
 --- !ruby/object:Gem::Specification
 name: middleman-sprockets
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Thomas Reynolds
 - Ben Hollis
+- Karl Freeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: sprockets-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
 description: Sprockets support for Middleman
 email:
 - me@tdreyno.com
 - ben@benhollis.net
+- karlfreeman@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -208,17 +210,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sprockets support for Middleman