motion-prime 0.4.2 → 0.4.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGY2Yjg2ZDEwNTBlN2FjNjNhNDM1YWRjMWZkMGNiMzYyOGMxYWYzZA==
+    ZWVmZmZjNDVhMTMxZGE4ZjMzMWQyMzM0OWU4NDMzZGUzMjdmZTNjMQ==
   data.tar.gz: !binary |-
-    MmE0Nzg5ZjA2MmQ0OTVjYjQ3MjRmNGZjZmIzMDg3NDAyNWIxNmI1ZQ==
+    ZDBkMTNhODQzYjQyZGMwOTI1ZTEwYWM2NzUyNTFjZDJhYTBiODUyZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjM2NjNjMjBmNDcyN2ZkMGRmNzFlZDI4M2E0NWY0MmFiYjU1ZTJlMTk3NDM5
-    MDZiMzQ0NDdjYmRkYmNjZDg3MDVjYjViYTNkMGM3MzMxZThlZmEwYjJjZGVl
-    ZjQ1Y2I5YmNjYzNkZmU2ZDY1NTFiM2VmYWQ5ZWEyNzJkYzYwZDY=
+    NDJkY2JmMzAzMWFmY2QyODM0Yzg1ODllMjRmNDY2MWIzMTk5MDRlMDI5NWQ1
+    NTIwZmJmYWE5Y2U2NzZjNWM3NGUwMTVkNDM0YzAyYzNiZjNlMDVkYmUwZGEw
+    NTkxNWJlY2U5ODM4NTIyNWNhN2I2M2UzZTRiYmYyMDllYWM0NDc=
   data.tar.gz: !binary |-
-    OWRmMjk4OTliN2U1OGZiMWNjOTc5NjFjNGMzYjkxZjYyMDM2MWI4MmY5YmI3
-    NTU1MmZiMjAyYTlhY2Y3MzM1NzViMjI4YzA0YjY0OWFmZWVhNjVhMWJmMmRi
-    NjVmM2Q1NTY3OTllNjFiODMzZTY1MzVhZGI4ZmYyYmM2NWMzNjk=
+    NTU5YzUwZmUwYWVhYWNiYzc0YWIzOGU4NzMxMDE4NGJkMjUyN2QxZjBkMGY3
+    ZWJjMmMwN2E4YmZkMGM0YWZkZWI0NTBlYzIzYmEyM2NmNjVmNTJiNWUyZjZh
+    M2Y0Yjk2MjYzNGI1NDkwZjU0NjNlYTMyNzUyMjY1YzQ4OTZkOTc=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+=== 0.4.3
+* Speed improvements
+* Rename dm_ views to mp_
+* Upgrade sugarcube
+* Render screen on appear instead of on load
+
 === 0.4.2
 * Bug fixes
 * Added web view element support

data/Gemfile

@@ -2,6 +2,6 @@ source 'http://rubygems.org'
 
 gem 'motion-cocoapods', '~> 1.4.0'
 gem 'motion-support', '~> 0.2.4'
-gem 'sugarcube', '~> 0.20.23'
+gem 'sugarcube', '~> 1.3.7', require: 'sugarcube-classic'
 gem 'bubble-wrap', '~> 1.3.0'
 gemspec

data/Gemfile.lock

@@ -1,20 +1,19 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.4.2)
+    motion-prime (0.4.3)
       bubble-wrap
       cocoapods
       methadone
       motion-cocoapods
       motion-require
       motion-support
-      nano-store
       sugarcube
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.15)
+    activesupport (3.2.16)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     bubble-wrap (1.3.0)
@@ -38,7 +37,7 @@ GEM
     colored (1.2)
     escape (0.0.4)
     fuzzy_match (2.0.4)
-    i18n (0.6.5)
+    i18n (0.6.9)
     json (1.8.1)
     json_pure (1.8.1)
     methadone (1.3.1)
@@ -51,12 +50,10 @@ GEM
     motion-support (0.2.5)
       motion-require (>= 0.0.6)
     multi_json (1.8.2)
-    nano-store (0.6.3)
-      motion-cocoapods (>= 1.2.1)
-    nap (0.5.1)
+    nap (0.6.0)
     open4 (1.3.0)
     rake (10.1.0)
-    sugarcube (0.20.25)
+    sugarcube (1.3.7)
     xcodeproj (0.14.1)
       activesupport (~> 3.0)
       colored (~> 1.2)
@@ -73,4 +70,4 @@ DEPENDENCIES
   motion-stump
   motion-support (~> 0.2.4)
   rake
-  sugarcube (~> 0.20.23)
+  sugarcube (~> 1.3.7)

data/files/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gem 'motion-cocoapods', '~> 1.4.0'
 gem 'motion-support', '~> 0.2.4'
