motion-prime 0.9.5 → 0.9.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGU1Njc4YzVkNGIyNmZjNDg0MWIwZGYzYmMwMDliNWZhMDVkNWI5Mg==
+    MDhjOWNjZjBiYWMwMGM0YTE5YzRkZTBmZWQyNDZmMzdiM2VjOTE5OQ==
   data.tar.gz: !binary |-
-    OGNiYjkyMThmM2QwZWU5YzQzM2E0YWI0ZDgxZjlkMzAzZDQ3NDU1MQ==
+    ZTllMmM5YWMyZjg4MDNhYzVhOWY5YzEzM2ExNzZiNWY1NTcwN2E5OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODg2YmIyZTc5Y2ZhMGQxZTMzNDlhM2RmNDdlM2FmN2RiOTVjZGJhMjE4ODBl
-    NjU3NTY2MDNjYjk3ZWMzNmM1MWJjMTI4OGY5NjUzMWRhOWRlNzI2ZmIzNTdl
-    MjdhYzdjMTk0OGUwODZlYTIzNWQ1ZmZkNTQ3YzBlZWY0YzFhNmM=
+    YWQ4YTdhYjhkOWFjMDhmZjc0ZjZkMWY3MmMxYjA4ZWQwMzE1MWMxYjhkZjFl
+    OTQ3NjNjMWRjODI1NGQ4Y2RlOGU2N2ZhOGU5OGM1Nzc4MzZjMTU2NGRmMWM1
+    N2YxYmEwM2Q1MjFmZGIwOTNhZjcwZmQyZGQwNmIzYzNmMzQyYjA=
   data.tar.gz: !binary |-
-    YzdiYTliMTNmNWVhMzI2NDZjNzRlZGVmYzllODI1YTg2ZjAyYmRiMGIyYmU3
-    N2EzODQ2YWM2OGE2M2U4ZGRjM2NmN2RkODA2NTM3ZTJmNzhkYmEyYmJjYmIw
-    MWU5ZTkzNzdiY2JjNjhiYTUyZjY0MmE2ZjhiZDk3MmMwYmFhMzk=
+    M2M2MjUzNjk0OWI0ZWRkY2I3MzA4YTIxNzcxMTRjNDhiNTg5NjM3ZDNiOWIz
+    ZTJjNzg5NTAyODgzODU2MjM2M2Y4MTFiYjc3ZDk4YjE4NzI4ZGRjY2MwYzQ0
+    ZjA0YjY0N2IwZDY4OTMwNTU0YTFkMTlmMDBhMjYzMzVkNmM0NzA=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 0.9.6
+* BREAKING CHANGE: proc for form field option will be executed in context of form, not field.
+* BREAKING CHANGE: screen#setup renamed to screen#set_options.
+
 === 0.9.5
 * Ability to set wrapper for sections in screen.
 * Screen refresh reloads all sections in screen.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.9.5)
+    motion-prime (0.9.6)
       activesupport
       afmotion (~> 2.1.0)
       bubble-wrap (~> 1.5.0)

data/doc/code/sections.rb

@@ -1,9 +1,9 @@
 # ** What is a Section? **
 #
-# "Section" is something like "partial" which you may know from RubyOnRails. 
+# "Section" is something like "partial" which you may know from RubyOnRails.
 # In the first look it's just a list of elements which will be added to the "Screen".
-# But the magic is inside. 
-# When you add "Element" to a "Section", e.g. image or label, 
+# But the magic is inside.
+# When you add "Element" to a "Section", e.g. image or label,
 # it will try to draw it using CALayer/CGContext/etc, instead of adding new UIView.
 # That way increases application speed (especially on Table elements) by 5-10 times.
 #
@@ -18,7 +18,7 @@ end
 
 # ** Add some elements to the section. **
 #
