sass 3.2.7 → 3.3.0.rc.1

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2009 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
+Copyright (c) 2006-2013 Hampton Catlin, Nathan Weizenbaum, and Chris Eppstein
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,4 +1,4 @@
-# Sass
+# Sass [![Gem Version](https://badge.fury.io/rb/sass.png)](http://badge.fury.io/rb/sass)
 
 **Sass makes CSS fun again**. Sass is an extension of CSS3,
 adding nested rules, variables, mixins, selector inheritance, and more.
@@ -56,7 +56,7 @@ to `config.ru`.
 Then any Sass files in `public/stylesheets/sass`
 will be compiled into CSS files in `public/stylesheets` on every request.
 
-To use Sass programatically,
+To use Sass programmatically,
 check out the [YARD documentation](http://sass-lang.com/docs/yardoc/).
 
 ## Formatting
@@ -171,6 +171,18 @@ When converting from CSS to Sass or SCSS,
 nesting is applied where appropriate.
 See `sass-convert --help` for further information and options.
 
+### Running locally
+
+To run the Sass executables from a source checkout instead of from rubygems:
+
+```
+$ cd <SASS_CHECKOUT_DIRECTORY>
+$ bundle
+$ bundle exec sass ...
+$ bundle exec scss ...
+$ bundle exec sass-convert ...
+```
+
 ## Authors
 
 Sass was envisioned by [Hampton Catlin](http://www.hamptoncatlin.com)

data/Rakefile

@@ -19,6 +19,25 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
+# ----- Code Style Enforcement -----
+
+if RUBY_VERSION !~ /^(1\.8|2\.1)/ && (ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] == "true" || !ENV.has_key?("RUBOCOP"))
+  require 'rubocop/rake_task'
+  Rubocop::RakeTask.new do |t|
+    t.patterns = FileList["lib/**/*"]
+  end
+else
+  task :rubocop do
+    puts "Skipping rubocop style check."
+    if !ENV.has_key?("RUBOCOP")
+      puts "Passing this check is required in order for your patch to be accepted."
+      puts "Use ruby 1.9 or greater and then run the style check with: rake rubocop"
+    end
+  end
+end
+
+task :test => :rubocop
+
 # ----- Packaging -----
 
 # Don't use Rake::GemPackageTast because we want prerequisites to run
@@ -140,6 +159,11 @@ task :release_edge do
     sh %{git reset --hard origin/master}
     sh %{rake package}
     version = get_version
+    if version.include?('.rc.')
+      puts "#{'=' * 20} Not releasing edge gem for RC version"
+      next
+    end
+
     sh %{rubyforge add_release sass sass "Bleeding Edge (v#{version})" pkg/sass-#{version}.gem}
     sh %{gem push pkg/sass-#{version}.gem}
   end
@@ -191,7 +215,7 @@ begin
     task :undocumented do
       opts = ENV["YARD_OPTS"] || ""
       ENV["YARD_OPTS"] = opts.dup + <<OPTS
- --list --query "
+ --list --tag comment --hide-tag comment --query "
   object.docstring.blank? &&
   !(object.type == :method && object.is_alias?)"
 OPTS

data/VERSION

@@ -1 +1 @@
-3.2.7
+3.3.0.rc.1

data/VERSION_DATE

@@ -1 +1 @@
-09 March 2013 01:30:08 UTC
+12 October 2013 15:48:52 GMT

data/VERSION_NAME

@@ -1 +1 @@
-Media Mark
+Maptastic Maple

data/lib/sass/cache_stores/base.rb

@@ -27,7 +27,7 @@ module Sass
 
       # Retrieved cached contents.
       # Must be implemented by all subclasses.
-      # 
+      #
       # Note: if the key exists but the sha or version have changed,
       # then the key may be deleted by the cache store, if it wants to do so.
       #
@@ -46,11 +46,12 @@ module Sass
       #
       # @param key [String] The key to store it under.
       # @param sha [String] The checksum for the contents that are being stored.
-      # @param obj [Object] The object to cache.
+      # @param root [Object] The root node to cache.
       def store(key, sha, root)
         _store(key, Sass::VERSION, sha, Marshal.dump(root))
       rescue TypeError, LoadError => e
         Sass::Util.sass_warn "Warning. Error encountered while saving cache #{path_to(key)}: #{e}"
+        nil
       end
 
       # Retrieve a {Sass::Tree::RootNode}.
@@ -63,6 +64,7 @@ module Sass
         Marshal.load(contents) if contents
       rescue EOFError, TypeError, ArgumentError, LoadError => e
         Sass::Util.sass_warn "Warning. Error encountered while reading cache #{path_to(key)}: #{e}"
+        nil
       end
 
       # Return the key for the sass file.

data/lib/sass/cache_stores/chain.rb

@@ -22,7 +22,8 @@ module Sass
       # @see Base#retrieve
       def retrieve(key, sha)
         @caches.each_with_index do |c, i|
-          next unless obj = c.retrieve(key, sha)
+          obj = c.retrieve(key, sha)
+          next unless obj
           @caches[0...i].each {|prev| prev.store(key, sha, obj)}
           return obj
         end

data/lib/sass/cache_stores/filesystem.rb

@@ -30,19 +30,15 @@ module Sass
 
       # @see Base#\_store
       def _store(key, version, sha, contents)
-        # return unless File.writable?(File.dirname(@cache_location))
-        # return if File.exists?(@cache_location) && !File.writable?(@cache_location)
         compiled_filename = path_to(key)
-        # return if File.exists?(File.dirname(compiled_filename)) && !File.writable?(File.dirname(compiled_filename))
-        # return if File.exists?(compiled_filename) && !File.writable?(compiled_filename)
         FileUtils.mkdir_p(File.dirname(compiled_filename))
-        File.open(compiled_filename, "wb") do |f|
+        Sass::Util.atomic_create_and_write_file(compiled_filename) do |f|
           f.puts(version)
           f.puts(sha)
           f.write(contents)
         end
       rescue Errno::EACCES
-        #pass
+        # pass
       end
 
       private

data/lib/sass/cache_stores/memory.rb

@@ -37,7 +37,7 @@ module Sass
       def store(key, sha, obj)
         @contents[key] = {:sha => sha, :obj => obj}
       end
-      
+
       # Destructively clear the cache.
       def reset!
         @contents = {}

data/lib/sass/cache_stores/null.rb

@@ -12,11 +12,11 @@ module Sass
       def _retrieve(key, version, sha)
         nil
       end
-      
+
       def _store(key, version, sha, contents)
         @keys[key] = true
       end
-      
+
       def was_set?(key)
         @keys[key]
       end

data/lib/sass/callbacks.rb

@@ -30,6 +30,7 @@ module Sass
     def self.extended(base)
       base.send(:include, InstanceMethods)
     end
+
     protected
 
     module InstanceMethods

data/lib/sass/css.rb

@@ -76,7 +76,7 @@ module Sass
     #
     # @return [Tree::Node] The root node of the parsed tree
     def build_tree
-      root = Sass::SCSS::CssParser.new(@template, @options[:filename]).parse
+      root = Sass::SCSS::CssParser.new(@template, @options[:filename], nil).parse
       parse_selectors    root
       expand_commas      root
       nest_seqs          root
@@ -96,7 +96,7 @@ module Sass
       root.children.each do |child|
         next parse_selectors(child) if child.is_a?(Tree::DirectiveNode)
         next unless child.is_a?(Tree::RuleNode)
-        parser = Sass::SCSS::CssParser.new(child.rule.first, child.filename, child.line)
+        parser = Sass::SCSS::CssParser.new(child.rule.first, child.filename, nil, child.line)
         child.parsed_rules = parser.parse_selector
       end
     end
@@ -169,11 +169,11 @@ module Sass
           current_rule.parsed_rules = make_seq(first)
         end
 
-        unless rest.empty?
+        if rest.empty?
+          current_rule.children += child.children
+        else
           child.parsed_rules = make_seq(*rest)
           current_rule << child
-        else
-          current_rule.children += child.children
         end
 
         current_rule
@@ -220,12 +220,12 @@ module Sass
           current_rule.parsed_rules = make_sseq(last_simple_subject, *firsts)
         end
 
-        unless rest.empty?
+        if rest.empty?
+          current_rule.children += child.children
+        else
           rest.unshift Sass::Selector::Parent.new
           child.parsed_rules = make_sseq(sseq.subject?, *rest)
           current_rule << child
-        else
-          current_rule.children += child.children
         end
 
         current_rule
@@ -317,7 +317,7 @@ module Sass
     #       bar, baz
     #         color: blue
     #
-    # @param rule [Tree::RuleNode] The candidate for flattening
+    # @param root [Tree::Node] The parent node
     def fold_commas(root)
       prev_rule = nil
       root.children.map! do |child|
@@ -326,7 +326,7 @@ module Sass
           next child
         end
 
-        if prev_rule && prev_rule.children == child.children
+        if prev_rule && prev_rule.children.map {|c| c.to_sass} == child.children.map {|c| c.to_sass}
           prev_rule.parsed_rules.members << first_seq(child)
           next nil
         end