-gem 'sugarcube', '~> 0.20.23'
+gem 'sugarcube', '~> 1.3.7', require: 'sugarcube-classic'
 gem 'bubble-wrap', '~> 1.3.0'
 
-gem 'motion-prime', '~> 0.3.1'
+gem 'motion-prime', '~> 0.4.2'

data/files/Rakefile

@@ -5,7 +5,7 @@ require "rubygems"
 require 'motion-cocoapods'
 require 'bundler'
 Bundler.require
-require 'sugarcube-568'
+require 'sugarcube-common'
 require 'motion-prime'
 
 Motion::Project::App.setup do |app|

data/motion-prime.gemspec

@@ -26,6 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "motion-support"
   spec.add_dependency 'bubble-wrap'
   spec.add_dependency 'sugarcube'
-  spec.add_dependency 'nano-store'
   spec.add_dependency("methadone")
 end

data/motion-prime/elements/_content_padding_mixin.rb

@@ -51,7 +51,7 @@ module MotionPrime
     end
 
     def default_padding_for(side)
-      view_class.constantize.send(:"default_padding_#{side}")
+      class_factory(view_class).send(:"default_padding_#{side}")
     end
   end
 end

data/motion-prime/elements/_content_text_mixin.rb

@@ -1,7 +1,7 @@
 module MotionPrime
   module ElementContentTextMixin
     def content_text
-      (is_a?(ButtonElement) ? button_content_text : input_content_text).to_s
+      is_a?(ButtonElement) ? button_content_text : input_content_text
     end
 
     def content_font

data/motion-prime/elements/base_element.rb

@@ -1,5 +1,6 @@
 motion_require '../helpers/has_normalizer'
 motion_require '../helpers/has_style_chain_builder'
+motion_require '../helpers/has_class_factory'
 module MotionPrime
   class BaseElement
     # MotionPrime::BaseElement is container for UIView class elements with options.
@@ -8,6 +9,8 @@ module MotionPrime
     include ::MotionSupport::Callbacks
     include HasNormalizer
     include HasStyleChainBuilder
+    include HasClassFactory
+    extend HasClassFactory
 
     attr_accessor :options, :section, :name,
                   :view_class, :view, :view_name, :styles, :screen
@@ -20,7 +23,7 @@ module MotionPrime
       @section = options[:section]
       @name = options[:name]
       @block = options[:block]
-      @view_class = options[:view_class] || "UIView"
+      @view_class = options[:view_class] || 'UIView'
       @view_name = self.class_name_without_kvo.demodulize.underscore.gsub(/(_draw)?_element/, '')
     end
 
@@ -31,7 +34,7 @@ module MotionPrime
     end
 
     def render!(&block)
-      screen.add_view view_class.constantize, computed_options do |view|
+      screen.add_view class_factory(view_class), computed_options do |view|
         @view = view
         block.try(:call, view, self)
       end
@@ -97,14 +100,16 @@ module MotionPrime
           # following example in Prime::TableSection#cell_styles
           # form element/cell: <base|user>_form_field, <base|user>_form_string_field, user_form_field_email
           # table element/cell: <base|categories>_table_cell, categories_table_title
-          section.section_styles.each { |type, values| base_styles[type] += values } if section.section_styles
-          if %w[base table_view_cell].exclude?(@view_name.to_s)
+          if section.section_styles
+            section.section_styles.each { |type, values| base_styles[type] += values }
+          end
+          if %w[base table_view_cell].exclude?(@view_name)
             # form element: _input
             # table element: _image
             suffixes[:common] << @view_name.to_sym
             suffixes[:common] << :"#{@view_name}_with_errors" if has_errors
           end
-          if name && name.to_s != @view_name.to_s
+          if name && name.to_s != @view_name
             # form element: _input
             # table element: _icon
             suffixes[:specific] << name.to_sym
@@ -118,7 +123,7 @@ module MotionPrime
             build_styles_chain(base_styles[:common], suffixes[:common])
           elsif suffixes[:specific].any?
             build_styles_chain(base_styles[:common], suffixes[:specific])
-          elsif @view_name.to_s == 'table_view_cell'
+          elsif @view_name == 'table_view_cell'
             base_styles[:common]
           end
           @styles += Array.wrap(common_styles)
@@ -129,7 +134,7 @@ module MotionPrime
           # table element: categories_table_cell_image, categories_table_title_image
           specific_base_common_suffix_styles = if suffixes[:common].any?
             build_styles_chain(base_styles[:specific], suffixes[:common])
-          elsif suffixes[:specific].empty? && @view_name.to_s == 'table_view_cell'
+          elsif suffixes[:specific].empty? && @view_name == 'table_view_cell'
             base_styles[:specific]
           end
           @styles += Array.wrap(specific_base_common_suffix_styles)
@@ -144,20 +149,18 @@ module MotionPrime
         # custom style (from options or block options), using for TableViews as well
         custom_styles = style_sources.map do |source|
           normalize_object(source.delete(:styles), section)
