icodi 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d272a6dc8d9e595006ce36f72421892a2381cb0d51285e2390143d257c9f119
-  data.tar.gz: e7fc61dfee1364269ffe07d4100b14fa7b48ec100680ed5094b6e40b673ea6c3
+  metadata.gz: ed662658e812ed352bae13ab22ade162554042af8894e4ac6b979cb5f5b33d49
+  data.tar.gz: 68f723bc2f69ac46f051796ffcf69713c5e1c1d2d4d6cb45902afdcbffb7872b
 SHA512:
-  metadata.gz: 86b7e257b95b0ead2d4ec44ee27edb3187cafa18ba519f99776831520502294b6a47c80732cc71abbf5f3e544a17307f449d66153391b8d806c7df03298a6b86
-  data.tar.gz: 68fa6d9f3ed793c99f3cdce6437781026e2bd44c8192bae60e8925988ec8b496840083bbf4a5c2314b1a6fa33f4069e0d150413928e91054fe6d35f71d54bdd4
+  metadata.gz: 115aa2c08283428ea5883737b118b4bbd4f6dd29996964cdfcf6fd1e9c7abdc8212708b6bbaf446048e692d105cf6858e6aa2ff54b1d944a056620efefbf0d73
+  data.tar.gz: 211be6a5f5d6b96c8e2e2e22d9a5b9fbcebaa3594d0f624582a4a584dbb40a5aa352b574ed38245fcfb022a5641b9e44f5ec505490dbe7bad2b1a73ab1ad0150

data/README.md

@@ -122,6 +122,7 @@ Parameter   | Default    | Type    | Description
 `stroke`    | `0.1`      | Float   | Width of the border around each pixel. Note that each pixel is a 10x10 box, so a stroke of 1 means it will take 10% of the box. Higher values generate more overlap between the pixels.
 `jitter`    | `0`        | Float   | A value between 0 and 1 representing the chance for a pixel to be dislocated by half of its size in a random direction.
 `background`| `#fff`     | String  | A named SVG color string (`blue`, `yellow` etc.) or RGB color (for example `#dddddd`).
+`id`        | `icodi`    | String  | The ID to assign the SVG object. Normally this should not matter, but if you intend to embed this icon in an HTML, or in another SVG, this can be useful.
 `template`  | `:default` | Symbol/String | SVG template to use. Can be `:default`, `:html` or a path to a file. Read more on [Victor SVG Templates].
 
 ---

data/lib/icodi.rb

@@ -1,81 +1,33 @@
 require 'victor'
 require 'digest/md5'
+require 'icodi/option_handling'
+require 'icodi/randomization'
 
 class Icodi < Victor::SVGBase
+  include IcodiCore::OptionHandling
+  include IcodiCore::Randomization
+
   attr_reader :text, :options
 
-  def initialize(text = nil, options = {})
-    text, options = nil, text if text.is_a? Hash
+  def initialize(text = nil, opts = {})
+    text, opts = nil, text if text.is_a? Hash
     
     @text = text
-    @options = default_options.merge options
+    @options = default_options.merge opts
 
-    super template: template, viewBox: "0 0 #{size} #{size}", clip_path: "url(#rect)"
+    super template: template, viewBox: "0 0 #{size} #{size}", id: id
     
     generate
   end
 
-  def method_missing(method_name, *_args, &_block)
-    respond_to?(method_name) ? options[method_name] : super
-  end
-
-  def respond_to?(method_name, include_private = false)
-    options.has_key?(method_name) ? true : super
-  end
-
 private
 
-  def default_options
-    {
-      template: :default, 
-      pixels: 5,
-      density: 0.5,
-      stroke: 0.1,
-      background: '#fff',
-      color: random_color,
-      mirror: :x,
-      jitter: 0,
-    }
-  end
-
-  def random_color
-    "#%06x" % (random(:color).rand * 0xffffff)
-  end
-
-  def seed(string)
-    Digest::MD5.hexdigest(string).to_i(16)
-  end
-
-  def random(set = nil)
-    @random_sets ||= {}
-    set ||= :default
-    @random_sets[set] ||= (text ? Random.new(seed(text)) : Random.new)
-  end
-
-  def size
-    @size ||= pixels * 10
-  end
-
-  def style
-    @style ||= { stroke: color, stroke_width: stroke }
-  end
-
-  def mirror_x?
-    [:x, :both].include? mirror
-  end
-
-  def mirror_y?
-    [:y, :both].include? mirror
-  end
-
-  def mirror_both?
-    mirror == :both
-  end
-
   def generate
