color_picker 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fe4fbbbf1235475e1501e9751dd54881671b0b0
-  data.tar.gz: 5789d0af9689a52b59d489e074272bf4d4cd4d18
+  metadata.gz: 429a2e8286798677c460a201fdd4450fbf2fb4b8
+  data.tar.gz: f136bbb6b36d74e3487f7cab7807e4eb33485466
 SHA512:
-  metadata.gz: 9905256a5b440772a402e07be46c7198b3c2d9231e93586c2253ae94105706d628449113900722ea974a6d89751dff7fac277be91efaef512826e79a009a8a3e
-  data.tar.gz: 1a0949de602310fd32759618932218abdca41db450418351519b72a2a7b3cf48e64e66fa098f5d9019498612cedbf5561dea5327f9c3c09a95f898acc6959904
+  metadata.gz: 067cc616b32cd0406e11360f568b0a31edbfc53be6df20fc81267d1919dba6b2d855734af0555b04d10c369c3caf0fcea58f942d135d1422522a8ab053e8f26f
+  data.tar.gz: 2c9f23cd121f6522c076a9ecccfe24e2ba0611b0bf51a4c7789734aeddc27aac59e3707789813d44cc4af1be5291d0d280a52ae2b171c10a46a0521758340fb5

data/CHANGELOG.md

@@ -48,6 +48,8 @@
 * change indentation tabs to spaces 
 ### VERSION 0.1.2
 * depreacate default options in palette
+### VERSION 0.1.3
+* add to s method
 
  
 

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
-gem "minitest", "~> 5.3.5"
-gem "rake"
-gem "coveralls",	require:false
+
+gem 'minitest', '~> 5.3.5'
+gem 'rake'
+gem 'coveralls',	require:false

data/lib/color_picker.rb

@@ -1,3 +1,4 @@
 require 'color_picker/color'
 require 'color_picker/palette'
 require 'color_picker/version'
+require 'color_picker/palette/templates'

data/lib/color_picker/color.rb

@@ -1,29 +1,44 @@
 module ColorPicker
   class Color
-    attr_reader :hex_code, :rgb_code
-    attr_accessor :hex_code, :rgb_code
-    
+    attr_accessor :code
+
     def initialize(code)
-      @hex_code = code.to_str if code.respond_to?(:to_str)
-      @rgb_code = code.to_ary unless @hex_code
+      @code = code
     end
 
     def to_rgb
-      return self.to_s unless @hex_code
-      @hex_code.scan(/.{2}/).map{|color| color.to_i(16)}
+      return code if rgb?
+      code.scan(/.{2}/).map { |n| n.to_i(16) }
     end
 
     def to_hex
-      return self.to_s unless @rgb_code
-      @rgb_code.map{|number| number.to_s(16)}.join.rjust(6, '0')
+      return code if hex?
+      code.map { |n| n.to_s(16) }.join.rjust(6, '0')
+    end
+
+    def hex?
+      code.respond_to?(:to_str)
     end
 
-    def to_s(type=nil)
-      return "rgb(#{rgb_code.join(', ')})" if type == :rgb || !rgb_code.nil?
-      "##{hex_code}"
+    def rgb?
+      code.respond_to?(:to_ary)
     end
 
-    private :rgb_code=, :hex_code=
+    def to_s
+      send("to_s_#{type}")
+    end
+
+    private
+      def type
+        rgb? ? :rgb : :hex
+      end
+
+      def to_s_hex
+        "##{self.to_hex}"
+      end
 
+      def to_s_rgb
+        "rgb(#{self.to_rgb.join(', ')})"
+      end
   end
 end

data/lib/color_picker/palette.rb

@@ -1,90 +1,19 @@
 module ColorPicker
-  class Palette 
-    #palette templates
-    TEMPLATES = {
-      complete: {template: :complete, red_color_range: 0..255, green_color_range: 0..255, blue_color_range: 0..255 }, 
-      strong: {template: :strong, red_color_range: 0..7, green_color_range: 0..9, blue_color_range: 0..255},
-      skeleton: {template: nil, red_color_range: 0..0, green_color_range: 0..0, blue_color_range: 0..0}
-    }
-    
-    attr_reader :rgb_range, :max_number_of_colors, :template,
-                :blue_color_range, :green_color_range, :red_color_range
-    attr_accessor :blue_color_range, :green_color_range, :red_color_range, :template
+  class Palette
 