-        end.compact.flatten
+        end.flatten
         @styles += custom_styles
-        # puts @view_class.to_s + @styles.inspect, ''
+        #puts @view_class.to_s + @styles.inspect, ''
       end
 
     class << self
       def factory(type, options = {})
-        class_name = "#{type.classify}Element"
-        options.merge!({view_class: "UI#{type.classify}"})
-        if MotionPrime.const_defined?(class_name)
-          "MotionPrime::#{class_name}".constantize.new(options)
-        else
-          self.new(options)
-        end
+        element_class = class_factory("#{type}_element", true) || self
+        view_class_name = camelize_factory("ui_#{type}")
+        
+        options.merge!(view_class: view_class_name)
+        element_class.new(options)
       end
       def before_render(method_name)
         set_callback :render, :before, method_name

data/motion-prime/elements/button.rb

@@ -14,7 +14,7 @@ module MotionPrime
     end
 
     def view_class
-      "DMButton"
+      "MPButton"
     end
 
     def text_value

data/motion-prime/elements/draw.rb

@@ -51,6 +51,16 @@ module MotionPrime
       section.bind_gesture_on_container_for(self, action, receiver)
     end
 
+    def hide
+      computed_options[:hidden] = true
+      view.setNeedsDisplay
+    end
+
+    def show
+      computed_options[:hidden] = false
+      view.setNeedsDisplay
+    end
+
     private
       def reset_computed_values
         @computed_frame = nil
@@ -58,9 +68,8 @@ module MotionPrime
 
     class << self
       def factory(type, options = {})
-        return unless %w[View Label Image].include?(type.classify)
-        class_name = "#{type.classify}DrawElement"
-        "MotionPrime::#{class_name}".constantize.new(options)
+        return unless %w[view label image].include?(type.to_s.downcase)
+        class_factory("#{type}_draw_element", true).new(options)
       end
     end
   end

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

@@ -1,16 +1,14 @@
 module MotionPrime
   module DrawBackgroundMixin
     def draw_background_in(draw_rect, options)
-
       bg_color = options[:background_color]
       border_radius = options[:layer].try(:[], :corner_radius)
       border_width = options[:layer].try(:[], :border_width).to_f
       border_color = options[:layer].try(:[], :border_color) || bg_color || :black
 
-
-      inset = border_width > 0 ? (border_width - 1 )*0.5 : 0
-      rect = CGRectInset(draw_rect, -inset, -inset)
       if bg_color || border_width > 0
+        inset = border_width > 0 ? (border_width - 1 )*0.5 : 0
+        rect = CGRectInset(draw_rect, -inset, -inset)
         if border_radius
           bezierPath = UIBezierPath.bezierPathWithRoundedRect rect, cornerRadius: border_radius
           if border_width > 0

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

@@ -52,26 +52,19 @@ module MotionPrime
     end
 
     def draw_with_layer(image, rect)
+      layer = CALayer.layer
+      layer.contents = image.CGImage
+      layer.frame = rect
+      layer.bounds = rect
       if computed_options[:layer]
-        layer = CALayer.layer
-        layer.frame = CGRectMake(0, 0, image.size.width, image.size.height)
-        layer.contents = image.CGImage
-
         layer.masksToBounds = computed_options[:layer][:masks_to_bounds] || computed_options[:clips_to_bounds]
         if radius = computed_options[:layer][:corner_radius]
           k = image.size.width / rect.size.width
           radius = radius * k
           layer.cornerRadius = radius
         end
-
-        UIGraphicsBeginImageContext(image.size)
-        layer.renderInContext(UIGraphicsGetCurrentContext())
-        image = UIGraphicsGetImageFromCurrentImageContext()
-        UIGraphicsEndImageContext()
-        image.drawInRect(rect)
-      else
-        image.drawInRect(rect)
       end
+      view.layer.addSublayer layer
     end
   end
 end

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

@@ -23,7 +23,7 @@ module MotionPrime
       color = (options[:text_color] || :black).uicolor
       font = (options[:font] || :system).uifont
       alignment = (options.has_key?(:text_alignment) ? options[:text_alignment] : :left).uitextalignment
-      line_break_mode = (options.has_key?(:line_break_mode) ? options[:line_break_mode] : :tailtruncation).uilinebreakmode
+      line_break_mode = (options.has_key?(:line_break_mode) ? options[:line_break_mode] : :tail_truncation).uilinebreakmode
       label_text = options[:text].to_s.gsub(/^[\n\r]+/, '')
 
       top_left_corner = CGPointMake(computed_inner_left, computed_inner_top)

data/motion-prime/elements/table_view_cell.rb

@@ -1,7 +1,7 @@
 module MotionPrime
   class TableViewCellElement < BaseElement
     def view_class
-      "DMCellWithSection"
+      "MPCellWithSection"
     end
   end
 end

