csso-rails 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 840e602c661b0ac531066c2ca19f8ba2023e82bfcd755b6c9dd15229551b3efd
-  data.tar.gz: f36bc9d64ef72c525eb519e886e202ec2285b750bcfecd6c68e243334c573471
+  metadata.gz: b6862690966e276e0608530646f9b634c2bd1a4d444a673128ff054211f58b7d
+  data.tar.gz: 989cd8260e016051e4e07e44cb85037337d479b993bf313782189e570678955d
 SHA512:
-  metadata.gz: 6b4145642929bebad90c9e26985280aa55170340e6321e1d5810b99a0d5b722f4a712abc16e74d13aeb5e7a89ac82a487bbfb6b12ab596c918573032482b9ca9
-  data.tar.gz: e3c40080bcdb66176ca65b55501d773360b2980bdaf7b64ed902b4b7e5523a57134e9e5d568ef91158d194e254b8bdf78544abee9eb3c1535a4fdad629540474
+  metadata.gz: c4d7a0d8874889644bfb838e008dc101b916bbe5b29dda6f225a6c127a89968568357d537fa55224292fcfa96f937015360c51d79b70013d7a5c5997487e6382
+  data.tar.gz: c12bfcecf3aeda0964108ecdf8173d813281e8650819c86c5afb11d2d223be4ec31de04d60b45b9322ea97878c0a09b42f117f6c240007f1bb27e3fcb22952f7

data/bin/ruby_csso

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'csso-rails'
 require 'csso/cli'

data/csso-rails.gemspec

@@ -1,41 +1,45 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "csso/version"
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path('lib', __dir__)
+require 'csso/version'
 
 Gem::Specification.new do |s|
-  s.name        = "csso-rails"
+  s.name        = 'csso-rails'
   s.version     = Csso::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Vasily Fedoseyev"]
-  s.email       = ["vasilyfedoseyev@gmail.com"]
-  s.homepage    = "https://github.com/Vasfed/csso-rails"
-  s.summary     = %q{CSS Stylesheet optimizer/compressor for Rails}
-  s.description = %q{Invoke the CSSO from Ruby}
+  s.authors     = ['Vasily Fedoseyev']
+  s.email       = ['vasilyfedoseyev@gmail.com']
+  s.homepage    = 'https://github.com/Vasfed/csso-rails'
+  s.summary     = 'CSS Stylesheet optimizer/compressor for Rails'
+  s.description = 'Invoke the CSSO from Ruby'
   s.license     = 'MIT'
 
-  s.rubyforge_project = "csso-rails"
+  s.rubyforge_project = 'csso-rails'
 
-  s.files         = `git ls-files -z`.split("\x0").reject do |f|
+  s.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(Regexp.union(
-      %r{^\.},
-      %r{^spec/},
-      %r{^Appraisals},
-      %r{^Gemfile},
-      %r{^gemfiles/},
-      %r{^Rakefile},
-    ))
+              %r{^gemfiles/},
+              %r{lib/csso/csso.js.erb},
+              %r{^spec/},
+              /^\./,
+              /^Appraisals/,
+              /^Gemfile/,
+              /^Rakefile/
+            ))
   end
-  s.files         += [Csso::CSSO_JS_LIB]
+  s.files += [Csso::CSSO_JS_LIB]
 
   s.bindir        = 'bin'
