csscss 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0813cfe3a3c5ea373702b3e9a666ab1f7c89a99d
-  data.tar.gz: e0c6d6a8927eaf0486c3345cea4829fb0845d85f
+  metadata.gz: 29fe6b307cec72a8caa09c390e53c62bbc14e711
+  data.tar.gz: ea292f00371ff139241d08731f4e34c341bd7316
 SHA512:
-  metadata.gz: 232d3550de49a5f655cab3f68981f3d8b58bfd4c7465a8aee565d0f3e27b7a282c611a5434ce4283d6daa34c1f4e5ef62c143e676a2b2f041b0bed2da3cce8fa
-  data.tar.gz: 8e1ea90d3ef93a39dc721ac4e19463dc9fd248f4dc888602a05f4a370a5d4da1ac742e33031d08c32fdf3d532f53d6fe7443493cb7ec7f90d1cfbe784797402b
+  metadata.gz: 0a0f4b998370a3fe7f43b01c80ed8dd2b7e0cbcdfa614163545b5e1b6ae1ce165116eaed1d770819d4665c27c453ae63220e17f708dbdc50a158c47420d1bbce
+  data.tar.gz: af2c34e8c0d78c3a4a2e5cc8cb675c016532c472656f6e7fda95e91eef840e9aa06c9b62b14bb2edd06af1c1fddca86ae32773a34f68c3f49bf2f8e914bc4ae2

data/.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p195
+ruby-2.1.2

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1.2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.3.3 - 5/30/2014 ##
+
+* Upgrades parslet dependency to v1.6.1 and drops optimization monkeypatch
+* Use correct terminology "declartions" instead of "rules" in the output
+
 ## 1.3.2 - 6/22/2013 ##
 
 * Fixes attribute parsing bug that includes comments with braces

data/Gemfile

@@ -4,16 +4,16 @@ source 'https://rubygems.org'
 gemspec
 
 # optional runtime dependencies
-gem "sass"
-gem "compass"
-gem "less"
-gem "therubyracer", :platform => :mri
+gem 'sass'
+gem 'compass'
+gem 'less'
+gem 'therubyracer', :platform => :mri
 
-gem "rake", :require => false
-gem "debugger"
+gem 'rake', :require => false
+gem 'byebug'
 
-gem "minitest"
-gem "m"
-gem "minitest-rg"
+gem 'minitest'
+gem 'm'
+gem 'minitest-rg'
 
-gem "ruby-prof"
+gem 'ruby-prof'

data/Gemfile.lock

@@ -1,28 +1,26 @@
 PATH
   remote: .
   specs:
-    csscss (1.3.2)
+    csscss (1.3.3)
       colorize
-      parslet (~> 1.5)
+      parslet (>= 1.6.1, < 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     blankslate (2.1.2.4)
+    byebug (3.1.2)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
     chunky_png (1.2.7)
-    colorize (0.5.8)
-    columnize (0.3.6)
+    colorize (0.7.3)
+    columnize (0.8.9)
     commonjs (0.2.6)
     compass (0.12.2)
       chunky_png (~> 1.2)
       fssm (>= 0.2.7)
       sass (~> 3.1)
-    debugger (1.6.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.1)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.2)
     fssm (0.2.10)
     less (2.3.1)
       commonjs (~> 0.2.6)
@@ -33,7 +31,7 @@ GEM
     method_source (0.8.1)
     minitest (2.12.1)
     minitest-rg (1.1.0)
-    parslet (1.5.0)
+    parslet (1.6.1)
       blankslate (~> 2.0)
     rake (10.0.3)
     ref (1.0.4)
@@ -47,9 +45,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  byebug
   compass
   csscss!
-  debugger
   less
   m
   minitest

data/README.md