data/motion-prime/elements/text_field.rb

@@ -4,7 +4,7 @@ module MotionPrime
     include MotionPrime::ElementContentTextMixin
 
     def view_class
-      "DMTextField"
+      "MPTextField"
     end
   end
 end

data/motion-prime/elements/text_view.rb

@@ -4,7 +4,7 @@ module MotionPrime
     include MotionPrime::ElementContentTextMixin
     
     def view_class
-      "DMTextView"
+      "MPTextView"
     end
   end
 end

data/motion-prime/helpers/has_class_factory.rb

@@ -0,0 +1,33 @@
+# These things required because camelize/constantize/classify methods are very slow
+module MotionPrime
+  module HasClassFactory
+    def class_factory(name, is_mp_class = false)
+      if is_mp_class
+        value = Prime.class_factory_cache["motion_prime/#{name}"]
+        return value if value
+        class_name = camelize_factory(name)
+
+        return nil unless MotionPrime.const_defined?(class_name)
+        class_name = "MotionPrime::#{class_name}"
+        name = "motion_prime/#{name}"
+      else
+        value = Prime.class_factory_cache[name]
+        return value if value
+        class_name = camelize_factory(name)
+      end
+      Prime.class_factory_cache[name] = class_name.constantize
+    end
+
+    def camelize_factory(name)
+      value = Prime.camelize_factory_cache[name]
+      return value if value
+      Prime.camelize_factory_cache[name] = name.camelize
+    end
+
+    def low_camelize_factory(name)
+      value = Prime.low_camelize_factory_cache[name]
+      return value if value
+      Prime.low_camelize_factory_cache[name] = name.camelize(:lower)
+    end
+  end
+end

data/motion-prime/helpers/has_style_chain_builder.rb

@@ -1,7 +1,16 @@
 module MotionPrime
   module HasStyleChainBuilder
     def build_styles_chain(base_styles, suffixes)
-      [*base_styles].compact.map(&:to_s).uniq.map { |base_style| [*suffixes].compact.map(&:to_s).uniq.map { |suffix| [base_style, suffix].join('_').to_sym } }.flatten
+      styles = []
+      [*base_styles].each do |base_style|
+        [*suffixes].each do |suffix|
+          components = []
+          components << base_style.to_s if base_style.present?
+          components << suffix.to_s if suffix.present?
+          styles << components.join('_').to_sym if components.present?
+        end
+      end
+      styles
     end
   end
 end

data/motion-prime/models/sync.rb

@@ -161,7 +161,7 @@ module MotionPrime
           data.each do |attributes|
             model = old_collection.detect{ |model| model.id == attributes[:id]}
             unless model
-              model = key.singularize.to_s.classify.constantize.new
+              model = key.classify.constantize.new
               self.send(:"#{key}_bag") << model
             end
             model.fetch_with_attributes(attributes)
@@ -191,7 +191,7 @@ module MotionPrime
         if data.present?
           model = self.send(key)
           unless model
-            model = key.singularize.to_s.classify.constantize.new
+            model = key.classify.constantize.new
             self.send(:"#{key}_bag") << model
           end
           model.fetch_with_attributes(data)

data/motion-prime/mp.rb

@@ -1,4 +1,15 @@
 module MotionPrime
+  def self.class_factory_cache
+    @class_factory_cache ||= {}
+  end
+
+  def self.camelize_factory_cache
+    @camelize_factory_cache ||= {}
+  end
+
+  def self.low_camelize_factory_cache
+    @camelize_factory_cache ||= {}
+  end
 end
 ::MP = MotionPrime unless defined?(::MP)
 ::Prime = MotionPrime unless defined?(::Prime)

data/motion-prime/screens/_base_mixin.rb

@@ -35,7 +35,7 @@ module MotionPrime
       end
     end
 
-    # Setup the screen, will be called when you run DMViewController.new
+    # Setup the screen, will be called when you run MPViewController.new
     # @param options [hash] Options passed to setup
     # @return [MotionPrime::BaseScreen] Ready to use screen
     def on_create(options = {})
@@ -48,8 +48,6 @@ module MotionPrime
       options.each do |k, v|
         self.send("#{k}=", v) if self.respond_to?("#{k}=")
       end
-
-      self.on_init if respond_to?(:on_init)
       self
     end
 

data/motion-prime/screens/_navigation_mixin.rb

@@ -107,7 +107,7 @@ module MotionPrime
       end
 
       def wrap_in_navigation!
-        self.navigation_controller = NavigationController.alloc.initWithRootViewController(self)
+        self.navigation_controller = UINavigationController.alloc.initWithRootViewController(self)
       end
   end
 end

data/motion-prime/screens/base_screen.rb

@@ -1,4 +1,4 @@
-motion_require '../support/dm_view_controller.rb'
+motion_require '../support/mp_view_controller.rb'
 motion_require '../views/layout.rb'
 motion_require '../screens/_base_mixin.rb'
 motion_require './extensions/_indicators_mixin'
@@ -6,7 +6,7 @@ motion_require './extensions/_navigation_bar_mixin'
 motion_require '../helpers/has_authorization'
 motion_require '../helpers/has_search_bar'
 module MotionPrime
-  class BaseScreen < DMViewController
+  class BaseScreen < MPViewController
     include Layout
     include ScreenBaseMixin
 
@@ -25,10 +25,13 @@ module MotionPrime
       [:base_screen, self.class_name_without_kvo.underscore.to_sym]
     end
 
-    def on_load
-      setup view, styles: default_styles do
-        render
+    def will_appear
+      unless @on_appear_happened
+        setup view, styles: default_styles do
+          render
+        end
       end
+      @on_appear_happened = true
     end
   end
 end

data/motion-prime/screens/sidebar_container_screen.rb

@@ -5,6 +5,7 @@ module MotionPrime
     def self.new(menu, content, options={})
       screen = self.alloc.initWithContentViewController(nil, menuViewController: nil)
       screen.backgroundImage = MotionPrime::Config.sidebar.background_image
+      screen.parallaxEnabled = false
 
       full_width = UIScreen.mainScreen.bounds.size.width
 
@@ -58,7 +59,7 @@ module MotionPrime
     private
 
       def should_reinit_content?(new_controller)
-        content_controller.nil? || 
+        content_controller.nil? ||
         content_controller.is_a?(TabBarController) ||
         new_controller.is_a?(TabBarController)
       end

data/motion-prime/sections/_cell_section_mixin.rb

@@ -23,5 +23,16 @@ module MotionPrime
         name.gsub("#{table_name}_", '')
       end
     end
+
+    def load_container_element(options = {})
+      @container_element ||= begin
+        options.merge!({
+          screen: screen,
+          section: self,
+          has_drawn_content: true
+        })
+        MotionPrime::BaseElement.factory(:table_view_cell, options)
+      end
+    end
   end
 end

data/motion-prime/sections/base_section.rb

@@ -17,6 +17,7 @@ module MotionPrime
     include ::MotionSupport::Callbacks
     include HasAuthorization
     include HasNormalizer
+    include HasClassFactory
     include DrawMixin
 
     attr_accessor :screen, :model, :name, :options, :elements, :section_styles
@@ -88,6 +89,7 @@ module MotionPrime
 
     def load_elements
       self.elements.values.each do |element|
+        element.size_to_fit_if_needed if element.is_a?(LabelDrawElement)
         element.computed_options if element.respond_to?(:computed_options)
       end
     end
@@ -198,7 +200,7 @@ module MotionPrime
       views = Array.wrap(keyboard_close_bindings_options[:views])
 
       elements.each { |el| views << el.view if %w[text_field text_view].include?(el.view_name) && el.view }
-      (views + Array.wrap(keyboard_close_bindings_options[:views])).compact.each(&:resignFirstResponder)
+      views.compact.each(&:resignFirstResponder)
     end
 
     protected

data/motion-prime/sections/form.rb

@@ -54,14 +54,6 @@ module MotionPrime
       self.table_element = screen.table_view(options)
     end
 
-    def render_cell(index, table)
-      field = rows_for_section(index.section)[index.row]
-      screen.table_view_cell section: field, reuse_identifier: cell_name(table, index), parent_view: table_view do |container_view, container_element|
-        field.container_element = container_element
-        field.render
-      end
-    end
-
     def reload_cell(section)
       field = section.name.to_sym
       index = field_indexes[field].split('_').map(&:to_i)
@@ -218,8 +210,8 @@ module MotionPrime
     end
 
     def load_field(field)
-      klass = "MotionPrime::#{field[:type].classify}FieldSection".constantize
-      klass.new(field.merge(screen: screen, table: self))
+      field_class = class_factory("#{field[:type]}_field_section", true)
+      field_class.new(field.merge(screen: screen, table: self))
     end
 
     def render_field?(name, options)

data/motion-prime/sections/tabbed.rb

@@ -103,8 +103,8 @@ module MotionPrime
         self.tab_pages = []
         index = 0
         tab_options.each do |key, options|
-          section_class = options[:page_section].classify
-          page = "::#{section_class}Section".constantize.new(screen: screen, model: model)
+          page_class = class_factory("/#{options[:page_section]}_section")
+          page = page_class.new(screen: screen, model: model)
           page.render
           page.hide if index != tab_default
           self.tab_pages << page

data/motion-prime/sections/table.rb

@@ -117,13 +117,18 @@ module MotionPrime
     end
 
     def render_cell(index, table)
