miro 0.2.0 → 0.2.1

data/README.md

@@ -29,10 +29,8 @@ Configuration
 ```ruby
 # Defaults
 Miro.options # => {:image_magick_path  => "/usr/bin/convert", :resolution => "150x150", :color_count => 8}
-```
 
-```ruby
-# Setting
+# Setting new options
 Miro.options[:image_magick_path] = '/usr/local/bin/convert'
 Miro.options[:resolution] = '100x100'
 Miro.options[:color_count] = 4
@@ -61,6 +59,15 @@ colors.to_rgb # => [[81, 51, 42], [44, 29, 24], [108, 73, 55], [101, 81, 74], [1
 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]]
 ```
 
+Retrieving percentages of colors
+
+```ruby
+# percentage of each color in an image. matches sorting from to_hex,
+# to_rgb and to_rgba.
+
+colors.by_percentage # => [0.50, 0.25, 0.15, 0.10]
+```
+
 ## Contributing
 
 1. Fork it

data/lib/miro/dominant_colors.rb

@@ -17,6 +17,12 @@ module Miro
     def to_rgba
       sorted_pixels.collect {|c| ChunkyPNG::Color.to_truecolor_alpha_bytes c }
     end
+    
+    def by_percentage
+      sorted_pixels
+      pixel_count = @pixels.size
+      sorted_pixels.collect { |pixel| @grouped_pixels[pixel].size / pixel_count.to_f }
+    end
 
     def sorted_pixels
       @sorted_pixels ||= extract_colors_from_image
@@ -69,8 +75,8 @@ module Miro
     end
 
     def group_pixels_by_color
-      chunky_png = ChunkyPNG::Image.from_file File.expand_path(@downsampled_image.path)
-      chunky_png.pixels.group_by { |pixel| pixel }
+      @pixels ||= ChunkyPNG::Image.from_file(File.expand_path(@downsampled_image.path)).pixels
+      @grouped_pixels ||= @pixels.group_by { |pixel| pixel }
     end
 
     def sort_by_dominant_color

data/lib/miro/version.rb

@@ -1,3 +1,3 @@
 module Miro
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/miro/dominant_colors_spec.rb

@@ -130,5 +130,27 @@ describe Miro::DominantColors do
         subject.to_rgba.should eq(expected_rgba_values)
       end
     end
+
+  end
+
+  context "when find percentages of each color" do
+    let(:pixel_data) {
+        [ 2678156287,
+          1362307839, 1362307839,
+          2506379263, 2506379263, 2506379263, 2506379263,
+          2739747583, 2739747583, 2739747583
+        ] }
+
+    describe "#by_percentage" do
+      before do
+        File.stub(:open).and_return(mock_source_image)
+        subject.stub(:open_downsampled_image).and_return(mock_downsampled_image)
+      end
+
+      it "returns an array of percents" do
+        subject.by_percentage.should == [0.4, 0.3, 0.2, 0.1]
+      end
+    end
   end
+  
 end

metadata

@@ -1,89 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: miro
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.2.1
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 0
-  version: 0.2.0
 platform: ruby
-authors: 
+authors:
 - Jon Buda
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-25 00:00:00 -06:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cocaine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70242933714440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: oily_png
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70242933714440
+- !ruby/object:Gem::Dependency
+  name: oily_png
+  requirement: &70242933714020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70242933714020
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70242933713600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70242933713600
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70242933713180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *70242933713180
 description: Extract the dominant colors from an image.
-email: 
+email:
 - jon.buda@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
@@ -97,41 +75,32 @@ files:
 - spec/miro/dominant_colors_spec.rb
 - spec/miro_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: https://github.com/jonbuda/miro
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-requirements: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
 - ImageMagick
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Extract the dominant colors from an image.
-test_files: 
+test_files:
 - spec/miro/dominant_colors_spec.rb
 - spec/miro_spec.rb
 - spec/spec_helper.rb