motion-prime 0.5.2 → 0.5.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzJhZGY0OTNiNDY5YmZmOWQ0NDZhNGEzOWY4MjM3ZDU3YjUzODVkOQ==
+    NWM1NzdlODhjMWNjZjU2ZDMwYjNhYzExNDBiNjA2OTE1MDAyYThmNg==
   data.tar.gz: !binary |-
-    ZDcyYmRiYWM3MWQyYmI5OTA0M2U2YzcyYTlmZGFkNjBjZWIzMWJlMw==
+    NzE4MTM4ZGI1YmIxZjExNjkxZWYwMzM5NWRlMmNjZDViZDBhMjBjOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NzAwYWU2NDlmYjUyZGVhZjkxMzcyZGE0ZTBiNmYyN2EwZmEyNGMzYjJmNTcz
-    N2IyZmRkNWVjZjU0ZDVmNGQxYmYxZGJkOTE0YTdkZTBjMDc3MmMwZDU2NjJk
-    NWUyYWRjN2E4NDg4YWEwY2U0N2MyMDhlMzI2OTY0MDJmNjRiZGE=
+    NWQ0NjVjYzAyYzQ2NThiOGJkNGU2OTNiYzZmMDA1N2JhOTQ4MTBjNjc1N2Jl
+    NjI4ZWRkM2IzNWRjOTZhOTdmYzNjMDkyMzFjMjcwZTczNmYxMzAyZjRmZmIw
+    NDQzZGY3Y2EwYjIxZmY4OGEyODVhMWViNTM0MWUxYjhhMWRkMTU=
   data.tar.gz: !binary |-
-    MmYyY2I4MTQ5ZTA4OGIxZjYzOWFhOTc1NDk5NWI5YWMwZjJmN2Q0NGU1Y2Jm
-    MTQwZGU3ZDlmNTgwMThkZGQ2OTBmMjU5NTY3OTY3OGQ5NzA3NjQxODYwZThj
-    MThjMjgxMmQ0YzU0MTYyZDljZGY1NTI0NzllZGExYzRkZjMxYmU=
+    ZGIxZTA4OWY1NzRhMTRjMDY0NDE3YmIwMDM5M2ZjZTBjNGFlYWI0Yzk2YzI0
+    NDBmOTQ0MWVhNDdhZGEzNGU0ZTY0MzdlYmU3MzY5YjE1MTBmZWIyY2RhYjE5
+    YTQ5NjI5ZGVkNjM1OTQzM2ZhOTU3NzBkYzBlZmM5OWU5OTQyOTY=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+=== 0.5.3
+* bug fixes.
+* improve form fields.
+* memory fixes.
+* add selected image support for tab bar items.
+
 === 0.5.2
 * fix bugs.
 

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.5.2)
+    motion-prime (0.5.3)
       bubble-wrap
       cocoapods
       methadone
       motion-cocoapods
       motion-require
       motion-support
+      rm-digest
       sugarcube
 
 GEM
@@ -53,6 +54,7 @@ GEM
     nap (0.6.0)
     open4 (1.3.0)
     rake (10.1.0)
+    rm-digest (0.0.2)
     sugarcube (1.3.7)
     xcodeproj (0.14.1)
       activesupport (~> 3.0)

data/README.md

@@ -4,6 +4,11 @@
 
 MotionPrime is yet another framework written on RubyMotion for creating really fast iOS applications.
 
+## Why MotionPrime?
+
+* Performance. MotionPrime designed to improve creating and scrolling performance of table views.
+* Simplicity. Creating first MotionPrime application is as simple as creating new RubyOnRails application.
+
 ## Getting Started
 
 ### 1. Install MotionPrime:
@@ -65,6 +70,10 @@ MotionPrime is yet another framework written on RubyMotion for creating really f
 * [ECSlidingViewController 2 integration](https://github.com/droidlabs/prime_sliding_menu) (Sidebar)
 * [RESideMenu integration](https://github.com/droidlabs/prime_reside_menu) (Sidebar)
 
+## Samples
+
+* [Simple to-do app](https://github.com/droidlabs/prime_sample_todo)
+
 ## Contributing
 
 1. Fork it
@@ -73,7 +82,7 @@ MotionPrime is yet another framework written on RubyMotion for creating really f
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-## Documentation
+## Help with Documentation
 
 We are using [Docco](http://jashkenas.github.io/docco/) to generate documentation.
 

data/ROADMAP.md

@@ -1,16 +1,20 @@
 === 0.6.0
+* deprecate root level :title option for submit field
+* rename submit element in submit field to button element
+* rename date_picker element in date_picker field to input element
+* add more and better default options for fields
+
+=== 0.7.0
 * add cleanup for section events
-* add computed_options.get(), this will allow to make sure that options is computed.
 * add dsl for push notifications
 * add some extensions/middleware system, at least for networking.
 * create "display_network_error" extension.
 * add different templates. some templates should be more like final app.
 
-=== 0.7.0
+=== 0.8.0
+* add computed_options.get(), this will allow to make sure that options is computed.
 * add testing framework
-* add auth backends to ApiClient: password auth and facebook auth
 
-=== 0.8.0
+=== 0.9.0
 * add sections/screens/models generator
-* add DSL for ViewStyles#setValue conditions
-* add auto-symbol-value for Prime::Config.color items
+* add DSL for ViewStyles#setValue conditions

data/files/Gemfile

@@ -3,9 +3,9 @@ source 'http://rubygems.org'
 gem 'motion-cocoapods', '~> 1.4.0'
 gem 'motion-support', '~> 0.2.4'
 gem 'sugarcube', '~> 1.3.7', require: 'sugarcube-classic'
-gem 'bubble-wrap', '~> 1.3.0'
+gem 'bubble-wrap', '~> 1.4.0'
 
-gem 'motion-prime', '~> 0.5.1'
+gem 'motion-prime', '~> 0.5.2'
 
 # add reside menu for sidebar support
 gem 'prime_reside_menu', '~> 0.1.3'

data/files/Gemfile.lock

@@ -4,35 +4,37 @@ GEM
     activesupport (3.2.16)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    bubble-wrap (1.3.0)
+    bubble-wrap (1.4.0)
     claide (0.4.0)
-    cocoapods (0.28.0)
+    cocoapods (0.29.0)
       activesupport (>= 3.2.15, < 4)
       claide (~> 0.4.0)
-      cocoapods-core (= 0.28.0)
-      cocoapods-downloader (~> 0.2.0)
+      cocoapods-core (= 0.29.0)
+      cocoapods-downloader (~> 0.3.0)
+      cocoapods-try-release-fix (~> 0.1.1)
       colored (~> 1.2)
       escape (~> 0.0.4)
       json_pure (~> 1.8)
+      nap (~> 0.5)
       open4 (~> 1.3)
       xcodeproj (~> 0.14.1)
-    cocoapods-core (0.28.0)
+    cocoapods-core (0.29.0)
       activesupport (>= 3.2.15, < 4)
       fuzzy_match (~> 2.0.4)
-      json (~> 1.8)
+      json_pure (~> 1.8)
       nap (~> 0.5)
-    cocoapods-downloader (0.2.0)
+    cocoapods-downloader (0.3.0)
+    cocoapods-try-release-fix (0.1.1)
     colored (1.2)
     escape (0.0.4)
     fuzzy_match (2.0.4)
     i18n (0.6.9)
-    json (1.8.1)
     json_pure (1.8.1)
     methadone (1.3.1)
       bundler
     motion-cocoapods (1.4.0)
       cocoapods (>= 0.26.2)
-    motion-prime (0.5.1)
+    motion-prime (0.5.2)
       bubble-wrap
       cocoapods
       methadone
@@ -41,9 +43,9 @@ GEM
       motion-support
       sugarcube
     motion-require (0.0.7)
-    motion-support (0.2.5)
+    motion-support (0.2.6)
       motion-require (>= 0.0.6)
-    multi_json (1.8.2)
+    multi_json (1.8.4)
     nap (0.6.0)
     open4 (1.3.0)
     prime_reside_menu (0.1.3)
@@ -61,9 +63,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bubble-wrap (~> 1.3.0)
+  bubble-wrap (~> 1.4.0)
   motion-cocoapods (~> 1.4.0)
-  motion-prime (~> 0.5.1)
+  motion-prime (~> 0.5.2)
   motion-support (~> 0.2.4)
   prime_reside_menu (~> 0.1.3)
   sugarcube (~> 1.3.7)

data/files/Rakefile

@@ -7,6 +7,7 @@ require 'bundler'
 Bundler.require
 require 'motion-prime'
 
+require File.expand_path 'app/environment.rb'
 Motion::Project::App.setup do |app|
   # Use `rake config' to see complete project settings.
   app.name = 'Prime Project'

data/files/app/app_delegate.rb

@@ -1,7 +1,7 @@
 class AppDelegate < Prime::BaseAppDelegate
   def on_load(app, options)
     setup_navigation_styles
-    open_screen HomeScreen.new, sidebar: SidebarScreen.new(navigation: false)
+    open_screen :home, sidebar: true
   end
 
   def setup_navigation_styles

data/lib/motion-prime.rb

@@ -3,6 +3,7 @@ require 'motion-support'
 require 'sugarcube-common'
 require 'bubble-wrap'
 require 'bubble-wrap/reactor'
+require 'rm-digest'
 require File.expand_path('../../motion-prime/env.rb', __FILE__)
 require File.expand_path('../../motion-prime/prime.rb', __FILE__)
 
@@ -16,7 +17,6 @@ Motion::Project::App.setup do |app|
     pod 'SDWebImage'
     pod 'SVPullToRefresh'
     pod 'MBAlertView'
-    pod 'SDSegmentedControl'
-    pod 'MBProgressHUD'
+    pod 'MBProgressHUD', '~> 0.8'
   end
 end

data/motion-prime.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'bubble-wrap'
   spec.add_dependency 'sugarcube'
   spec.add_dependency("methadone")
+  spec.add_dependency("rm-digest")
 end

data/motion-prime/api_client.rb

@@ -5,35 +5,39 @@ class ApiClient
     self.access_token = options[:access_token]
   end
 
-  def parse_json(text)
-    Prime::JSON.parse(text)
-  rescue
-    NSLog("Can't parse json: #{text}")
-    false
-  end
-
   def request_params(data)
+    data = data.clone
     files = data.delete(:files)
-    params = {payload: data, no_redirect: true, format: :form_data}
+    params = {
+      payload: data,
+      no_redirect: !config.allow_redirect,
+      format: config.request_format
+    }
     if files.present?
       params.merge!(files: files)
     end
-    if MotionPrime::Config.api.http_auth.present?
-      params.merge!(credentials: MotionPrime::Config.api.http_auth.to_hash)
+    if config.http_auth?
+      params.merge!(credentials: config.http_auth.to_hash)
+    end
+    if config.sign_request?
+      signature = RmDigest::MD5.hexdigest(
+        config.signature_secret + data.keys.map(&:to_s).sort.join
+      )
+      params[:payload].merge!(sign: signature)
     end
     params
   end
 
-  def authenticate(username, password, &block)
-    data = {
+  def authenticate(username = nil, password = nil, data = nil, &block)
+    data ||= {
       grant_type: "password",
       username: username,
       password: password,
-      client_id: MotionPrime::Config.api.client_id,
-      client_secret: MotionPrime::Config.api.client_secret
+      client_id: config.client_id,
+      client_secret: config.client_secret
     }
     use_callback = block_given?
-    BW::HTTP.post("#{MotionPrime::Config.api.base}/oauth/token", request_params(data)) do |response|
+    BW::HTTP.post("#{config.base}#{config.auth_path}", request_params(data)) do |response|
       access_token = if response.ok?
         json = parse_json(response.body)
         json[:access_token]
@@ -48,40 +52,78 @@ class ApiClient
 
   def api_url(path)
     return path if path =~ /^http(s)?:\/\//
-    "#{MotionPrime::Config.api.base}/api/v1#{path}"
+    "#{config.base}#{config.api_namespace}#{path}"
   end
 
   def page_url(path)
-    "#{MotionPrime::Config.api.base}/#{path}"
+    "#{config.base}#{path}"
   end
 
   def resource_url(path)
     # return if path.blank?
-    base = Prime::Config.api.resource_base.present? ? Prime::Config.api.resource_base : Prime::Config.api.base
+    base = config.resource_base? ? config.resource_base : config.base
     "#{base}#{path}"
   end
 
-  def request(method, path, params = {}, &block)
+  def request(method, path, params = {}, options = {}, &block)
     params.merge!(access_token: access_token)
+    use_callback = block_given?
     BW::HTTP.send method, api_url(path), request_params(params) do |response|
-      json = parse_json(response.body.to_s)
-      block.call(json, response.status_code)
+      if !response.ok? && options[:allow_queue] && config.allow_queue?
+        add_to_queue(method: method, path: path, params: params)
+      else
+        json = parse_json(response.body.to_s)
+        block.call(json, response.status_code) if use_callback
+        process_queue
+      end
+    end
+  end
+
+  def process_queue
+    queue = user_defaults['api_client_queue']
+    user_defaults['api_client_queue'] = []
+    Array.wrap(queue).each do |item|
+      request(item[:method], item[:path], item[:params].clone.symbolize_keys)
     end
   end
 
-  def get(path, params = {}, &block)
-    request(:get, path, params, &block)
+  def add_to_queue(item)
+    queue = user_defaults['api_client_queue'].clone || []
+    queue.push(item)
+    user_defaults['api_client_queue'] = queue
+  end
+
+  def get(path, params = {}, options = {}, &block)
+    request(:get, path, params, options, &block)
   end
 
-  def put(path, params = {}, &block)
-    request(:put, path, params, &block)
+  def put(path, params = {}, options = {}, &block)
+    request(:put, path, params, options, &block)
   end
 
-  def post(path, params = {}, &block)
-    request(:post, path, params, &block)
+  def post(path, params = {}, options = {}, &block)
+    options[:allow_queue] = true unless options.has_key?(:allow_queue)
+    request(:post, path, params, options, &block)
   end
 
-  def delete(path, params = {}, &block)
-    request(:delete, path, params, &block)
+  def delete(path, params = {}, options = {}, &block)
+    options[:allow_queue] = true unless options.has_key?(:allow_queue)
+    request(:delete, path, params, options, &block)
   end
+
+  private
+    def user_defaults
+      @user_defaults ||= NSUserDefaults.standardUserDefaults
+    end
+
+    def parse_json(text)
+      Prime::JSON.parse(text)
+    rescue
+      NSLog("Can't parse json: #{text}")
+      false
+    end
+
+    def config
+      MotionPrime::Config.api_client
+    end
 end

data/motion-prime/app_delegate.rb

@@ -77,7 +77,7 @@ module MotionPrime
         self.window.makeKeyAndVisible
         screen
       end
-    
+
       def open_content_screen(screen, options = {})
         open_root_screen(screen)
       end

data/motion-prime/config/base.rb

@@ -10,9 +10,16 @@ MotionPrime::Config.configure do |config|
     colors.base = 0x424242
     colors.error = 0xef471f
   end
-  config.api do |api|
+  config.api_client do |api|
     api.base = "http://example.com"
     api.client_id = ""
     api.client_secret = ""
+    api.signature_secret = ""
+    api.sign_request = false
+    api.auth_path = '/oauth/token'
+    api.api_namespace = '/api'
+    api.request_format = :form_data
+    api.allow_redirect = false
+    api.allow_queue = false
   end
 end

data/motion-prime/core_ext/kernel.rb

@@ -16,10 +16,11 @@ class Kernel
   end
 
   def clear_instance_variables(options = {})
-    ivars = self.instance_variables.clone
-    ivars.each do |ivar|
+    ivars = self.instance_variables
+    clear_block = proc { |ivar|
       next if Array.wrap(options[:except]).include?(ivar[1..-1])
       self.instance_variable_set(ivar, nil)
-    end
+    }.weak!
+    ivars.each(&clear_block)
   end
 end

data/motion-prime/elements/_content_text_mixin.rb

@@ -54,9 +54,11 @@ module MotionPrime
       def get_content_rect(width)
         raise "Please set element width for content size calculation" unless width
 
-        content_attributed_text.boundingRectWithSize(
-          [width, Float::MAX], options: NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading | NSStringDrawingTruncatesLastVisibleLine, context:nil
-        )
+        options = NSStringDrawingUsesLineFragmentOrigin
+        if is_a?(TextViewElement)
+          options |= NSStringDrawingUsesFontLeading | NSStringDrawingTruncatesLastVisibleLine
+        end
+        content_attributed_text.boundingRectWithSize([width, Float::MAX], options: options, context:nil)
       end
 
       def button_content_text

data/motion-prime/elements/_text_mixin.rb

@@ -13,7 +13,7 @@ module MotionPrime
     def html_string(options)
       styles = []
       styles << "color: #{options[:text_color].hex};" if options[:text_color]
-      styles << "line-height: #{options.fetch(:line_height, options[:line_spacing].to_f + options[:font].pointSize)}px;"
+      styles << "line-height: #{options[:line_height] || (options[:line_spacing].to_f + options[:font].pointSize)}px;"
       styles << "font-family: '#{options[:font].familyName}';"
       styles << "font-size: #{options[:font].pointSize}px;"
       styles << "text-align: #{options[:text_alignment_name]};" if options[:text_alignment_name]

data/motion-prime/elements/base_element.rb

@@ -28,10 +28,10 @@ module MotionPrime
       @view_name = self.class_name_without_kvo.demodulize.underscore.gsub(/(_draw)?_element/, '')
     end
 
-    def dealloc
-      # pp 'deallocating elemenet', self.name, self.to_s, view_class, view.try(:to_s)
-      super
-    end
+    # def dealloc
+    #   pp 'deallocating elemenet', self.name, self.to_s, view_class#, view.try(:to_s)
+    #   super
+    # end
 
     def add_target(target = nil, action = 'on_click:', event = :touch)
       return false unless self.view
@@ -164,6 +164,7 @@ module MotionPrime
         end.flatten
         @styles += custom_styles
         # puts @view_class.to_s + @styles.inspect, ''
+        @styles
       end
 
     class << self

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

@@ -68,14 +68,13 @@ module MotionPrime
       return if image_data || !computed_options[:url]
       BW::Reactor.schedule do
         manager = SDWebImageManager.sharedManager
-        @screen_ref = screen.strong_ref
-        @section_ref = section.strong_ref
+        @strong_refs = section.strong_references
         manager.downloadWithURL(computed_options[:url],
           options: 0,
           progress: lambda{ |r_size, e_size|  },
           completed: lambda{ |image, error, type, finished|
             if !image || screen.retainCount == 1 || section.retainCount == 1
-              @screen_ref = @section_ref = nil
+              @strong_refs = nil
               return
             end
 
@@ -87,7 +86,7 @@ module MotionPrime
             else
               self.view.performSelectorOnMainThread :setNeedsDisplay, withObject: nil, waitUntilDone: false
             end
-            @screen_ref = @section_ref = nil
+            @strong_refs = nil
           }
         )
       end

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

@@ -7,13 +7,13 @@ module MotionPrime
 
     def draw_options
       options = computed_options
-      text = (options[:html] || options[:text]).to_s.gsub(/^[\n\r]+/, '')
+      text = (options[:html] || options[:text]).to_s.gsub(/\A[\n\r]+/, '')
       text_color = (options[:text_color] || :black).uicolor
       font = (options[:font] || :system).uifont
 
-      text_alignment_name = options.has_key?(:text_alignment) ? options[:text_alignment] : :left
+      text_alignment_name = options.fetch(:text_alignment, :left)
       text_alignment = text_alignment_name.uitextalignment
-      line_break_mode_name = options.has_key?(:line_break_mode) ? options[:line_break_mode] : :tail_truncation
+      line_break_mode_name = options.fetch(:line_break_mode, :tail_truncation)
       line_break_mode = line_break_mode_name.uilinebreakmode
 
       top_left_corner = CGPointMake(computed_inner_left, computed_inner_top)

data/motion-prime/env.rb

@@ -1,7 +1,9 @@
 module MotionPrime
   class Env
     def env
-      ENV['PRIME_ENV'] || ENV['RUBYMOTION_ENV'] || 
+      (defined?(NSBundle) && NSBundle.mainBundle.objectForInfoDictionaryKey('PRIME_ENV')) || 
+      ENV['PRIME_ENV'] || 
+      ENV['RUBYMOTION_ENV'] || 
       (defined?(RUBYMOTION_ENV) && RUBYMOTION_ENV) || 
       'development'
     end

data/motion-prime/models/errors.rb

@@ -34,6 +34,7 @@ module MotionPrime
     end
 
     def add(key, error)
+      initialize_for_key(key)
       send(unique_key(key)) << error
     end
 

data/motion-prime/models/store.rb

@@ -11,7 +11,7 @@ module MotionPrime
       when :persistent, :file
         path ||= begin
           documents_path = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, true)[0]
-          documents_path + "/nano.db"
+          documents_path + "/nano_#{Prime.env.to_s}.db"
         end
         store = NSFNanoStore.createAndOpenStoreWithType(NSFPersistentStoreType, path: path, error: error_ptr)
       else

data/motion-prime/screens/screen.rb

@@ -30,24 +30,29 @@ module MotionPrime
     end
 
     def will_appear
-      unless @on_appear_happened
+      @visible = true
+      @on_appear_happened ||= {}
+      unless @on_appear_happened[view.object_id]
         setup view, styles: default_styles do
           run_callbacks :render { render }
         end
       end
-      @on_appear_happened = true
+      @on_appear_happened[view.object_id] = true
+    end
+
+    def will_disappear
+      @visible = false
     end
 
     def dealloc
-      pp self.object_id, 'Deallocating Screen', self.retainCount
+      pp 'Deallocating Screen', self.object_id, self.to_s
       # FIXME: calling instance_eval in title method (_base_screen_mixin) instance variables need to be cleared manually
-      # clear_instance_variables cause BAD_ACCESS errors too
-      @main_section = nil
+      clear_instance_variables
       super
     end
 
     def visible?
-      self.isViewLoaded && view.window
+      @visible
     end
   end
 end

data/motion-prime/sections/_draw_section_mixin.rb

@@ -77,6 +77,10 @@ module MotionPrime
       @cached_draw_image ||= MotionSupport::HashWithIndifferentAccess.new
     end
 
+    def strong_references
+      [self, screen].map(&:strong_ref)
+    end
+
     private
       def set_container_gesture_recognizer
         single_tap = UITapGestureRecognizer.alloc.initWithTarget(self, action: 'on_container_tap_gesture:')

data/motion-prime/sections/base_section.rb

@@ -37,7 +37,7 @@ module MotionPrime
     end
 
     def dealloc
-      pp 'deallocating section', self.name, self.elements.try(:count), self.to_s, self.object_id
+      # pp 'deallocating section', self.name, self.elements.try(:count), self.to_s, self.object_id
       NSNotificationCenter.defaultCenter.removeObserver self # unbinding events created in bind_keyboard_events
       super
     end
@@ -110,7 +110,7 @@ module MotionPrime
       end
     end
 
-    def add_element(key, options)
+    def add_element(key, options = {})
       return unless render_element?(key)
       opts = options.clone
       index = opts.delete(:at)
@@ -254,7 +254,7 @@ module MotionPrime
         # we should clone options to prevent overriding options
         # in next element with same name in another class
         options = opts.clone
-        options[:type] ||= (options[:text] || options[:attributed_text_options]) ? :label : :view
+        options[:type] ||= (options[:text] || options[:html] || options[:attributed_text_options]) ? :label : :view
         options.merge(screen: screen, section: self.weak_ref)
       end
 

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

@@ -11,9 +11,15 @@ module MotionPrime
 
     def prepare_table_data
       @form = @options[:table]
-      @errors_observer_options = normalize_options(options.delete(:observe_errors).clone, self) if options[:observe_errors]
+      if options[:observe_errors]
+        @errors_observer_options = normalize_options(options.delete(:observe_errors), self)
+      end
     end
 
+    # Returns true if we should render element in current state
+    # 
+    # @param element_name [Symbol] name of element in field
+    # @return [Boolean]
     def render_element?(element_name)
       case element_name.to_sym
       when :error_message
@@ -24,6 +30,19 @@ module MotionPrime
       end
     end
 
+    # Changes height of the field (the cell in table) with animation.
+    # 
+    # @param height [Integet] new height of field
+    # @return [MotionPrime::BaseFieldSection]
+    def update_height(height)
+      container_options[:height] = height
+      field_index = form.field_indexes[name]
+      index = field_index.split('_').map(&:to_i)
+      path = NSIndexPath.indexPathForRow(index.last, inSection: index.first)
+      form.table_view.reloadRowsAtIndexPaths([path], withRowAnimation: UITableViewRowAnimationNone)
+      self
+    end
+
     def on_section_render
       @status_for_updated = :rendered
       form.register_elements_from_section(self)
@@ -57,7 +76,7 @@ module MotionPrime
 
     def focus(begin_editing = true)
       # scroll to cell
-      path = form.table_view.indexPathForCell cell
+      path = form.table_view.indexPathForCell(cell)
       form.table_view.scrollToRowAtIndexPath path,
         atScrollPosition: UITableViewScrollPositionTop, animated: true
       # focus on text field

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

@@ -4,14 +4,21 @@ module MotionPrime
     element :label, type: :label do
       options[:label] || {}
     end
-    element :date_picker, type: :date_picker
+    element :date_picker, type: :date_picker do
+      options[:input] || {}
+    end
 
     after_render :bind_date_picker
 
     def bind_date_picker
       picker = view(:date_picker)
       picker.setDelegate form
-      picker.setDate NSDate.date, animated: true
+      unless picker.date
+        picker.setDate NSDate.date, animated: true
+      end
+      picker.on :change do
+        form.send(options[:action]) if options[:action]
+      end
     end
   end
 end

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

@@ -1,8 +1,10 @@
 module MotionPrime
   class SubmitFieldSection < BaseFieldSection
     element :submit, type: :button do
-      {title: options[:title]}
+      {title: options[:title]}.merge(options[:button] || {})
     end
+    element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
+
     after_render :bind_submit
 
     def bind_submit

data/motion-prime/sections/table.rb

@@ -51,11 +51,17 @@ module MotionPrime
       @preloader_queue[-1] = :cancelled if @preloader_queue.present?
     end
 
+    def reload_cell(section)
+      section.elements.values.each(&:compute_options!)
+      section.cached_draw_image = nil
+      # TODO: reset date stamps, reload row
+    end
+
     def table_styles
       type = self.is_a?(FormSection) ? :base_form : :base_table
 
       base_styles = [type]
-      base_styles << :"#{type}_with_sections" #unless flat_data?
+      base_styles << :"#{type}_with_sections" unless flat_data?
       item_styles = [name.to_sym]
       item_styles << @styles if @styles.present?
       {common: base_styles, specific: item_styles}
@@ -371,7 +377,6 @@ module MotionPrime
         BW::Reactor.schedule(@preloader_queue.count) do |queue_id|
           @preloader_queue[queue_id] = :in_progress
           @strong_refs[queue_id] = screen.strong_ref
-
           result = load_count.times do |offset|
             if @preloader_queue[queue_id] == :cancelled
               @strong_refs[queue_id] = nil

data/motion-prime/styles/base.rb

@@ -19,8 +19,8 @@ MotionPrime::Styles.define :base do
   # basic form styles
   # ----------
   style :form,
-    width: 260,
-    left: 30,
+    width: 280,
+    left: 20,
     top: 0,
     right: 30,
     bottom: 0,

data/motion-prime/styles/form.rb

@@ -37,7 +37,8 @@ MotionPrime::Styles.define :base_form do
   style :field_error_message,
     top: nil,
     bottom: 0,
-    width: 300,
+    width: 280,
+    left: 0,
     line_break_mode: :word_wrap,
     number_of_lines: 0,
     size_to_fit: true,
@@ -79,6 +80,7 @@ MotionPrime::Styles.define :base_form do
     title_label: {
       font: proc { MotionPrime::Config.font.name.uifont(16) }
     }
+
   style :select_field_image,
     image: "images/forms/select_arrow.png",
     top: 40,
@@ -89,7 +91,11 @@ MotionPrime::Styles.define :base_form do
   style :with_sections_field_switch,
     right: 20
 
-  style :with_sections_field_text_field, :with_sections_field_text_view, :with_sections_field_password_field, :with_sections_field_label, :with_sections_field_button,
+  style :with_sections_field_text_field, 
+    :with_sections_field_text_view, 
+    :with_sections_field_password_field, 
+    :with_sections_field_label, 
+    :with_sections_field_button,
     left: 20,
     right: 20
 

data/motion-prime/support/mp_cell_content_view.rb

@@ -0,0 +1,12 @@
+class MPTableViewCellContentView < UITableViewCellContentView
+  attr_accessor :section
+
+  def setSection(section)
+    @section = section.try(:weak_ref)
+  end
+
+  def drawRect(rect)
+    section.try(:draw_in, rect)
+    super
+  end
+end

data/motion-prime/support/mp_cell_with_section.rb

@@ -1,23 +1,25 @@
 class MPCellWithSection < UITableViewCell
   attr_reader :section
+  attr_accessor :scroll_view, :content_view
 
-  def setSection(section)
-    @section = section.try(:weak_ref)
-    @section_name = section.try(:name) # TODO: remove after debug
-  end
-
-  def drawRect(rect)
+  def setNeedsDisplay
+    content_view.try(:setNeedsDisplay)
     super
-    draw_in(rect)
   end
 
-  def draw_in(rect)
-    # pp '++ drawing', @section_name, self.object_id
-    section.draw_in(rect) if section && section.respond_to?(:draw_in)
+  def setSection(section)
+    @section = section.try(:weak_ref)
+    self.content_view.setSection(@section)
   end
 
-  # def dealloc
-  #   pp '--- deallog cell with section', @section_name, self.object_id
-  #   super
-  # end
+  def initialize_content
+    self.scroll_view = self.subviews.first
+    self.scroll_view.subviews.first.removeFromSuperview
+    self.content_view = MPTableViewCellContentView.alloc.initWithFrame(self.bounds)
+    self.content_view.setBackgroundColor(:clear.uicolor)
+    self.content_view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight
+    self.content_view.top = 0
+    self.content_view.left = 0
+    self.scroll_view.addSubview(content_view)
+  end
 end

data/motion-prime/support/tab_bar_controller.rb

@@ -5,14 +5,11 @@ module MotionPrime
 
       view_controllers = []
 
-      screens.each_with_index do |screen, index|
-        if screen.is_a?(Hash)
-          screen, image, title = screen[:screen], screen[:image], screen[:title]
-          screen = Screen.create_with_options(screen).try(:weak_ref)
-          title ||= screen.title
-          image = image.uiimage if image
-          screen.tabBarItem = UITabBarItem.alloc.initWithTitle title, image: image, tag: index
+      screens.each_with_index do |options, index|
+        if options.is_a?(Hash)
+          screen = init_screen_with_options(options, tag: index)
         else
+          screen = options
           screen.tabBarItem.tag = index
         end
 
@@ -33,5 +30,29 @@ module MotionPrime
       end
       controller
     end
+
+    protected
+      def self.init_screen_with_options(options, tag: tag)
+        screen, image, title = options[:screen], options[:image], options[:title]
+        screen = Screen.create_with_options(screen).try(:weak_ref)
+        title ||= screen.title
+
+        image = extract_image_from_options(options, with_key: :image)
+        screen.tabBarItem = UITabBarItem.alloc.initWithTitle title, image: image, tag: tag
+
+        selected_image = extract_image_from_options(options, with_key: :selected_image)
+        screen.tabBarItem.setSelectedImage(selected_image) if selected_image
+        screen
+      end
+
+      def self.extract_image_from_options(options, with_key: key)
+        image = options[key]
+        return unless image
+        image = image.uiimage
+        if options[:translucent] === false
+          image = image.imageWithRenderingMode UIImageRenderingModeAlwaysOriginal
+        end
+        image
+      end
   end
 end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/motion-prime/views/layout.rb

@@ -2,7 +2,8 @@
 motion_require '../support/mp_cell_with_section'
 module MotionPrime
   module Layout
-    def add_view(klass, options = {}, &block)    
+    def add_view(klass, options = {}, &block)
+      options = options.clone
       bounds = if view_stack.empty?
         options.delete(:parent_view).try(:bounds) || CGRectZero
       else

data/motion-prime/views/view_builder.rb

@@ -35,6 +35,7 @@ module MotionPrime
             if options.slice(:line_spacing, :line_height, :underline, :fragment_color).any?
               options[:attributed_text_options] = {
                 text: options.delete(:text),
+                html: options.delete(:html),
                 line_spacing: options.delete(:line_spacing),
                 line_height: options.delete(:line_height),
                 fragment_color: options.delete(:fragment_color),
@@ -74,7 +75,7 @@ module MotionPrime
             is_custom_button = options[:background_image] || options[:title_color]
             default_button_type = is_custom_button ? :custom : :rounded
             button_type = (options.delete(:button_type) || default_button_type).uibuttontype
-            button = klass.buttonWithType button_type
+            klass.buttonWithType button_type
           },
           'UIImageView' => Proc.new{|klass, options|
             image = options.delete(:image)
@@ -109,7 +110,9 @@ module MotionPrime
               options.delete(:gradient)
             end
 
-            klass.alloc.initWithStyle style, reuseIdentifier: options.delete(:reuse_identifier)
+            obj = klass.alloc.initWithStyle style, reuseIdentifier: options.delete(:reuse_identifier)
+            obj.initialize_content
+            obj
           },
           'MPViewWithSection' => Proc.new{|klass, options|
             if options[:has_drawn_content]

data/motion-prime/views/view_styler.rb

@@ -106,25 +106,41 @@ module MotionPrime
         view.mask = mask_layer
       elsif key == 'attributed_text_options'
         attributes = {}
-        if line_spacing = value[:line_spacing] || line_height = value[:line_height]
-          paragrahStyle = NSMutableParagraphStyle.alloc.init
-          line_height ? paragrahStyle.setMinimumLineHeight(line_height) : paragrahStyle.setLineSpacing(line_spacing)
-          attributes[NSParagraphStyleAttributeName] = paragrahStyle
-        end
+        if value[:html] # TODO: use _text_mixin
+          styles = []
+          styles << "color: #{options[:text_color].hex};" if options[:text_color]
+          styles << "line-height: #{options[:line_height] || (options[:line_spacing].to_f + options[:font].pointSize)}px;"
+          styles << "font-family: '#{options[:font].familyName}';"
+          styles << "font-size: #{options[:font].pointSize}px;"
 
-        attributedString = NSAttributedString.alloc.initWithString(value[:text], attributes: attributes)
-        if underline_range = value[:underline]
-          attributedString = NSMutableAttributedString.alloc.initWithAttributedString(attributedString)
-          attributedString.addAttributes({NSUnderlineStyleAttributeName => NSUnderlineStyleSingle}, range: underline_range)
-        end
-        if fragment_color = value[:fragment_color]
-          attributedString = NSMutableAttributedString.alloc.initWithAttributedString(attributedString)
-          attributedString.addAttributes({NSForegroundColorAttributeName => fragment_color[:color].uicolor}, range: fragment_color[:range])
-        end
-        if view.is_a?(UIButton)
-          view.setAttributedTitle attributedString, forState: UIControlStateNormal
+          html_options = {
+            NSDocumentTypeDocumentAttribute => NSHTMLTextDocumentType,
+            NSCharacterEncodingDocumentAttribute => NSNumber.numberWithInt(NSUTF8StringEncoding)
+          }
+          text = "#{value[:html]}<style>* { #{styles.join} }</style>"
+          view.attributedText = NSAttributedString.alloc.initWithData(text.dataUsingEncoding(NSUTF8StringEncoding), options: html_options, documentAttributes: nil, error: nil)
         else
-          view.attributedText = attributedString
+          if line_spacing = value[:line_spacing] || line_height = value[:line_height]
+            paragrahStyle = NSMutableParagraphStyle.alloc.init
+            line_height ? paragrahStyle.setMinimumLineHeight(line_height) : paragrahStyle.setLineSpacing(line_spacing)
+            attributes[NSParagraphStyleAttributeName] = paragrahStyle
+          end
+
+          attributedString = NSAttributedString.alloc.initWithString(value[:text].to_s, attributes: attributes)
+          if underline_range = value[:underline]
+            underline_range = [0, value[:text].length] if underline_range === true
+            attributedString = NSMutableAttributedString.alloc.initWithAttributedString(attributedString)
+            attributedString.addAttributes({NSUnderlineStyleAttributeName => NSUnderlineStyleSingle}, range: underline_range)
+          end
+          if fragment_color = value[:fragment_color]
+            attributedString = NSMutableAttributedString.alloc.initWithAttributedString(attributedString)
+            attributedString.addAttributes({NSForegroundColorAttributeName => fragment_color[:color].uicolor}, range: fragment_color[:range])
+          end
+          if view.is_a?(UIButton)
+            view.setAttributedTitle attributedString, forState: UIControlStateNormal
+          else
+            view.attributedText = attributedString
+          end
         end
       elsif key == 'gradient'
         gradient = prepare_gradient(value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-12 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -151,6 +151,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rm-digest
+  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'
 description: RubyMotion apps development framework
 email:
 - gvalmon@gmail.com
@@ -294,6 +308,7 @@ files:
 - motion-prime/support/_key_value_store.rb
 - motion-prime/support/_padding_attribute.rb
 - motion-prime/support/mp_button.rb
+- motion-prime/support/mp_cell_content_view.rb
 - motion-prime/support/mp_cell_with_section.rb
 - motion-prime/support/mp_label.rb
 - motion-prime/support/mp_search_bar_custom.rb