miro 0.2.2 → 0.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8da79a7879154e553ec78af76e25f2a9d8a6b232
+  data.tar.gz: d180f86a6a43976d2d0ef84455aca46b109e36af
+SHA512:
+  metadata.gz: 85e2a88179149a9afd9e4f62ad5a997115d705c72dd8d649a98b1cf157ee1e12fc756cf006a9f688f6e3a39c3aab8a6c4c03b8679fa2ba5765bb43c4330f0ee5
+  data.tar.gz: b870d98b936ebc868b49d5771ae7e6a402c640becc21bbd5c84c3abc81e5da488dc37298277c900fe2de9bef94b1c1fd52badf2fa0cfbfd8d8b81fa6000fffd6

data/lib/miro.rb

@@ -9,8 +9,9 @@ require "miro/dominant_colors"
 module Miro
   class << self
     def options
+      convert = `which convert`.strip
       @options ||= {
-        :image_magick_path  => "/usr/bin/convert",
+        :image_magick_path  => convert.length > 0 ? convert : '/usr/bin/convert',
         :resolution         => "150x150",
         :color_count        => 8,
         :quantize           => 'RGB'

data/lib/miro/dominant_colors.rb

@@ -2,8 +2,9 @@ module Miro
   class DominantColors
     attr_accessor :src_image_path
 
-    def initialize(src_image_path)
+    def initialize(src_image_path, image_type = nil)
       @src_image_path = src_image_path
+      @image_type = image_type
     end
 
     def to_hex
@@ -54,12 +55,12 @@ module Miro
 
     def open_source_image
       if remote_source_image?
-        original_extension = URI.parse(@src_image_path).path.split('.').last
+        original_extension = @image_type || URI.parse(@src_image_path).path.split('.').last
 
         tempfile = Tempfile.open(["source", ".#{original_extension}"])
         remote_file_data = open(@src_image_path).read
 
-        tempfile.write(RUBY_VERSION =~ /1.9/ ? remote_file_data.force_encoding("UTF-8") : remote_file_data)
+        tempfile.write(should_force_encoding? ? remote_file_data.force_encoding("UTF-8") : remote_file_data)
         tempfile.close
         return tempfile
       else
@@ -67,6 +68,10 @@ module Miro
       end
     end
 
+    def should_force_encoding?
+      Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('1.9')
+    end
+
     def open_downsampled_image
       tempfile = Tempfile.open(["downsampled", '.png'])
       tempfile.binmode

data/lib/miro/version.rb

@@ -1,3 +1,3 @@
 module Miro
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/miro_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Miro do
   describe '.options' do
     it "has default options" do
-      Miro.options[:image_magick_path].should eq('/usr/bin/convert')
+      Miro.options[:image_magick_path].should eq(`which convert`.strip)
       Miro.options[:color_count].should eq(8)
       Miro.options[:resolution].should eq('150x150')
     end

metadata

@@ -1,78 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: miro
 version: !ruby/object:Gem::Version
-  version: 0.2.2
-  prerelease: 
+  version: 0.2.3
 platform: ruby
 authors:
 - Jon Buda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oily_png
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Extract the dominant colors from an image.
@@ -97,31 +88,29 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/jonbuda/miro
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
 - ImageMagick
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Extract the dominant colors from an image.
 test_files:
 - spec/miro/dominant_colors_spec.rb
 - spec/miro_spec.rb
 - spec/spec_helper.rb
-has_rdoc: