acbaker 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0da3aebf60075ce0d77dbcdda8353ef87d099dd
-  data.tar.gz: d545f2520a8bb8ff17ac7ea78be66a0a32252d60
+  metadata.gz: 7d47f4083dd69b97d8e22b739639fd13d85a833f
+  data.tar.gz: 40cc181909e9ebcd6fbdf24bff73d3b2e5e4cfae
 SHA512:
-  metadata.gz: a7b744fbf7d7b0728bbd9a0f5f3521f9c588f35110a0b7d480d9491deb94b876ff2463e4fe9e9a7a51e85121f071bbeffc433e7f2f352e156bd1637766cb4cf5
-  data.tar.gz: 7ab1d19be2e6bf202b417b72edd40e041ee479b105f9de7beefe0779598bc85e37b438ff1f0fa14e58dcf051fb55a7071df903dafbf9191ed36abea3f3490842
+  metadata.gz: 9c7e66e084a2085e49e00fbfffe567f7149bf7130a232b7129f5c234e7ab4530fb124e0047024ed3f8b80294ee40b240e0e231f36b5af27e538d6604fa538734
+  data.tar.gz: 9f2edbc654a1effbe76f73b9e80e6b04c710a4303440d5a88a9e688d23ade03028ae4bfaa01f36f94008c9b0cbec58db92e950fda793dbeef88a140ae0c68905

data/README.md

@@ -20,6 +20,10 @@ USAGE
 CHANGELOG
 ---------
 
+* **0.0.6**
+  * Implemented processors (advanced image manipulations)
+  * Added "center" strategy (align image in center with relative or absolute width constraints)
+
 * **0.0.5**
   * Add dynamic sizing option
 

data/acbaker.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '>= 1.3.6'
   s.add_dependency "commander", '~> 4.1'
   s.add_dependency 'json', '~> 1.8'
-  s.add_dependency 'rmagick', '~> 2.13'
+  s.add_dependency 'rmagick', '~> 2.13', '>= 2.13.4'
   s.add_development_dependency "rake", '~> 10.0'
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

data/lib/acbaker/asset_pack.rb

@@ -3,10 +3,11 @@ require 'rmagick'
 
 module Acbaker
   class AssetPack
-    attr_reader :type, :images
+    attr_reader :type, :images, :processors
     
     def initialize(type, options={})
       @type = type
+      @processors = []
       if options[:json]
         @json_data = options[:json]
       else
@@ -18,7 +19,7 @@ module Acbaker
     end
     
     def defaults
-      {json: false, gravity: 'Center', strategy: 'cover'}
+      {json: false, gravity: 'Center', strategy: 'Cover'}
     end
     
     def process(source_image_file, target_directory, &block)
@@ -26,6 +27,15 @@ module Acbaker
       # Define variables
       json_output_file = File.join(target_directory, "Contents.json")
   
+      # Get processors
+      if @json_data['processors'] and @json_data['processors'].length
+        @json_data['processors'].each do |processor_spec|
+          @processors.push(Object.const_get(processor_spec['type']).new(self, processor_spec['config']))
+        end
+      else
+        @processors = [Object.const_get("Acbaker::Processors::#{@options[:strategy]}").new(self)]
+      end
+  
       # Loop through images
       @json_data['images'].each_with_index.map do |image_spec, index|
 
@@ -86,16 +96,11 @@ module Acbaker
         end
     
         # Generate image
-        if image_size_present          
-          if @options[:strategy] == 'contain'
-            cmd = "convert #{source_image_file} -resize #{width}x -size #{width}x#{height} xc:#FFFFFF +swap -gravity #{@options[:gravity]} -composite #{target_directory}/#{filename}"
-          else
-            cmd = "convert #{source_image_file} -resize #{width}x#{height}^ -gravity #{@options[:gravity]} -crop #{width}x#{height}+0+0 +repage #{target_directory}/#{filename}"
-          end
-        else
-          cmd = "convert #{source_image_file} -gravity #{@options[:gravity]} +repage #{target_directory}/#{filename}"
+        image = Magick::ImageList.new(source_image_file)
+        @processors.each do |processor|
+          image = processor.run(image, image_spec, width, height)
         end
-        system(cmd)
+        image.write("#{target_directory}/#{filename}")
         
         # Trigger Callback proc
         block.call("#{target_directory}/#{filename}", index+1) if not block.nil?
@@ -106,6 +111,7 @@ module Acbaker
       end
 
       # Save Contents.json
+      @json_data.delete('processors')
       File.open(json_output_file,"w") do |f|
         f.write(JSON.pretty_generate(@json_data))
       end

data/lib/acbaker/commands/pack.rb

@@ -5,7 +5,7 @@ command :'pack' do |c|
   c.option '--type STRING', String, 'Specify asset pack type'
   c.option '--json STRING', String, 'Specify custom json file path'
   c.option '--gravity STRING', String, 'Specify gravity (NorthWest, North, NorthEast, West, Center, East, SouthWest, South, SouthEast)'
-  c.option '--strategy STRING', String, 'Specify strategy (cover, contain)'
+  c.option '--strategy STRING', String, 'Specify strategy (Cover, Contain, Center)'
   c.option '--force', String, 'Delete and recreate output directory (careful!)'
   global_option '--force'
 
@@ -87,6 +87,14 @@ command :'pack' do |c|
       }[token]
     end
     
+    # Fill json
+    if @type and not @json
+      if File.file?("lib/acbaker/config/#{@type}.json")
+        @json = "lib/acbaker/config/#{@type}.json"
+      end
+    end
+    
+    abort "error: no JSON configuration found" if not @json
     abort("error: Could not detect asset type.") if not @type
   end
   
@@ -99,9 +107,15 @@ command :'pack' do |c|
 
   def validate_strategy!
     if not @strategy
-      @strategy = "cover"
+      @strategy = "Cover"
+    end
+    
+    # try to instantiate strategy class
+    begin
+      Object.const_get("Acbaker::Processors::#{@strategy}")
+    rescue Exception => e
+      abort("error: Invalid strategy specified.")
     end
-    abort("error: Invalid strategy specified.") if not ["cover", "contain"].include?(@strategy)
   end
 
   

data/lib/acbaker/processors/base.rb

@@ -0,0 +1,18 @@
+module Acbaker
+  module Processors
+    class Base
+      attr_accessor :asset_pack, :options
+      @@defaults = {}
+      
+      def initialize(asset_pack, options={})
+        @asset_pack = asset_pack
+        @options = options ? @@defaults.merge(options) : @@defaults
+      end
+      
+      def run(image, image_spec, width=nil, height=nil)
+        throw "Acbaker::Processors::Base should be extended"
+      end
+
+    end
+  end
+end

data/lib/acbaker/processors/center.rb

@@ -0,0 +1,42 @@
+module Acbaker
+  module Processors
+    class Center < Base
+      @@defaults = {"max-width" => "50%", "background-color" => "#FFFFFF", "gravity" => "Center"}
+            
+      def run(image, image_spec, width=nil, height=nil)
+        transform_width = width.to_f
+        transform_height = height.to_f
+        target_ratio = transform_width / transform_height
+        image_ratio = image.columns / image.rows
+        
+        # calculate dimensions
+        if @options['max-width']
+          if @options['max-width'][-1] == "%"
+            rel_width = (@options['max-width'][0..-2].to_f / 100)
+            transform_width = transform_width * rel_width
+          else
+            transform_width = @options['max-width'].to_f
+          end
+          transform_height = transform_width * image_ratio
+        end
+        
+        # resize image
+        image.resize!(transform_width.to_i, transform_height.to_i)
+        
+        # create canvas
+        canvas = Magick::Image.new(width, height)
+        if @options['background-color'] == :transparent
+          canvas = canvas.matte_floodfill(1, 1)
+        else
+          canvas = canvas.color_floodfill(1, 1, Magick::Pixel.from_color(@options['background-color']))
+        end
+        
+        # place image
+        image = canvas.composite(image, Magick::CenterGravity, Magick::OverCompositeOp)
+        
+        image
+      end
+
+    end
+  end
+end

data/lib/acbaker/processors/contain.rb

@@ -0,0 +1,30 @@
+module Acbaker
+  module Processors
+    class Contain < Base
+      @@defaults = {"background-color" => "#FFFFFF", "gravity" => "Center"}
+      
+      def run(image, image_spec, width=nil, height=nil)
+        # resize image
+        image.change_geometry("#{width}x") do |px, py, i|
+          image.resize!(px, py)
+        end
+        
+        # crop image
+        canvas = Magick::Image.new(width, height)
+        if @options['background-color'] == :transparent
+          canvas = canvas.matte_floodfill(1, 1)
+        else
+          canvas = canvas.color_floodfill(1, 1, Magick::Pixel.from_color(@options['background-color']))
+        end
+        
+        # place image
+        gravity_string = "Magick::#{@options['gravity']}Gravity"
+        gravity = Object.const_get(gravity_string)
+        image = canvas.composite(image, gravity, Magick::OverCompositeOp)
+        
+        image
+      end
+
+    end
+  end
+end

data/lib/acbaker/processors/cover.rb

@@ -0,0 +1,30 @@
+module Acbaker
+  module Processors
+    class Cover < Base
+      @@defaults = {"background-color" => "#FFFFFF", "gravity" => "Center"}
+      
+      def run(image, image_spec, width=nil, height=nil)
+        # resize image
+        image.change_geometry("#{width}x#{height}^") do |px, py, i|
+          image.resize!(px, py)
+        end
+        
+        # crop image
+        canvas = Magick::Image.new(width, height)
+        if @options['background-color'] == :transparent
+          canvas = canvas.matte_floodfill(1, 1)
+        else
+          canvas = canvas.color_floodfill(1, 1, Magick::Pixel.from_color(@options['background-color']))
+        end
+        
+        # place image
+        gravity_string = "Magick::#{@options['gravity']}Gravity"
+        gravity = Object.const_get(gravity_string)
+        image = canvas.composite(image, gravity, Magick::OverCompositeOp)
+        
+        image
+      end
+
+    end
+  end
+end

data/lib/acbaker/processors.rb

@@ -0,0 +1,5 @@
+$:.push File.expand_path('../', __FILE__)
+require 'processors/base'
+require 'processors/center'
+require 'processors/cover'
+require 'processors/contain'

data/lib/acbaker/version.rb

@@ -1,3 +1,3 @@
 module Acbaker
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/acbaker.rb

@@ -1,5 +1,6 @@
 require "acbaker/version"
 require 'acbaker/asset_pack'
+require 'acbaker/processors'
 
 module Acbaker
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acbaker
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -45,6 +45,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.13'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.13.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,6 +55,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.13'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.13.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -85,6 +91,11 @@ files:
 - lib/acbaker/commands/pack.rb
 - lib/acbaker/config/AppIcon.json
 - lib/acbaker/config/LaunchImage.json
+- lib/acbaker/processors.rb
+- lib/acbaker/processors/base.rb
+- lib/acbaker/processors/center.rb
+- lib/acbaker/processors/contain.rb
+- lib/acbaker/processors/cover.rb
 - lib/acbaker/version.rb
 - test/assets/AppIcon.png
 - test/assets/LaunchImage.png