-    def initialize(options = {})
-      opts(options).each_pair do |key, value|
-        eval "@#{key}= value"
-      end
-    end
+    attr_accessor :template, :colors
 
-    def rgb_range
-      @rgb_range = [red_color_range,green_color_range,blue_color_range]
-    end
-    
-    def html
-      html = "<div style='width:600px;height:auto;float:left;clear:both'>"  
-      range = max_number_of_colors
-      range = 0 if max_number_of_colors == 1
-      (0 .. range).each do |color_code|
-        color_container = "<div style='background:##{color_code.to_s(16).rjust(6, '0')};width:60px;height:60px;border:1px solid #000;'>&nbsp;</div><div style='float:left'>#{color_code.to_s(16).rjust(6, '0')}</div>"
-        html += color_container
-      end
-      html += "</div>"
-      to_html { html }
-    end
-    
-    def generate(options={})
-      opts(options).each_pair do |key, value|
-        eval "self.#{key}=value"
-      end
-      rgb_range
-    end
-  
-    def max_number_of_colors
-      (red_color_range.end+1) * (green_color_range.end+1) * (blue_color_range.end+1)
+    def initialize(template: :default, colors: {})
+      @template = template
+      @colors   = TEMPLATES[template].merge(colors)
     end
 
-    def sample_color
-      ary_code = rgb_range.map do |range_color|
-        range_color.to_a.sample.to_s(16).rjust(2, "0")
-      end
-      Color.new(ary_code.join)
+    def ranges
+      colors.values
     end
 
-    def method_missing(m, *args, &block)
-      "Colors and stars something wrong. Palette types available :complete and :strong via template option"
+    def sample_color
+      Color.new(ranges.map { |range| range.to_a.sample })
     end
-    
-    private :red_color_range=, :blue_color_range=, :green_color_range=, :template=
-
-    private    
-      def opts(options={})
-        case options[:template]
-        when :strong
-          TEMPLATES[:strong].merge(options)
-        when :complete
-          TEMPLATES[:complete].merge(options)
-        else
-          TEMPLATES[:skeleton].merge(options)
-        end
-      end 
-
-      def to_html
-        "<!DOCTYPE HTML>
-        
-        <html>
-        
-        <head>
-          <meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />
-          <title>Palette Html</title>
-        </head>
-        
-        <body>
-          #{yield}
-        </body>
-        </html>
-        "
-      end
-      
   end
 end

data/lib/color_picker/palette/templates.rb

@@ -0,0 +1,8 @@
+module ColorPicker
+  class Palette
+    TEMPLATES = {
+      default: { red: 0..255, green: 0..255, blue: 0..255 },
+      strong:  { red: 0..7, green: 0..9, blue: 0..255}
+    }
+  end
+end

data/lib/color_picker/version.rb

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

data/test/color_test.rb

@@ -1,33 +1,40 @@
-require "test_helper"
+require 'test_helper'
+
 module ColorPicker
   class ColorTest < Minitest::Test
     def setup
-      @color = ColorPicker::Color.new("000000")
+      @hex_color = ColorPicker::Color.new("000000")
+      @rgb_color = ColorPicker::Color.new([0,0,0])
     end
 
     def test_initialize_color
-      assert_equal "000000", @color.hex_code
+      assert_equal '000000', @hex_color.code
+      assert_equal [0,0,0], @rgb_color.code
     end
 
-    def test_convert_to_rgb
-      assert_equal [0,0,0], ColorPicker::Color.new([0,0,0]).rgb_code
+    def test_to_rgb
+      assert_equal [0,0,0], @hex_color.to_rgb
+      assert_equal [0,0,0], @rgb_color.to_rgb
     end
 
-    def test_to_s_hexadecimal
-      assert_equal "#000000", @color.to_s
+    def test_to_hex
+      assert_equal '000000', @hex_color.to_hex
+      assert_equal '000000', @rgb_color.to_hex
     end
 
-    def test_to_s_rgb
-      assert_equal "rgb(0, 0, 0)", ColorPicker::Color.new([0,0,0]).to_s(:rgb)
+    def test_to_s
+      assert_equal "rgb(0, 0, 0)", @rgb_color.to_s
+      assert_equal "#000000", @hex_color.to_s
     end
 
