paleta 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbc68d095b1685f151b262ce76ec4c5f51380b07
-  data.tar.gz: c31c9b06f8045aa81bd4aca725c83411f1c75f55
+  metadata.gz: a3e1531d51066d39da5e89abe5aca0a8ac4ee15a
+  data.tar.gz: c74e22eec380ab93b18a57220c0bc95d81ecb9d4
 SHA512:
-  metadata.gz: 3affa703081598c705dc1b678ac3f8d2dc1b47a363338dd86e7778d0df9b8fcd2ba8d53434f2a7a24130214aab65cf0c83abcb9b4dbdddcc94e2bb26c387d371
-  data.tar.gz: 707274da81a1aeec5ee96bff51feadd472867791f73aaaffc9619e2b8abb15c569d9e1a6c0b926cb2f0cf9567a9ad7067686b5848a83319b585ff6d355221a3a
+  metadata.gz: ecd84c4445cffafb2f0f8d801a9601315bf375eddad66b9353c21304c9ea5801199f3d79d3cb82378a53454618c153a9a214ca0726f1cda7de793f5e92759f46
+  data.tar.gz: 3b46763b1cdf9568d835100c101d9bcd70e6138aaadbcac5b524606a5e2a2bce8a4e6fe50bd1fa8f75915c5f73c4be949299aa70b80c715fd48af80d8105860e

data/.gitignore

@@ -7,4 +7,5 @@ Guardfile
 tmp
 .yardoc
 _yardoc
-doc/
+doc/
+.ruby-version

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 2.1.6
+  - 2.2.2
+  - jruby-19mode
+jdk:
+  - oraclejdk8
+script: bundle exec rspec spec

data/Gemfile

@@ -2,4 +2,6 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rmagick'
+platforms :ruby do
+  gem 'rmagick'
+end

data/lib/paleta.rb

@@ -3,4 +3,15 @@ require 'paleta/color'
 require 'paleta/palette'
 
 module Paleta
+  class MissingDependencyError < StandardError; end
+
+  @rmagick_available = begin
+    require "rmagick"
+  rescue LoadError
+    false
+  end
+
+  def self.rmagick_available?
+    @rmagick_available
+  end
 end

data/lib/paleta/color.rb

@@ -302,9 +302,9 @@ module Paleta
       else; @red, @green, @blue = 0, 0, 0
       end
 
-      @red = 255 * (@red + d3)
-      @green = 255 * (@green + d3)
-      @blue = 255 * (@blue + d3)
+      @red = (255 * (@red + d3)).to_i
+      @green = (255 * (@green + d3)).to_i
+      @blue = (255 * (@blue + d3)).to_i
     end
 
     def update_hex

data/lib/paleta/palette.rb

@@ -1,38 +1,10 @@
 require 'paleta/core_ext/math'
 
 module Paleta
-  module MagickDependent
-    def self.included(klass)
-      require 'RMagick' unless defined?(Magick)
-      klass.extend(ClassMethods)
-    rescue LoadError
-      puts "You must install RMagick to use Palette.generate(:from => :image, ...)"
-    end
-
-    module ClassMethods
-      def generate_from_image(path, size = 5)
-        include Magick
-        begin
-          image = Magick::ImageList.new(path)
-
-          # quantize image to the nearest power of 2 greater the desired palette size
-          quantized_image = image.quantize((Math.sqrt(size).ceil ** 2), Magick::RGBColorspace)
-          colors = quantized_image.color_histogram.sort { |a, b| b[1] <=> a[1] }[0..(size - 1)].map do |color|
-            Paleta::Color.new(color[0].red / 256, color[0].green / 256, color[0].blue / 256)
-          end
-          return Paleta::Palette.new(colors)
-        rescue Magick::ImageMagickError
-          raise "Invalid image at " << path
-        end
-      end
-    end
-  end
-
   # Represents a palette, a collection of {Color}s
   class Palette
     include Math
     include Enumerable
