motion-prime 0.2.1 → 0.3.0

data/motion-prime/config/base.rb

@@ -10,4 +10,9 @@ MotionPrime::Config.font.name = "Ubuntu"
 MotionPrime::Config.color do |color|
   color.base = 0x424242
   color.error = 0xef471f
+end
+MotionPrime::Config.api do |api|
+  api.base = "http://example.com"
+  api.client_id = ""
+  api.client_secret = ""
 end

data/motion-prime/core_ext/kernel.rb

@@ -0,0 +1,5 @@
+class Kernel
+  def class_name_without_kvo
+    self.class.name.gsub(/^NSKVONotifying_/, '')
+  end
+end

data/motion-prime/elements/_field_dimensions_mixin.rb

@@ -0,0 +1,43 @@
+module MotionPrime
+  module ElementFieldDimensionsMixin
+    def text_value
+      text = view ? view.text : computed_options[:text].to_s
+      text.empty? ? computed_options[:placeholder] : text
+    end
+
+    def font
+      computed_options[:font] || :system.uifont
+    end
+
+    def computed_width
+      min_width = computed_options[:min_width] || 20
+      return min_width if text_value.to_s.empty?
+
+      padding_left = view.try(:padding_left) || computed_options[:padding_left] || computed_options[:padding] || view_class.constantize::DEFAULT_PADDING_LEFT
+      padding_right = view.try(:padding_right) || computed_options[:padding_right] || padding_left
+      max_width = computed_options[:max_width] || Float::MAX
+
+      attributed_text = NSAttributedString.alloc.initWithString(text_value, attributes: {NSFontAttributeName => font })
+      rect = attributed_text.boundingRectWithSize([Float::MAX, Float::MAX], options:NSStringDrawingUsesLineFragmentOrigin, context:nil)
+
+      width = (rect.size.width + padding_left + padding_right).ceil
+      [[width, max_width].min, min_width].max
+    end
+
+    def computed_height
+      text = view ? view.titleLabel.text : computed_options[:title]
+      return 0 if text.blank?
+
+      width = computed_options[:width]
+      font = computed_options[:title_label][:font] || :system.uifont
+      raise "Please set element width for height calculation" unless width
+
+      attributes = {NSFontAttributeName => font }
+      attributed_text = NSAttributedString.alloc.initWithString(text, attributes: attributes)
+      rect = attributed_text.boundingRectWithSize([width, Float::MAX], options:NSStringDrawingUsesLineFragmentOrigin, context:nil)
+
+      padding_top = computed_options[:padding_top] || computed_options[:padding] || view.try(:default_padding_top)
+      rect.size.height + padding_top*2
+    end
+  end
+end

data/motion-prime/elements/_text_dimensions_mixin.rb

@@ -0,0 +1,39 @@
+module MotionPrime
+  module ElementTextDimensionsMixin
+    def content_height
+      text = view.try(:text) || computed_options[:text]
+      return 0 if text.blank?
+
+      width = computed_options[:width]
+      font = computed_options[:font] || :system.uifont
+      raise "Please set element width for height calculation" unless width
+
+      attributes = {NSFontAttributeName => font }
+      if computed_options[:line_spacing]
+        paragrahStyle = NSMutableParagraphStyle.alloc.init
+        paragrahStyle.setLineSpacing(computed_options[:line_spacing])
+        attributes[NSParagraphStyleAttributeName] = paragrahStyle
+      end
+      attributed_text = NSAttributedString.alloc.initWithString(computed_options[:text], attributes: attributes)
+      rect = attributed_text.boundingRectWithSize([width, Float::MAX], options:NSStringDrawingUsesLineFragmentOrigin, context:nil)
+      rect.size.height
+    end
+
+    def content_width
+      text = view.try(:text) || computed_options[:text]
+      return 0 if text.blank?
+
+      width = computed_options[:width]
+      font = computed_options[:font] || :system.uifont
+
+      attributed_text = NSAttributedString.alloc.initWithString(computed_options[:text], attributes: {NSFontAttributeName => font })
+      rect = attributed_text.boundingRectWithSize([Float::MAX, Float::MAX], options:NSStringDrawingUsesLineFragmentOrigin, context:nil)
+
+      rect.size.width
+    end
+
+    def content_outer_height
+      content_height + computed_inner_top + computed_inner_bottom
+    end
+  end
+end