-# Each element should have name and type: "image", "label", "button", etc. 
+# Each element should have name and type: "image", "label", "button", etc.
 #
 # When you send `:text` option, type will be "label" by default.
 #
@@ -31,7 +31,7 @@ class FooSection < Prime::Section
 end
 
 # ** Render Section to Screen **
-# 
+#
 # NOTE: it's recommended to use instance variables for sections, e.g. `@main_section` instead of `main_section`.
 
 class FooScreen < Prime::Screen
@@ -42,12 +42,12 @@ class FooScreen < Prime::Screen
 end
 
 # ** Add some styles for section **
-# 
+#
 # Generally styles are just attributes of UIView elements.
 #
 # Let's style the UILabel element (:welcome label element we added above.)
 #
-# We send :foo parameter to `define`, because we have section named `foo` (FooSection) 
+# We send :foo parameter to `define`, because we have section named `foo` (FooSection)
 # and :welcome parameter to `style`, because the name of element is `welcome`.
 #
 Prime::Styles.define :foo do
@@ -56,7 +56,7 @@ Prime::Styles.define :foo do
     top: 100,
     width: 320,
     left: 20,
-    font: proc { :system.uifont(20) },
+    font: :system.uifont(20),
     size_to_fit: true,
 end
 

data/files/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
 gem 'motion-cocoapods', '~> 1.4.0'
-gem 'motion-prime', '0.9.5'
+gem 'motion-prime', '0.9.6'
 
 # add reside menu for sidebar support
 # gem 'prime_reside_menu', '~> 0.1.4'

data/generators/templates/scaffold/form.rb

@@ -1,15 +1,15 @@
 class <%= @p_class_name %>FormSection < Prime::FormSection
   field :title,
     label: { text: 'Title' },
