spriteful 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e63c0a3ac0ace8a37960c2b007802938effb9f73
-  data.tar.gz: bbd2d4e865227dd3b68f4bec64c4f6c15df03b96
+  metadata.gz: dcd128fafbb8a2299d5a30d4e8a110e8595f522d
+  data.tar.gz: 19a3213b12edad5575d30e127723b182b405f6df
 SHA512:
-  metadata.gz: 7dd122c7267b3926e351f245ee9907998f8ba01b0a168508a7de6d2a2f825ee0d0b199395cdddf93e1e774d6ef2051a1caa4117f2eff258faa793b8385362418
-  data.tar.gz: aa6b33f88f21060952d4afc531ec578728c7c7784c1334550bb3fc95ce249a8c5d41ab72ff4691c9d9b14e82fbc8166f7913a383198cab5242d2b94bccadd2bc
+  metadata.gz: 1edd2284cee208dbdebce15093b44b28defea0709b39f2a331397c0d672be3904e1ce98463a8a179b5fbb391ba6e4d5a4815e6c0eddecd91dec7cfe813f8c0c0
+  data.tar.gz: 12e1e36cdd15fc62b5b4dbc77cf2e18c27bfceed626f484cf43577f9e35bd6fcb28d72aeafa4d10e9a9426af09722e5077d7426a6ef3725acc0973d56768e438

data/lib/spriteful.rb

@@ -9,8 +9,4 @@ require 'spriteful/template'
 
 module Spriteful
   class EmptySourceError < Thor::Error; end
-
-  class << self
-    attr_accessor :options
-  end
 end

data/lib/spriteful/cli.rb

@@ -111,7 +111,7 @@ module Spriteful
     # Returns nothing.
     def save_options
       if save_options?
-        parts = Shellwords.join(Spriteful.options)
+        parts = Shellwords.join(@cli_options)
         create_file '.spritefulrc', parts + "\n", force: true
       end
     end
@@ -124,7 +124,8 @@ module Spriteful
         format: options.format,
         rails: options.rails?,
         mixin: options.mixin?,
-        template: template
+        template: template,
+        cli_options: @cli_options
       }
     end
 
@@ -147,8 +148,8 @@ module Spriteful
     #
     # Returns nothing.
     def prepare_options!
-      Spriteful.options = ARGV.dup.uniq
-      @save_options = !!Spriteful.options.delete('--save')
+      @cli_options = ARGV.dup.uniq
+      @save_options = !!@cli_options.delete('--save')
 
       if options.rails?
         sources.concat(detect_sources)

data/lib/spriteful/sprite.rb

@@ -6,6 +6,9 @@ module Spriteful
   # of images into a single one, and providing the required information
   # about the related images.
   class Sprite
+    # RMagick 2.13.4 replaced 'MaxRGB' with 'QuantumRange'.
+    OPACITY = Magick.const_defined?(:MaxRGB) ? Magick::MaxRGB : Magick::QuantumRange
+
     # Public: returns the path where the sprite will be saved.
     attr_reader :path
 
@@ -67,7 +70,7 @@ module Spriteful
     # Returns nothing.
     def combine!
       combined = Magick::Image.new(width, height)
-      combined.opacity = Magick::MaxRGB
+      combined.opacity = OPACITY
       @images.each do |image|
         combined.composite!(image.source, image.left.abs, image.top.abs, Magick::SrcOverCompositeOp)
       end

data/lib/spriteful/stylesheet.rb

@@ -73,7 +73,7 @@ module Spriteful
     protected
 
     def template_options
-      @options.merge(destination: @destination, cli_options: Spriteful.options)
+      @options.merge(destination: @destination)
     end
 
     # Internal: returns the 'rails' flag.

data/lib/spriteful/stylesheets/template.css.erb

@@ -1,6 +1,6 @@
 /*
  * This Stylesheet was generated by the 'spriteful' gem, with the following options:
-<%- if Spriteful.options -%>
+<%- if cli_options.any? -%>
  * 'spriteful <%= cli_options.join(' ') %>'.
 <%- end -%>
  * Below there are several CSS classes to use the '<%= sprite.name %>'

data/lib/spriteful/stylesheets/template.scss.erb

@@ -1,6 +1,6 @@
 // ============================================================================
 // This Stylesheet was generated by the 'spriteful' gem, with the following options:
-<%- if Spriteful.options -%>
+<%- if cli_options.any? -%>
 // 'spriteful <%= cli_options.join(' ') %>'.
 <%- end -%>
 <%- if mixin? -%>

data/lib/spriteful/template.rb

@@ -27,7 +27,7 @@ module Spriteful
       @sprite = sprite
       @options = options
       @destination = Pathname.new(options[:destination])
-      @cli_options = options[:cli_options]
+      @cli_options = Array(options[:cli_options])
 
       if @options[:root]
         @root = Pathname.new(File.expand_path(options[:root]))

data/lib/spriteful/version.rb

@@ -1,3 +1,3 @@
 module Spriteful
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/spec/spec_helper.rb

@@ -2,8 +2,4 @@ require 'spriteful'
 
 RSpec.configure do |config|
   config.order = 'random'
-
-  config.after do
-    Spriteful.options = nil
-  end
 end

data/spec/stylesheet_spec.rb

@@ -66,9 +66,8 @@ describe Spriteful::Stylesheet do
     end
 
     it 'documents the Spriteful options used to generate the stylesheet' do
-      Spriteful.options = %w(one two three)
       sprite = Spriteful::Sprite.new(source, destination)
-      stylesheet = Spriteful::Stylesheet.new(sprite, destination, format: 'css')
+      stylesheet = Spriteful::Stylesheet.new(sprite, destination, format: 'css', cli_options: %w(one two three))
       output = stylesheet.render
 
       expect(output).to match(/'spriteful one two three'/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spriteful
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Lucas Mazza
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ''
@@ -180,4 +180,3 @@ test_files:
 - spec/sprite_spec.rb
 - spec/spriteful/template_spec.rb
 - spec/stylesheet_spec.rb
-has_rdoc: