motion-prime 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b5a8d65686ce22cebae1f6a18212692367805be
-  data.tar.gz: 3e66ba6bf3966649c60a86210fdad3165a5822a2
+  metadata.gz: c05d314976c62a856091891705c135ec7efcec22
+  data.tar.gz: c36d99bc5fbd5c2220d0eac3677d87dbc0acf4b8
 SHA512:
-  metadata.gz: 599c6c60f50516854af50238bcbfd1e09a6d2e248e8687c9436672bbe9b7c86192d36c642e0a647da3f04667a57411df4de03aa557efec3a32511738fffad736
-  data.tar.gz: 04eadebb2e6967e2abb9ff613bdbc1c38632ec2b907442df57c54ddcd19f3b0477ec6592093ba100cb44c5f6e91f17f769c25fbfadc39989072686ad346e4a7f
+  metadata.gz: 89864fab09b0b64a7c1ad1610300141c5ae60296a4a858e7abb83ceecf1277ebd3ff027886a061e1e022e1df551e9270b24f435a12f33d34973e7d4940d72e35
+  data.tar.gz: 6c83f9726a57b620a1d2f93fd0e8e8b2089d3e71de9f5bea27acd279f98ad9a9f536bd247d1b4fd42822cc31341510d3ce82316eba8b49314ca8a71ee7dc5829

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+=== 1.0.4
+* Multiple bug fixes
+* Model#save will be performed on main thread (now you can fetch models in thread)
+* Improved support for UIPageViewController
+
 === 1.0.3
 * Fixed issue with overriding background color
 * Improved support for UIPageViewController

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (1.0.3)
+    motion-prime (1.0.4)
       activesupport
       afmotion (~> 2.1.0)
       bubble-wrap (~> 1.6.0)

data/ROADMAP.md

@@ -1,4 +1,5 @@
 === 1.1.0
+* Model.fetch should always return status of main model fetch response
 * grid item width should be calculated based on uicollectionview with.
 * ability to change access token param name.
 * bug: if mp label do not have text and was set as hidden, it should unhide after setting text.
@@ -7,6 +8,8 @@
 * bug: dealloc of Prime::Section will not be called for cell created in collection_data using #map.
 * bug: images does not render after reload table if using draw_with_layer (prerender not enabled).
 * bug: incorrect height (cropped) for draw label with lineSpacing in cases when there is just one line.
+* use one style to set rounded corners for view/draw elements (remove :rounded_corners option)
+* add :sides option to BaseElement border (like in draw)
 * add dsl for push notifications.
 * add some extensions/middleware system, at least for networking.
 * create "display_network_error" extension.

data/files/Gemfile

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

data/lib/motion-prime.rb

@@ -18,7 +18,7 @@ Motion::Project::App.setup do |app|
   app.pods do
     pod 'NanoStore', '~> 2.7.7'
     pod 'SDWebImage'
-    pod 'SVPullToRefresh', git: 'git@github.com:droidlabs/SVPullToRefresh.git'
+    pod 'SVPullToRefresh', git: 'https://github.com/droidlabs/SVPullToRefresh.git'
     pod 'MBAlertView'
     pod 'MBProgressHUD', '~> 0.8'
   end

data/motion-prime/api_client.rb

@@ -43,13 +43,12 @@ class ApiClient
   end
 
   def page_url(path)
-    "#{config.base}#{path}"
+    path_with_base(path, config.base)
   end
 
   def resource_url(path)
-    # return if path.blank?
     base = config.resource_base? ? config.resource_base : config.base
-    "#{base}#{path}"
+    path_with_base(path, base)
   end
 
   def request(method, path, params = {}, options = {}, &block)
@@ -73,7 +72,7 @@ class ApiClient
 
   def request!(method, path, data, files = nil, options = {}, &block)
     use_callback = block_given?
-    path = "#{config.api_namespace}#{path}" unless path.starts_with?('http')
+    path = path_with_base(path, config.api_namespace)
     client_method = files.present? ? :"multipart_#{method}" : method
     AFMotion::Client.shared.send client_method, path, data do |response, form_data, progress|
       if form_data && files.present?
@@ -131,7 +130,6 @@ class ApiClient
 
   # TODO: temporary solution, add real caching system here
   def read_cache(key)
-    puts "read cache #{key}"
     @cache ||= {}
     @cache[key]
   end
