oreorenasass 3.4.4 → 3.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d1865fa667cb14d3bbc87ec02219cbcd37b6d1d
-  data.tar.gz: 0d2f8bed1b90cf39dd4a0fd54382c26dfc88d8fa
+  metadata.gz: 43d86ae65ada6b57dc4199e4f9549b229d948a97
+  data.tar.gz: 0d4ae59a191fae5b3bdab842b98daeec19aaa4ac
 SHA512:
-  metadata.gz: b9bbb09ee8ea0633335e74605fcbba2a2ef70e3dca07a2bf5c87334d5dbea1707fe3fd5a619de877874260ba814ad8e0cb29fba33b894e3cea2ace004f2561e4
-  data.tar.gz: 409ec2fa3a515cdabf5951517104c9a54bba1d4f99f3336a341d05d4e26495ea4ba818801971f5036d9344bc4e2a8ef1c946dc104c6375d03f139068a84dda32
+  metadata.gz: 77f6e678d9ccec64f3f78ed65e0b5d740ab729b65f4cdd375a49f998e147c9481dcf0c5e92a47f174ff6d2e800937b236cf6a627e0277b0cde92c0ce92664ac1
+  data.tar.gz: ae21995c6b87813c4ed406e984daecbf0d6043c38c98089e0761b4a67d0fef884ddbde627f71ad614685d9196bfce6ea9b6a265e0121f3325797defa09f89c7b

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2014 Hampton Catlin, Natalie 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

data/README.md

