motion-prime 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c05d314976c62a856091891705c135ec7efcec22
-  data.tar.gz: c36d99bc5fbd5c2220d0eac3677d87dbc0acf4b8
+  metadata.gz: 45140a3e0294c388e06a65d8984b3178d3a61860
+  data.tar.gz: bbdb962a185668be9c8788616fd562697b4dc80f
 SHA512:
-  metadata.gz: 89864fab09b0b64a7c1ad1610300141c5ae60296a4a858e7abb83ceecf1277ebd3ff027886a061e1e022e1df551e9270b24f435a12f33d34973e7d4940d72e35
-  data.tar.gz: 6c83f9726a57b620a1d2f93fd0e8e8b2089d3e71de9f5bea27acd279f98ad9a9f536bd247d1b4fd42822cc31341510d3ce82316eba8b49314ca8a71ee7dc5829
+  metadata.gz: 29e217defff9f85b314495158591cd4bb0215d58f86e3bee2e7660fd4e70e36668c035917f9589345425527d3f10edfd02d57255bfd7608937279b09203682cc
+  data.tar.gz: a459b509909885a8b77d71f94a4cb02cb12e91f56b9c9f91c24b1e1c863d9ba073b105258908fc6648da2487d8225638a98bc34b3bc479ec55f30a7c3f29b78d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+=== 1.0.5
+* Bug fixes
+
 === 1.0.4
 * Multiple bug fixes
 * Model#save will be performed on main thread (now you can fetch models in thread)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (1.0.4)
+    motion-prime (1.0.5)
       activesupport
       afmotion (~> 2.1.0)
       bubble-wrap (~> 1.6.0)
@@ -51,7 +51,7 @@ GEM
     fuzzy_match (2.0.4)
     i18n (0.6.9)
     json_pure (1.8.1)
-    methadone (1.4.0)
+    methadone (1.5.1)
       bundler
     motion-cocoapods (1.4.1)
       cocoapods (>= 0.32.1)

data/ROADMAP.md

@@ -15,6 +15,7 @@
 * create "display_network_error" extension.
 * add different templates. some templates should be more like final app.
 * add size_to_fit support for images.
+* simplify border radius for common case
 
 === 1.2.0
 * Move api_client and model sync mixin to prime_model_sync gem.

data/files/Gemfile

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

data/motion-prime/api_client.rb

@@ -80,7 +80,7 @@ class ApiClient
       elsif progress
         # handle progress
       elsif !response.success? && allow_queue?(method, path, options)
-        queue(method: method, path: path, params: params)
+        queue(method: method, path: path, params: data)
       elsif response.operation.response.nil?
         block.call if use_callback
       else
@@ -123,9 +123,9 @@ class ApiClient
   end
 
   def queue(item)
-    queue_list = user_defaults['api_client_queue'].clone || []
+    queue_list = MotionPrime::JSON.parse(user_defaults['api_client_queue']) || []
     queue_list.push(item)
-    user_defaults['api_client_queue'] = queue_list
+    user_defaults['api_client_queue'] = MotionPrime::JSON.generate(queue_list)
   end
 
   # TODO: temporary solution, add real caching system here

data/motion-prime/elements/_content_text_mixin.rb

@@ -115,6 +115,7 @@ module MotionPrime
         normalize_object(font, section || self)
       end
 
+      # FIXME: does not work when #update_with_options is called
       def input_value_text
         view && !is_a?(DrawElement) ? view.text : (computed_options[:html] || computed_options[:text])
       end

data/motion-prime/elements/_text_mixin.rb

@@ -33,6 +33,7 @@ module MotionPrime
       prepared_text = NSMutableAttributedString.alloc.initWithString(options[:text].to_s, attributes: attributes)
       underline_range = options[:underline]
       fragment_color = options[:fragment_color]
+      fragment_font = options[:fragment_font]
       if paragrah_style && (underline_range || fragment_color) && options.fetch(:number_of_lines, 1) == 1
         Prime.logger.debug "If attributed text has paragraph style and underline - you must set number of lines != 1"
       end
@@ -44,6 +45,10 @@ module MotionPrime
       if fragment_color
         prepared_text.addAttributes({NSForegroundColorAttributeName => fragment_color[:color].uicolor}, range: fragment_color[:range])
       end