-      item = row_by_index(index)
-      screen.table_view_cell section: item, reuse_identifier: cell_name(table, index), parent_view: table_view, has_drawn_content: true do |container_view, container_element|
-        # DrawSection allows as to draw inside the cell view, so we can setup
-        # to use cell view as container
-        item.container_element = container_element
-        item.render
+      section = rows_for_section(index.section)[index.row]
+      cell_element = container_element_for(index)
+      cell_view = cell_element.render do
+        section.render
       end
+
+      @rendered_cells[index.section][index.row] = cell_view
+      on_row_render(cell_view, index)
+
+      preload_sections_for(index)
+
+      cell_view
     end
 
     def on_row_render(cell, index); end
@@ -148,12 +153,7 @@ module MotionPrime
       @rendered_cells ||= []
       @rendered_cells[index.section] ||= []
 
-      cell = cached_cell(index, table) || render_cell(index, table).tap do |cell|
-        @rendered_cells[index.section][index.row] = cell
-        on_row_render(cell, index)
-
-        preload_sections_for(index)
-      end
+      cell = cached_cell(index, table) || render_cell(index, table)
 
       # run table view is appeared callback if needed
       if !@did_appear && index.row == rows_for_section(index.section).size - 1
@@ -203,6 +203,16 @@ module MotionPrime
     def on_async_data_loaded; end
     def on_async_data_preloaded(loaded_index); end
 
+    def cell_name(table, index)
+      record = row_by_index(index)
+      if record && record.model &&
+         record.model.respond_to?(:id) && record.model.id.present?
+        "cell_#{record.model.id}_#{data_stamp_for("#{index.section}_#{index.row}")}"
+      else
+        "cell_#{index.section}_#{index.row}_#{data_stamp_for("#{index.section}_#{index.row}")}"
+      end
+    end
+
     private
       def set_table_data
         cells = async_data? ? load_sections_async : table_data
@@ -225,16 +235,6 @@ module MotionPrime
         end
       end
 
-      def cell_name(table, index)
-        record = row_by_index(index)
-        if record && record.model &&
-           record.model.respond_to?(:id) && record.model.id.present?
-          "cell_#{record.model.id}_#{data_stamp_for("#{index.section}_#{index.row}")}"
-        else
-          "cell_#{index.section}_#{index.row}_#{data_stamp_for("#{index.section}_#{index.row}")}"
-        end
-      end
-
       def cached_cell(index, table = nil)
         table ||= self.table_view
         table.dequeueReusableCellWithIdentifier(cell_name(table, index))
@@ -252,6 +252,19 @@ module MotionPrime
         cell = rows_for_section(index.section)[index.row]
         return unless cell.load_section # return if already loaded
         cell.load_elements
+        if async_data?
+          container_element = container_element_for(index)
+          container_element.computed_options # compute options
+        end
+      end
+
+      def container_element_for(index)
+        cell = rows_for_section(index.section)[index.row]
+        options = {
+          reuse_identifier: cell_name(table_view, index),
+          parent_view: table_view
+        }
+        cell.load_container_element(options)
       end
 
       def data_stamp_for(id)

data/motion-prime/styles/_mixins.rb

@@ -1,8 +1,13 @@
 motion_require '../views/styles.rb'
 MotionPrime::Styles.define :_mixin do
+  style :label_reset,
+    top: nil, left: nil, height: nil, right: nil, bottom: nil, top: nil,
+    padding: nil, padding_top: nil, padding_left: nil, padding_right: nil, padding_bottom: nil,
+    size_to_fit: false
+
   style :multiline,
     size_to_fit: true,
     number_of_lines: 0,
-    line_break_mode: :wordwrap,
+    line_break_mode: :word_wrap,
     line_spacing: 2
 end

data/motion-prime/styles/form.rb

@@ -38,7 +38,7 @@ MotionPrime::Styles.define :base_form do
     top: nil,
     bottom: 0,
     width: 300,
-    line_break_mode: :wordwrap,
+    line_break_mode: :word_wrap,
     number_of_lines: 0,
     size_to_fit: true,
     text_color: proc { MotionPrime::Config.color.error },

data/motion-prime/support/{dm_button.rb → mp_button.rb}

@@ -1,4 +1,4 @@
-class DMButton < UIButton
+class MPButton < UIButton
   include MotionPrime::SupportKeyValueStore
   include MotionPrime::SupportPaddingAttribute
   attr_accessor :sizeToFit

data/motion-prime/support/{dm_cell_with_section.rb → mp_cell_with_section.rb}

@@ -1,4 +1,4 @@
-class DMCellWithSection < UITableViewCell
+class MPCellWithSection < UITableViewCell
   attr_accessor :section
 
   def setSection(section)

data/motion-prime/support/{ui_search_bar_custom.rb → mp_search_bar_custom.rb}

@@ -1,5 +1,5 @@
 # Search bar with background and no padding
-class UISearchBarCustom < UISearchBar
+class MPSearchBarCustom < UISearchBar
   def layoutSubviews
     super
     text_field = subviews.objectAtIndex(0).subviews.detect do |view|

