Freeze all strings

csuhta · csuhta · commit 796c44622c1a · 2018-09-26T02:19:32.000-04:00
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,2 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in sassc.gemspec
+source "https://rubygems.org"
 gemspec
diff --git a/lib/sassc.rb b/lib/sassc.rb
@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 module SassC
 end
 
 require_relative "sassc/version"
-require_relative "sassc/root"
 require_relative "sassc/native"
 require_relative "sassc/import_handler"
 require_relative "sassc/importer"
diff --git a/lib/sassc/dependency.rb b/lib/sassc/dependency.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   class Dependency
     attr_reader :filename
diff --git a/lib/sassc/engine.rb b/lib/sassc/engine.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "error"
 
 module SassC
diff --git a/lib/sassc/error.rb b/lib/sassc/error.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pathname"
 
 module SassC
diff --git a/lib/sassc/functions_handler.rb b/lib/sassc/functions_handler.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   class FunctionsHandler
     def initialize(options)
diff --git a/lib/sassc/import_handler.rb b/lib/sassc/import_handler.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   class ImportHandler
     def initialize(options)
diff --git a/lib/sassc/importer.rb b/lib/sassc/importer.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   class Importer
     attr_reader :options
diff --git a/lib/sassc/native.rb b/lib/sassc/native.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "ffi"
 
 module SassC
@@ -48,8 +50,7 @@ def self.return_string_array(ptr)
     end
 
     def self.native_string(string)
-      string = string.to_s
-      string << "\0"
+      string = "#{string}\0"
       data = Native::LibC.malloc(string.bytesize)
       data.write_string(string)
       data