data/motion-prime/elements/base.rb

@@ -1,4 +1,5 @@
 motion_require '../helpers/has_normalizer'
+motion_require '../helpers/has_style_chain_builder'
 module MotionPrime
   class BaseElement
     # MotionPrime::BaseElement is container for UIView class elements with options.
@@ -6,20 +7,21 @@ module MotionPrime
 
     include ::MotionSupport::Callbacks
     include HasNormalizer
+    include HasStyleChainBuilder
 
     attr_accessor :options, :section, :name,
                   :view_class, :view, :view_name, :styles, :screen
-
+    delegate :observing_errors?, :has_errors?, :errors_observer_fields, :observing_errors_for, to: :section, allow_nil: true
     define_callbacks :render
 
     def initialize(options = {})
       @options = options
       @section = options.delete(:section)
-      @observe_errors_for = options.delete(:observe_errors_for)
+
       @name = options[:name]
       @block = options.delete(:block)
       @view_class = options.delete(:view_class) || "UIView"
-      @view_name = self.class.name.demodulize.underscore.gsub('_element', '')
+      @view_name = self.class_name_without_kvo.demodulize.underscore.gsub('_element', '')
     end
 
     def render(options = {}, &block)
@@ -41,10 +43,12 @@ module MotionPrime
     end
 
     def compute_options!
-      @computed_options = normalize_options(options, section)
-      compute_block_options
-      compute_style_options
-      @computed_options = normalize_options(@computed_options, section)
+      @computed_options ||= {}
+      block_options = compute_block_options || {}
+      compute_style_options(options, block_options)
+      @computed_options.merge!(options)
+      @computed_options.merge!(block_options)
+      normalize_options(@computed_options, section, %w[text font title_label padding padding_left padding_right max_width width left right])
     end
 
     # Compute options sent inside block, e.g.
@@ -52,20 +56,37 @@ module MotionPrime
     #   {name: model.name}
     # end
     def compute_block_options
-      if block = @block
-        @computed_options.merge!(section.send :instance_eval, &block)
-      end
+      section.send(:instance_exec, self, &@block) if @block
     end
 
-    def compute_style_options
+    def compute_style_options(*style_sources)
       @styles = []
-      @styles << :"#{section.name}_#{name}" if section.present?
-      @styles << :"base_#{@view_name}"
-      if section && @observe_errors_for && @observe_errors_for.errors[section.name].present?
-        @styles << :"base_#{name}_with_errors"
+      base_styles = {common: [], specific: []}
+      suffixes = {common: [@view_name.to_sym, name.try(:to_sym)].compact, specific: []}
+
+      if section
+        field_section = section.respond_to?(:section_styles)
+        if field_section
+          section.section_styles.each { |type, values| base_styles[type] += values }
+        end
+        if section.respond_to?(:observing_errors?) && observing_errors? && has_errors?
+          suffixes[:common] += [:"#{name}_with_errors", :"#{@view_name}_with_errors"]
+        end
       end
-      custom_styles = @computed_options.delete(:styles)
-      @styles += [*custom_styles]
+
+      # common + specific base - common suffixes
+      @styles += build_styles_chain(base_styles[:common], suffixes[:common])
+      @styles << :"#{section.name}_#{name}" if section
+      @styles += build_styles_chain(base_styles[:specific], suffixes[:common])
+      # specific base - specific suffixes
+      @styles += build_styles_chain(base_styles[:specific], suffixes[:specific])
+      @styles << :"#{section.form.name}_field_#{section.name}_#{name}" if field_section
+      # custom style (from options or block options)
+      custom_styles = style_sources.map do |source|
+        normalize_object(source.delete(:styles), section)
+      end.compact.flatten
+      @styles += custom_styles
+      # puts @view_class.to_s + @styles.inspect, ''
       @computed_options.merge!(style_options)
     end
 
@@ -73,6 +94,8 @@ module MotionPrime
       Styles.for(styles)
     end
 
+    private
+
     class << self
       def factory(type, options = {})
         class_name = "#{type.classify}Element"

data/motion-prime/elements/button.rb

@@ -1,7 +1,27 @@
 module MotionPrime
   class ButtonElement < BaseElement
+    include MotionPrime::ElementFieldDimensionsMixin
+
+    after_render :size_to_fit
+
+    def size_to_fit
+      if computed_options[:size_to_fit] || style_options[:size_to_fit]
+        if computed_options[:width]
+          view.setHeight computed_height
+        end
+      end
+    end
+
     def view_class
       "DMButton"
     end
+
+    def text_value
+      view.try(:currentTitle) || computed_options[:title]
+    end
+
+    def font
+      computed_options[:title_label].try(:[], :font) || :system.uifont
+    end
   end
 end

data/motion-prime/elements/draw.rb

@@ -134,8 +134,8 @@ module MotionPrime
 
     def reset_computed_values
       [:left, :top, :right, :bottom, :width, :height].each do |key|
-        instance_variable_set "@compited_#{key}", nil
-        instance_variable_set "@compited_inner_#{key}", nil
+        instance_variable_set "@computed_#{key}", nil
+        instance_variable_set "@computed_inner_#{key}", nil
       end
     end
 

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

@@ -12,7 +12,7 @@ module MotionPrime
       )
       # draw already initialized image
       if image_data
-        image_data.drawInRect(image_rect)
+        draw_with_layer(image_data, image_rect)
       # draw image from resources
       elsif computed_options[:image]
         self.image_data = computed_options[:image].uiimage
@@ -50,10 +50,12 @@ module MotionPrime
 
         if radius = computed_options[:layer][:corner_radius]
           layer.masksToBounds = true
+          k = image.size.width / rect.size.width
+          radius = radius * k
           layer.cornerRadius = radius
         end
 
-        UIGraphicsBeginImageContext(image.size);
+        UIGraphicsBeginImageContext(image.size)
         layer.renderInContext(UIGraphicsGetCurrentContext())
         image = UIGraphicsGetImageFromCurrentImageContext()
         UIGraphicsEndImageContext()

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

@@ -1,7 +1,7 @@
 motion_require '../draw.rb'
 module MotionPrime
   class LabelDrawElement < DrawElement
-    include MotionPrime::ElementTextHeightMixin
+    include MotionPrime::ElementTextDimensionsMixin
 
     def draw_in(rect)
       options = computed_options

data/motion-prime/elements/error_message.rb

@@ -1,23 +1,10 @@
+motion_require './label'
 module MotionPrime
-  class ErrorMessageElement < BaseElement
-    include MotionPrime::ElementTextHeightMixin
-
-    after_render :size_to_fit
+  class ErrorMessageElement < LabelElement
+    include MotionPrime::ElementTextDimensionsMixin
 
     def view_class
       "UILabel"
     end
-
-    def size_to_fit
-      view.size.height = self.content_height
-    end
-
-    def computed_inner_top
-      computed_options[:top].to_i
-    end
-
-    def computed_inner_bottom
-      computed_options[:bottom].to_i
-    end
   end
 end

data/motion-prime/elements/label.rb

@@ -1,12 +1,23 @@
 module MotionPrime
   class LabelElement < BaseElement
-    include MotionPrime::ElementTextHeightMixin
+    include MotionPrime::ElementTextDimensionsMixin
 
+    before_render :size_to_fit_if_needed
     after_render :size_to_fit
 
     def size_to_fit
       if computed_options[:size_to_fit] || style_options[:size_to_fit]