-    include MagickDependent
 
     attr_accessor :colors
 
@@ -237,6 +209,25 @@ module Paleta
 
     private
 
+    def self.generate_from_image(path, size = 5)
+      unless Paleta.rmagick_available?
+        raise Paleta::MissingDependencyError, "You must install RMagick to use Palette.generate(:from => :image, ...)"
+      end
+
+      begin
+        image = Magick::ImageList.new(path)
+
+        # quantize image to the nearest power of 2 greater the desired palette size
+        quantized_image = image.quantize((Math.sqrt(size).ceil ** 2), Magick::RGBColorspace)
+        colors = quantized_image.color_histogram.sort { |a, b| b[1] <=> a[1] }[0..(size - 1)].map do |color|
+          Paleta::Color.new(color[0].red / 256, color[0].green / 256, color[0].blue / 256)
+        end
+        return Paleta::Palette.new(colors)
+      rescue Magick::ImageMagickError
+        raise "Invalid image at " << path
+      end
+    end
+
     def self.generate_analogous_from_color(color, size)
       raise(ArgumentError, "Passed argument is not a Color") unless color.is_a?(Color)
       palette = self.new(color)

data/lib/paleta/version.rb

@@ -1,3 +1,3 @@
 module Paleta
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/paleta.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rspec", "~> 2.8"
   gem.add_development_dependency "guard-rspec", "~> 1.2"
-  gem.add_development_dependency "pry-byebug", "~> 2.0"
+  gem.add_development_dependency("pry-byebug", "~> 2.0") unless defined?(JRUBY_VERSION)
 end

data/readme.markdown

@@ -1,5 +1,10 @@
 # Paleta
 
+[![Build Status](https://travis-ci.org/jordanstephens/paleta.svg?branch=master)](https://travis-ci.org/jordanstephens/paleta)
+[![Code Climate](https://codeclimate.com/github/jordanstephens/paleta/badges/gpa.svg)](https://codeclimate.com/github/jordanstephens/paleta)
+[![Dependency Status](https://gemnasium.com/jordanstephens/paleta.svg)](https://gemnasium.com/jordanstephens/paleta)
+
+
 A gem for working with color palettes
 
 ## Installation

data/spec/models/palette_spec.rb

@@ -224,15 +224,28 @@ describe Paleta::Palette do
     end
   end
 
-  it "should generate a Palette from an image" do
-    path = File.join(File.dirname(__FILE__), '..', 'images/test.jpg')
-    size = 5
-    palette = Paleta::Palette.generate(:from => :image, :image => path, :size => size)
-    palette.size.should == size
-  end
+  unless defined?(JRUBY_VERSION)
+    it "should generate a Palette from an image" do
+      path = File.join(File.dirname(__FILE__), '..', 'images/test.jpg')
+      size = 5
+      palette = Paleta::Palette.generate(:from => :image, :image => path, :size => size)
+      palette.size.should == size
+    end
+
+    it "should raise when generating a Palette from an image without RMagick" do
+      # stub Paleta.rmagick_available? to return false
+      allow(Paleta).to receive(:rmagick_available?).and_return(false)
 
-  it "should raise an error when generating a Palette from an invalid image" do
-    expect{ Paleta::Palette.generate(:from => :image, :image => "/no/image.here") }.to raise_error(RuntimeError)
+      path = File.join(File.dirname(__FILE__), '..', 'images/test.jpg')
+      size = 5
+      expect do
+        Paleta::Palette.generate(:from => :image, :image => path, :size => size)
+      end.to raise_error(Paleta::MissingDependencyError)
+    end
+
+    it "should raise an error when generating a Palette from an invalid image" do
+      expect{ Paleta::Palette.generate(:from => :image, :image => "/no/image.here") }.to raise_error(RuntimeError)
+    end
   end
 
   it "should return an array of colors, where each color is represented as an array of component values" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paleta
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Jordan Stephens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - lib/paleta.rb