+      if fragment_font
+        prepared_text.addAttributes({NSFontAttributeName => fragment_font[:font].uifont}, range: fragment_font[:range])
+      end
+
       prepared_text
     end
 

data/motion-prime/elements/draw.rb

@@ -10,18 +10,32 @@ module MotionPrime
     def draw_options
       options = computed_options
       background_color = options[:background_color].try(:uicolor)
+      layer_options = options[:layer] || {}
+      corner_radius = layer_options[:corner_radius].to_f
+
+      layer_options.delete(:masks_to_bounds) if layer_options[:masks_to_bounds].nil?
+      options.delete(:clips_to_bounds) if options[:clips_to_bounds].nil?
+      masks_to_bounds = layer_options.fetch(:masks_to_bounds, options.fetch(:clips_to_bounds, corner_radius > 0))
       {
         rect: CGRectMake(frame_left, frame_top, frame_outer_width, frame_outer_height),
         background_color: background_color,
-        masks_to_bounds: options[:layer].try(:[], :masks_to_bounds) || options[:clips_to_bounds],
-        corner_radius: options[:layer].try(:[], :corner_radius).to_f,
-        border_width: options[:layer].try(:[], :border_width).to_f,
-        border_color: options[:layer].try(:[], :border_color).try(:uicolor) || background_color,
-        border_sides: options[:layer].try(:[], :border_sides),
-        dashes: options[:layer].try(:[], :dashes),
+        masks_to_bounds: masks_to_bounds,
+        corner_radius: corner_radius,
+        rounded_corners: layer_options[:rounded_corners],
+        border_width: layer_options[:border_width].to_f,
+        border_color: layer_options[:border_color].try(:uicolor) || background_color,
+        border_sides: layer_options[:border_sides],
+        dashes: layer_options[:dashes]
       }
     end
 
+    def draw_in(rect)
+      if @_prev_rect_size && @_prev_rect_size != rect.size
+        reset_computed_values
+      end
+      @_prev_rect_size = rect.size
+    end
+
     def render!; end
 
     def on_container_render
@@ -59,6 +73,7 @@ module MotionPrime
     end
 
     def rerender!(changed_options = [])
+      @_original_options = nil
       section.cached_draw_image = nil
       view.try(:setNeedsDisplay)
     end

data/motion-prime/elements/draw/_draw_background_mixin.rb

@@ -3,7 +3,7 @@ module MotionPrime
     def draw_background_in_context(context = nil)
       context ||= UIGraphicsGetCurrentContext()
       options = draw_options
-      rect, background_color, border_width, border_color, border_sides, corner_radius, dashes_array = options.slice(:rect, :background_color, :border_width, :border_color, :border_sides, :corner_radius, :dashes).values
+      rect, background_color, border_width, border_color, border_sides, corner_radius, dashes_array, rounded_corners = options.slice(:rect, :background_color, :border_width, :border_color, :border_sides, :corner_radius, :dashes, :rounded_corners).values
 
       return unless background_color || border_width > 0
 
@@ -15,7 +15,7 @@ module MotionPrime
         dashes_array.each_with_index { |length, i| dashes[i] = length }
       end
 
-      if corner_radius > 0
+      if corner_radius > 0 && !rounded_corners
         bezier_path = UIBezierPath.bezierPathWithRoundedRect rect, cornerRadius: corner_radius
         UIGraphicsPushContext(context)
         bezier_path.setLineDash(dashes, count: dashes_array.count, phase: 0) if dashes
@@ -29,11 +29,24 @@ module MotionPrime
           bezier_path.fill
         end
         UIGraphicsPopContext()
+      elsif corner_radius > 0
+        CGContextSetLineDash(context, dashes_array.count, dashes, 0) if dashes
+        CGContextSetLineWidth(context, border_width) if border_width > 0
+        CGContextSetStrokeColorWithColor(context, border_color.uicolor.cgcolor) if border_color
+        draw_rect_in_context(context, rect: rect, radius: corner_radius, rounded_corners: rounded_corners)
+        CGContextSaveGState(context)
+        CGContextClip(context)
+        if background_color
+          CGContextSetFillColorWithColor(context, background_color.uicolor.cgcolor)
+          CGContextFillRect(context, rect)
+        end
+        CGContextRestoreGState(context)
       else
         if border_width > 0 && border_color
           CGContextSetLineDash(context, dashes_array.count, dashes, 0) if dashes
           CGContextSetLineWidth(context, border_width)
           CGContextSetStrokeColorWithColor(context, border_color.uicolor.cgcolor)