@@ -49,10 +49,8 @@ see [the Sass reference](http://sass-lang.com/docs/yardoc/file.SASS_REFERENCE.ht
 Sass can also be used with any Rack-enabled web framework.
 To do so, just add
 
-```ruby
-require 'sass/plugin/rack'
-use Sass::Plugin::Rack
-```
+    require 'sass/plugin/rack'
+    use Sass::Plugin::Rack
 
 to `config.ru`.
 Then any Sass files in `public/stylesheets/sass`
@@ -95,20 +93,18 @@ put them in a file called `test.scss` and run `sass test.scss`.
 Sass avoids repetition by nesting selectors within one another.
 The same thing works for properties.
 
-```scss
-table.hl {
-  margin: 2em 0;
-  td.ln { text-align: right; }
-}
-
-li {
-  font: {
-    family: serif;
-    weight: bold;
-    size: 1.2em;
-  }
-}
-```
+    table.hl {
+      margin: 2em 0;
+      td.ln { text-align: right; }
+    }
+
+    li {
+      font: {
+        family: serif;
+        weight: bold;
+        size: 1.2em;
+      }
+    }
 
 ### Variables
 
@@ -116,21 +112,19 @@ Use the same color all over the place?
 Need to do some math with height and width and text size?
 Sass supports variables, math operations, and many useful functions.
 
-```scss
-$blue: #3bbfce;
-$margin: 16px;
+    $blue: #3bbfce;
+    $margin: 16px;
 
-.content_navigation {
-  border-color: $blue;
-  color: darken($blue, 10%);
-}
+    .content_navigation {
+      border-color: $blue;
+      color: darken($blue, 10%);
+    }
 
-.border {
-  padding: $margin / 2;
-  margin: $margin / 2;
-  border-color: $blue;
-}
-```
+    .border {
+      padding: $margin / 2;
+      margin: $margin / 2;
+      border-color: $blue;
+    }
 
 ### Mixins
 
@@ -139,25 +133,23 @@ mixins allow you to re-use whole chunks of CSS,
 properties or selectors.
 You can even give them arguments. 
 
-```scss
-@mixin table-scaffolding {
-  th {
-    text-align: center;
-    font-weight: bold;
-  }
-  td, th { padding: 2px; }
-}
-
-@mixin left($dist) {
-  float: left;
-  margin-left: $dist;
-}
-
-#data {
-  @include left(10px);
-  @include table-scaffolding;
-}
-```
+    @mixin table-scaffolding {
+      th {
+        text-align: center;
+        font-weight: bold;
+      }
+      td, th { padding: 2px; }
+    }
+
+    @mixin left($dist) {
+      float: left;
+      margin-left: $dist;
+    }
+
+    #data {
+      @include left(10px);
+      @include table-scaffolding;
+    }
 
 A comprehensive list of features is available
 in the [Sass reference](http://sass-lang.com/documentation/file.SASS_REFERENCE.html).
@@ -179,18 +171,6 @@ 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)
@@ -199,23 +179,23 @@ and now occasionally consults on the language issues. Hampton lives in San
 Francisco, California and works as VP of Technology
 at [Moovweb](http://www.moovweb.com/).
 
-[Natalie Weizenbaum](http://nex-3.com) is the primary developer and architect of
-Sass. Her hard work has kept the project alive by endlessly answering forum
+[Nathan Weizenbaum](http://nex-3.com) is the primary developer and architect of
+Sass. His hard work has kept the project alive by endlessly answering forum
 posts, fixing bugs, refactoring, finding speed improvements, writing
 documentation, implementing new features, and getting Hampton coffee (a fitting
-task for a girl genius). Natalie lives in Seattle, Washington and works on
+task for a boy-genius). Nathan lives in Seattle, Washington and works on
 [Dart](http://dartlang.org) application libraries at Google.
 
 [Chris Eppstein](http://acts-as-architect.blogspot.com) is a core contributor to
 Sass and the creator of Compass, the first Sass-based framework. Chris focuses
 on making Sass more powerful, easy to use, and on ways to speed its adoption
 through the web development community. Chris lives in San Jose, California with
-his wife and daughter. He is an Engineer for
-[LinkedIn.com](http://linkedin.com), where one of his responsibilities is to
-maintain Sass & Compass.
+his wife and daughter. He is the Software Architect for
+[Caring.com](http://caring.com), a website devoted to the 34 Million caregivers
+whose parents are sick or elderly, that uses Haml and Sass.
 
-If you use this software, you must pay Hampton a compliment. And buy Natalie
-some candy. Maybe pet a kitten. Yeah. Pet that kitty.
+If you use this software, you must pay Hampton a compliment. And
+buy Nathan some jelly beans. Maybe pet a kitten. Yeah. Pet that kitty.
 
 Beyond that, the implementation is licensed under the MIT License.
 Okay, fine, I guess that means compliments aren't __required__.

data/Rakefile

@@ -21,25 +21,6 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-# ----- Code Style Enforcement -----
-
-if RUBY_VERSION !~ /^(1\.8)/ && (ENV.has_key?("RUBOCOP") && ENV["RUBOCOP"] == "true" || !(ENV.has_key?("RUBOCOP") || ENV.has_key?("TEST")))
-  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
@@ -102,10 +83,12 @@ task :install => [:package] do
   sh %{#{'sudo ' if ENV["SUDO"]}#{gem} install --no-ri pkg/sass-#{get_version}}
 end
 
-desc "Release a new Sass package to RubyGems.org."
+desc "Release a new Sass package to Rubyforge."
 task :release => [:check_release, :package] do
   name = File.read(scope("VERSION_NAME")).strip
   version = File.read(scope("VERSION")).strip
+  # sh %{rubyforge add_release sass sass "#{name} (v#{version})" pkg/sass-#{version}.gem}
+  # sh %{rubyforge add_file    sass sass "#{name} (v#{version})" pkg/sass-#{version}.tar.gz}
   sh %{gem push pkg/sass-#{version}.gem}
 end
 
@@ -159,11 +142,7 @@ 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
 end
@@ -214,7 +193,7 @@ begin
     task :undocumented do
       opts = ENV["YARD_OPTS"] || ""
       ENV["YARD_OPTS"] = opts.dup + <<OPTS
- --list --tag comment --hide-tag comment --query "
+ --list --query "
   object.docstring.blank? &&
   !(object.type == :method && object.is_alias?)"
 OPTS

data/VERSION

@@ -1 +1 @@
-3.4.4
+3.4.5

data/VERSION_NAME

@@ -1 +1 @@
-Selective Steve
+Media Mark

data/bin/sass

@@ -9,5 +9,5 @@ rescue LoadError
 end
 require 'sass/exec'
 
-opts = Sass::Exec::SassScss.new(ARGV, :sass)
+opts = Sass::Exec::Sass.new(ARGV)
 opts.parse!

data/bin/scss

@@ -9,5 +9,5 @@ rescue LoadError
 end
 require 'sass/exec'
 
-opts = Sass::Exec::SassScss.new(ARGV, :scss)
+opts = Sass::Exec::Scss.new(ARGV)
 opts.parse!

data/lib/sass.rb

@@ -1,6 +1,11 @@
 dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 
+# This is necessary to set so that the Haml code that tries to load Sass
+# knows that Sass is indeed loading,
+# even if there's some crazy autoload stuff going on.
+SASS_BEGUN_TO_LOAD = true unless defined?(SASS_BEGUN_TO_LOAD)
+
 require 'sass/version'
 
 # The module that contains everything Sass-related:
@@ -12,14 +17,9 @@ require 'sass/version'
 #
 # Also see the {file:SASS_REFERENCE.md full Sass reference}.
 module Sass
-  class << self
-    # @private
-    attr_accessor :tests_running
-  end
-
   # The global load paths for Sass files. This is meant for plugins and
   # libraries to register the paths to their Sass stylesheets to that they may
-  # be `@imported`. This load path is used by every instance of {Sass::Engine}.
+  # be `@imported`. This load path is used by every instance of [Sass::Engine].
   # They are lower-precedence than any load paths passed in via the
   # {file:SASS_REFERENCE.md#load_paths-option `:load_paths` option}.
   #
@@ -35,11 +35,8 @@ module Sass
   #   Sass.load_paths << File.dirname(__FILE__ + '/sass')
   # @return [Array<String, Pathname, Sass::Importers::Base>]
   def self.load_paths
-    @load_paths ||= if ENV['SASS_PATH']
-                      ENV['SASS_PATH'].split(Sass::Util.windows? ? ';' : ':')
-                    else
-                      []
-                    end
+    @load_paths ||= ENV['SASS_PATH'] ?
+      ENV['SASS_PATH'].split(Sass::Util.windows? ? ';' : ':') : []
   end
 
   # Compile a Sass or SCSS string to CSS.
@@ -59,6 +56,9 @@ module Sass
 
   # Compile a file on disk to CSS.
   #
+  # @param filename [String] The path to the Sass, SCSS, or CSS file on disk.
+  # @param options [{Symbol => Object}] An options hash;
+  #   see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
   # @raise [Sass::SyntaxError] if there's an error in the document
   # @raise [Encoding::UndefinedConversionError] if the source encoding
   #   cannot be converted to UTF-8
@@ -67,17 +67,11 @@ module Sass
   # @overload compile_file(filename, options = {})
   #   Return the compiled CSS rather than writing it to a file.
   #
-  #   @param filename [String] The path to the Sass, SCSS, or CSS file on disk.
-  #   @param options [{Symbol => Object}] An options hash;
-  #     see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
   #   @return [String] The compiled CSS.
   #
   # @overload compile_file(filename, css_filename, options = {})
   #   Write the compiled CSS to a file.
   #
-  #   @param filename [String] The path to the Sass, SCSS, or CSS file on disk.
-  #   @param options [{Symbol => Object}] An options hash;
-  #     see {file:SASS_REFERENCE.md#sass_options the Sass options documentation}
   #   @param css_filename [String] The location to which to write the compiled CSS.
   def self.compile_file(filename, *args)
     options = args.last.is_a?(Hash) ? args.pop : {}
@@ -85,7 +79,7 @@ module Sass
     result = Sass::Engine.for_file(filename, options).render
     if css_filename
       options[:css_filename] ||= css_filename
-      open(css_filename, "w") {|css_file| css_file.write(result)}
+      open(css_filename,"w") {|css_file| css_file.write(result)}
       nil
     else
       result
@@ -99,4 +93,3 @@ require 'sass/util'
 require 'sass/engine'
 require 'sass/plugin' if defined?(Merb::Plugins)
 require 'sass/railtie'
-require 'sass/features'

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,7 +46,7 @@ module Sass
       #
       # @param key [String] The key to store it under.
       # @param sha [String] The checksum for the contents that are being stored.
-      # @param root [Object] The root node to cache.
+      # @param obj [Object] The object to cache.
       def store(key, sha, root)
         _store(key, Sass::VERSION, sha, Marshal.dump(root))
       rescue TypeError, LoadError => e

data/lib/sass/cache_stores/chain.rb

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

data/lib/sass/cache_stores/filesystem.rb

@@ -34,7 +34,11 @@ 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))
         Sass::Util.atomic_create_and_write_file(compiled_filename, 0600) do |f|
           f.puts(version)
@@ -42,7 +46,7 @@ module Sass
           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,7 +30,6 @@ module Sass
     def self.extended(base)
       base.send(:include, InstanceMethods)
     end
-
     protected
 
     module InstanceMethods

data/lib/sass/css.rb

@@ -67,14 +67,16 @@ module Sass
     def check_encoding!
       return if @checked_encoding
       @checked_encoding = true
-      @template, @original_encoding = Sass::Util.check_sass_encoding(@template)
+      @template, @original_encoding = Sass::Util.check_sass_encoding(@template) do |msg, line|
+        raise Sass::SyntaxError.new(msg, :line => line)
+      end
     end
 
     # Parses the CSS template and applies various transformations
     #
     # @return [Tree::Node] The root node of the parsed tree
     def build_tree
-      root = Sass::SCSS::CssParser.new(@template, @options[:filename], nil).parse
+      root = Sass::SCSS::CssParser.new(@template, @options[:filename]).parse
       parse_selectors    root
       expand_commas      root
       nest_seqs          root
@@ -94,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, nil, child.line)
+        parser = Sass::SCSS::CssParser.new(child.rule.first, child.filename, child.line)
         child.parsed_rules = parser.parse_selector
       end
     end
@@ -167,11 +169,11 @@ module Sass
           current_rule.parsed_rules = make_seq(first)
         end
 
-        if rest.empty?
-          current_rule.children += child.children
-        else
+        unless rest.empty?
           child.parsed_rules = make_seq(*rest)
           current_rule << child
+        else
+          current_rule.children += child.children
         end
 
         current_rule
@@ -218,12 +220,12 @@ module Sass
           current_rule.parsed_rules = make_sseq(last_simple_subject, *firsts)
         end
 
-        if rest.empty?
-          current_rule.children += child.children
-        else
+        unless rest.empty?
           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
@@ -315,7 +317,7 @@ module Sass
     #       bar, baz
     #         color: blue
     #
-    # @param root [Tree::Node] The parent node
+    # @param rule [Tree::RuleNode] The candidate for flattening
     def fold_commas(root)
       prev_rule = nil
       root.children.map! do |child|
@@ -324,7 +326,7 @@ module Sass
           next child
         end
 
-        if prev_rule && prev_rule.children.map {|c| c.to_sass} == child.children.map {|c| c.to_sass}
+        if prev_rule && prev_rule.children == child.children
           prev_rule.parsed_rules.members << first_seq(child)
           next nil
         end