@@ -143,6 +141,10 @@ class ApiClient
   end
 
   protected
+    def path_with_base(path, base)
+      path.to_s.starts_with?('http') ? path : "#{base}#{path}"
+    end
+
     def allow_queue?(method, path, options)
       options[:allow_queue] && config.allow_queue?
     end

data/motion-prime/elements/_content_text_mixin.rb

@@ -35,15 +35,22 @@ module MotionPrime
       @content_width = width_for_attributed_text(current_attributed_text)
     end
 
+    def multiline_content_width
+      unless computed_options[:width]
+        Prime.logger.error "Please set element width for multiline content width calculation (`#{self.name}` in section `#{section.try(:name)}`)"
+      end
+      width_for_attributed_text(current_attributed_text, computed_options[:width] - content_padding_width)
+    end
+
     def width_for_text(text)
       width_for_attributed_text(attributed_text_for_text(text))
     end
 
-    def width_for_attributed_text(attributed_text)
+    def width_for_attributed_text(attributed_text, width = Float::MAX)
       min, max = computed_options[:min_width].to_f, computed_options[:max_width]
       return min if attributed_text.to_s.blank?
 
-      rect = get_content_rect(attributed_text, Float::MAX)
+      rect = get_content_rect(attributed_text, width)
       [[rect.size.width.ceil, max].compact.min, min].max.ceil
     end
 
@@ -61,6 +68,9 @@ module MotionPrime
 
     def height_for_attributed_text(attributed_text)
       min, max = computed_options[:min_height].to_f, computed_options[:max_height]
+      unless computed_options[:width]
+        Prime.logger.error "Please set element width for content height calculation (`#{self.name}` in section `#{section.try(:name)}`)"
+      end
       return min if attributed_text.to_s.blank?
       rect = get_content_rect(attributed_text, computed_options[:width] - content_padding_width)
       [[rect.size.height.ceil, max].compact.min, min].max.ceil
@@ -92,7 +102,7 @@ module MotionPrime
       end
 
       def button_content_font
-        computed_options[:title_label].try(:[], :font)
+        extract_font_from(computed_options[:title_label])
       end
 
       def input_content_text
@@ -101,7 +111,7 @@ module MotionPrime
 
       # TODO: normalize_object will not be required after refactoring computed options.
       def input_content_font
-        font = input_value_text.blank? ? computed_options[:placeholder_font] : computed_options[:font]
+        font = input_value_text.blank? ? extract_font_from(computed_options, 'placeholder') : extract_font_from(computed_options)
         normalize_object(font, section || self)
       end
 

data/motion-prime/elements/_text_mixin.rb

@@ -71,8 +71,12 @@ module MotionPrime
         end
         attributes[NSParagraphStyleAttributeName] = paragrah_style
       end
-      attributes[NSForegroundColorAttributeName] = options[:text_color].uicolor if options[:text_color]
-      attributes[NSFontAttributeName] = options[:font].uifont if options[:font]
+      if color = options[:text_color] || options[:title_color]
+        attributes[NSForegroundColorAttributeName] = color.uicolor
+      end
+      if font = extract_font_from(options)
+        attributes[NSFontAttributeName] = font.uifont
+      end
       [attributes, paragrah_style]
     end
   end

data/motion-prime/elements/base_element.rb

@@ -1,6 +1,7 @@
 motion_require '../helpers/has_normalizer'
 motion_require '../helpers/has_style_chain_builder'
 motion_require '../helpers/has_class_factory'
+motion_require '../helpers/has_style_options'
 module MotionPrime
   class BaseElement
     # MotionPrime::BaseElement is container for UIView class elements with options.
@@ -10,6 +11,7 @@ module MotionPrime
     include HasNormalizer
     include HasStyleChainBuilder
     include HasClassFactory
+    include HasStyleOptions
     extend HasClassFactory
 
     attr_accessor :options, :section, :name,
@@ -54,6 +56,14 @@ module MotionPrime
       self.view.addTarget(target || section, action: action, forControlEvents: event.uicontrolevent)
     end
 
+    def notify_section_before_render
+      section.try(:before_element_render, self)
+    end
+
+    def notify_section_after_render
+      section.try(:after_element_render, self)
+    end
+
     def render(options = {}, &block)
       run_callbacks :render do
         render!(options, &block)