+
           if border_sides.present?
             points = [
               [rect.origin.x, rect.origin.y],
@@ -67,9 +80,60 @@ module MotionPrime
             CGContextStrokeRect(context, rect)
           end
         end
-        CGContextSetFillColorWithColor(context, background_color.uicolor.cgcolor) if background_color
-        CGContextFillRect(context, rect) if background_color
+
+        if background_color
+          CGContextSetFillColorWithColor(context, background_color.uicolor.cgcolor)
+          CGContextFillRect(context, rect)
+        end
       end
     end
+
+    def draw_rect_in_context(context, options)
+      rect = options.fetch(:rect)
+      radius = options.fetch(:radius, 0)
+      rounded_corners = options[:rounded_corners] || [:top_left, :top_right, :bottom_right, :bottom_left]
+
+      CGContextBeginPath(context)
+
+      x_left = rect.origin.x
+      x_left_center = x_left + radius
+      x_right_center = x_left + rect.size.width - radius
+      x_right = x_left + rect.size.width
+      y_top = rect.origin.y
+      y_top_center = y_top + radius
+      y_bottom_center = y_top + rect.size.height - radius
+      y_bottom = y_top + rect.size.height
+      CGContextMoveToPoint(context, x_left, y_top_center)
+
+      if rounded_corners.include?(:top_left)
+        CGContextAddArcToPoint(context, x_left, y_top, x_left_center, y_top, radius)
+      else
+        CGContextAddLineToPoint(context, x_left, y_top)
+      end
+      CGContextAddLineToPoint(context, x_right_center, y_top)
+
+      if rounded_corners.include?(:top_right)
+        CGContextAddArcToPoint(context, x_right, y_top, x_right, y_top_center, radius)
+      else
+        CGContextAddLineToPoint(context, x_right, y_top)
+      end
+      CGContextAddLineToPoint(context, x_right, y_bottom_center)
+
+      if rounded_corners.include?(:bottom_right)
+        CGContextAddArcToPoint(context, x_right, y_bottom, x_right_center, y_bottom, radius)
+      else
+        CGContextAddLineToPoint(context, x_right, y_bottom)
+      end
+      CGContextAddLineToPoint(context, x_left_center, y_bottom)
+
+      if rounded_corners.include?(:bottom_left)
+        CGContextAddArcToPoint(context, x_left, y_bottom, x_left, y_bottom_center, radius)
+      else
+        CGContextAddLineToPoint(context, x_left, y_bottom)
+      end
+      CGContextAddLineToPoint(context, x_left, y_top_center)
+
+      CGContextClosePath(context)
+    end
   end
 end

data/motion-prime/elements/draw/image.rb

@@ -17,10 +17,11 @@ module MotionPrime
 
     def draw_in(rect)
       return if computed_options[:hidden]
-      draw_background_in_context(UIGraphicsGetCurrentContext())
+      super
       if computed_options[:draw_in_rect]
         draw_in_context(UIGraphicsGetCurrentContext())
       else
+        draw_background_in_context(UIGraphicsGetCurrentContext())
         draw_with_layer
       end
       load_image
@@ -37,12 +38,9 @@ module MotionPrime
       inset = border_width > 0 ? (border_width - 1 ).abs*0.5 : 0
       rect = CGRectInset(options[:inner_rect], inset, inset)
       radius = options[:corner_radius].to_f if options[:corner_radius] && options[:masks_to_bounds]
-
       UIGraphicsPushContext(context)
       if radius
-        CGContextBeginPath(context)
-        CGContextAddArc(context, rect.origin.x + rect.size.width/2, rect.origin.y + rect.size.height/2, radius, 0, 2*Math::PI, 0) # FIXME
-        CGContextClosePath(context)
+        draw_rect_in_context(context, rect: rect, radius: radius, rounded_corners: options[:rounded_corners])
         CGContextSaveGState(context)
         CGContextClip(context)
         image.drawInRect(rect)
@@ -58,6 +56,7 @@ module MotionPrime
       @layer.try(:removeFromSuperlayer)
       return unless image = options[:image]
       rect = options[:inner_rect]
+
       radius = options[:corner_radius].to_f if options[:corner_radius] && options[:masks_to_bounds]
 
       @layer = CALayer.layer
@@ -94,7 +93,6 @@ module MotionPrime
             end
 
             self.image_data = image
-
             section.cached_draw_image = nil
             if section.respond_to?(:cell_section_name)
               section.pending_display!

data/motion-prime/elements/draw/label.rb

@@ -34,12 +34,15 @@ module MotionPrime
         line_spacing: options[:line_spacing],
         line_height: options[:line_height],
         underline: options[:underline],
+        fragment_color: options[:fragment_color],
+        fragment_font: options[:fragment_font],
         top_left_corner: top_left_corner,
         inner_rect: inner_rect
       })
     end
 
     def draw_in(rect)
+      super
       draw_in_context(UIGraphicsGetCurrentContext())
     end
 
@@ -54,8 +57,7 @@ module MotionPrime
 
       UIGraphicsPushContext(context)
       options = draw_options
-      if options[:is_html] || options[:line_spacing] ||
-        options[:line_height] || options[:underline] || options[:force_attributed]
+      if options.slice(:is_html, :line_spacing, :line_height, :underline, :force_attributed, :fragment_color, :fragment_font).any?
         prepared_text = options[:is_html] ? html_string(options) : attributed_string(options)
 
         CGContextSaveGState(context)
@@ -90,27 +92,33 @@ module MotionPrime
     end
 
     def size_to_fit_if_needed
-      if computed_options[:size_to_fit]
-        computed_options[:width] ||= cached_content_outer_width
-        computed_options[:height] ||= cached_content_outer_height
+      if original_options[:size_to_fit]
+        computed_options[:width] = cached_content_outer_width unless original_options[:width]
+        computed_options[:height] = cached_content_outer_height unless original_options[:height]
         reset_computed_values
-      elsif computed_options.slice(:width, :left, :right).values.none?
-        computed_options[:width] ||= cached_content_outer_width
+      elsif !original_options[:width] && (!original_options[:left] || !original_options[:right])
+        computed_options[:width] = cached_content_outer_width unless original_options[:width]
         reset_computed_values
-      elsif computed_options.slice(:height, :top, :bottom).values.none?
-        computed_options[:height] ||= cached_content_outer_height
+      elsif original_options.slice(:height, :top, :bottom).values.none?
+        computed_options[:height] = cached_content_outer_height unless original_options[:height]
         reset_computed_values
       end
     end
 
     def set_text_position
-      if computed_options.slice(:padding_top, :padding_bottom, :padding).values.none?
+      # FIXME: there is a bug when overriding this method for custom fonts (adjust @padding_top), you must set 'padding' to 0
+      if original_options.slice(:padding_top, :padding_bottom, :padding, :size_to_fit).values.none?
         computed_options[:width] ||= frame_width
+        frame_height = computed_options[:height] || frame_outer_height
         content_height = cached_content_height
-        content_height = frame_outer_height if content_height > frame_outer_height
-        @padding_top = (frame_outer_height - content_height)/2
+        content_height = frame_height if content_height > frame_height
+        @padding_top = (frame_height - content_height)/2
         # @padding_top += 1 unless @padding_top.zero?
       end
     end
+
+    def original_options
+      @_original_options ||= computed_options.clone
+    end
   end
 end

data/motion-prime/elements/draw/view.rb

@@ -4,6 +4,7 @@ module MotionPrime
     include DrawBackgroundMixin
 
     def draw_in(rect)
+      super
       draw_in_context(UIGraphicsGetCurrentContext())
     end
 

data/motion-prime/models/_association_mixin.rb

@@ -89,7 +89,7 @@ module MotionPrime
         define_method("#{association_name}_attributes=") do |value|
           bags_attributes = self.send(association_name).try(:bags_attributes) || {}
           self.send(bag_name).clear
-          association = association_name.classify.constantize.new
+          association = options.fetch(:class_name, association_name.classify).constantize.new
           association.info.merge!(bags_attributes)
           association.fetch_with_attributes(value)
           self.send(:"#{bag_name}") << association
@@ -120,7 +120,7 @@ module MotionPrime
 
           pending_save_counter = 0
           collection = value.inject({}) do |result, attrs|