@@ -63,6 +63,13 @@ LESS requires an additional javascript runtime.
 rubies, and [therubyrhino](https://rubygems.org/gems/therubyrhino) on
 jruby.
 
+## Are there any community extensions? ##
+
+* [compass-csscss](https://github.com/Comcast/compass-csscss) integrates csscss with [compass](http://compass-style.org/) projects.
+* [grunt-csscss](https://github.com/peterkeating/grunt-csscss) a [grunt](http://gruntjs.com/) task to automatically run csscss.
+
+_Please submit [an issue](https://github.com/zmoazeni/csscss/issues/new) if you know of any others._
+
 ## Why doesn't csscss automatically remove duplications for me? ##
 
 I have been asked this a lot, but csscss is intentionally designed this

data/csscss.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 1.9"
 
-  gem.add_dependency "parslet", "~> 1.5"
+  gem.add_dependency "parslet", ">= 1.6.1", "< 2.0"
   gem.add_dependency "colorize"
 end

data/lib/csscss.rb

@@ -5,7 +5,6 @@ require "open-uri"
 
 require "colorize"
 require "parslet"
-require "csscss/parslet_optimizations"
 
 require "csscss/version"
 require "csscss/cli"

data/lib/csscss/reporter.rb

@@ -13,7 +13,7 @@ module Csscss
         selector_groups = selector_groups.map {|selectors| "{#{maybe_color(selectors, :red, should_color)}}" }
         last_selector = selector_groups.pop
         count = declarations.size
-        io.puts %Q(#{selector_groups.join(", ")} AND #{last_selector} share #{maybe_color(count, :red, should_color)} rule#{"s" if count > 1})
+        io.puts %Q(#{selector_groups.join(", ")} AND #{last_selector} share #{maybe_color(count, :red, should_color)} declaration#{"s" if count > 1})
         if verbose
           declarations.each {|dec| io.puts("  - #{maybe_color(dec, :yellow, should_color)}") }
         end

data/lib/csscss/version.rb

@@ -1,3 +1,3 @@
 module Csscss
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/test/csscss/reporter_test.rb

@@ -12,19 +12,19 @@ module Csscss
       })
 
      expected =<<-EXPECTED
-{.foo} AND {.bar} share 2 rules
-{h1, h2}, {.foo} AND {.baz} share 1 rule
-{h1, h2} AND {.bar} share 1 rule
+{.foo} AND {.bar} share 2 declarations
+{h1, h2}, {.foo} AND {.baz} share 1 declaration
+{h1, h2} AND {.bar} share 1 declaration
 EXPECTED
      reporter.report(color:false).must_equal expected
 
      expected =<<-EXPECTED
-{.foo} AND {.bar} share 2 rules
+{.foo} AND {.bar} share 2 declarations
   - width: 1px
   - border: black
-{h1, h2}, {.foo} AND {.baz} share 1 rule
+{h1, h2}, {.foo} AND {.baz} share 1 declaration
   - display: none
-{h1, h2} AND {.bar} share 1 rule
+{h1, h2} AND {.bar} share 1 declaration
   - position: relative
 EXPECTED
      reporter.report(verbose:true, color:false).must_equal expected

data/test/just_parse.rb

@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 
-require "debugger"
+require "byebug"
 require "csscss"
 
 raise "need a file name" unless ARGV[0]

data/test/test_helper.rb

@@ -1,11 +1,11 @@
-require "rubygems"
-require "bundler/setup"
+require 'rubygems'
+require 'bundler/setup'
 
-require "minitest/autorun"
-require "minitest/rg"
-require "debugger"
+require 'minitest/autorun'
+require 'minitest/rg'
+require 'byebug'
 
-require "csscss"
+require 'csscss'
 
 module TypeHelpers
   def sel(s)

metadata

@@ -1,41 +1,47 @@
 --- !ruby/object:Gem::Specification
 name: csscss
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - Zach Moazeni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.6.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: csscss will parse any CSS files you give it and let you know which rulesets
@@ -47,9 +53,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
@@ -79,7 +85,6 @@ files:
 - lib/csscss/parser/multi_side_transformer.rb
 - lib/csscss/parser/outline.rb
 - lib/csscss/parser/padding.rb
-- lib/csscss/parslet_optimizations.rb
 - lib/csscss/redundancy_analyzer.rb
 - lib/csscss/reporter.rb
 - lib/csscss/sass_include_extensions.rb
@@ -115,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A CSS redundancy analyzer that analyzes redundancy.

data/lib/csscss/parslet_optimizations.rb

@@ -1,77 +0,0 @@
-# These are my multibyte optimizations for parslet.
-# More information can be found: 
-# https://github.com/kschiess/parslet/issues/73
-# https://github.com/kschiess/parslet/pull/74
-# https://github.com/zmoazeni/parslet/tree/optimized-multibyte-parsing
-
-require 'strscan'
-require 'forwardable'
-
-module Parslet
-  class Source
-    extend Forwardable
-
-    def initialize(str)
-      raise ArgumentError unless str.respond_to?(:to_str)
-
-      @str = StringScanner.new(str)
-
-      @line_cache = LineCache.new
-      @line_cache.scan_for_line_endings(0, str)
-    end
-
-    def matches?(pattern)
-      regexp = pattern.is_a?(String) ? Regexp.new(Regexp.escape(pattern)) : pattern
-      !@str.match?(regexp).nil?
-    end
-    alias match matches?
-
-    def consume(n)
-      original_pos = @str.pos
-      slice_str = n.times.map { @str.getch }.join
-      slice = Parslet::Slice.new(
-        slice_str,
-        original_pos,
-        @line_cache)
-
-      return slice
-    end
-
-    def chars_left
-      @str.rest_size
-    end
-
-    def_delegator :@str, :pos
-    def pos=(n)
-      if n > @str.string.bytesize
-        @str.pos = @str.string.bytesize
-      else
-        @str.pos = n
-      end
-    end
-
-
-    class LineCache
-      def scan_for_line_endings(start_pos, buf)
-        return unless buf
-
-        buf = StringScanner.new(buf)
-        return unless buf.exist?(/\n/)
-
-        ## If we have already read part or all of buf, we already know about
-        ## line ends in that portion. remove it and correct cur (search index)
-        if @last_line_end && start_pos < @last_line_end
-          # Let's not search the range from start_pos to last_line_end again.
-          buf.pos = @last_line_end - start_pos
-        end
-
-        ## Scan the string for line endings; store the positions of all endings
-        ## in @line_ends. 
-        while buf.skip_until(/\n/)
-          @last_line_end = start_pos + buf.pos
-          @line_ends << @last_line_end
-        end
-      end
-    end
-  end
-end