data/motion-prime/support/{dm_text_field.rb → mp_text_field.rb}

@@ -1,7 +1,7 @@
 # This class have some modifications for UITextField:
 # * support padding, padding_left, padding_right options
 # * support placeholder_color, placeholder_font options
-class DMTextField < UITextField
+class MPTextField < UITextField
   include MotionPrime::SupportKeyValueStore
   include MotionPrime::SupportPaddingAttribute
   attr_accessor :placeholderColor, :placeholderFont, :readonly, :placeholderAlignment
@@ -30,7 +30,7 @@ class DMTextField < UITextField
     color.setFill
     font = self.placeholderFont || self.font || :system.uifont(16)
 
-    truncation = :tailtruncation.uilinebreakmode
+    truncation = :tail_truncation.uilinebreakmode
     alignment = (placeholderAlignment || :left)
     alignment = alignment.uitextalignment if alignment.is_a?(Symbol)
     self.placeholder.drawInRect(rect, withFont: font, lineBreakMode: truncation, alignment: alignment)

data/motion-prime/support/{dm_text_view.rb → mp_text_view.rb}

@@ -1,7 +1,7 @@
 # This class have some modifications for UITextView:
 # * support padding, padding_left, padding_right options
 # * support placeholder, placeholder_color, placeholder_font options
-class DMTextView < UITextView
+class MPTextView < UITextView
   include MotionPrime::SupportKeyValueStore
   include MotionPrime::SupportPaddingAttribute
   attr_accessor :placeholderColor, :placeholderFont, :placeholder

data/motion-prime/support/{dm_view_controller.rb → mp_view_controller.rb}

@@ -1,4 +1,4 @@
-class DMViewController < UIViewController
+class MPViewController < UIViewController
   def self.new(args = {})
     self.alloc.initWithNibName(nil, bundle: nil).tap do |screen|
       screen.on_create(args) if screen.respond_to?(:on_create)

data/motion-prime/support/{dm_view_with_section.rb → mp_view_with_section.rb}

@@ -1,4 +1,4 @@
-class DMViewWithSection < UIView
+class MPViewWithSection < UIView
   attr_accessor :section
 
   def setSection(section)

data/motion-prime/support/tab_bar_controller.rb

@@ -1,6 +1,5 @@
 module MotionPrime
   class TabBarController < UITabBarController
-    
     def self.new(screens)
       controller = alloc.init
 

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/motion-prime/views/layout.rb

@@ -1,5 +1,5 @@
 # TODO: make it part of Sections
-motion_require '../support/dm_cell_with_section'
+motion_require '../support/mp_cell_with_section'
 module MotionPrime
   module Layout
     def add_view(klass, options = {}, &block)
@@ -39,7 +39,7 @@ module MotionPrime
         [::UIActionSheet, ::UIActivityIndicatorView, ::UIButton, ::UIDatePicker, ::UIImageView, ::UILabel,
           ::UIPageControl, ::UIPickerView, ::UIProgressView, ::UIScrollView, ::UISearchBar, ::UISegmentedControl,
           ::UISlider, ::UIStepper, ::UISwitch, ::UITabBar, ::UITableView, ::UITableViewCell, ::UITextField, ::UITextView,
-          ::UIToolbar, ::UIWebView, ::UINavigationBar, ::DMCellWithSection, ::MBProgressHUD].each do |klass|
+          ::UIToolbar, ::UIWebView, ::UINavigationBar, ::MPCellWithSection, ::MBProgressHUD].each do |klass|
 
           shorthand = "#{klass}"[2..-1].underscore.to_sym
 

data/motion-prime/views/view_builder.rb

@@ -107,10 +107,11 @@ module MotionPrime
               options[:background_color] = :clear
               options.delete(:gradient)
             end