@@ -82,10 +92,10 @@ module MotionPrime
       block_options = compute_block_options || {}
       raw_options = self.options.except(:screen, :name, :block, :view_class).merge(block_options)
       compute_style_options(raw_options)
-      raw_options = Styles.for(styles).merge(raw_options)
+      raw_options = Styles.for(styles).deep_merge(raw_options)
       @computed_options = raw_options
       normalize_options(@computed_options, section.try(:elements_eval_object), %w[
-        font text placeholder title_label
+        font font_name font_size text placeholder 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])
@@ -104,18 +114,27 @@ module MotionPrime
       if (changed_options & [:text, :size_to_fit]).any? && respond_to?(:size_to_fit)
         size_to_fit
       end
-      section.try(:on_element_render, self)
     end
 
     def update_with_options(new_options = {})
-      options.merge!(new_options)
+      options.deep_merge!(new_options)
       reload!
+      computed_options.deep_merge!(new_options)
       rerender!(new_options.keys)
     end
 
     def update_options(new_options)
-      options.merge!(new_options)
+      options.deep_merge!(new_options)
       return unless view
+
+      required_options = if new_options.slice(:width, :height, :top, :left, :right, :bottom).any?
+        new_options[:calculate_frame] = true
+        [:width, :height, :top, :left, :right, :bottom]
+      elsif new_options.slice(:text, :title).any?
+        [:line_spacing, :line_height, :underline, :fragment_color, :text_alignment, :font, :font_name, :font_size, :line_break_mode, :number_of_lines]
+      end
+      new_options = computed_options.slice(*Array.wrap(required_options)).merge(new_options)
+
       ViewStyler.new(view, view.superview.try(:bounds), new_options).apply
     end
 
@@ -161,11 +180,10 @@ module MotionPrime
       end
 
       def compute_style_options(*style_sources)
-        has_errors = section.respond_to?(:observing_errors?) && observing_errors? && has_errors?
-
         @styles = []
         if cell_section?
-          @styles += compute_cell_style_options(style_sources, has_errors)
+          suffixes = section.style_suffixes if section.respond_to?(:style_suffixes)
+          @styles += compute_cell_style_options(style_sources, Array.wrap(suffixes))
         end
 
         mixins = []
@@ -189,11 +207,11 @@ module MotionPrime
 
         # custom style (from options or block options), using for TableViews as well
         @styles += custom_styles
-        # pp @view_class.to_s + @styles.inspect; puts()
+        # pp(@view_class.to_s + @styles.inspect); puts()
         @styles
       end
 
-      def compute_cell_style_options(style_sources, has_errors)
+      def compute_cell_style_options(style_sources, additional_suffixes)
         base_styles = {common: [], specific: []}
         suffixes = {common: [], specific: []}
         all_styles = []
@@ -208,13 +226,17 @@ module MotionPrime
           # form element: _input
           # table element: _image
           suffixes[:common] << @view_name.to_sym
-          suffixes[:common] << :"#{@view_name}_with_errors" if has_errors
+          additional_suffixes.each do |additional_suffix|
+            suffixes[:common] << [@view_name, additional_suffix].join('_').to_sym
+          end
         end
         if name && name.to_s != @view_name
           # form element: _input
           # table element: _icon
           suffixes[:specific] << name.to_sym
-          suffixes[:specific] << :"#{name}_with_errors" if has_errors
+          additional_suffixes.each do |additional_suffix|
+            suffixes[:specific] << [name, additional_suffix].join('_').to_sym
+          end
         end
         # form cell: base_form_field, base_form_string_field
         # form element: base_form_field_string_field, base_form_string_field_text_field, base_form_string_field_input
@@ -259,5 +281,8 @@ module MotionPrime
         set_callback :render, :after, method_name
       end
     end
+
+    before_render :notify_section_before_render
+    after_render :notify_section_after_render
   end
 end

data/motion-prime/elements/button.rb

@@ -22,7 +22,7 @@ module MotionPrime
     end
 
     def font
-      computed_options[:title_label].try(:[], :font) || :system.uifont
+      extract_font_from(computed_options[:title_label]) || :system.uifont
     end
   end
 end

data/motion-prime/elements/draw.rb

@@ -17,12 +17,18 @@ module MotionPrime
         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),
       }
     end
 
     def render!; end
 
+    def on_container_render
+      @view = nil
+      @computed_frame = nil
+    end
+
     def view
       @view ||= section.container_view
     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, corner_radius, dashes_array = options.slice(:rect, :background_color, :border_width, :border_color, :corner_radius, :dashes).values