diff --git a/lib/sassc/native/lib_c.rb b/lib/sassc/native/lib_c.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     module LibC
diff --git a/lib/sassc/native/native_context_api.rb b/lib/sassc/native/native_context_api.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     attach_function :version, :libsass_version, [], :string
diff --git a/lib/sassc/native/native_functions_api.rb b/lib/sassc/native/native_functions_api.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     # Creators for sass function list and function descriptors
diff --git a/lib/sassc/native/sass2scss_api.rb b/lib/sassc/native/sass2scss_api.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     # ADDAPI char* ADDCALL sass2scss (const char* sass, const int options);
diff --git a/lib/sassc/native/sass_input_style.rb b/lib/sassc/native/sass_input_style.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     SassInputStyle = enum(
diff --git a/lib/sassc/native/sass_output_style.rb b/lib/sassc/native/sass_output_style.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     SassOutputStyle = enum(
diff --git a/lib/sassc/native/sass_value.rb b/lib/sassc/native/sass_value.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     class SassValue < FFI::Union; end
diff --git a/lib/sassc/native/string_list.rb b/lib/sassc/native/string_list.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Native
     class StringList < FFI::Struct
diff --git a/lib/sassc/root.rb b/lib/sassc/root.rb
diff --git a/lib/sassc/sass_2_scss.rb b/lib/sassc/sass_2_scss.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   class Sass2Scss
     def self.convert(sass)
diff --git a/lib/sassc/script.rb b/lib/sassc/script.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Script
 
diff --git a/lib/sassc/script/functions.rb b/lib/sassc/script/functions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Script
     module Functions
diff --git a/lib/sassc/script/value/color.rb b/lib/sassc/script/value/color.rb
@@ -77,6 +77,15 @@ def value
     ].compact
   end
 
+  # True if this Color is equal to `other_color`
+  def eql?(other_color)
+    unless other_color.is_a?(self.class)
+      raise ArgumentError, "No implicit conversion of #{other_color.class} to #{self.class}"
+    end
+    self.value == other_color.value
+  end
+  alias_method :==, :eql?
+
   # Returns a numeric value for comparing two Color objects
   # This method is used internally by the Hash class and is not the same as `.to_h`
   def hash
diff --git a/lib/sassc/script/value_conversion/base.rb b/lib/sassc/script/value_conversion/base.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Script
     module ValueConversion
diff --git a/lib/sassc/script/value_conversion/bool.rb b/lib/sassc/script/value_conversion/bool.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Script
     module ValueConversion
diff --git a/lib/sassc/script/value_conversion/color.rb b/lib/sassc/script/value_conversion/color.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Script
     module ValueConversion
diff --git a/lib/sassc/script/value_conversion/list.rb b/lib/sassc/script/value_conversion/list.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Script
     module ValueConversion
diff --git a/lib/sassc/script/value_conversion/map.rb b/lib/sassc/script/value_conversion/map.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Script
     module ValueConversion
diff --git a/lib/sassc/script/value_conversion/number.rb b/lib/sassc/script/value_conversion/number.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Script
     module ValueConversion
diff --git a/lib/sassc/script/value_conversion/string.rb b/lib/sassc/script/value_conversion/string.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   module Script
     module ValueConversion
diff --git a/lib/sassc/util.rb b/lib/sassc/util.rb
@@ -24,13 +24,6 @@ module SassC::Util
   # @api public
   RUBY_ENGINE = defined?(::RUBY_ENGINE) ? ::RUBY_ENGINE : "ruby"
 
-  # Returns the path of a file relative to the Sass root directory.
-  # @param file [String] The filename relative to the Sass root
-  # @return [String] The filename relative to the the working directory
-  def scope(file)
-    File.join(SassC::ROOT_DIR, file)
-  end
-
   # Maps the keys in a hash according to a block.
   # @example
   #   map_keys({:foo => "bar", :baz => "bang"}) {|k| k.to_s}
diff --git a/lib/sassc/version.rb b/lib/sassc/version.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SassC
   VERSION = "2.0.0"
 end
diff --git a/lib/tasks/libsass.rb b/lib/tasks/libsass.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :libsass do
   desc "Compile libsass"
   task :compile do
diff --git a/sassc.gemspec b/sassc.gemspec
@@ -1,9 +1,11 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'sassc/version'
+require "sassc/version"
 
 Gem::Specification.new do |spec|
+
   spec.name          = "sassc"
   spec.version       = SassC::VERSION
   spec.authors       = ["Ryan Boland"]
@@ -43,4 +45,5 @@ Gem::Specification.new do |spec|
       end
     end
   end
+
 end
diff --git a/test/custom_importer_test.rb b/test/custom_importer_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 
 module SassC
diff --git a/test/engine_test.rb b/test/engine_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 
 module SassC
@@ -224,7 +226,7 @@ def test_sass_variation
     end
 
     def test_encoding_matches_input
-      input = "$size: 30px;"
+      input = String.new("$size: 30px;")
       input.force_encoding("UTF-8")
       output = Engine.new(input).render
       assert_equal input.encoding, output.encoding
@@ -257,13 +259,13 @@ def test_empty_template
     end
 
     def test_empty_template_returns_a_new_object
-      input = ''
+      input = String.new
       output = Engine.new(input).render
       assert input.object_id != output.object_id, 'empty template must return a new object'
     end
 
     def test_empty_template_encoding_matches_input
-      input = ''.force_encoding("ISO-8859-1")
+      input = String.new.force_encoding("ISO-8859-1")
       output = Engine.new(input).render
       assert_equal input.encoding, output.encoding
     end
diff --git a/test/error_test.rb b/test/error_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 
 module SassC
diff --git a/test/functions_test.rb b/test/functions_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 require "stringio"
 
diff --git a/test/native_test.rb b/test/native_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 
 module SassC
diff --git a/test/output_style_test.rb b/test/output_style_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 
 module SassC
diff --git a/test/sass_2_scss_test.rb b/test/sass_2_scss_test.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "test_helper"
 
 module SassC
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "minitest/autorun"
 require "minitest/pride"
 require "minitest/around/unit"

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`module SassC`
`2`	`4`	`class Dependency`
`3`	`5`	`attr_reader :filename`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`require_relative "error"`
`2`	`4`
`3`	`5`	`module SassC`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+# frozen_string_literal: true`
	`2`	`+`
`1`	`3`	`require "pathname"`
`2`	`4`
`3`	`5`	`module SassC`