sass-media_query_combiner 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YWRjMjZiOTNiMzFiNDk1NGYzNGNmNjhhNzJkNzI5ZTM4OTc0ZmNjNA==
-  data.tar.gz: !binary |-
-    MzA1Nzg0MjI0MzE3Y2EwYTI1ZDA0MzgyMWY3MGU2ZDcwNGI1NjQ0Nw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    ODk2NjA4NDNkZjBmZDM2ODkwMDFiMDk0MjIxMjFmYjEzMTkwYWFhNzlkNzBk
-    NThmZTZmZmU1MDFjM2U5NTk1NGZiNzIwYWYwZDNhZDQ5NGE2NTEyYmU3Y2Vj
-    OTM0MjIxNTczMGZhNDViNmMxMTcxY2QwN2E5MmI3ZDczNDdlNWQ=
-  data.tar.gz: !binary |-
-    MjdmNjk0YjIyNTcyYzk1NjNjYmM4OTg4YTZiZTJiMTVmMzY0NGJjZTE2Mjkz
-    MThlNGI3NTBlYTIxZTBjMTdlMGQ4ODI1MzY5NzhjNmVhMDg3N2Y3MTI3NTdi
-    ZDE2OWRjNzMzZDlhMmUyODAxZGQzYzA3NWJlMjZkNGJlZDQ1MDQ=
+SHA1:
+  metadata.gz: d5336fadd067874f1617a9f8a5b9c97c89a94598
+  data.tar.gz: 2a970c01aab4299566178ae0a9008b2345238336
+SHA512:
+  metadata.gz: fe173a3c9733d7615eee0b887e089b635e9c4912cf4399b6553282d7ddd183d481c1f8b607d0cff8362d3b63cbfbcfe8a07abdd34eaf697a6abc1ce27e8cafba
+  data.tar.gz: f0b1075b9dddfcbf64c93777aec6e6aa40e86cdd14101f652eb9a11833d391460b969a3baeec1f8d1881c4523517c90c75adfc64e905df62d7fbc19aeb530318

data/README.md

@@ -8,7 +8,9 @@
 Combines all matching media queries while compiling your Sass.
 
 If you're using
-Rails 3.1+ or Sprockets, you should use [sprockets-media_query_combiner](https://github.com/aaronjensen/sprockets-media_query_combiner)
+Rails 3.1+ or Sprockets, you should use [sprockets-media_query_combiner](https://github.com/aaronjensen/sprockets-media_query_combiner).
+
+For node pipelines try [node-css-mqpacker](https://github.com/hail2u/node-css-mqpacker).
 
 For example:
 

data/lib/sass-media_query_combiner.rb

@@ -9,4 +9,14 @@ Sass::Engine.class_eval do
   alias_method :render_without_combine, :render
   alias_method :render, :render_with_combine
   alias_method :to_css, :render_with_combine
+
+  def render_with_sourcemap_with_combine(*args)
+    rendered, sourcemap = render_with_sourcemap_without_combine(*args)
+
+    rendered = Sass::MediaQueryCombiner::Combiner.combine(rendered)
+
+    return rendered, sourcemap
+  end
+  alias_method :render_with_sourcemap_without_combine, :render_with_sourcemap
+  alias_method :render_with_sourcemap, :render_with_sourcemap_with_combine
 end

data/lib/sass/media_query_combiner/combiner.rb

@@ -5,6 +5,8 @@ module Sass
         queries = Hash.new { |hash, key| hash[key] = '' }
         pretty = true
 
+        css, source_map_url = extract_source_map_url(css)
+
         filtered_data = css.gsub(/
           \n?                 # Optional newline
           (?<query>           # The media query parameters, this will be $1
@@ -32,7 +34,18 @@ module Sass
 
         combined = queries.map { |query, body| "#{query}{#{body}}" }.
           join(("\n\n" if pretty))
-        "#{filtered_data}#{"\n" if pretty}#{combined}\n"
+        "#{filtered_data}#{"\n" if pretty}#{combined}#{source_map_url}\n"
+      end
+
+      def self.extract_source_map_url(css)
+        source_map_url = ''
+
+        css = css.gsub(/\n*\/\*# sourceMappingURL=.* \*\/$/m) do |match|
+          source_map_url = match
+          ''
+        end
+
+        return css, source_map_url
       end
     end
   end

data/lib/sass/media_query_combiner/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module MediaQueryCombiner
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/spec/sass-media_query_combiner_spec.rb

@@ -22,10 +22,37 @@ b
   color: yellow
 SASS
 
+
   it "should work with sass" do
     # NOTE: the weird interpolated space in there is required to match.
     # My editor strips out trailing whitespace, so that's how I get it to stay.
-    Sass::Engine.new(sass).render.should == <<CSS
+    expected_output = <<CSS
+h3 {
+  color: orange; }
+b {
+  color: yellow; }
+
+@media (max-width: 480px) {
+  h1 {
+    color: red; }#{" "}
+  h2 {
+    color: blue; } }
+
+@media (max-width: 980px) {
+  h4 {
+    color: black; } }
+CSS
+
+    Sass::Engine.new(sass).render.should == expected_output
+  end
+
+  it "should work with sourcemaps" do
+    options = {
+      filename: "out.css",
+      sourcemap_filename: "out.css.map"
+    }
+
+    expected_output = <<CSS
 h3 {
   color: orange; }
 b {
@@ -40,7 +67,12 @@ b {
 @media (max-width: 980px) {
   h4 {
     color: black; } }
+
+/*# sourceMappingURL=out.css.map */
 CSS
+
+    output, _ = Sass::Engine.new(sass, options).render_with_sourcemap("out.css.map")
+    output.should == expected_output
   end
 
   it "should work with debug_info: true" do

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: sass-media_query_combiner
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Aaron Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-15 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
 description: Automatically combine media queries
 email:
 - aaronjensen@gmail.com
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -82,17 +82,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Sass plugin to combine all like media queries