colorant 0.1.2 → 0.1.3

data/.gitignore

@@ -1,3 +1,4 @@
 pkg/*
 *.gem
 .bundle
+coverage

data/Gemfile.lock

@@ -1,89 +1,55 @@
-GIT
-  remote: git://github.com/aslakhellesoy/aruba.git
-  revision: 1cca0f2433b418e7e3a4a3d5671c2531bf5a7101
-  specs:
-    aruba (0.2.4)
-      background_process
-      cucumber (~> 0.9.3)
-
-GIT
-  remote: git://github.com/aslakhellesoy/cucumber.git
-  revision: 19a87c14098afb7ed418b234b22a9e5b91eda5f4
-  specs:
-    cucumber (0.9.4)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.2.9)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-
-GIT
-  remote: git://github.com/retro/color-namer.git
-  revision: e5ba1bd142ecc4c22ece12784decd5e9ce1ba43e
-  specs:
-    color_namer (0.1.0)
-      color (>= 1.4.1)
-
-GIT
-  remote: git://github.com/rspec/rspec-core.git
-  revision: 62402739a3e2f0e29ca025e60c600c1100f21424
-  specs:
-    rspec-core (2.2.pre)
-
-GIT
-  remote: git://github.com/rspec/rspec-expectations.git
-  revision: 8729e9adbb2e1b50b8db2877afefd2e61ba18ad5
-  specs:
-    rspec-expectations (2.2.pre)
-      diff-lcs (~> 1.1.2)
-
-GIT
-  remote: git://github.com/rspec/rspec-mocks.git
-  revision: ed672c6a2b943eac5b537d1f2c5beef71bb3aee9
-  specs:
-    rspec-mocks (2.2.pre)
-
-GIT
-  remote: git://github.com/rspec/rspec.git
-  revision: 79447df6d32ec9e9eb3194bd1897293d824ca298
-  specs:
-    rspec (2.2.pre)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-
 PATH
   remote: .
   specs:
     colorant (0.1.2)
+      color_namer
+      trollop
 
 GEM
   remote: http://rubygems.org/
   specs:
+    aruba (0.2.4)
+      background_process
+      cucumber (~> 0.9.3)
     background_process (1.2)
     builder (2.1.2)
     color (1.4.1)
+    color_namer (0.1.0)
+      color (>= 1.4.1)
+    cucumber (0.9.4)
+      builder (~> 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.2.9)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
     diff-lcs (1.1.2)
     gherkin (2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
     json (1.4.6)
+    rspec (2.1.0)
+      rspec-core (~> 2.1.0)
+      rspec-expectations (~> 2.1.0)
+      rspec-mocks (~> 2.1.0)
+    rspec-core (2.1.0)
+    rspec-expectations (2.1.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.1.0)
+    simplecov (0.3.7)
+      simplecov-html (>= 0.3.7)
+    simplecov-html (0.3.9)
     term-ansicolor (1.0.5)
     trollop (1.16.2)
-    watchr (0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba!
-  bundler
-  color_namer!
+  aruba
+  bundler (>= 1.0.3)
+  color_namer
   colorant!
-  cucumber!
-  rspec!
-  rspec-core!
-  rspec-expectations!
-  rspec-mocks!
+  cucumber
+  rspec
+  simplecov
   trollop
-  watchr

data/Rakefile

@@ -1,6 +1,11 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
+require 'simplecov'
+SimpleCov.start do
+  add_group "Lib", 'lib'
+end
+
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|

data/Readme.md

@@ -13,12 +13,12 @@ Just put it in your Gemfile:
 And wherever you want, you only need a filename, and you get an array of color
 percentual frequencies of your image.
 
-    colorant.process "path/to/my/leaves.jpg"
+    Colorant.process "path/to/my/leaves.jpg"
     # => [["Brown", 78.95], ["Green", 3.85], ...]
 
 These are other options you can specify:
 
-    colorant.process "file", :colors => 5,      # Default is 8
+    Colorant.process "file", :colors => 5,      # Default is 8
                              :depth => 24,      # Default is 16
                              :extended => true  # Use more accurate color names
 

data/bin/colorant

@@ -5,7 +5,7 @@ require 'trollop'
 require 'colorant'
 
 opts = Trollop::options do
-  version "colorant 0.1.0 (c) 2010 Codegram"
+  version "colorant 0.1.3 (c) 2010 Codegram"
   banner <<-EOS
   Colorant is a simple utility to extract the colors present in an image.
 

data/colorant.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'cucumber'
   s.add_development_dependency 'aruba'
+  s.add_development_dependency 'simplecov'
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/features/cli.feature

@@ -1,6 +1,6 @@
 Feature: Command line interpreter
 
-  You can use Colorist from the command line as well.
+  You can use Colorant from the command line as well.
 
   Scenario: get the most relevant colors out of the Arnolfini Portrait
     When I run "colorant arnolfini.jpg --colors 8 --depth 24"

data/features/support/env.rb

@@ -1,3 +1,8 @@
+require 'simplecov'
+SimpleCov.start do
+  add_group "Lib", "lib"
+end
+
 require 'aruba'
 require 'fileutils'
 

data/lib/colorant/processer.rb

@@ -29,33 +29,5 @@ module Colorant
       end
     end
 
-    private
-
-    def parse(raw_data)
-      collection = []
-      raw_data.split("\n").map(&:strip).each do |line|
-        line.match /^(\d+):.*rgb\((.*)%,(.*)%,(.*)%\)$/
-        freq = $1.to_i
-        red, green, blue = [$2,$3,$4].map do |color|
-          color.to_f  / 100.to_f
-        end
-        collection << { :freq => freq,
-                        :red => percent_to_number(red),
-                        :green => percent_to_number(green),
-                        :blue => percent_to_number(blue) }
-      end
-      total = collection.map{|element| element[:freq]}.inject(:+)
-      collection.each{|element| element[:freq] = number_to_percent(element[:freq], total)}
-      collection
-    end
-
-    def percent_to_number(percent)
-      ("%.2f" % (255 * percent)).to_f
-    end
-
-    def number_to_percent(number, total)
-      ("%.2f" % ((number * 100.to_f) / total)).to_f
-    end
-
   end
 end

data/lib/colorant/version.rb

@@ -1,3 +1,3 @@
 module Colorant
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/reporter_spec.rb

@@ -60,16 +60,16 @@ module Colorant
 
           it 'outputs a simple ordered array with the image color composition' do
             subject.report(arnolfini_data, :reporter => :stdout)
-            @out.string.should include "\tBrown\t\t-- 70.65 %\n"
-            @out.string.should include "\tBrown\t\t-- 29.35 %\n"
+            @out.string.should include "\tBrown\t\t\t\t\t\t-- 70.65 %\n"
+            @out.string.should include "\tBrown\t\t\t\t\t\t-- 29.35 %\n"
           end
 
           context "when called with :extended => true" do
 
             it 'outputs more accurate info about the color' do
               subject.report(arnolfini_data, :extended => true, :reporter => :stdout)
-              @out.string.should include "\tBistre Brown\t\t-- 70.65 %\n"
-              @out.string.should include "\tAu Chico Brown\t\t-- 29.35 %\n"
+              @out.string.should include "\tBistre Brown\t\t\t\t\t\t-- 70.65 %\n"
+              @out.string.should include "\tAu Chico Brown\t\t\t\t\t\t-- 29.35 %\n"
             end
 
             it 'removes duplication to keep the color name nice' do
@@ -77,8 +77,8 @@ module Colorant
                                                                    ["FFFF00", "Yellow", "Yellow"])
 
               subject.report(arnolfini_data, :extended => true, :reporter => :stdout)
-              @out.string.should include "\tBrown Derby\t\t-- 70.65 %\n"
-              @out.string.should include "\tYellow\t\t-- 29.35 %\n"
+              @out.string.should include "\tBrown Derby\t\t\t\t\t\t-- 70.65 %\n"
+              @out.string.should include "\tYellow\t\t\t\t\t\t-- 29.35 %\n"
             end
           end
 

data/spec/spec_helper.rb

@@ -1,8 +1,10 @@
 require 'bundler'
-# require 'simplecov'
-# SimpleCov.start do
-#   add_group "Lib", "lib"
-# end
+require 'simplecov'
+SimpleCov.start do
+  add_group "Lib", "lib"
+end
+
+
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Josep M. Bach
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-10 00:00:00 +01:00
+date: 2010-11-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,6 +99,19 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: Easily extract the colors of any image file!
 email: 
 - info@codegram.com