miro 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 269d3bca169bf72e9496cf0b019b2f39d844f05b
-  data.tar.gz: 7ca804e24f8f4433fb01064c98477b3c56ac8804
+  metadata.gz: c5adccda17b31cfe4ffc944c691e22de53ab0f54
+  data.tar.gz: ecb1cadaa5fb53b9bd9a5ffa32a72c277cbd447d
 SHA512:
-  metadata.gz: c2391941d1a5fe148ca76c0807fa78db23ac7b86ff00df2a95b5d420217c06aecc354242dc8b1ae49162cb9cdf3f185b5b50a84d3c46ee44d8c8ee976b077801
-  data.tar.gz: 4f9ac4fb9fccf3ad157411175860a62c1dc935ea5b6b8df1e754204d6b58fa730802d4500c4a7c90733b4dce90935eaa91fea27d74fead5817ac0b7d5a5a3c84
+  metadata.gz: dd7c0d005af2038c499d7c01da06d6f7ff5ecd2391732f2211141f0a8c29d5d4fea7932799fe2f432f806231b6f5d141b3c2cd07dca63c172b7a60e207e8b615
+  data.tar.gz: 7a2795bc17f4d35a5a2fac3f78a881b7fb8ad329bf62bc17c3faa9b4c8bf28e2288adaaed391a998a42878dee0e33ae89b823b73507c81694b9d92d26cb03e41

data/CHANGELOG.md

@@ -1,9 +1,18 @@
 # Miro Changelog
 
+## 0.4.0
+
+* Enhancements
+  * Jruby Support [#24][]
+  * Add support for file paths with spaces in the name [#28][]
+  * Updated README
+
 ## 0.3.0
 
 * Enhancements
   * new `:histogram` option for improved performance [#19][]
   * Updated README
 
-[#19]: https://github.com/jonbuda/miro/pull/19
+[#19]: https://github.com/jonbuda/miro/pull/19
+[#24]: https://github.com/jonbuda/miro/pull/24
+[#28]: https://github.com/jonbuda/miro/pull/28

data/README.md

@@ -60,7 +60,7 @@ colors.to_rgb # => [[81, 51, 42], [44, 29, 24], [108, 73, 55], [101, 81, 74], [1
 # RGB with Alpha channels
 colors.to_rgba # => [[82, 37, 40, 255], [48, 17, 19, 255], [109, 70, 71, 255], [221, 158, 48, 255], [168, 103, 48, 255], [226, 178, 79, 255], [191, 146, 65, 255], [199, 165, 150, 255]]
 ```
-**Aditional methods only aviable when histogram method is enabled**
+**Additional methods only available when histogram method is enabled**
 
 ```ruby
 # HSL

data/lib/miro.rb

@@ -1,9 +1,9 @@
 require "miro/version"
-require "oily_png"
 require "cocaine"
 require "color"
 require "tempfile"
 require "open-uri"
+require png_lib = (RUBY_ENGINE != "jruby" ? "oily_png" : "chunky_png") # Load the C extension oily_png unless jruby is the platform in use.
 
 require "miro/dominant_colors"
 

data/lib/miro/dominant_colors.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module Miro
   class DominantColors
     attr_accessor :src_image_path
@@ -46,14 +48,14 @@ module Miro
     end
 
     def histogram
-      @histogram || downsample_and_histogram.sort_by { |item| item[0]  }.reverse
+      @histogram ||= downsample_and_histogram.sort_by { |item| item[0]  }.reverse
     end
   private
 
     def downsample_and_histogram
       @source_image = open_source_image
       hstring = Cocaine::CommandLine.new(Miro.options[:image_magick_path], image_magick_params).
-        run(:in => File.expand_path(@source_image.path),
+        run(:in => Shellwords.escape(File.expand_path(@source_image.path)),
             :resolution => Miro.options[:resolution],
             :colors => Miro.options[:color_count].to_s,
             :quantize => Miro.options[:quantize])
@@ -63,7 +65,7 @@ module Miro
 
     def parse_result(hstring)
       hstring.scan(/(\d*):.*(#[0-9A-Fa-f]*)/).collect do |match|
-        [match[0].to_i, Object.const_get("Color::#{Miro.options[:quantize].upcase}").from_html(match[1])]
+        [match[0].to_i, eval("Color::#{Miro.options[:quantize].upcase}").from_html(match[1])]
       end
     end
 

data/lib/miro/version.rb

@@ -1,3 +1,3 @@
 module Miro
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/miro.gemspec

@@ -11,8 +11,9 @@ Gem::Specification.new do |gem|
   gem.requirements  = 'ImageMagick'
 
   gem.add_dependency "cocaine"
-  gem.add_dependency "oily_png"
   gem.add_dependency "color"
+  gem.add_dependency "chunky_png"
+  gem.add_dependency "oily_png" if RUBY_ENGINE != "jruby"
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "fakeweb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miro
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jon Buda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: oily_png
+  name: color
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +39,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: color
+  name: chunky_png
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oily_png
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Extract the dominant colors from an image.