+
             klass.alloc.initWithStyle style, reuseIdentifier: options.delete(:reuse_identifier)
           },
           'UISearchBar' => Proc.new{|klass, options|
-            klass = options[:search_field_background_image] ? UISearchBarCustom : UISearchBar
+            klass = options[:search_field_background_image] ? MPSearchBarCustom : UISearchBar
             search_bar = klass.alloc.init
             search_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
             search_bar

data/motion-prime/views/view_styler.rb

@@ -2,6 +2,7 @@ module MotionPrime
   class ViewStyler
     include FrameCalculatorMixin
     include HasStyles
+    include HasClassFactory
 
     attr_reader :view, :options
 
@@ -13,7 +14,9 @@ module MotionPrime
 
     def apply
       converted_options = convert_primitives_to_objects(options)
-      setValuesForKeysWithDictionary(converted_options)
+      converted_options.each do |key, value|
+        set_option(key.to_s, value)
+      end
     end
 
     def convert_primitives_to_objects(options)
@@ -39,7 +42,7 @@ module MotionPrime
       end
     end
 
-    def setValue(value, forUndefinedKey: key)
+    def set_option(key, value)
       # return if value.nil?
       # ignore options
       return if key == 'section' && !view.respond_to?(:section=)
@@ -56,15 +59,15 @@ module MotionPrime
       if key.end_with?('title_color')
         view.setTitleColor value.uicolor, forState: UIControlStateNormal
       elsif key.end_with?('alignment') && value.is_a?(Symbol)
-        view.setValue value.uitextalignment, forKey: key.camelize
+        view.setValue value.uitextalignment, forKey: camelize_factory(key)
       elsif key.end_with?('line_break_mode') && value.is_a?(Symbol)
-        view.setValue value.uilinebreakmode, forKey: key.camelize
+        view.setValue value.uilinebreakmode, forKey: camelize_factory(key)
       elsif key.end_with?('title_shadow_color')
         view.setTitleShadowColor value.uicolor, forState: UIControlStateNormal
       elsif key.end_with?('color')
         color = value.try(:uicolor)
         color = color.cgcolor if view.is_a?(CALayer)
-        view.send :"#{key.camelize(:lower)}=", color
+        view.send :"#{low_camelize_factory(key)}=", color
       elsif key.end_with?('background_image')
         if view.is_a?(UIButton)
           view.setBackgroundImage value.uiimage, forState: UIControlStateNormal
@@ -79,10 +82,10 @@ module MotionPrime
           bg_view.backgroundColor = value[:color].uicolor
           view.backgroundView = bg_view
         else
-          view.setValue value, forKey: key.camelize(:lower)
+          view.setValue value, forKey: low_camelize_factory(key)
         end
       elsif key.end_with?('image')
-        view.setValue value.uiimage, forKey: key.camelize
+        view.setValue value.uiimage, forKey: camelize_factory(key)
       elsif key.end_with?('_content_inset')
         current_inset = view.contentInset
         current_inset.send("#{key.partition('_').first}=", value)
@@ -144,9 +147,9 @@ module MotionPrime
           view.separatorInset = UIEdgeInsetsMake(0, value.first, 0, value.last)
         end
       elsif value.is_a?(Hash)
-        self.class.new(view.send(key.camelize(:lower).to_sym), nil, value.merge(parent_frame: options[:frame] || options[:parent_frame])).apply
+        self.class.new(view.send(low_camelize_factory(key).to_sym), nil, value.merge(parent_frame: options[:frame] || options[:parent_frame])).apply
       else
-        view.setValue value, forKey: key.camelize(:lower)
+        view.setValue value, forKey: low_camelize_factory(key)
       end
     end
 

data/spec/screens/base_screen_spec.rb

@@ -3,9 +3,10 @@ describe "BaseScreen" do
   before do
     @screen = BaseScreen.new()
     @screen.on_load
+    @screen.will_appear
   end
 
-  it "should render screen on load" do
+  it "should render screen on appear" do
     @screen.was_rendered.should == true
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Iskander Haziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -136,20 +136,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nano-store
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
@@ -242,6 +228,7 @@ files:
 - motion-prime/elements/text_field.rb
 - motion-prime/elements/text_view.rb
 - motion-prime/helpers/has_authorization.rb
+- motion-prime/helpers/has_class_factory.rb
 - motion-prime/helpers/has_normalizer.rb
 - motion-prime/helpers/has_search_bar.rb
 - motion-prime/helpers/has_style_chain_builder.rb
@@ -289,16 +276,15 @@ files:
 - motion-prime/styles/form.rb
 - motion-prime/support/_key_value_store.rb
 - motion-prime/support/_padding_attribute.rb
-- motion-prime/support/dm_button.rb
-- motion-prime/support/dm_cell_with_section.rb
-- motion-prime/support/dm_text_field.rb
-- motion-prime/support/dm_text_view.rb
-- motion-prime/support/dm_view_controller.rb
-- motion-prime/support/dm_view_with_section.rb
+- motion-prime/support/mp_button.rb
+- motion-prime/support/mp_cell_with_section.rb
 - motion-prime/support/mp_label.rb
-- motion-prime/support/navigation_controller.rb
+- motion-prime/support/mp_search_bar_custom.rb
+- motion-prime/support/mp_text_field.rb
+- motion-prime/support/mp_text_view.rb
+- motion-prime/support/mp_view_controller.rb
+- motion-prime/support/mp_view_with_section.rb
 - motion-prime/support/tab_bar_controller.rb
-- motion-prime/support/ui_search_bar_custom.rb
 - motion-prime/support/ui_view.rb
 - motion-prime/version.rb
 - motion-prime/views/_frame_calculator_mixin.rb

data/motion-prime/support/navigation_controller.rb

@@ -1,4 +0,0 @@
-module MotionPrime
-  class NavigationController < UINavigationController
-  end
-end