-            model = association_name.classify.constantize.new
+            model = options.fetch(:class_name, association_name.classify).constantize.new
             model.info.merge!(bags_attributes.fetch(attrs[:id], {}))
             model.fetch_with_attributes(attrs)
             unique_key = model.id || "pending_#{pending_save_counter+=1}"
@@ -138,6 +138,7 @@ module MotionPrime
           bag = self.send(:"#{bag_name}")
           collection_options = {
             association_name: association_name,
+            class_name: options.fetch(:class_name, association_name.classify),
             inverse_relation: {
               type: :has_one,
               name: self.class_name_without_kvo.demodulize.underscore,
@@ -152,7 +153,7 @@ module MotionPrime
         self._associations ||= {}
         self._associations[association_name] = {
           type: :belongs_to_one,
-          class_name: association_name.classify
+          class_name: options.fetch(:class_name, association_name.classify)
         }.merge(options)
 
         self.send(:attr_accessor, association_name)

data/motion-prime/models/_sync_mixin.rb

@@ -284,7 +284,8 @@ module MotionPrime
 
       track_changed_attributes do
         old_collection = self.send(key)
-        model_class = key.classify.constantize
+        association_options = associations[key]
+        model_class = association_options.fetch(:class_name, key.classify).constantize
 
         data.each do |attributes|
           model = old_collection.detect{ |model| model.id == attributes[:id]}

data/motion-prime/models/association_collection.rb

@@ -2,12 +2,13 @@ module MotionPrime
   class AssociationCollection < ::Array
     include FilterMixin
 
-    attr_reader :bag, :association_name
+    attr_reader :bag, :association_name, :model_class
     attr_reader :inverse_relation_name, :inverse_relation_key, :model_inverse_relation_name
 
     def initialize(bag, options, *args)
       @bag = bag
       @association_name = options[:association_name]
+      @model_class = options[:class_name].constantize
       bag.bare_class = model_class
 
       inverse_relation_options = options[:inverse_relation]
@@ -91,10 +92,6 @@ module MotionPrime
       data
     end
 
-    def model_class
-      @model_class ||= @association_name.classify.constantize
-    end
-
     # Remove all association records.
     #
     # @example:

data/motion-prime/screens/_navigation_mixin.rb

@@ -23,7 +23,7 @@ module MotionPrime
 
     # @return screen [Prime::Screen] screen appearing after close
     def close_screen(args = {})
-      args[:animated] = args.has_key?(:animated) ? args[:animated] : true
+      args[:animated] = args.fetch(:animated, true)
       # Pop current view, maybe with arguments, if in navigation controller
       if modal?
         close_screen_modal(args)

data/motion-prime/screens/controllers/tab_bar_controller.rb

@@ -53,11 +53,11 @@ module MotionPrime
       def self.extract_image_from_options(options, with_key: key)
         image = options.delete(key)
         return unless image
-        image = image.uiimage
-        if options[:translucent] === false
-          image = image.imageWithRenderingMode UIImageRenderingModeAlwaysOriginal
+        ui_image = image.uiimage
+        if ui_image && options[:translucent] === false
+          ui_image = ui_image.imageWithRenderingMode UIImageRenderingModeAlwaysOriginal
         end
-        image
+        ui_image
       end
   end
 end

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

@@ -16,6 +16,12 @@ module MotionPrime
       navigationItem.rightBarButtonItem = create_navigation_button(title, args, &block)
     end
 
+    def set_navigation_right_buttons(options)
+      navigationItem.rightBarButtonItems = options.map do |button_options|
+        create_navigation_button(button_options.delete(:title), button_options)
+      end
+    end
+
     def set_navigation_left_button(title, args = {}, &block)
       navigationItem.leftBarButtonItem = create_navigation_button(title, args, &block)
     end
@@ -65,9 +71,9 @@ module MotionPrime
     end
 
     def create_navigation_button_with_title(title, args)
-      image = args[:icon].uiimage if args[:icon]
+      ui_image = args[:icon].uiimage if args[:icon]
       face = UIButton.buttonWithType UIButtonTypeCustom
-      face.setImage(image, forState: UIControlStateNormal) if args[:icon]
+      face.setImage(ui_image, forState: UIControlStateNormal) if ui_image
       face.setTitle(title, forState: UIControlStateNormal)
       face.setTitleColor((args[:title_color] || :app_navigation_base).uicolor, forState: UIControlStateNormal)
       face.setContentHorizontalAlignment UIControlContentHorizontalAlignmentLeft
@@ -79,10 +85,14 @@ module MotionPrime
     end
 
     def create_navigation_button_with_image(title, args)
-      image = args[:image].uiimage
       face = UIButton.buttonWithType UIButtonTypeCustom
-      face.bounds = CGRectMake(0, 0, image.size.width, image.size.height)
-      face.setImage image, forState: UIControlStateNormal
+      if ui_image = args[:image].uiimage
+        ui_image = ui_image.imageWithRenderingMode(2) if args[:tint_color].present?
+        face.bounds = CGRectMake(0, 0, ui_image.size.width, ui_image.size.height)
+        face.setImage ui_image, forState: UIControlStateNormal
+      end
+      face.setTintColor(args[:tint_color].uicolor) if args[:tint_color]
+      face.setImageEdgeInsets(UIEdgeInsetsMake(0, args[:offset_x], 0, -args[:offset_x])) if args[:offset_x]
       face.on :touch do
         args[:action].to_proc.call(args[:target] || self)
       end if args[:action]

data/motion-prime/sections/_async_table_mixin.rb

@@ -55,10 +55,10 @@ module Prime
     #
     # @param from_index [NSIndexPath] Value of first index to load if current sheduled index not exists.
     # @return [NSIndexPath, Boolean] Index of next sheduled index.
-    def preload_sections_after(from_index)
+    def preload_sections_after(from_index, load_limit = nil)
       return unless async_data?
       service = preloader_index_service
-      load_limit = self.class.async_data_options.try(:[], :preload_cells_count)
+      load_limit ||= self.class.async_data_options.try(:[], :preload_cells_count)
 
       if @preloader_next_starts_from
         index_to_start_preloading = service.sum_index(@preloader_next_starts_from, load_limit ? -load_limit/2 : 0)
@@ -70,6 +70,7 @@ module Prime
       current_group = from_index.section
       left_to_load_in_group = cell_sections_for_group(current_group).count - from_index.row
       load_count = [left_to_load_in_group, load_limit].compact.min
+
       to_index = service.sum_index(from_index, load_count - 1)
       @preloader_next_starts_from = to_index
 
@@ -90,6 +91,11 @@ module Prime
 
       load_count = to_index.row - from_index.row + 1
       preload_sections_schedule_from(from_index, load_count) if load_count > 0
+
+      # quota_left = (load_limit || 0) - load_count
+      # if quota_left > 0 && cell_sections_for_group(current_group + 1).any?
+      #   preload_sections_after(NSIndexPath.indexPathForRow(0, inSection: current_group + 1), quota_left)
+      # end
     end
 
     # Schedules preloading sections starting with given index with given limit.

data/motion-prime/sections/_draw_section_mixin.rb

@@ -86,7 +86,7 @@ module MotionPrime
 
       def on_container_tap_gesture(recognizer)
         target = Array.wrap(container_gesture_recognizers).detect do |gesture_data|
-          point = recognizer.locationInView(container_view)
+          point = recognizer.locationInView(container_view.respond_to?(:content_view) ? container_view.content_view : container_view)
           element = gesture_data[:element]
           section = element.section
           if section.has_container_bounds?

data/motion-prime/sections/_section_with_container_mixin.rb

@@ -26,6 +26,7 @@ module MotionPrime
 
     def load_container_with_elements(options = {})
       init_container_element(options[:container] || {})
+      # FIXME: does not work for grid sections
       @container_element.compute_options! unless @container_element.computed_options
       compute_element_options(options[:elements] || {})
 

data/motion-prime/sections/abstract_collection.rb

@@ -245,6 +245,13 @@ module MotionPrime
       display_pending_cells unless @decelerating = will_decelerate
     end
 
+    def on_input_change(text_field); end
+    def on_input_edit_begin(text_field); end
+    def on_input_edit_end(text_field); end
+    def on_input_return(text_field)
+      text_field.resignFirstResponder
+    end
+
     private
       def cached_cell(index)
       end

data/motion-prime/sections/base_section.rb

@@ -54,7 +54,7 @@ module MotionPrime
     end
 
     def strong_references
-      [screen, screen.main_controller]
+      [screen, screen.try(:main_controller)]
     end
 
     def container_bounds

data/motion-prime/sections/form.rb

@@ -140,14 +140,6 @@ module MotionPrime
       :base_form
     end
 
-    # ALIASES
-    def on_input_change(text_field); end
-    def on_input_edit_begin(text_field); end
-    def on_input_edit_end(text_field); end
-    def on_input_return(text_field)
-      text_field.resignFirstResponder
-    end
-
     def allow_string_replacement?(target, limit, range, string)
       if string.length.zero? || (range.length + limit - target.text.length) >= string.length
         true

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

@@ -130,7 +130,7 @@ module MotionPrime
     end
 
     def observing_errors?
-      @errors_observer_options.present?
+      @errors_observer_options.present? && observing_errors_for.present?
     end
 
     def has_errors?

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

@@ -1,19 +1,6 @@
 motion_require '../table/table_delegate'
 module MotionPrime
   class FormDelegate < TableDelegate
-    def textFieldShouldReturn(text_field)
-      table_section.on_input_return(text_field)
-    end
-    def textFieldShouldBeginEditing(text_field)
-      text_field.respond_to?(:readonly) ? !text_field.readonly : true
-    end
-    def textFieldDidBeginEditing(text_field)
-      table_section.on_input_edit_begin(text_field)
-    end
-    def textFieldDidEndEditing(text_field)
-      table_section.on_input_edit_end(text_field)
-    end
-
     def textField(text_field, shouldChangeCharactersInRange:range, replacementString:string)
       limit = (table_section.class.text_field_limits || {}).find do |field_name, limit|
         table_section.view("#{field_name}:input") == text_field
@@ -22,25 +9,6 @@ module MotionPrime
       table_section.allow_string_replacement?(text_field, limit, range, string)
     end
 
-    def textViewDidBeginEditing(text_view)
-      table_section.on_input_edit_begin(text_view)
-    end
-    def textViewDidEndEditing(text_view)
-      table_section.on_input_edit_end(text_view)
-    end
-    def textViewDidChange(text_view) # bug in iOS 7 - cursor is out of textView bounds
-      line = text_view.caretRectForPosition(text_view.selectedTextRange.start)
-      overflow = line.origin.y + line.size.height -
-        (text_view.contentOffset.y + text_view.bounds.size.height - text_view.contentInset.bottom - text_view.contentInset.top)
-      if overflow > 0
-        offset = text_view.contentOffset
-        offset.y += overflow + text_view.textContainerInset.bottom
-        UIView.animate(duration: 0.2) do
-          text_view.setContentOffset(offset)
-        end
-      end
-    end
-
     def textView(text_view, shouldChangeTextInRange:range, replacementText:string)
       textField(text_view, shouldChangeCharactersInRange:range, replacementString:string)
     end

data/motion-prime/sections/table.rb

@@ -57,7 +57,7 @@ module MotionPrime
         index = index_for_cell_section(section)
         next Prime.logger.debug("Reload section: `#{section.name}` is not in the list") unless index
         paths << index
-        block.call(section, index, counter)
+        block.call(section, index, counter) if block_given?
         deque_cell(section, at: index) # deque cached
         section.reload
       end

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

@@ -75,5 +75,36 @@ module MotionPrime
     def scrollViewDidEndDragging(scroll, willDecelerate: will_decelerate)
       table_section.scroll_view_did_end_dragging(scroll, willDecelerate: will_decelerate)
     end
+
+    def textFieldShouldReturn(text_field)
+      table_section.on_input_return(text_field)
+    end
+    def textFieldShouldBeginEditing(text_field)
+      text_field.respond_to?(:readonly) ? !text_field.readonly : true
+    end
+    def textFieldDidBeginEditing(text_field)
+      table_section.on_input_edit_begin(text_field)
+    end
+    def textFieldDidEndEditing(text_field)
+      table_section.on_input_edit_end(text_field)
+    end
+    def textViewDidBeginEditing(text_view)
+      table_section.on_input_edit_begin(text_view)
+    end
+    def textViewDidEndEditing(text_view)
+      table_section.on_input_edit_end(text_view)
+    end
+    def textViewDidChange(text_view) # bug in iOS 7 - cursor is out of textView bounds
+      line = text_view.caretRectForPosition(text_view.selectedTextRange.start)
+      overflow = line.origin.y + line.size.height -
+        (text_view.contentOffset.y + text_view.bounds.size.height - text_view.contentInset.bottom - text_view.contentInset.top)
+      if overflow > 0
+        offset = text_view.contentOffset
+        offset.y += overflow + text_view.textContainerInset.bottom
+        UIView.animate(duration: 0.2) do
+          text_view.setContentOffset(offset)
+        end
+      end
+    end
   end
 end

data/motion-prime/support/consts.rb

@@ -11,6 +11,13 @@ UIControlContentVerticalAlignmentBottom
 UIControlContentVerticalAlignmentFill
 
 if defined?(ALAssetsLibrary)
+  ALAssetsLibrary
+end
+
+if defined?(ALAuthorizationStatusNotDetermined)
   ALAuthorizationStatusNotDetermined
+end
+
+if defined?(ALAssetsGroupAll)
   ALAssetsGroupAll
-end
+end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/motion-prime/views/_frame_calculator_mixin.rb

@@ -7,7 +7,6 @@ module MotionPrime
       right   = options[:right]
       bottom  = options[:bottom]
       left    = options[:left]
-
       value_type = options[:value_type].to_s # absolute/relative
 
       if options[:height_to_fit].present? && height.nil? && (top.nil? || bottom.nil?)

data/motion-prime/views/view_builder.rb

@@ -67,12 +67,12 @@ module MotionPrime
             if image.nil?
               klass.alloc.initWithFrame CGRectZero
             else
-              image = image.uiimage
-              image = image.imageWithRenderingMode(2) if options[:tint_color].present?
+              ui_image = image.uiimage
+              ui_image = ui_image.imageWithRenderingMode(2) if options[:tint_color].present?
               if highlighted_image.nil?
-                klass.alloc.initWithImage image.uiimage
+                klass.alloc.initWithImage ui_image
               else
-                klass.alloc.initWithImage image.uiimage, highlightedImage: highlighted_image.uiimage
+                klass.alloc.initWithImage ui_image, highlightedImage: highlighted_image.uiimage
               end
             end
           },
@@ -109,7 +109,9 @@ module MotionPrime
           'UICollectionView' => Proc.new{|klass, options|
             unless layout = options.delete(:layout)
               layout = UICollectionViewFlowLayout.alloc.init
-              total_width = options[:parent_bounds].size.width / (options.delete(:grid_size) || 3)
+
+              width = options[:width] || options[:parent_bounds].size.width
+              total_width = width / (options.delete(:grid_size) || 3)
               if horizontal_spacing = options.delete(:horizontal_spacing)
                 layout.setMinimumInteritemSpacing horizontal_spacing
               end

data/motion-prime/views/view_styler.rb

@@ -135,11 +135,11 @@ module MotionPrime
       end
 
       def set_image_options(key, value)
-        if key.end_with?('background_image')
+        if key.end_with?('background_image') && ui_image = value.uiimage
           if view.is_a?(UIControl) || view.is_a?(UISearchBar)
-            view.send :"set#{camelize_factory(key)}:forState", value.uiimage, UIControlStateNormal
+            view.send :"set#{camelize_factory(key)}:forState", ui_image, UIControlStateNormal
           else
-            view.setBackgroundColor value.uiimage.uicolor
+            view.setBackgroundColor ui_image.uicolor
           end
           true
         elsif key.end_with?('background_view')
@@ -152,7 +152,10 @@ module MotionPrime
           end
           true
         elsif key.end_with?('image')
-          view.setValue value.uiimage, forKey: camelize_factory(key)
+          if ui_image = value.uiimage
+            ui_image = ui_image.imageWithRenderingMode(2) if options[:tint_color]
+            view.setValue ui_image, forKey: camelize_factory(key)
+          end
           true
         end
       end
@@ -189,7 +192,7 @@ module MotionPrime
           current_inset.send("#{key.partition('_').first}=", value)
           view.contentInset = current_inset
           true
-        elsif key.end_with?('inset') || key.end_with?('indicator_insets')
+        elsif key.end_with?('inset') || key.end_with?('indicator_insets') || (key.end_with?('insets') && value.is_a?(Array))
           inset = if value.to_s == 'none'
             UIEdgeInsetsMake(0, 320, 0, 0)
           elsif value.is_a?(Array) && value.count == 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake