image_mosaic 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16c5f7ada72b064ecf1bef0bd89f7dc50dc28a28
-  data.tar.gz: 5da2b55388a4897099f432885488fe124601790b
+  metadata.gz: 984c3b5a6fbb11cb7b4576882355a63cb3889d68
+  data.tar.gz: eb396d1d438bed75f3da82e68ae150f61ac5e5c6
 SHA512:
-  metadata.gz: df1829264594f547382597ca356919679b6a58ba9bd605a1da517e4bb29f219ea70dd03eca958ed637525086b4b59dd378a29a6348abc6b09a1080e565873973
-  data.tar.gz: 240a137ef6e4c0453dcb2df2d7e607cd8160b605c47ac1ce7fdc96c307a794f0d199d7faf979b8a093481f5b07dfefabdc54e18abe24c3f694077236658bed46
+  metadata.gz: 8dad330e1d2acc3fe0e8c663469a20970ca81fc9d43de0936dddbfe812c52c43c33366b108eb066aea52877dd607b473b29d98663e381ddee0a41d6f7d20f257
+  data.tar.gz: 844f8b7463bb528be4ac4cf0eca87882ab63c638f15eec941df83f775789f22d2d6ca3b1bbd2d967cf81bd23bf42bd0ad3f15eadda2019b45a689f19420cfcb6

data/lib/image_mosaic.rb

@@ -3,21 +3,21 @@ require 'mini_magick'
 require 'tempfile'
 require 'securerandom'
 require 'image_mosaic/data/background'
-require 'image_mosaic/data/setting'
 require 'image_mosaic/data/validator'
 require 'image_mosaic/image/child'
 require 'image_mosaic/image/mosaic'
 require 'image_mosaic/image/parent'
+require 'image_mosaic/image/layout/grid'
 require 'image_mosaic/operations/compositor'
 require 'image_mosaic/operations/construct'
 require 'image_mosaic/railtie' if defined?(Rails)
 
 module ImageMosaic
-  HEIGHT = 1000
   WIDTH = 1000
   COLOUR = '#ffffff'.freeze
+  LAYOUT = 'grid'.freeze
 
-  def self.create(items, colour: COLOUR)
-    Operations::Construct.new(items, colour: colour).parent
+  def self.create(items, layout: LAYOUT, colour: COLOUR, width: WIDTH)
+    Operations::Construct.new(items, layout: layout, colour: colour, width: width).parent
   end
 end

data/lib/image_mosaic/data/validator.rb

@@ -6,15 +6,20 @@ module ImageMosaic
       end
 
       def items
-        @items ||= create_images.compact
+        @items ||= validate_items.compact
       end
 
       private
 
-      def create_images
+      def validate_items
         @urls.map do |url|
-          child = Image::Child.new(url)
-          child if child.valid?
+          image = Image::Child.new(url)
+          next unless image.valid?
+          {
+            url: url,
+            h: image.height,
+            w: image.width
+          }
         end
       end
     end

data/lib/image_mosaic/image/child.rb

@@ -12,6 +12,20 @@ module ImageMosaic
         false
       end
 
+      def width
+        dimensions[0]
+      end
+
+      def height
+        dimensions[1]
+      end
+
+      private
+
+      def dimensions
+        @dimensions ||= image.dimensions
+      end
+
       def image
         @image ||= MiniMagick::Image.open(@url)
       end

data/lib/image_mosaic/image/layout/grid.rb

@@ -0,0 +1,46 @@
+module ImageMosaic
+  module Image
+    module Layout
+      # Takes an array of URLs, returns a sliced array of Child images with sizes based on columns
+      class Grid
+        STARTING_Y = 0
+
+        def initialize(items, width: WIDTH)
+          @items = items
+          @width = width
+        end
+
+        def items(y: STARTING_Y)
+          [].tap do |images|
+            rows.each do |row|
+              x = 0
+              row.each do |cell|
+                images << cell.merge(y: y, x: x, h: child_dimension, w: child_dimension)
+                x += child_dimension
+              end
+              y += child_dimension
+            end
+          end
+        end
+
+        private
+
+        def rows
+          @rows ||= valid_items.each_slice(columns).to_a
+        end
+
+        def columns
+          Math.sqrt(valid_items.count).floor
+        end
+
+        def child_dimension
+          @width / columns
+        end
+
+        def valid_items
+          @valid_items ||= Data::Validator.new(@items).items
+        end
+      end
+    end
+  end
+end

data/lib/image_mosaic/image/parent.rb

@@ -2,35 +2,27 @@ module ImageMosaic
   module Image
     #Takes an array of images and metrics and then returns a single image of composited images.
     class Parent
-      def initialize(items, colour:, columns:, dimension:)
+      def initialize(items, colour:, width:)
         @items = items
         @colour = colour
-        @columns = columns
-        @dimension = dimension
+        @width = width
       end
 
       def create
-        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 += @dimension
-          end
-          y += @dimension
-        end
+        image.run_command(:convert, '-size', dimensions, "xc:#{@colour}", image.path)
+        @items.each { |item| @image = add_image(item) }
         Mosaic.new(image)
       end
 
       private
 
-      def sliced_grid
-        @items.each_slice(@columns).to_a
+      def dimensions
+        # Parent image is always square for time being.
+        "#{@width}x#{@width}"
       end
 
-      def add_image(child_image, x, y)
-        Operations::Compositor.new(@image, child_image).save(x, y, type: 'Over', dimension: @dimension)
+      def add_image(image)
+        Operations::Compositor.new(@image, image).save
       end
 
       def temp_file

data/lib/image_mosaic/operations/compositor.rb

@@ -8,22 +8,17 @@ module ImageMosaic
         @child = child
       end
 
-      def save(x, y, type: 'Over', dimension: 200)
-        resize_image_to(dimension)
-        @composite_image.composite(child_image) do |composite|
+      def save(type: 'Over')
+        @composite_image.composite(image) do |composite|
           composite.compose type
-          composite.geometry "+#{x}+#{y}"
+          composite.geometry "+#{@child[:x]}+#{@child[:y]}"
         end
       end
 
       private
 
-      def resize_image_to(dimension)
-        child_image.resize "#{dimension}x#{dimension}^"
-      end
-
-      def child_image
-        @child.image
+      def image
+        @image ||= MiniMagick::Image.open(@child[:url]).resize "#{@child[:w]}x#{@child[:h]}^"
       end
     end
   end

data/lib/image_mosaic/operations/construct.rb

@@ -1,27 +1,29 @@
 module ImageMosaic
   module Operations
     class Construct
-      def initialize(items, colour: COLOUR)
+      def initialize(items, layout: LAYOUT, colour: COLOUR, width: WIDTH)
         @items = items
+        @layout = layout
         @colour = colour
+        @width = width
       end
 
       def parent
-        @parent ||= Image::Parent.new(valid_items, colour: @colour, columns: setting.columns, dimension: setting.dimension).create
+        @parent ||= Image::Parent.new(layout_items, colour: @colour, width: @width).create
       end
 
       private
 
-      def setting
-        @setting ||= Data::Setting.new(valid_items.count)
+      def background
+        @background ||= Data::Background.new(@colour).hex
       end
 
-      def valid_items
-        @valid_items ||= Data::Validator.new(@items).items
+      def layout_items
+        @layout_items ||= layout_klass.new(@items, width: @width).items
       end
 
-      def background
-        @background ||= Data::Background.new(@colour).hex
+      def layout_klass
+        Kernel.const_get("ImageMosaic::Image::Layout::#{@layout.split('_').collect(&:capitalize).join}")
       end
     end
   end

data/lib/image_mosaic/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_mosaic
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Dan Goodwin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -86,9 +86,9 @@ files:
 - image_mosaic.gemspec
 - lib/image_mosaic.rb
 - lib/image_mosaic/data/background.rb
-- lib/image_mosaic/data/setting.rb
 - lib/image_mosaic/data/validator.rb
 - lib/image_mosaic/image/child.rb
+- lib/image_mosaic/image/layout/grid.rb
 - lib/image_mosaic/image/mosaic.rb
 - lib/image_mosaic/image/parent.rb
 - lib/image_mosaic/operations/compositor.rb

data/lib/image_mosaic/data/setting.rb

@@ -1,18 +0,0 @@
-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