-    def test_hex_to_rgb
-      assert_equal [0,0,0], @color.to_rgb 
+    def test_rgb?
+      assert_equal false, @hex_color.rgb?
+      assert_equal  true, @rgb_color.rgb?
     end
 
-    def test_rgb_to_hex
-      assert_equal "000000", ColorPicker::Color.new([0,0,0]).to_hex
+    def test_hex?
+      assert_equal true, @hex_color.hex?
+      assert_equal false, @hex_color.rgb?
     end
-
   end
 end

data/test/palette_test.rb

@@ -1,70 +1,30 @@
-require "test_helper"
+require 'test_helper'
+
 module ColorPicker
   class PaletteTest < Minitest::Test
     def setup
       @palette = ColorPicker::Palette.new
+      @strong_palette = ColorPicker::Palette.new(template: :strong)
     end
 
-    def test_initialize_default
-      assert_equal [0..0, 0..0, 0..0], @palette.rgb_range
-    end
-
-    def test_initialize_with_strong_template
-      assert_equal [0..7, 0..9, 0..255], ColorPicker::Palette.new(template: :strong).rgb_range
-    end
-
-    def test_initialize_with_complete_template
-      assert_equal [0..255, 0..255, 0..255], ColorPicker::Palette.new(template: :complete).rgb_range
-    end
-
-    def test_initialize_complete_range
-      assert_equal [0..0, 0..0, 0..0], @palette.rgb_range
-    end
-
-    def test_initialize_complete_palette_template
-      assert_equal nil, @palette.template
-    end
-
-    def test_complete_palette
-      assert_equal [0..255, 0 .. 255, 0 .. 255], @palette.generate(template: :complete)
+    def test_default_palette
+      assert_equal :default, @palette.template
+      assert_equal ({ red: 0..255, green: 0..255, blue: 0..255 }), @palette.colors
     end
 
-    def test_strong_paletter
-      assert_equal [0..7, 0 .. 9, 0..255], @palette.generate(template: :strong)
+    def test_strong_palette
+      assert_equal :strong, @strong_palette.template
+      assert_equal ({ red: 0..7, green: 0..9, blue: 0..255 }), @strong_palette.colors
     end
 
-    def test_to_html
-      @palette.generate(template: :html)
-      assert_match /DOCTYPE HTML/, @palette.html
-      #assert_match /<div style='width:600px;height:auto;float:left;clear:both'><div style='background:#000000;width:60px;height:60px;border:1px solid #000'>&nbsp;<\/div><div style='float:left'>000000<\/div><\/div>/, @palette.to_html 
-    end
-
-    def test_generate_custom_palette
-      assert_equal [0..1, 0..1, 0..1], @palette.generate(template: :custom, red_color_range: 0..1, green_color_range: 0..1, blue_color_range: 0..1)
-    end
-
-    def test_sample_color_return_color_instance
-      assert_kind_of Color, @palette.sample_color
+    def test_custom_palette
+      @custom_palette = ColorPicker::Palette.new(colors: { red: 5..10, green: 15..20, blue: 25..30 })
+      assert_equal :default, @custom_palette.template
+      assert_equal ({ red: 5..10, green: 15..20, blue: 25..30 }), @custom_palette.colors
     end
 
     def test_sample_color
-      assert_match /([0-9]|[a-fA-F]){5,6}/, @palette.sample_color.to_s
-    end
-
-    def test_strong_colors_palette_range
-      @palette.generate(template: :strong)
-      max_range = (@palette.red_color_range.end+1) * (@palette.green_color_range.end+1) * (@palette.blue_color_range.end+1)
-      colors = []
-      10.times { colors << @palette.sample_color.to_s }
-      colors.each do |color|
-        assert_match (/[0-7]{2}[0-9]{2}[0-9|a-fA-F]{2}/), color
-      end
-      assert_equal @palette.max_number_of_colors, max_range
-    end
-
-    def test_method_missing
-      assert_match "Colors and stars something wrong. Palette types available :complete and :strong via template option", @palette.undefined
+      assert_kind_of Color, @palette.sample_color
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: color_picker
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Bernardo Galindo
@@ -56,6 +56,7 @@ files:
 - lib/color_picker.rb
 - lib/color_picker/color.rb
 - lib/color_picker/palette.rb
+- lib/color_picker/palette/templates.rb
 - lib/color_picker/version.rb
 - test/color_test.rb
 - test/palette_test.rb