+      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
 
       return unless background_color || border_width > 0
 
@@ -34,7 +34,38 @@ module MotionPrime
           CGContextSetLineDash(context, dashes_array.count, dashes, 0) if dashes
           CGContextSetLineWidth(context, border_width)
           CGContextSetStrokeColorWithColor(context, border_color.uicolor.cgcolor)
-          CGContextStrokeRect(context, rect)
+          if border_sides.present?
+            points = [
+              [rect.origin.x, rect.origin.y],
+              [rect.origin.x + rect.size.width, rect.origin.y],
+              [rect.origin.x + rect.size.width, rect.origin.y + rect.size.height],
+              [rect.origin.x, rect.origin.y + rect.size.height]
+            ]
+            CGContextMoveToPoint(context, *points[0])
+            if border_sides.include?(:top)
+              CGContextAddLineToPoint(context, *points[1])
+            else
+              CGContextMoveToPoint(context, *points[1])
+            end
+            if border_sides.include?(:right)
+              CGContextAddLineToPoint(context, *points[2])
+            else
+              CGContextMoveToPoint(context, *points[2])
+            end
+            if border_sides.include?(:bottom)
+              CGContextAddLineToPoint(context, *points[3])
+            else
+              CGContextMoveToPoint(context, *points[3])
+            end
+            if border_sides.include?(:left)
+              CGContextAddLineToPoint(context, *points[0])
+            else
+              CGContextMoveToPoint(context, *points[0])
+            end
+            CGContextStrokePath(context)
+          else
+            CGContextStrokeRect(context, rect)
+          end
         end
         CGContextSetFillColorWithColor(context, background_color.uicolor.cgcolor) if background_color
         CGContextFillRect(context, rect) if background_color

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

@@ -9,7 +9,10 @@ module MotionPrime
       image ||= computed_options[:default] if computed_options[:url]
 
       # already initialized image or image from resources or default image
-      super.merge({image: image.try(:uiimage)})
+      super.merge({
+        image: image.try(:uiimage),
+        inner_rect: CGRectMake(frame_inner_left, frame_inner_top, frame_width, frame_height)
+      })
     end
 
     def draw_in(rect)
@@ -32,7 +35,7 @@ module MotionPrime
 
       border_width = options[:border_width]
       inset = border_width > 0 ? (border_width - 1 ).abs*0.5 : 0
-      rect = CGRectInset(options[:rect], inset, inset)
+      rect = CGRectInset(options[:inner_rect], inset, inset)
       radius = options[:corner_radius].to_f if options[:corner_radius] && options[:masks_to_bounds]
 
       UIGraphicsPushContext(context)
@@ -52,9 +55,9 @@ module MotionPrime
 
     def draw_with_layer
       options = draw_options
-      @layer.removeFromSuperlayer if @layer
+      @layer.try(:removeFromSuperlayer)
       return unless image = options[:image]
-      rect = options[:rect]
+      rect = options[:inner_rect]
       radius = options[:corner_radius].to_f if options[:corner_radius] && options[:masks_to_bounds]
 
       @layer = CALayer.layer
@@ -106,8 +109,9 @@ module MotionPrime
     end
 
     def update_with_options(new_options = {})
+      self.image_data = nil if new_options.slice(:url, :image).any? || new_options.blank?
+      @layer.try(:removeFromSuperlayer)
       super
-      self.image_data = nil if new_options.slice(:url, :image).any?
     end
   end
 end

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

@@ -9,7 +9,7 @@ module MotionPrime
       options = computed_options
       text = (options[:html] || options[:text]).to_s.gsub(/\A[\n\r]+/, '')
       text_color = (options[:text_color] || :black).uicolor
-      font = (options[:font] || :system).uifont
+      font = (extract_font_from(options) || :system).uifont
 
       text_alignment_name = options.fetch(:text_alignment, :left)
       text_alignment = text_alignment_name.nstextalignment

data/motion-prime/elements/label.rb

@@ -31,7 +31,7 @@ module MotionPrime
     end
 
     def set_text(value)
-      computed_options[:text] = value
+      options[:text] = computed_options[:text] = value
       styler = ViewStyler.new(view, CGRectZero, computed_options)
       if styler.options[:attributed_text]
         view.attributedText = styler.options[:attributed_text]