sass-media_query_combiner 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWJiYjI2MmE2ZjYzODYwNDZiNjBiZTA1YmUxNTdkZGVmMTAyOWZiNg==
+  data.tar.gz: !binary |-
+    Y2E3ZTI1YzgyY2IwM2FmZGU0MjRlZGU5MmRmOWEzNjc0YmRkYzU4Mg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MDFmZmNlYWU3M2RiZDY5NWY0YjI3N2MxYzZiNmJjNzVkMGZiYWZhOTMwZmIx
+    ZGMwZTBlYTgwYzA2ZGJmMTNiZGRlNTMyODhmNzYyYzZiODA3OTg2MWE4NDNj
+    NWQ2N2E4ZjQwM2EwNGRlMzgwOWFlMjUzNDg0ZjBmNzVkNTFmNjY=
+  data.tar.gz: !binary |-
+    Y2ZlMzNjOGQ0NDQyYjhjY2EzNjgyOTBiNzY4MWY3MmVjNGMzYmE1YzQwZjMw
+    YzYwNjI0ZTg3ZjczZjk5MTM5Yzk3ZTAzNjNhMmQzNTA2MmRiZDFkNTNjNDc5
+    MWRmNGI0MWZhMTg0ZDFjMTY5ODMxYzg3NjAwYzk5MWYxNDNkMmE=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.0.5 (2013-11-02)
+
+* [Fix hang when using `debug_info: true`](https://github.com/aaronjensen/sass-media_query_combiner/issues/8#issuecomment-27630196)
+
 ## 0.0.4 (2013-10-09)
 
 * Internal refactor to allow

data/lib/sass/media_query_combiner/combiner.rb

@@ -9,6 +9,7 @@ module Sass
           \n?                 # Optional newline
           (?<query>           # The media query parameters, this will be $1
             @media            #   Start with @media
+            (?!\ -sass-debug-info) # Ignore sass-debug-info
             [^{]+             #   One to many characters that are not {, we are guaranteed to have a space
           )
           {
@@ -16,12 +17,10 @@ module Sass
             (?<braces>        #   Recursive capture group
               (?:
                 [^{}]*        #     Anything that is not a brace
-              )
-              |               #     OR
-              (
+                |             #     OR
                 {\g<braces>}  #     Recursively capture things within braces, this allows for balanced braces
-              )
-            )*                # As many of these as we have
+              )*              # As many of these as we have
+            )
           )
           }
           \n?                 # Optional newline

data/lib/sass/media_query_combiner/version.rb

@@ -1,5 +1,5 @@
 module Sass
   module MediaQueryCombiner
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/spec/lib/sass-media_query_combiner/combiner_spec.rb

@@ -8,6 +8,17 @@ describe Sass::MediaQueryCombiner::Combiner do
 @media (min-width: 40em) {
   @-webkit-keyframes whatever {}
 }
+CSS
+    end
+  end
+
+  it "should handle debug info" do
+    Timeout::timeout(0.5) do
+      Sass::MediaQueryCombiner::Combiner.combine <<CSS
+@media (max-width: 480px) {
+@media -sass-debug-info {filename{}line{}}
+  h1 {
+    color: red; } }
 CSS
     end
   end

data/spec/sass-media_query_combiner_spec.rb

@@ -2,8 +2,7 @@ require 'spec_helper'
 require 'sass-media_query_combiner'
 
 describe "Combiner" do
-  it "should work with sass" do
-    sass = <<SASS
+  let(:sass) { <<SASS }
 h3
   color: orange
 
@@ -23,6 +22,7 @@ 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
@@ -42,4 +42,30 @@ b {
     color: black; } }
 CSS
   end
+
+  it "should work with debug_info: true" do
+    Timeout::timeout(1) do
+      Sass::Engine.new(sass, debug_info: true).render.should == <<CSS
+@media -sass-debug-info{filename{}line{font-family:\\000031}}
+h3 {
+  color: orange; }
+@media -sass-debug-info{filename{}line{font-family:\\0000316}}
+b {
+  color: yellow; }
+
+@media (max-width: 480px) {
+@media -sass-debug-info{filename{}line{font-family:\\000035}}
+  h1 {
+    color: red; }#{" "}
+@media -sass-debug-info{filename{}line{font-family:\\0000313}}
+  h2 {
+    color: blue; } }
+
+@media (max-width: 980px) {
+@media -sass-debug-info{filename{}line{font-family:\\000039}}
+  h4 {
+    color: black; } }
+CSS
+    end
+  end
 end

metadata

@@ -1,64 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: sass-media_query_combiner
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Aaron Jensen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sass
-  type: :runtime
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
-    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
-    none: false
+  type: :runtime
   prerelease: false
+  name: sass
 - !ruby/object:Gem::Dependency
-  name: rspec
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
   prerelease: false
+  name: rspec
 - !ruby/object:Gem::Dependency
-  name: rake
-  type: :development
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
+  type: :development
   prerelease: false
+  name: rake
 description: Automatically combine media queries
 email:
 - aaronjensen@gmail.com
@@ -81,6 +74,7 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -90,21 +84,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: -4377433259710746294
       version: '0'
-  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sass plugin to combine all like media queries
 test_files:
 - spec/lib/sass-media_query_combiner/combiner_spec.rb