-    input: { 
-      text: proc { form.model.title }, 
+    input: {
+      text: proc { model.title },
       placeholder: "Enter title here"
     }
 
   field :delete, type: :submit,
-    button: { 
-      title: "Delete", 
-      background_color: :red 
+    button: {
+      title: "Delete",
+      background_color: :red
     },
     action: :on_delete,
     if: proc { model.persisted? }

data/motion-prime/elements/base_element.rb

@@ -84,7 +84,11 @@ module MotionPrime
       compute_style_options(raw_options)
       raw_options = Styles.for(styles).merge(raw_options)
       @computed_options = raw_options
-      normalize_options(@computed_options, section, %w[text placeholder font title_label padding padding_left padding_right min_width min_outer_width max_width max_outer_width width left right])
+      normalize_options(@computed_options, section.try(:elements_eval_object), %w[
+        text placeholder font title_label
+        padding padding_left padding_right padding_top padding_bottom
+        left right min_width min_outer_width max_width max_outer_width width
+        top bottom min_height min_outer_height max_height max_outer_height height])
     end
 
     def reload!
@@ -120,7 +124,7 @@ module MotionPrime
       #   {name: model.name}
       # end
       def compute_block_options
-        section.send(:instance_exec, self, &@block) if @block
+        normalize_value(@block, section) if @block
       end
 
       def compute_style_options(*style_sources)
@@ -136,10 +140,10 @@ module MotionPrime
         custom_styles = []
         style_sources.each do |source|
           if source_mixins = source.delete(:mixins)
-            mixins += Array.wrap(normalize_object(source_mixins, section))
+            mixins += Array.wrap(normalize_object(source_mixins, section.try(:elements_eval_object)))
           end
           if source_styles = source.delete(:styles)
-            custom_styles += Array.wrap(normalize_object(source_styles, section))
+            custom_styles += Array.wrap(normalize_object(source_styles, section.try(:elements_eval_object)))
           end
         end
         # styles got from mixins option
@@ -192,7 +196,6 @@ module MotionPrime
           base_styles[:common]
         end
         all_styles += Array.wrap(common_styles)
-
         # form cell: user_form_field, user_form_string_field, user_form_field_email
         # form element: user_form_field_text_field, user_form_string_field_text_field, user_form_field_email_text_field
         # table cell: categories_table_cell, categories_table_title

data/motion-prime/helpers/has_normalizer.rb

@@ -1,13 +1,15 @@
 module MotionPrime
   module HasNormalizer
-    def normalize_options(unordered_options, receiver = nil, order = nil)
+    def normalize_options(unordered_options, receiver = nil, order = nil, keys = nil)
       options = if order
         Hash[unordered_options.sort_by { |k,v| order.index(k.to_s).to_i }]
       else
         unordered_options
       end
 
-      options.each do |key, option|
+      filtered_options = keys.nil? ? options : options.slice(*keys)
+      filtered_options.each do |key, option|
+        @_key_chain = [key]
         unordered_options[key] = normalize_object(option, receiver)
       end
     end
@@ -15,14 +17,41 @@ module MotionPrime
     def normalize_object(object, receiver = nil)
       receiver ||= self
       if object.is_a?(Proc)
-        receiver.send(:instance_exec, self, &object)
+        normalize_value(object, receiver)
       elsif object.is_a?(Hash)
         object.inject({}) do |result, (key, nested_object)|
+          @_key_chain ||= []
+          @_key_chain << key
           result.merge(key => normalize_object(nested_object, receiver))
         end
       else
         object
       end
     end
+
+    def normalize_value(object, receiver)
+      if element?
+        receiver.send(:instance_exec, section || screen, self, &object)
+      else
+        receiver.send(:instance_exec, self, &object)
+      end
+    rescue => e
+      Prime.logger.error "Can't normalize: ", *debug_info, @_key_chain
+      raise e
+    end
+
+    def element?
+      self.is_a?(BaseElement)
+    end
+
+    def debug_info
+      if element?
+        [self.class.name, self.name, section.try(:name)]
+      elsif self.is_a?(Section)
+        [self.class.name, self.name, @table.try(:class).try(:name)]
+      else
+        [self.class.name]
+      end
+    end
   end
 end

data/motion-prime/screens/extensions/_indicators_mixin.rb

@@ -24,7 +24,7 @@ module MotionPrime
         options[:add_to_view] ||= self.view
         @progress_indicator_view = self.progress_hud(options).view
       else
-        self.setup(@progress_indicator_view, options.except(:add_to_view))
+        self.set_options(@progress_indicator_view, options.except(:add_to_view))
         @progress_indicator_view.show options.has_key?(:animated) ? options[:animatetd] : true
       end
     end

data/motion-prime/screens/screen.rb

@@ -35,8 +35,8 @@ module MotionPrime
       @visible = true
       @on_appear_happened ||= {}
       unless @on_appear_happened[view.object_id]
-        setup view, styles: default_styles do
-          run_callbacks :render do 
+        set_options view, styles: default_styles do
+          run_callbacks :render do
             send((action).to_sym)
           end
         end

data/motion-prime/sections/base_section.rb

@@ -131,7 +131,7 @@ module MotionPrime
       elements_options.each do |key, opts|
         add_element(key, opts)
       end
-      self.instance_eval(&@options_block) if @options_block.is_a?(Proc)
+      elements_eval(&@options_block) if @options_block.is_a?(Proc)
 
       @section_loading = false
       return @section_loaded = true
@@ -309,6 +309,14 @@ module MotionPrime
     end
 
     protected
+      def elements_eval_object
+        self
+      end
+
+      def elements_eval(&block)
+        elements_eval_object.instance_exec(self, &block)
+      end
+
       def bind_keyboard_close
         bindings = self.class.keyboard_close_bindings
         return unless bindings.present?
@@ -323,7 +331,7 @@ module MotionPrime
 
       def keyboard_close_bindings_options
         return {} unless self.class.keyboard_close_bindings.present?
-        @keyboard_close_bindings_options ||= normalize_options(self.class.keyboard_close_bindings.clone, self)
+        @keyboard_close_bindings_options ||= normalize_options(self.class.keyboard_close_bindings.clone, elements_eval_object)
       end
 
       def build_options_for_element(opts)
@@ -366,14 +374,15 @@ module MotionPrime
         raw_options.merge!(self.class.container_options.try(:clone) || {})
         raw_options.merge!(options.delete(:container) || {})
 
-        @container_options = raw_options
+        # allow to pass styles as proc
+        normalize_options(raw_options, elements_eval_object, nil, [:styles])
+        @container_options = raw_options # must be here because section_styles may use container_options for custom styles
 
-        # must be here because section_styles may use container_options for custom styles
         container_options_from_styles = Styles.for(section_styles.values.flatten)[:container] if section_styles
         if container_options_from_styles.present?
           @container_options = container_options_from_styles.merge(@container_options)
         end
-        normalize_options(@container_options)
+        normalize_options(@container_options, elements_eval_object)
       end
 
     class << self

data/motion-prime/sections/form/base_field_section.rb

@@ -6,14 +6,13 @@ module MotionPrime
     attr_reader :form
     after_render :on_section_render
 
-    before_initialize :prepare_table_data
     after_initialize :observe_model_errors
 
     def prepare_table_data
       @form = @options[:table]
       if options[:observe_errors]
         # Do not remove clone() after delete()
-        @errors_observer_options = normalize_options(options.delete(:observe_errors).clone, self)
+        @errors_observer_options = normalize_options(options.delete(:observe_errors).clone, elements_eval_object)
       end
     end
 
@@ -50,6 +49,7 @@ module MotionPrime
     end
 
     def observe_model_errors
+      prepare_table_data
       return unless observing_errors?
       on_error_change = proc { |old_value, new_value|
         changes = observing_errors_for.errors.changes
@@ -187,5 +187,10 @@ module MotionPrime
       error_height = element ? element.cached_content_height + 5 : 0
       super + error_height
     end
+
+    protected
+      def elements_eval_object
+        form
+      end
   end
 end

data/motion-prime/sections/form/password_field_section.rb

@@ -3,10 +3,10 @@ module MotionPrime
     element :label, type: :label do
       default_label_options
     end
-    element :input, type: :text_field, delegate: proc { form.table_delegate } do
+    element :input, type: :text_field, delegate: proc { table_delegate } do
       {secure_text_entry: true}.merge(options[:input] || {})
     end
-    element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
+    element :error_message, type: :error_message, text: proc { |field| field.all_errors.join("\n") if field.observing_errors? }
     after_render :bind_text_input
 
     def value

data/motion-prime/sections/form/select_field_section.rb

@@ -9,7 +9,7 @@ module MotionPrime
     element :arrow, type: :image do
       options[:arrow] || {}
     end
-    element :error_message, type: :error_message, text: proc { observing_errors? and all_errors.join("\n") }
+    element :error_message, type: :error_message, text: proc { |field| field.observing_errors? and field.all_errors.join("\n") }
 
     after_render :bind_select_button
 

data/motion-prime/sections/form/static_field_section.rb

@@ -5,5 +5,10 @@ module MotionPrime
     def form
       table
     end
+
+    protected
+      def elements_eval_object
+        form
+      end
   end
 end

data/motion-prime/sections/form/string_field_section.rb

@@ -4,11 +4,11 @@ module MotionPrime
       default_label_options
     end
 
-    element :input, type: :text_field, delegate: proc { form.table_delegate } do
+    element :input, type: :text_field, delegate: proc { table_delegate } do
       options[:input] || {}
     end
 
-    element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
+    element :error_message, type: :error_message, text: proc { |field| field.all_errors.join("\n") if field.observing_errors? }
     after_render :bind_text_input
 
     def value

data/motion-prime/sections/form/submit_field_section.rb

@@ -3,7 +3,7 @@ module MotionPrime
     element :button, type: :button do
       {title: options[:name].to_s.titleize}.merge(options[:button] || {})
     end
-    element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
+    element :error_message, type: :error_message, text: proc { |field| field.all_errors.join("\n") if field.observing_errors? }
 
     after_render :bind_button
 

data/motion-prime/sections/form/text_field_section.rb

@@ -3,11 +3,11 @@ module MotionPrime
     element :label, type: :label do
       default_label_options
     end
-    element :input, type: :text_view, delegate: proc { form.table_delegate } do
+    element :input, type: :text_view, delegate: proc { table_delegate } do
       {editable: true}.merge(options[:input] || {})
     end
 
-    element :error_message, type: :error_message, text: proc { observing_errors? and all_errors.join("\n") }
+    element :error_message, type: :error_message, text: proc { |field| field.observing_errors? and field.all_errors.join("\n") }
     after_render :bind_text_input
 
     def value

data/motion-prime/sections/table.rb

@@ -165,7 +165,7 @@ module MotionPrime
       base_styles = [type]
       base_styles << :"#{type}_with_sections" unless flat_data?
       item_styles = [name.to_sym]
-      item_styles << @styles if @styles.present?
+      item_styles += Array.wrap(@styles) if @styles.present?
       {common: base_styles, specific: item_styles}
     end
 
@@ -216,13 +216,13 @@ module MotionPrime
     end
 
     def table_element_options
-      {
+      container_options.slice(:render_target).merge({
         section: self.weak_ref,
         styles: table_styles.values.flatten,
         delegate: table_delegate,
         data_source: table_delegate,
         style: (UITableViewStyleGrouped unless flat_data?)
-      }
+      })
     end
 
     def render_table
@@ -388,9 +388,11 @@ module MotionPrime
       end
 
       def container_element_options_for(index)
+        cell_section = cell_section_by_index(index)
         {
           reuse_identifier: cell_name(table_view, index),
-          parent_view: table_view
+          parent_view: table_view,
+          bounds: {height: cell_section.container_height}
         }
       end
 

data/motion-prime/sections/table/refresh_mixin.rb

@@ -4,7 +4,7 @@ module MotionPrime
       screen.automaticallyAdjustsScrollViewInsets = false
 
       table_view.addPullToRefreshWithActionHandler(block) # block must be a variable
-      screen.setup table_view.pullToRefreshView, styles: [:base_pull_to_refresh]
+      screen.set_options table_view.pullToRefreshView, styles: [:base_pull_to_refresh]
     end
 
     def finish_pull_to_refresh

data/motion-prime/styles/form.rb

@@ -66,7 +66,6 @@ MotionPrime::Styles.define :base_form do
     top: 30,
     height: 35,
     title_shadow_color: :white,
-    content_horizontal_alignment: :left,
     layer: {
       border_color: :gray,
       border_width: 1

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.9.5"
+  VERSION = "0.9.6"
 end

data/motion-prime/views/_frame_calculator_mixin.rb

@@ -1,6 +1,6 @@
 module MotionPrime
   module FrameCalculatorMixin
-    def calculate_frame_for(bounds, options)
+    def calculate_frame_for(parent_bounds, options)
       width   = options[:width]
       height  = options[:height]
       top     = options[:top]
@@ -14,11 +14,11 @@ module MotionPrime
         height = options[:height_to_fit]
       end
 
-      return bounds if width.nil? && height.nil? && right.nil? && bottom.nil?
+      return parent_bounds if width.nil? && height.nil? && right.nil? && bottom.nil?
       frame = CGRectMake(0,0,0,0)
 
-      max_width = bounds.size.width
-      max_height = bounds.size.height
+      max_width = parent_bounds.size.width
+      max_height = parent_bounds.size.height
       width = 0.0 if width.nil?
       height = 0.0 if height.nil?
 

data/motion-prime/views/layout.rb

@@ -8,36 +8,36 @@ module MotionPrime
       render_target = options.delete(:render_target)
       parent_view = options.delete(:parent_view) || render_target
 
-      bounds = if view_stack.empty?
+      parent_bounds = if view_stack.empty?
         parent_view.try(:bounds) || CGRectZero
       else
         view_stack.last.bounds
       end
       builder = ViewBuilder.new(klass, options)
-      options = builder.options.merge(calculate_frame: true, bounds: bounds)
+      options = builder.options.merge(calculate_frame: true, parent_bounds: parent_bounds)
       view = builder.view
       insert_index = options.delete(:at_index)
 
-      if render_target
-        options[:bounds] = render_target.bounds
-        insert_index ? render_target.insertSubview(view, atIndex: insert_index) : render_target.addSubview(view)
-      elsif view_stack.any?
-        insert_index ? view_stack.last.insertSubview(view, atIndex: insert_index) : view_stack.last.addSubview(view)
+      set_options(view, options, &block)
+      if superview = render_target || view_stack.last
+        insert_index ? superview.insertSubview(view, atIndex: insert_index) : superview.addSubview(view)
       end
-
-      setup(view, options, &block)
       view.on_added if view.respond_to?(:on_added)
-
       view
     end
 
-    def setup(view, options = {}, &block)
-      ViewStyler.new(view, options.delete(:bounds), options).apply
+    def set_options(view, options = {}, &block)
+      ViewStyler.new(view, options.delete(:parent_bounds), options).apply
       view_stack.push(view)
       block.call(view) if block_given?
       view_stack.pop
     end
 
+    def setup(view, options = {}, &block)
+      puts "DEPRECATION: screen#setup is deprecated, please use screen#set_options instead"
+      set_options(view, options, &block)
+    end
+
     def view_stack
       @view_stack ||= []
     end

data/motion-prime/views/view_styler.rb

@@ -7,10 +7,10 @@ module MotionPrime
 
     attr_reader :view, :options
 
-    def initialize(view, bounds = CGRectZero, options = {})
+    def initialize(view, parent_bounds = CGRectZero, options = {})
       @options = Styles.extend_and_normalize_options options
       @view = view
-      prepare_frame_for(bounds) if @options.delete(:calculate_frame)
+      prepare_frame_for(parent_bounds) if @options.delete(:calculate_frame)
       prepare_options!
     end
 
@@ -29,8 +29,8 @@ module MotionPrime
       end
     end
 
-    def prepare_frame_for(bounds)
-      options[:frame] = calculate_frame_for(bounds, options.merge(test: view.is_a?(UITextView)))
+    def prepare_frame_for(parent_bounds)
+      options[:frame] = calculate_frame_for(parent_bounds, options)
       if options.slice(:width, :height, :right, :bottom, :height_to_fit).values.any?
         mask = UIViewAutoresizingNone
         mask |= UIViewAutoresizingFlexibleTopMargin if options[:top].nil?
@@ -77,6 +77,9 @@ module MotionPrime
         :text_alignment, :font, :line_break_mode, :number_of_lines
       ]
       attributed_text_options = options.slice(*text_attributes)
+      if view.is_a?(UIButton)
+        attributed_text_options[:text] ||= options[:title]
+      end
       options.except!(*text_attributes)
       attributed_text_options
     end
@@ -141,7 +144,10 @@ module MotionPrime
       end
 
       def set_text_options(key, value)
-        if key.end_with?('alignment') && value.is_a?(Symbol)
+        if key == 'content_horizontal_alignment' && value.is_a?(Symbol) && %[left right center fill].include?(value.to_s)
+          view.setValue "UIControlContentHorizontalAlignment#{value.camelize}".constantize, forKey: camelize_factory(key)
+          true
+        elsif key.end_with?('alignment') && value.is_a?(Symbol)
           view.setValue value.uitextalignment, forKey: camelize_factory(key)
           true
         elsif key.end_with?('line_break_mode') && value.is_a?(Symbol)
@@ -166,7 +172,7 @@ module MotionPrime
           current_inset.send("#{key.partition('_').first}=", value)
           view.contentInset = current_inset
           true
-        elsif key.end_with?('inset')
+        elsif key.end_with?('inset') || key.end_with?('indicator_insets')
           inset = if value.to_s == 'none'
             UIEdgeInsetsMake(0, 320, 0, 0)
           elsif value.is_a?(Array) && value.count == 2
@@ -181,16 +187,38 @@ module MotionPrime
 
       def set_layer_options(key, value)
         if key == 'rounded_corners'
+          layer_bounds = bounds
+          if value[:overlap]
+            size = layer_bounds.size
+            size.height += value.fetch(:border_width, 0) # overlap to the next cell
+            layer_bounds.size = size
+          end
+
           radius = value[:radius].to_f
           corner_consts = {top_left: UIRectCornerTopLeft, bottom_left: UIRectCornerBottomLeft, bottom_right: UIRectCornerBottomRight, top_right: UIRectCornerTopRight}
           corners = value[:corners].inject(0) { |result, corner| result|corner_consts[corner] }
-          size = options[:parent_frame].size
-          bounds = CGRectMake(0, 0, size.width, size.height)
-          mask_path = UIBezierPath.bezierPathWithRoundedRect(bounds, byRoundingCorners: corners, cornerRadii: CGSizeMake(radius, radius))
+          mask_path = UIBezierPath.bezierPathWithRoundedRect(layer_bounds, byRoundingCorners: corners, cornerRadii: CGSizeMake(radius, radius))
           mask_layer = CAShapeLayer.layer
-          mask_layer.frame = bounds
+
+
+          mask_layer.frame = layer_bounds
           mask_layer.path = mask_path.CGPath
           view.mask = mask_layer
+
+          if value[:border_color] && value[:border_width]
+            stroke_layer = CAShapeLayer.layer
+            stroke_layer.path = mask_path.CGPath
+            stroke_layer.fillColor = :clear.uicolor.cgcolor
+            stroke_layer.strokeColor = value[:border_color].uicolor.cgcolor
+            stroke_layer.lineWidth = value[:border_width].to_f*2 # another half is hidden by the mask
+
+            container_view = view.delegate
+            stroke_view = UIView.alloc.initWithFrame(layer_bounds)
+            stroke_view.userInteractionEnabled = false
+            stroke_view.layer.addSublayer(stroke_layer)
+            container_view.addSubview(stroke_view)
+            view.addSublayer(stroke_layer)
+          end
           true
         end
       end
@@ -199,7 +227,7 @@ module MotionPrime
         if value.is_a?(Hash)
           self.class.new(
             view.send(low_camelize_factory(key).to_sym), nil,
-            value.merge(parent_frame: options[:frame] || options[:parent_frame])
+            value.merge(parent_frame: options[:frame] || options[:parent_frame], bounds: options[:bounds])
           ).apply
           true
         end
@@ -227,9 +255,17 @@ module MotionPrime
           width height top right bottom left
           max_width max_outer_width min_width min_outer_width
           max_height max_outer_height min_height min_outer_width
+          bounds
         ].include?(key.to_s)
       end
 
+      def bounds
+        # TODO: raise error if parent_frame is nill
+        frame_size = options[:parent_frame].size
+        bounds_options = options[:bounds] || {}
+        CGRectMake(0, 0, bounds_options.fetch(:width, frame_size.width), bounds_options.fetch(:height, frame_size.height))
+      end
+
     STRUCTS_MAP = {
       CGAffineTransform   => Proc.new {|v| NSValue.valueWithCGAffineTransform(v) },
       CGPoint             => Proc.new {|v| NSValue.valueWithCGPoint(v) },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake