frameit 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3051f6bc614da778f504a828173c4dbf3704f99
-  data.tar.gz: 9ce4a4ab91e660e59d1ec28df45f888923ef68db
+  metadata.gz: d3069491e6493347dfc626e17df9f0b06758f415
+  data.tar.gz: 215c7531bab266b4b8d6ebf343b282523810ff23
 SHA512:
-  metadata.gz: e1583fcdc2ffbfd3d359d8b710325fd35f12cfb3be6132958890b88257d13433f71a24551111558bde84dd6a682ea6f6a6af71ea60c3b96c1f14a281399b3b6f
-  data.tar.gz: 0618a55cf147c1aef93b1dadc5ab7dcd329d25f3ca87b510879ae4fce9e00345bfccc5dee47819f0772d3ff1663ac9eac313a2ed04c677fea741b3eb323ad6aa
+  metadata.gz: ef8c0cbb1cc42af78848877e7e78ef54b18017db5b21ffde646212d121592513d8801b444124945316c0627a288a5cce4c1d9cd3dc8b343151318cbe2335bbdc
+  data.tar.gz: 14a01c6c7cfea720d42bbef42eca4407cc7a4822c761a570e0b213a7d8d6f1ca7294e6b90abbe80a5fb7db8589cc847c1b2b81a567d7c01f5fe506a0d04ac536

data/lib/frameit/config_parser.rb

@@ -85,7 +85,7 @@ module Frameit
           end
 
           if key == 'padding'
-            raise "padding must be type integer" unless value.kind_of? Integer
+            raise "padding must be type integer or pair of integers of format 'AxB'" unless value.kind_of?(Integer) || value.split('x').length == 2
           end
         end
       end

data/lib/frameit/editor.rb

@@ -92,24 +92,43 @@ module Frameit
         @image = put_into_frame
 
         # Decrease the size of the framed screenshot to fit into the defined padding + background
-        frame_width = background.width - frame_padding * 2
+        frame_width = background.width - horizontal_frame_padding * 2
         image.resize "#{frame_width}x"
       end
 
-      @image = put_device_into_background(background)
+      self.top_space_above_device = vertical_frame_padding
 
       if fetch_config['title']
-        @image = add_title
+        background = put_title_into_background(background)
       end
 
+      @image = put_device_into_background(background)
+
       image
     end
 
-    # Padding around the frames
-    def frame_padding
+    # Horizontal adding around the frames
+    def horizontal_frame_padding
+      padding = fetch_config['padding']
+      unless padding.kind_of?(Integer)
+        padding = padding.split('x')[0].to_i
+      end
+      return scale_padding(padding)
+    end
+
+    # Vertical adding around the frames
+    def vertical_frame_padding
+      padding = fetch_config['padding']
+      unless padding.kind_of?(Integer)
+        padding = padding.split('x')[1].to_i
+      end
+      return scale_padding(padding)
+    end
+
+    def scale_padding(padding)
       multi = 1.0
       multi = 1.7 if self.screenshot.triple_density?
-      return fetch_config['padding'] * multi
+      return padding * multi
     end
 
     # Returns a correctly sized background image
@@ -124,16 +143,6 @@ module Frameit
 
     def put_device_into_background(background)
       left_space = (background.width / 2.0 - image.width / 2.0).round
-      bottom_space = -(image.height / 10).round # to be just a bit below the image bottom
-      bottom_space -= 40 if screenshot.portrait? # even more for portrait mode
-
-      if screenshot.mini?
-        # Such small devices need special treatment
-        bottom_space -= 50 if screenshot.portrait?
-        bottom_space += 65 unless screenshot.portrait?
-      end
-
-      self.top_space_above_device = background.height - image.height - bottom_space
 
       @image = background.composite(image, "png") do |c|
         c.compose "Over"
@@ -152,9 +161,9 @@ module Frameit
     end
 
     # Add the title above the device
-    # rubocop:disable Metrics/AbcSize
-    def add_title
-      title_images = build_title_images(image.width)
+    def put_title_into_background(background)
+      title_images = build_title_images(image.width, image.height)
+
       keyword = title_images[:keyword]
       title = title_images[:title]
 
@@ -177,12 +186,15 @@ module Frameit
         sum_width *= smaller
       end
 
-      top_space = (top_space_above_device / 2.0 - (actual_font_size / 2.0 * smaller)).round # centered
-      left_space = (image.width / 2.0 - sum_width / 2.0).round
+      vertical_padding = vertical_frame_padding
+      top_space = vertical_padding
+      left_space = (background.width / 2.0 - sum_width / 2.0).round
+
+      self.top_space_above_device += title.height + vertical_padding
 
       # First, put the keyword on top of the screenshot, if we have one
       if keyword
-        @image = image.composite(keyword, "png") do |c|
+        background = background.composite(keyword, "png") do |c|
           c.compose "Over"
           c.geometry "+#{left_space}+#{top_space}"
         end
@@ -191,16 +203,15 @@ module Frameit
       end
 
       # Then, put the title on top of the screenshot next to the keyword
-      @image = image.composite(title, "png") do |c|
+      background = background.composite(title, "png") do |c|
         c.compose "Over"
         c.geometry "+#{left_space}+#{top_space}"
       end
-      image
+      background
     end
-    # rubocop:enable Metrics/AbcSize
 
     def actual_font_size
-      [top_space_above_device / 3.0, @image.width / 30.0].max.round
+      [@image.width / 10.0].max.round
     end
 
     # The space between the keyword and the title
@@ -209,17 +220,17 @@ module Frameit
     end
 
     # This will build 2 individual images with the title, which will then be added to the real image
-    def build_title_images(max_width)
+    def build_title_images(max_width, max_height)
       words = [:keyword, :title].keep_if { |a| fetch_text(a) } # optional keyword/title
       results = {}
       words.each do |key|
         # Create empty background
         empty_path = File.join(Helper.gem_path('frameit'), "lib/assets/empty.png")
         title_image = MiniMagick::Image.open(empty_path)
-        image_height = actual_font_size * 2 # gets trimmed afterwards anyway, and on the iPad the `y` would get cut
+        image_height = max_height # gets trimmed afterwards anyway, and on the iPad the `y` would get cut
         title_image.combine_options do |i|
-          # * 2.0 as the text might be larger than the actual image. We're trimming afterwards anyway
-          i.resize "#{max_width * 2.0}x#{image_height}!" # `!` says it should ignore the ratio
+          # Oversize as the text might be larger than the actual image. We're trimming afterwards anyway
+          i.resize "#{max_width * 5.0}x#{image_height}!" # `!` says it should ignore the ratio
         end
 
         current_font = font(key)
@@ -227,6 +238,8 @@ module Frameit
         Helper.log.debug "Using #{current_font} as font the #{key} of #{screenshot.path}" if $verbose and current_font
         Helper.log.debug "Adding text '#{text}'" if $verbose
 
+        text.gsub! '\n', "\n"
+
         # Add the actual title
         title_image.combine_options do |i|
           i.font current_font if current_font
@@ -267,10 +280,10 @@ module Frameit
       end
 
       # No string files, fallback to Framefile config
-      result = fetch_config[type.to_s]['text']
+      result = fetch_config[type.to_s]['text'] if fetch_config[type.to_s]
       Helper.log.debug "Falling back to default text as there was nothing specified in the .strings file" if $verbose
 
-      if !result and type == :title
+      if type == :title and !result
         # title is mandatory
         raise "Could not get title for screenshot #{screenshot.path}. Please provide one in your Framefile.json".red
       end

data/lib/frameit/screenshot.rb

@@ -22,9 +22,9 @@ module Frameit
       sizes = Deliver::AppScreenshot::ScreenSize
       case @screen_size
       when sizes::IOS_55
-        return 'iPhone_6_Plus'
+        return 'iPhone-6s-Plus'
       when sizes::IOS_47
-        return 'iPhone_6'
+        return 'iPhone-6s'
       when sizes::IOS_40
         return 'iPhone_5s'
       when sizes::IOS_35

data/lib/frameit/template_finder.rb

@@ -11,7 +11,7 @@ module Frameit
       ]
       joiner = "_"
 
-      if screenshot.device_name.include?('iPad')
+      if screenshot.device_name.include?('iPad') || screenshot.device_name.include?('6s')
         parts = [
           screenshot.device_name,
           (screenshot.color == 'SpaceGray' ? "Space-Gray" : "Silver"),

data/lib/frameit/version.rb

@@ -1,3 +1,3 @@
 module Frameit
-  VERSION = "2.3.0"
+  VERSION = "2.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frameit
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastlane_core
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: Quickly put your screenshots into the right device frames