-        view.sizeToFit
+        if computed_options[:width]
+          view.setHeight content_height + 2 # TODO maybe set width too as it can be wider
+        else
+          view.sizeToFit
+        end
+      end
+    end
+
+    def size_to_fit_if_needed
+      if computed_options[:size_to_fit] && computed_options[:width]
+        @computed_options[:height_to_fit] = content_height
       end
     end
 

data/motion-prime/elements/text_field.rb

@@ -1,5 +1,6 @@
 module MotionPrime
   class TextFieldElement < BaseElement
+    include MotionPrime::ElementFieldDimensionsMixin
     def view_class
       "DMTextField"
     end

data/motion-prime/helpers/cell_section.rb

@@ -0,0 +1,9 @@
+module MotionPrime
+  module CellSection
+    attr_accessor :cell_view
+
+    def cell
+      cell_view
+    end
+  end
+end

data/motion-prime/helpers/has_authorization.rb

@@ -1,9 +1,10 @@
 module MotionPrime
   module HasAuthorization
     def current_user
-      if defined?(User) && User.respond_to?(:current)
-        @current_user = User.current
-      end
+      App.delegate.current_user
+    end
+    def update_current_user
+      App.delegate.update_current_user
     end
     def user_signed_in?
       current_user.present?

data/motion-prime/helpers/has_normalizer.rb

@@ -1,13 +1,27 @@
 module MotionPrime
   module HasNormalizer
-    def normalize_options(options, receiver = nil)
-      receiver ||= self
+    def normalize_options(unordered_options, receiver = nil, order = 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|
-        options[key] = if option.is_a?(Proc)
-          receiver.send :instance_eval, &option
-        else
-          option
+        unordered_options[key] = normalize_object(option, receiver)
+      end
+    end
+
+    def normalize_object(object, receiver)
+      receiver ||= self
+      if object.is_a?(Proc)
+        receiver.send(:instance_exec, self, &object)
+      elsif object.is_a?(Hash)
+        object.inject({}) do |result, (key, nested_object)|
+          result.merge(key => normalize_object(nested_object, receiver))
         end
+      else
+        object
       end
     end
   end

data/motion-prime/helpers/has_search_bar.rb

@@ -1,19 +1,31 @@
 # This module adds search functionality, to Screen or TableSection
 module MotionPrime
   module HasSearchBar
-    def add_search_bar(&block)
-      search_bar = create_search_bar
+    def add_search_bar(options = {}, &block)
+      target = options.delete(:target)
+
+      search_bar = create_search_bar(options)
       search_bar.delegate = self
-      self.table_view.tableHeaderView = search_bar if is_a?(TableSection)
+
+      if target
+        target.addSubview search_bar
+      elsif is_a?(TableSection)
+        self.table_view.tableHeaderView = search_bar
+      end
+
       @search_callback = block
+      search_bar
     rescue
-      puts "can't add search bar to #{self.class.name}"
+      puts "can't add search bar to #{self.class_name_without_kvo}"
     end
 
-    def create_search_bar
-      name = is_a?(TableSection) ? name : self.class.name.underscore
+    def create_search_bar(options = {})
+      name = is_a?(TableSection) ? name : self.class_name_without_kvo.underscore
       screen = is_a?(TableSection) ? self.screen : self
-      screen.search_bar(styles: [:"base_search_bar", :"#{name}_search_bar"]).view
+      options[:styles] ||= []
+      options[:styles] += [:"base_search_bar", :"base_#{name}_search_bar"]
+
+      screen.search_bar(options).view
     end
 
     def searchBar(search_bar, textDidChange: text)

data/motion-prime/helpers/has_style_chain_builder.rb

@@ -0,0 +1,7 @@
+module MotionPrime
+  module HasStyleChainBuilder
+    def build_styles_chain(base_styles, suffixes)
+      [*base_styles].uniq.compact.map { |base_style| [*suffixes].uniq.compact.map { |suffix| [base_style, suffix].join('_').to_sym } }.flatten
+    end
+  end
+end