colos 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22f6c370ab9b0d006b87c6f269974bbd64864773
-  data.tar.gz: 113de3b14624f5a6653325abadce2f2b0e622d06
+  metadata.gz: cfa71c2fe49fceab591edb2e9a5b8ceee220c807
+  data.tar.gz: 808ced25842577be602ba36dd9a49411f40fc521
 SHA512:
-  metadata.gz: b900e17a5e29766a7bbb973a273fdde5eb4bdc1cbda00c3009cebb64d0705f3acb85105fe01263d46817201c6420d2ee95098b262bee547a75b78ff8d2f4ac3c
-  data.tar.gz: d713e8000b3758f780e04f8ecc16c6264529f0fec0c5234fced053909a2776af46c52ff9b248ed009b10b5d969f57b440623bc9cc3b3ae0845fd947e714389c3
+  metadata.gz: 67b32de676420cb93d9fd5bddc7ab68473c3181f5c3a4de19d8db4d1a901e763e94444aeae8d5d26bcf9feada37f4fc84f7a87c646ce51b549315e4a86318da7
+  data.tar.gz: 55ffa8a1277e14e6f7cee299f2677fe0f4044923eee775a78a3be533d1c09ad4ef023e245e49cb6b56210a76586cf0b10bce2f277555548e4c7e80666de04e7f

data/lib/colos/version.rb

@@ -1,3 +1,3 @@
 class Colos
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/colos.rb

@@ -3,7 +3,7 @@ require "cityhash"
 class Colos
   
   # Options store
-  attr_accessor :options
+  attr_reader :options
 
   # Initializer
   #
@@ -15,7 +15,6 @@ class Colos
   #   options: (Hash)
   def initialize options = {}
     default_options = {
-      hash: CityHash,
       frequency: 1.4,
       randomizr: 0,
       format: :hex
@@ -24,11 +23,14 @@ class Colos
     # merge
     @options = default_options.merge options
 
-    # errors
-    raise "Frequency option should be from 1.2 to 1.6" unless (1.2..1.6).include? @options[:frequency]
-    raise "Randomizr option should be from 0 to 23" unless (0..23).include? @options[:randomizr]
-    raise "Hash class should have `new` method" unless @options[:hash].respond_to?('hash32')
-    raise "Format can be hex or rgb" unless [:hex, :rgb].include? @options[:format]
+    check_options
+  end
+
+  # Options setter
+  def options= key, value
+    @options[key] = value
+
+    check_options
   end
 
   # Convert IPv4 to color
@@ -45,9 +47,13 @@ class Colos
 
     raise "Invalid IP" unless ip.size == 4
 
-    rgb = ip.permutation(3).to_a[@options[:randomizr]]
+    number = ip.permutation(3).to_a[@options[:randomizr]]
 
-    hex_from_int rgb
+    if @options[:format] == :hex
+      make_color number
+    else
+      to_rgb make_color number
+    end
   end
 
   # Convert IPv4 to colors
@@ -60,15 +66,21 @@ class Colos
   #   str: (String)
   def ips str
     ip = str.split '.'
-    hexs = []
+    colors = []
 
     raise "Invalid IP" unless ip.size == 4
 
-    ip.permutation(3).to_a.each do |color|
-      hexs << hex_from_int(color)
+    ip.permutation(3).to_a.each do |number|
+      colors << make_color(number)
     end
 
-    hexs
+    if @options[:format] == :hex
+      colors
+    else
+      colors.map do |hex|
+        to_rgb hex
+      end
+    end
   end
 
   # Convert string to color
@@ -81,7 +93,13 @@ class Colos
   #   str: (String)
   def color str
     hash = CityHash.hash32 str
-    (hash**(1.0 / @options[:frequency])).to_i.to_s 16
+    hex = (hash**(1.0 / @options[:frequency])).to_i.to_s 16
+
+    if @options[:format] == :hex
+      hex
+    else
+      to_rgb hex
+    end
   end
 
   # Convert string to colors
@@ -101,21 +119,37 @@ class Colos
       colors << q.to_s(16) if q.to_s(16).size == 6
     end
 
-    colors
+    if @options[:format] == :hex
+      colors
+    else
+      colors.map do |hex|
+        to_rgb hex
+      end
+    end
   end
 
 private
 
-  def hex_from_int ints
+  def check_options
+    raise "Frequency option should be from 1.2 to 1.6" unless (1.2..1.6).include? @options[:frequency]
+    raise "Randomizr option should be from 0 to 23" unless (0..23).include? @options[:randomizr]
+    raise "Format can be hex or rgb" unless [:hex, :rgb].include? @options[:format]
+  end
+
+  def make_color number
     hex = ""
     
-    ints.map(&:to_i).each do |b|
+    number.map(&:to_i).each do |b|
       b = b.to_s 16
       b = "0#{b}" unless b.size == 2
-      hex += b
+      hex << b
     end
 
     hex
   end
 
+  def to_rgb hex
+    hex.match(/(..)(..)(..)/).to_a.map(&:hex)[1..-1]
+  end
+
 end

metadata

@@ -1,16 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: colos
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Yuri Artemev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-15 00:00:00.000000000 Z
-dependencies: []
-description: convert ruby string to color
+date: 2013-04-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: cityhash
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+description: Convert Ruby string to color
 email:
 - i@artemeff.com
 executables: []
@@ -38,9 +52,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
-summary: string to color
+summary: String to color
 test_files: []
 has_rdoc: