image_mosaic 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72c39930b3c7187b496a4a57b615adbd3d6d2b2f
-  data.tar.gz: 6aa80f9493ef2c604ca68d3a0dc2a2431fd09d1b
+  metadata.gz: 4a1a7071ef66b370eb317cb4253fc2a27f1dabe6
+  data.tar.gz: 44e791111586332891ef202a18cc3995b25cee15
 SHA512:
-  metadata.gz: fa1d1015f6e43dcb13da577b34663215a74ff3baeb9854641fa17d81f2d452c9832f2180f0925e05366dd38b91eea7d9233d138dc5a9ff300f575930ca18ae50
-  data.tar.gz: 7b6d020d22948a5e84e72c3523debdcf7dd321c74ba581f2cdea33f1a64be8b4bccf8f5160ff0da868d498dbf70941611b7227dc314704d206de7e4e40c4e5d1
+  metadata.gz: 281facb0beed13789225c0463cdc90257d144d2fb3634140d5c04152ca84fe016c5e12bc72dc9fe2555696d97eff0cc8bf032407077f2e6e5b26b84afcdca69d
+  data.tar.gz: 3a924e0c83cb1d5e124226abec8e5da90d5e24a07b7e39f7f64f946fc45d39520527e08ec15a2481b9145fbec7494eefb17d7164897e493e0e6d8262f6af8b1a

data/lib/image_mosaic.rb

@@ -3,11 +3,15 @@ require 'mini_magick'
 require 'tempfile'
 require 'securerandom'
 require 'image_mosaic/operations/compositor'
+require 'image_mosaic/data/setting'
 require 'image_mosaic/data/validator'
 require 'image_mosaic/image/parent'
 require 'image_mosaic/image/child'
 
 module ImageMosaic
+  HEIGHT = 1000
+  WIDTH = 1000
+
   class Construct
     def initialize(items)
       @items = items
@@ -20,7 +24,11 @@ module ImageMosaic
     private
 
     def parent
-      @parent ||= Image::Parent.new(valid_items).create
+      @parent ||= Image::Parent.new(valid_items, colour: 'white', columns: setting.columns, dimension: setting.dimension).create
+    end
+
+    def setting
+      @setting ||= Data::Setting.new(valid_items.count)
     end
 
     def valid_items

data/lib/image_mosaic/data/setting.rb

@@ -0,0 +1,18 @@
+module ImageMosaic
+  module Data
+    class Setting
+      def initialize(count, width: WIDTH)
+        @count = count
+        @width = width
+      end
+
+      def columns
+        Math.sqrt(@count).ceil
+      end
+
+      def dimension
+        @width / columns
+      end
+    end
+  end
+end

data/lib/image_mosaic/image/parent.rb

@@ -1,26 +1,24 @@
 module ImageMosaic
   module Image
-    #Takes an array of images and metrics and then returns a single image of compisited images.
+    #Takes an array of images and metrics and then returns a single image of composited images.
     class Parent
-      def initialize(items, width: 1000, height: 1000, colour: 'white', columns: 5, cell_dimension: 200)
+      def initialize(items, colour: 'white', columns: 5, dimension: 200)
         @items = items
-        @width = width
-        @height = height
         @colour = colour
         @columns = columns
-        @cell_dimension = cell_dimension
+        @dimension = dimension
       end
 
       def create
-        image.run_command(:convert, '-size', "#{@width}x#{@height}", "xc:#{@colour}", image.path)
+        image.run_command(:convert, '-size', "#{WIDTH}x#{HEIGHT}", "xc:#{@colour}", image.path)
         y = 0
         sliced_grid.each do |row|
           x = 0
           row.each do |cell|
             @image = add_image(cell, x, y)
-            x += @cell_dimension
+            x += @dimension
           end
-          y += @cell_dimension
+          y += @dimension
         end
         image
       end
@@ -32,7 +30,7 @@ module ImageMosaic
       end
 
       def add_image(child_image, x, y)
-        Operations::Compositor.new(@image, child_image).save(x, y, type: 'Over', dimension: @cell_dimension)
+        Operations::Compositor.new(@image, child_image).save(x, y, type: 'Over', dimension: @dimension)
       end
 
       def temp_file

data/lib/image_mosaic/version.rb

@@ -1,3 +1,3 @@
 module ImageMosaic
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_mosaic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Dan Goodwin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -85,6 +85,7 @@ files:
 - bin/setup
 - image_mosaic.gemspec
 - lib/image_mosaic.rb
+- lib/image_mosaic/data/setting.rb
 - lib/image_mosaic/data/validator.rb
 - lib/image_mosaic/image/child.rb
 - lib/image_mosaic/image/parent.rb