-  s.executables   = `git ls-files -z -- bin/*`.split("\x0").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -z -- bin/*`.split("\x0").map do |f|
+    File.basename(f)
+  end
+  s.require_paths = ['lib']
 
+  s.required_ruby_version = '>= 1.9.2' # rubocop:disable Gemspec/RequiredRubyVersion
   s.add_dependency 'execjs', '>= 1'
 
-  s.add_development_dependency 'bundler', '~> 1.15'
-  s.add_development_dependency 'rake'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'mocha'
   s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'bundler'
+  s.add_development_dependency 'minitest', '>= 5.0'
+  s.add_development_dependency 'rake'
 end

data/lib/csso/cli.rb

@@ -1,40 +1,41 @@
-#encofing: utf-8
+# frozen_string_literal: true
+
+# encofing: utf-8
 
 require 'optparse'
 
 module Csso
+  # :nodoc
   module CLI
-    def self.run!(argv=ARGV)
+    def self.run!(argv = ARGV)
       maniac = false
-      opts = OptionParser.new do |opts|
+      opts = OptionParser.new do |opts| # rubocop:disable Lint/ShadowingOuterLocalVariable
         opts.version = Csso::VERSION
         opts.banner = "CSS Optimizer (ruby bindings by vasfed) version #{opts.version}"
-        opts.separator ""
-        opts.separator "Usage:"
+        opts.separator ''
+        opts.separator 'Usage:'
         opts.separator "  #{opts.program_name} [options] FILE [FILE2 [FILE3 [...]]"
         opts.separator "  #{opts.program_name} [options] < some_file.css"
-        opts.separator ""
-        opts.separator "All input files are concatenated and fed to stdout after processing."
-        opts.separator ""
+        opts.separator ''
+        opts.separator 'All input files are concatenated and fed to stdout after processing.'
+        opts.separator ''
 
-        opts.separator "Options:"
-        opts.on("-m", "--[no-]maniac", "\"Maniac mode\" optimizes input multiple times until optimization stops to give any results.") do |v|
+        opts.separator 'Options:'
+        opts.on('-m', '--[no-]maniac', '"Maniac mode" optimizes input multiple times until optimization stops to give any results.') do |v|
           maniac = v
         end
 
-        opts.on_tail("-v", "--version", "Print version information") do
+        opts.on_tail('-v', '--version', 'Print version information') do
           return puts opts.ver
         end
-        opts.on_tail("-h", "--help", "Show this message") do
+        opts.on_tail('-h', '--help', 'Show this message') do
           return puts opts.help
         end
       end
 
       opts.parse!(argv)
 
-      if $stdin.tty? && argv.empty?
-        return puts opts.help
-      end
+      return puts opts.help if $stdin.tty? && argv.empty?
 
       ARGV.replace(argv)
       css = ARGF.read

data/lib/csso/compressor.rb

@@ -1,10 +1,14 @@
+# frozen_string_literal: true
+
 module Csso
+  # sprockets-compatible compressor
   class Compressor
     def self.call(input)
       require 'csso'
-      #TODO: settings?
+      # TODO: settings?
       if input[:metadata] && input[:metadata][:map]
-        css, map_json = Csso.optimize_with_sourcemap(input[:data],
+        css, map_json = Csso.optimize_with_sourcemap(
+          input[:data],
           # Sprockets::PathUtils.split_subpath(input[:load_path], input[:filename])
           # sprockets seems to ignore filenames here, so we may save some mem:
           'uri'
@@ -21,19 +25,19 @@ module Csso
 
     # sprockets 2:
 
-    def initialize path, &block
+    def initialize(_path, &block)
       @block = block
     end
 
-    def render context, opts={}
-      self.class.call({data: @block.call})[:data]
+    def render(_context, _opts = {})
+      self.class.call(data: @block.call)[:data]
     end
 
+    # for old sprockets
     class Legacy
-      def self.compress data
+      def self.compress(data)
         Compressor.call(data: data)[:data]
       end
     end
-
   end
 end

data/lib/csso/js_lib.rb

@@ -1,26 +1,30 @@
+# frozen_string_literal: true
+
 require 'execjs'
 
 module Csso
+  # low-level wrapper around the js lib
   class JsLib
-
-    def initialize verbose=false
+    def initialize(verbose = false)
       if verbose && ExecJS.runtime.is_a?(ExecJS::ExternalRuntime)
         warn "You're using ExecJS::ExternalRuntime, did you forget to add therubyracer or other execjs runtime to gemfile?"
       end
 
-      lib = File.read(File.expand_path('../../' + CSSO_JS_LIB, File.dirname(__FILE__)))
-      unless @csso = ExecJS.runtime.compile(lib)
-        raise 'cannot compile or what?'
-      end
+      lib = File.read(File.expand_path("../../#{CSSO_JS_LIB}", File.dirname(__FILE__)))
+      raise 'cannot compile or what?' unless (@csso = ExecJS.runtime.compile(lib))
     end
 
-    def compress css, structural_optimization=true
-      @csso.call("do_compression", css, structural_optimization)
-    end
+    def compress(css, structural_optimization = true)
+      # TODO: raise ArgumentError, "expect css to be a String" unless css.is_a?(String)
+      return nil unless css.is_a?(String)
 
-    def compress_with_sourcemap css, filename, structural_optimization=true
-      @csso.call("do_compression_with_map", css, filename, structural_optimization)
+      @csso.call('do_compression', css, structural_optimization)
     end
 
+    def compress_with_sourcemap(css, filename, structural_optimization = true)
+      return nil unless css.is_a?(String)
+
+      @csso.call('do_compression_with_map', css, filename, structural_optimization)
+    end
   end
 end

data/lib/csso/railtie.rb

@@ -1,20 +1,18 @@
-require "action_controller/railtie"
+# frozen_string_literal: true
 
-module Csso
+require 'action_controller/railtie'
 
+module Csso
+  # hook into rails init
   class Railtie < ::Rails::Railtie
-    initializer "csso.environment", :after => "sprockets.environment" do |app|
-      #NB: app.assets may be nil, sprockets-rails creates env in after_initialize
+    initializer 'csso.environment', after: 'sprockets.environment' do |app|
+      # NB: app.assets may be nil, sprockets-rails creates env in after_initialize
       Csso.install(app.assets)
     end
 
     # saas-rails-3.2.4(and may be others) sets itself as default, ignoring config? => override :(
-    initializer "csso.setup", :after => :setup_compression, :group => :all do |app|
-      if app.config.assets.enabled
-        app.config.assets.css_compressor = :csso
-      end
+    initializer 'csso.setup', after: :setup_compression, group: :all do |app|
+      app.config.assets.css_compressor = :csso if app.config.assets.enabled
     end
-
   end
-
 end

data/lib/csso/version.rb

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 module Csso
-  VERSION = '0.8.2'
+  VERSION = '0.9.0'
   CSSO_JS_LIB = 'vendor/csso/csso.js'
 end

data/lib/csso-rails.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'csso'
 require 'csso/railtie' if defined?(Rails)

data/lib/csso.rb

@@ -1,16 +1,20 @@
+# frozen_string_literal: true
+
 require 'csso/version'
 
+# base interface
 module Csso
   autoload :JsLib,      'csso/js_lib'
   autoload :Compressor, 'csso/compressor'
 
   def self.js_api
-    @csso ||= Csso::JsLib.new
+    @js_api ||= Csso::JsLib.new
   end
 
   def self.install(sprockets)
     unless sprockets
-      raise "no compatible sprockets found" unless Sprockets.respond_to? :register_compressor
+      raise 'no compatible sprockets found' unless Sprockets.respond_to? :register_compressor
+
       Sprockets.register_compressor('text/css', :csso, Compressor)
       return
     end
@@ -23,33 +27,32 @@ module Csso
     end
   end
 
-  def self.optimize(css, maniac_mode=false, structural_optimization=true)
+  def self.optimize(css, maniac_mode = false, structural_optimization = true)
     if maniac_mode
       maniac_mode = 4 unless maniac_mode.is_a?(Integer) && maniac_mode > 0
-      begin
+      loop do
         prev_css = css
-        css = Optimizer.new.optimize(css, structural_optimization)
+        css = Csso.js_api.compress(css, structural_optimization)
         maniac_mode -= 1
-      end while maniac_mode > 0 && prev_css != css
+        break if maniac_mode <= 0 || prev_css == css
+      end
       css
     else
-      Optimizer.new.optimize(css, structural_optimization)
+      Csso.js_api.compress(css, structural_optimization)
     end
   end
 
-  def self.optimize_with_sourcemap css, filename, structural_optimization=true
+  def self.optimize_with_sourcemap(css, filename, structural_optimization = true)
     return nil unless css.is_a?(String)
     return css if css.size <= 3
+
     Csso.js_api.compress_with_sourcemap(css, filename, structural_optimization)
   end
 
-
+  # deprecated
   class Optimizer
-    def optimize(css, structural_optimization=true)
-      return nil unless css.is_a?(String)
-      return css if css.size <= 3
+    def optimize(css, structural_optimization = true)
       Csso.js_api.compress(css, structural_optimization)
     end
   end
-
 end