identiconify 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eee400110cb4bc5725c78c80660d096234dc8b66
-  data.tar.gz: f18b0408a27534063be413e461bc387713ab7cfc
+  metadata.gz: 9812922e146b23b22a72f1ef7ba813a833ca3f4c
+  data.tar.gz: e08d764334018ce4a69113c4df489e4ca71bcff8
 SHA512:
-  metadata.gz: 2c1250f3827a233091811db3277c5120cab852fed2e9f9618ddec02d92f2938bab4d8d5166db8aac4af435b43894e50f1c4dd0c8c11ee0269b4c9fcc155c355f
-  data.tar.gz: dd5c602bfcb43c70137f577e3f0b6c93d02916fae2b977244eea1ae912fa6704c4010ce93cec07c0b2026db6baab02cb41fc4f71141c2566a016176866613f74
+  metadata.gz: 19939b39766680b9c4cc03f47908c5a409307d24c8e7aa5c1cbcade0958c0beec7f9d3b933e872644f9c4f70253411d1aaf5f96b502418460cbdf2043728e7c6
+  data.tar.gz: 203e43620492f67e7f32aa1c0adb8e74199f2efba85bf2320800c0b6c1903fa32753e04c50b4293cc7e95529ea7dbdda52b7dcc5dec1e3cc7502d6113ec2cb68

data/identiconify.gemspec

@@ -23,5 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_runtime_dependency 'chunky_png', '~> 1.2', '>= 1.2.9'
-  spec.add_runtime_dependency 'siphash', '~> 0.0', '>= 0.0.1'
 end

data/lib/identiconify.rb

@@ -1,54 +1,95 @@
 require "identiconify/version"
 require "chunky_png"
-require "siphash"
+require "digest"
 
 module Identiconify
   class Identicon
-    HASH_KEY = "61616f73646a6173646a616f7369646a"
-
-    attr_reader :string,
-                :square_size,
-                :row_count,
-                :size,
-                :inverse_offset,
-                :colors
+    DEFAULT_HASH_PROVIDER = ->(string) {
+      Digest::SHA1.hexdigest(string).to_i(16)
+    }
 
     def initialize(string, options={})
       @string = string
       @size = options.fetch(:size) { 250 }
-      @row_count = 5
-      @square_size = @size / @row_count
+      @colors = options.fetch(:colors) { :default }.to_sym
+      @hash_provider = options.fetch(:hash_provider) { DEFAULT_HASH_PROVIDER }
+    end
+
+    def to_png_blob
+      render.to_blob :fast_rgba
+    end
+
+    private
+
+    attr_reader :string, :size, :colors, :hash_provider
+
+    def render
+      bits = hash.to_s(2).split("").map(&:to_i)
+
+      # Drop the first three bytes that are used for the color
+      bits.drop(3*8)
+
+      png = ChunkyPNG::Image.new(size, size, bg_color)
+
+      coordinates.each do |row, column|
+        render_square(row, column, png) if bits.shift == 1
+      end
+
+      png
+    end
+
+    def render_square(row, column, png)
+      x0 = column*square_size
+      y0 = row*square_size
+      x1 = (column+1)*square_size-1
+      y1 = (row+1)*square_size-1
+      png.rect(x0, y0, x1, y1, color, color)
+
+      # Inverse the x coordinates making the image mirrored vertically
+      x0 = size-(column+1)*square_size-inverse_offset
+      x1 = size-column*square_size-inverse_offset-1
+      png.rect(x0, y0, x1, y1, color, color)
+    end
+
+    def row_count
+      7
+    end
+
+    def column_count
+      row_count.even? ? row_count / 2 : row_count / 2 + 1
+    end
+
+    def square_size
+      size / row_count
+    end
+
+    def inverse_offset
       # Since we can't draw subpixels we need to calculate how much we have to
       # offset the inverted version of the identicon to not create gaps or
       # overlaps in the middle of the image.
-      @inverse_offset = @size - @square_size * @row_count
-      @colors = options.fetch(:colors) { :default }.to_sym
+      size - square_size * row_count
     end
 
-    def column_count
-      row_count.even? ? row_count/2 : row_count/2+1
+    def hash
+      hash_provider.call(string)
     end
 
-    def color_for_hash(hash)
-      # Use the three first bytes of the hash to generate a color
-      r = hash & 0xff
-      g = (hash >> 8) & 0xff
-      b = (hash >> 16) & 0xff
-      transform_color ChunkyPNG::Color.rgb(r,g,b)
+    def coordinates
+      rows = 0.upto(row_count-1).to_a
+      columns = 0.upto(column_count-1).to_a
+      rows.product(columns)
     end
 
-    def greyscale(color)
-      ChunkyPNG::Color.to_grayscale(color)
+    def bg_color
+      ChunkyPNG::Color::TRANSPARENT
     end
 
-    def tint(color)
-      r = ChunkyPNG::Color.r(color)
-      g = ChunkyPNG::Color.g(color)
-      b = ChunkyPNG::Color.b(color)
-      r += (0.3*(255-r)).round
-      g += (0.3*(255-g)).round
-      b += (0.3*(255-b)).round
-      ChunkyPNG::Color.rgb(r,g,b)
+    def color
+      # Use the three first bytes of the hash to generate a color
+      r = hash & 255
+      g = (hash >> 8) & 255
+      b = (hash >> 16) & 255
+      transform_color ChunkyPNG::Color.rgb(r,g,b)
     end
 
     def transform_color(color)
@@ -59,34 +100,19 @@ module Identiconify
       end
     end
 
-    def to_png_blob
-      hash = SipHash.digest(HASH_KEY, string)
-
-      color = color_for_hash(hash)
-      bg_color = ChunkyPNG::Color::TRANSPARENT
+    def greyscale(color)
+      ChunkyPNG::Color.to_grayscale(color)
+    end
 
-      # Remove the used three color bytes
-      hash >>= 24
+    def tint(color)
+      r = ChunkyPNG::Color.r(color)
+      g = ChunkyPNG::Color.g(color)
+      b = ChunkyPNG::Color.b(color)
+      ChunkyPNG::Color.rgb(tint_component(r),tint_component(g),tint_component(b))
+    end
 
-      png = ChunkyPNG::Image.new(size, size, bg_color)
-      0.upto(row_count-1).each do |row|
-        0.upto(column_count-1).each do |column|
-          if hash & 1 == 1
-            x0 = column*square_size
-            y0 = row*square_size
-            x1 = (column+1)*square_size-1
-            y1 = (row+1)*square_size-1
-            png.rect(x0, y0, x1, y1, color, color)
-
-            # Inverse the x coordinates making the image mirrored vertically
-            x0 = size-(column+1)*square_size-inverse_offset
-            x1 = size-column*square_size-inverse_offset-1
-            png.rect(x0, y0, x1, y1, color, color)
-          end
-          hash >>= 1
-        end
-      end
-      png.to_blob :fast_rgba
+    def tint_component(component)
+      component + (0.3 * (255 - component)).round
     end
   end
-end
+end

data/lib/identiconify/version.rb

@@ -1,3 +1,3 @@
 module Identiconify
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/test.rb

@@ -9,4 +9,4 @@ filename = File.join(tmpdir, "image.png")
 File.open(filename, "w") do |file|
   file.write(png_data)
 end
-system "open #{filename}"
+system "open #{filename}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: identiconify
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - calleerlandsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,26 +58,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.9
-- !ruby/object:Gem::Dependency
-  name: siphash
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.1
 description: Identiconify makes it super simple to generate identicons representing
   string values such as usernames or ip addresses.
 email:
@@ -115,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Super simple identicons