+    clip_path_id = "#{id}-#{random_id}"
+
     element :rect, x: 0, y: 0, width: size, height: size, fill: background
     element :defs do
-      element :clipPath, id: :clipper do
+      element :clipPath, id: clip_path_id do
         element :rect, width: size, height: size
       end
     end
@@ -84,7 +36,7 @@ private
     x = mirror_x? ? half : pixels
     y = mirror_y? ? half : pixels
 
-    element :g, clip_path: "url(#clipper)" do
+    element :g, clip_path: "url(##{clip_path_id})" do
       draw x, y
     end
   end  
@@ -106,6 +58,20 @@ private
     draw_pixel mirror_value(x), mirror_value(y) if mirror? x: x, y: y
   end
 
+  def add_jitter(x, y)
+    return [x, y] unless jitter > 0 and random(:jitter).rand < jitter
+    
+    x += [0, 0.5, -0.5][random(:jitter).rand(3)] unless mirror_x? and mid? x: x
+    y += [0, 0.5, -0.5][random(:jitter).rand(3)] unless mirror_y? and mid? y: y
+    [x, y]
+  end
+
+  def draw_pixel(x, y)
+    element :rect, x: x*10, y: y*10, width: 10, height: 10, fill: color, style: style
+  end
+
+  # Drawing Utilities
+
   def mirror?(x: nil, y: nil)
     if x and y
       mirror_both? and !mid?(x: x) and !mid?(y: y)
@@ -120,20 +86,11 @@ private
     x ? x == pixels/2 : y ? y == pixels/2 : nil
   end
 
-  def add_jitter(x, y)
-    return [x, y] unless jitter > 0 and random(:jitter).rand < jitter
-    
-    x += [0, 0.5, -0.5][random(:jitter).rand(3)] unless mirror_x? and mid? x: x
-    y += [0, 0.5, -0.5][random(:jitter).rand(3)] unless mirror_y? and mid? y: y
-    [x, y]
-  end
-
-  def draw_pixel(x, y)
-    element :rect, x: x*10, y: y*10, width: 10, height: 10, fill: color, style: style
-  end
-
   def mirror_value(value)
     pixels - 1 - value
   end
 
+  def random_id
+    random(:nonvisual).rand(9999999)
+  end
 end

data/lib/icodi/option_handling.rb

@@ -0,0 +1,48 @@
+module IcodiCore
+  module OptionHandling
+    def method_missing(method_name, *_args, &_block)
+      respond_to?(method_name) ? options[method_name] : super
+    end
+
+    def respond_to?(method_name, include_private = false)
+      options.has_key?(method_name) ? true : super
+    end
+
+    def default_options
+      {
+        template: :default, 
+        pixels: 5,
+        density: 0.5,
+        stroke: 0.1,
+        background: '#fff',
+        color: random_color,
+        mirror: :x,
+        jitter: 0,
+        id: :icodi,
+      }
+    end
+
+    # Derivative Properties
+
+    def size
+      @size ||= pixels * 10
+    end
+
+    def style
+      @style ||= { stroke: color, stroke_width: stroke }
+    end
+
+    def mirror_x?
+      [:x, :both].include? mirror
+    end
+
+    def mirror_y?
+      [:y, :both].include? mirror
+    end
+
+    def mirror_both?
+      mirror == :both
+    end
+
+  end
+end

data/lib/icodi/randomization.rb

@@ -0,0 +1,21 @@
+module IcodiCore
+  module Randomization
+    def random_color
+      "#%06x" % (random(:color).rand * 0xffffff)
+    end
+
+    def seed(string)
+      Digest::MD5.hexdigest(string).to_i(16)
+    end
+
+    def random(set = nil)
+      set ||= :default
+      random_sets[set] ||= (text ? Random.new(seed(text)) : Random.new)
+    end
+
+    def random_sets
+      @random_sets ||= {}
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: icodi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: victor
@@ -32,6 +32,8 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/icodi.rb
+- lib/icodi/option_handling.rb
+- lib/icodi/randomization.rb
 homepage: https://github.com/dannyben/icodi
 licenses:
 - MIT