motion-prime 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed397d9e2fd731cd20575ece1c67b150915711c3
-  data.tar.gz: d35b535aafc6ccfc39b317ab15387b0d58032edd
+  metadata.gz: 7e3edc8658a85c7184310acc029dc5a710be493f
+  data.tar.gz: a76dab2b6f08031d9edbd8c23e730a5cc061ac46
 SHA512:
-  metadata.gz: bf28b8ece9d90c0703b94b1763d0fb7ff61f7a6f7688d8355634ed0f76af2528e08e07f7e1d185824d8596715e251dc479fc99cca1e1f04114b0466f1d2b7c64
-  data.tar.gz: 35f315439efb220eb33d6c63def92b87dda91d52713abad7ad573956cc00a514de7d023aba6113282c07098f1a0f509b7094717386d1de22b98f197c63e2dabe
+  metadata.gz: c55504663d7c290007e2d81c04dd28f1633827ab4605c9c23a1480b736324b734bdfde29212072b03f77b13970a69cb274a648ba14e2ad86ba4d3e0071f4b61b
+  data.tar.gz: 12d135885f5dffa9a9017d5f0df862c846a5d5dc3e4ea9b29777a1b6046f97f3052b5558f77ac75a17e972bfec8369899e81311ebf1ec79b79b8c833a785435d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.4.4)
+    motion-prime (0.4.5)
       bubble-wrap
       cocoapods
       methadone

data/doc/code/getting_started.rb

@@ -10,7 +10,8 @@ Visit http://www.rubymotion.com
 # **2. Create application delegate.**
 #
 # You should rewrite the `on_load` method, which will be runned after starting application.
-# Note: you should always use AppDelegate class name.
+#
+# NOTE: you should always use AppDelegate class name.
 
 class AppDelegate < Prime::BaseAppDelegate
   def on_load(app, options)
@@ -21,6 +22,8 @@ end
 # **3. Create the main screen.**
 #
 # You should rewrite the `render` method, which will be runned after first opening screen.
+#
+# NOTE: it's recommended to use instance variables for sections, e.g. `@main_section` instead of `main_section`.
 
 class MainScreen < Prime::BaseScreen
   title 'Main screen'
@@ -47,14 +50,14 @@ end
 # Styles will be applied to each element in section.
 # The simplest rule by default is: `:section-name_:element-name`.
 #
-# E.g. if you have 'MyProfileSection' (the name for section by default will be - `my_profile`)
-# and 'title' element, then you should use `my_profile_title` style name.
+# E.g. if you have "MyProfileSection" (the name for section by default will be - `my_profile`)
+# and "title" element, then you should use `my_profile_title` style name.
 
 Prime::Styles.define do
   style :my_profile_title, width: 300, height: 20
 end
 
-# Also, you can pass namespace to `define` method.
+# You can pass namespace to `define` method.
 
 Prime::Styles.define :my_profile do
   style :title, width: 300, height: 20

data/doc/code/screens.rb

@@ -1,8 +1,15 @@
+# ** What is a Screen? **
+#
+# "Screen" is the most common class in MotionPrime, you can create entire application using only "Screens".
+# Generally it's just a "UIViewController" wrapper with some syntax sugar. 
+# For RubyOnRails developers the nearest analogy would be "Controllers".
+---
+
 # ** Render the screen. **
 #
-# You should rewrite the `render` method of Prime::BaseScreen, which will be runned after first opening screen.
+# You should rewrite the `render` method of `Prime::BaseScreen`, which will be runned after first opening screen.
 
-class MainScreen < Prime::BaseScreen
+class FooScreen < Prime::BaseScreen
   def render
     @main_section = MyProfileSection.new(screen: self, model: User.first)
     @main_section.render
@@ -11,44 +18,55 @@ end
 
 # ** Set screen's title **
 # 
-# This title will be used in screen's navigation controller and will be shown there.
+# Title will be used in screen's navigation controller and will be shown on top of screen.
+#
+# NOTE: screen should be created with enabled navigation (see "Initialize screen" block).
 
-class MainScreen < Prime::BaseScreen
-  title 'Main screen'
+class FooScreen < Prime::BaseScreen
+  title 'Foo screen'
 end
 
-# Also, you can pass block to define screen's title
+# You can pass block to define screen's title
 
-class MainScreen < Prime::BaseScreen
+class FooScreen < Prime::BaseScreen
   title { params[:title] }
 end
 
 # ** Initialize screen. **
 #
 # Available options:
-# * :navigation. when this options is true, screen will be created with navigation support, like left and right buttons and title.
+# * `:navigation`. When this options is true, screen will be created with navigation support: it will allow adding title and left/right buttons.
 # This option is false by default.
 
-screen = MainScreen.new(navigation: true)
+def open_foo_screen
+  foo_screen = FooScreen.new(navigation: true)
+end
 
 # ** Open screen: using app delegate. **
 
-# Opening screen using app delegate is the most basic way, you would do it at least on app load.
+# Opening screen using app delegate is the most basic way, you would use it at least on app load.
 #
 # Available options:
-# * :root. when this option is true, screen will not be in content controller and will create new root screen. 
+# * `:root`. When this option is true, screen will not be in content controller and will create new root screen. 
 # You can use root: true when you have already opened screen with sidebar, and you want to open new screen without sidebar.
 # This option is false by default if you already have root screen and true if not.
 #
-# * :sidebar. send Prime::BaseScreen instance to this option if you want to create root screen with sidebar. 
-# value of this options will be used as sidebar controller.
+# * `:sidebar`. Send `Prime::BaseScreen` instance to this option if you want to create root screen with sidebar. 
+# Value of this options will be used as sidebar controller.
 
-app_delegate.open_screen MainScreen.new(navigation: true), sidebar: MySidebar.new
+def open_foo_screen
+  foo_screen = FooScreen.new(navigation: true)
+  sidebar = MySidebar.new
+  app_delegate.open_screen foo_screen, sidebar: sidebar
+end
 
 # ** Open screen: using parent screen. **
 
 # Opening screen using parent screen is usefull if you want to create inherited screen. 
 # Parent screen should have been initialized with navigation support.
 
-screen.open_screen AnotherScreen.new(navigation: true)
+def open_second_screen
+  second_screen = SecondScreen.new(navigation: true)
+  foo_screen.open_screen second_screen
+end
 

data/doc/docs/getting_started.html

@@ -98,8 +98,8 @@
                 <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
               <p><strong>2. Create application delegate.</strong></p>
-<p>You should rewrite the <code>on_load</code> method, which will be runned after starting application.
-Note: you should always use AppDelegate class name.</p>
+<p>You should rewrite the <code>on_load</code> method, which will be runned after starting application.</p>
+<p>NOTE: you should always use AppDelegate class name.</p>
 
             </div>
             
@@ -120,6 +120,7 @@ Note: you should always use AppDelegate class name.</p>
               </div>
               <p><strong>3. Create the main screen.</strong></p>
 <p>You should rewrite the <code>render</code> method, which will be runned after first opening screen.</p>
+<p>NOTE: it&#39;s recommended to use instance variables for sections, e.g. <code>@main_section</code> instead of <code>main_section</code>.</p>
 
             </div>
             
@@ -164,8 +165,8 @@ Note: you should always use AppDelegate class name.</p>
               <p><strong>5. Create your first stylesheet file.</strong></p>
 <p>Styles will be applied to each element in section.
 The simplest rule by default is: <code>:section-name_:element-name</code>.</p>
-<p>E.g. if you have &#39;MyProfileSection&#39; (the name for section by default will be - <code>my_profile</code>)
-and &#39;title&#39; element, then you should use <code>my_profile_title</code> style name.</p>
+<p>E.g. if you have &quot;MyProfileSection&quot; (the name for section by default will be - <code>my_profile</code>)
+and &quot;title&quot; element, then you should use <code>my_profile_title</code> style name.</p>
 
             </div>
             
@@ -182,7 +183,7 @@ and &#39;title&#39; element, then you should use <code>my_profile_title</code> s
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-8">&#182;</a>
               </div>
-              <p>Also, you can pass namespace to <code>define</code> method.</p>
+              <p>You can pass namespace to <code>define</code> method.</p>
 
             </div>
             

data/doc/docs/screens.html

@@ -48,12 +48,30 @@
               <div class="pilwrap ">
                 <a class="pilcrow" href="#section-1">&#182;</a>
               </div>
+              <p><strong> What is a Screen? </strong></p>
+<p>&quot;Screen&quot; is the most common class in MotionPrime, you can create entire application using only &quot;Screens&quot;.
+Generally it&#39;s just a &quot;UIViewController&quot; wrapper with some syntax sugar. 
+For RubyOnRails developers the nearest analogy would be &quot;Controllers&quot;.</p>
+
+            </div>
+            
+            <div class="content"><div class='highlight'><pre>---</pre></div></div>
+            
+        </li>
+        
+        
+        <li id="section-2">
+            <div class="annotation">
+              
+              <div class="pilwrap ">
+                <a class="pilcrow" href="#section-2">&#182;</a>
+              </div>
               <p><strong> Render the screen. </strong></p>
-<p>You should rewrite the <code>render</code> method of Prime::BaseScreen, which will be runned after first opening screen.</p>
+<p>You should rewrite the <code>render</code> method of <code>Prime::BaseScreen</code>, which will be runned after first opening screen.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="class"><span class="keyword">class</span> <span class="title">MainScreen</span> <span class="inheritance">&lt; <span class="parent">Prime::BaseScreen</span></span></span>
+            <div class="content"><div class='highlight'><pre><span class="class"><span class="keyword">class</span> <span class="title">FooScreen</span> <span class="inheritance">&lt; <span class="parent">Prime::BaseScreen</span></span></span>
   <span class="function"><span class="keyword">def</span> <span class="title">render</span></span>
     <span class="variable">@main_section</span> = <span class="constant">MyProfileSection</span>.new(<span class="symbol">screen:</span> <span class="keyword">self</span>, <span class="symbol">model:</span> <span class="constant">User</span>.first)
     <span class="variable">@main_section</span>.render
@@ -63,92 +81,99 @@
         </li>
         
         
-        <li id="section-2">
+        <li id="section-3">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-2">&#182;</a>
+                <a class="pilcrow" href="#section-3">&#182;</a>
               </div>
               <p><strong> Set screen&#39;s title </strong></p>
-<p>This title will be used in screen&#39;s navigation controller and will be shown there.</p>
+<p>Title will be used in screen&#39;s navigation controller and will be shown on top of screen.</p>
+<p>NOTE: screen should be created with enabled navigation (see &quot;Initialize screen&quot; block).</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="class"><span class="keyword">class</span> <span class="title">MainScreen</span> <span class="inheritance">&lt; <span class="parent">Prime::BaseScreen</span></span></span>
-  title <span class="string">'Main screen'</span>
+            <div class="content"><div class='highlight'><pre><span class="class"><span class="keyword">class</span> <span class="title">FooScreen</span> <span class="inheritance">&lt; <span class="parent">Prime::BaseScreen</span></span></span>
+  title <span class="string">'Foo screen'</span>
 <span class="keyword">end</span></pre></div></div>
             
         </li>
         
         
-        <li id="section-3">
+        <li id="section-4">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-3">&#182;</a>
+                <a class="pilcrow" href="#section-4">&#182;</a>
               </div>
-              <p>Also, you can pass block to define screen&#39;s title</p>
+              <p>You can pass block to define screen&#39;s title</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre><span class="class"><span class="keyword">class</span> <span class="title">MainScreen</span> <span class="inheritance">&lt; <span class="parent">Prime::BaseScreen</span></span></span>
+            <div class="content"><div class='highlight'><pre><span class="class"><span class="keyword">class</span> <span class="title">FooScreen</span> <span class="inheritance">&lt; <span class="parent">Prime::BaseScreen</span></span></span>
   title { params[<span class="symbol">:title</span>] }
 <span class="keyword">end</span></pre></div></div>
             
         </li>
         
         
-        <li id="section-4">
+        <li id="section-5">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-4">&#182;</a>
+                <a class="pilcrow" href="#section-5">&#182;</a>
               </div>
               <p><strong> Initialize screen. </strong></p>
 <p>Available options:</p>
 <ul>
-<li>:navigation. when this options is true, screen will be created with navigation support, like left and right buttons and title.
+<li><code>:navigation</code>. When this options is true, screen will be created with navigation support: it will allow adding title and left/right buttons.
 This option is false by default.</li>
 </ul>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>screen = <span class="constant">MainScreen</span>.new(<span class="symbol">navigation:</span> <span class="keyword">true</span>)</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="function"><span class="keyword">def</span> <span class="title">open_foo_screen</span></span>
+  foo_screen = <span class="constant">FooScreen</span>.new(<span class="symbol">navigation:</span> <span class="keyword">true</span>)
+<span class="keyword">end</span></pre></div></div>
             
         </li>
         
         
-        <li id="section-5">
+        <li id="section-6">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-5">&#182;</a>
+                <a class="pilcrow" href="#section-6">&#182;</a>
               </div>
               <p><strong> Open screen: using app delegate. </strong></p>
-<p>Opening screen using app delegate is the most basic way, you would do it at least on app load.</p>
+<p>Opening screen using app delegate is the most basic way, you would use it at least on app load.</p>
 <p>Available options:</p>
 <ul>
-<li><p>:root. when this option is true, screen will not be in content controller and will create new root screen. 
+<li><p><code>:root</code>. When this option is true, screen will not be in content controller and will create new root screen. 
 You can use root: true when you have already opened screen with sidebar, and you want to open new screen without sidebar.
 This option is false by default if you already have root screen and true if not.</p>
 </li>
-<li><p>:sidebar. send Prime::BaseScreen instance to this option if you want to create root screen with sidebar. 
-value of this options will be used as sidebar controller.</p>
+<li><p><code>:sidebar</code>. Send <code>Prime::BaseScreen</code> instance to this option if you want to create root screen with sidebar. 
+Value of this options will be used as sidebar controller.</p>
 </li>
 </ul>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>app_delegate.open_screen <span class="constant">MainScreen</span>.new(<span class="symbol">navigation:</span> <span class="keyword">true</span>), <span class="symbol">sidebar:</span> <span class="constant">MySidebar</span>.new</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="function"><span class="keyword">def</span> <span class="title">open_foo_screen</span></span>
+  foo_screen = <span class="constant">FooScreen</span>.new(<span class="symbol">navigation:</span> <span class="keyword">true</span>)
+  sidebar = <span class="constant">MySidebar</span>.new
+  app_delegate.open_screen foo_screen, <span class="symbol">sidebar:</span> sidebar
+<span class="keyword">end</span></pre></div></div>
             
         </li>
         
         
-        <li id="section-6">
+        <li id="section-7">
             <div class="annotation">
               
               <div class="pilwrap ">
-                <a class="pilcrow" href="#section-6">&#182;</a>
+                <a class="pilcrow" href="#section-7">&#182;</a>
               </div>
               <p><strong> Open screen: using parent screen. </strong></p>
 <p>Opening screen using parent screen is usefull if you want to create inherited screen. 
@@ -156,7 +181,10 @@ Parent screen should have been initialized with navigation support.</p>
 
             </div>
             
-            <div class="content"><div class='highlight'><pre>screen.open_screen <span class="constant">AnotherScreen</span>.new(<span class="symbol">navigation:</span> <span class="keyword">true</span>)</pre></div></div>
+            <div class="content"><div class='highlight'><pre><span class="function"><span class="keyword">def</span> <span class="title">open_second_screen</span></span>
+  second_screen = <span class="constant">SecondScreen</span>.new(<span class="symbol">navigation:</span> <span class="keyword">true</span>)
+  foo_screen.open_screen second_screen
+<span class="keyword">end</span></pre></div></div>
             
         </li>
         

data/files/Gemfile.lock

@@ -32,7 +32,7 @@ GEM
       bundler
     motion-cocoapods (1.4.0)
       cocoapods (>= 0.26.2)
-    motion-prime (0.4.3)
+    motion-prime (0.4.4)
       bubble-wrap
       cocoapods
       methadone
@@ -59,6 +59,6 @@ PLATFORMS
 DEPENDENCIES
   bubble-wrap (~> 1.3.0)
   motion-cocoapods (~> 1.4.0)
-  motion-prime (~> 0.4.3)
+  motion-prime (~> 0.4.4)
   motion-support (~> 0.2.4)
   sugarcube (~> 1.3.7)

data/motion-prime/api_client.rb

@@ -53,7 +53,8 @@ class ApiClient
 
   def resource_url(path)
     # return if path.blank?
-    "#{MotionPrime::Config.api.base}#{path}"
+    base = Prime::Config.api.resource_base.present? ? Prime::Config.api.resource_base : Prime::Config.api.base
+    "#{base}#{path}"
   end
 
   def request(method, path, params = {}, &block)

data/motion-prime/app_delegate.rb

@@ -32,7 +32,6 @@ module MotionPrime
 
     # TODO: move to private methods
     def open_root_screen(screen)
-      close_current_screens
       screen.send(:on_screen_load) if screen.respond_to?(:on_screen_load)
       screen.wrap_in_navigation if screen.respond_to?(:wrap_in_navigation)
 
@@ -47,7 +46,6 @@ module MotionPrime
     # TODO: move to private methods
     def open_content_screen(screen)
       if sidebar?
-        close_current_screens
         sidebar_container.content_controller = screen
       else
         open_root_screen(screen)
@@ -85,24 +83,7 @@ module MotionPrime
       NSNotificationCenter.defaultCenter.postNotificationName(:on_current_user_reset, object: user_was)
     end
 
-    def close_screens(screens)
-      Array.wrap(screens).each { |screen| screen.on_destroy if screen.respond_to?(:on_destroy) }
-    end
-
     private
-      def close_current_screens
-        return unless self.window
-
-        screens = if sidebar? && sidebar_container.content_controller.is_a?(UINavigationController)
-          sidebar_container.content_controller.childViewControllers
-        elsif sidebar?
-          sidebar_container.content_controller
-        else
-          window.rootViewController
-        end
-        close_screens(screens)
-      end
-
       def create_tab_bar(screens)
         MotionPrime::TabBarController.new(screens)
       end

data/motion-prime/elements/base_element.rb

@@ -18,6 +18,7 @@ module MotionPrime
     define_callbacks :render
 
     def initialize(options = {})
+      options[:screen] = options[:screen].try(:weak_ref)
       @options = options
       @screen = options[:screen]
       @section = options[:section]
@@ -27,9 +28,14 @@ module MotionPrime
       @view_name = self.class_name_without_kvo.demodulize.underscore.gsub(/(_draw)?_element/, '')
     end
 
-    def dealloc
-      pp 'deallocating elemenet', self.name
-      super
+    # def dealloc
+    #   pp 'deallocating elemenet', self.name, self.to_s, section.to_s
+    #   super
+    # end
+
+    def add_target(target = nil, action = 'on_click:', event = :touch)
+      return false unless self.view
+      self.view.addTarget(target || section, action: action, forControlEvents: event.uicontrolevent)
     end
 
     def render(options = {}, &block)

data/motion-prime/models/association_collection.rb

@@ -41,19 +41,17 @@ module MotionPrime
 
     def all(*args)
       return [] unless bag.store.present?
-      data = bag.find(find_options(args[0]), sort_options(args[1]))
+      find_options = find_options(args[0])
+      sort_options = sort_options(args[1])
+      data = if sort_options.present? # TODO: check bag items count
+        bag.find(find_options, sort_options)
+      else
+        bag.to_a.select { |entity| find_options.all? { |field, value| entity.send(field) == value } }
+      end
       set_inverse_relation_for(data)
       data
     end
 
-    def last
-      all.last
-    end
-
-    def first
-      all.first
-    end
-
     def set_inverse_relation_for(models)
       [*models].each do |model|
         model.send("#{inverse_relation_name}=", inverse_relation)
@@ -71,8 +69,7 @@ module MotionPrime
     end
 
     def sort_options(options)
-      return options if options.present?
-      {sort: model_class.default_sort_options}
+      options || {sort: model_class.default_sort_options}
     end
 
     def model_class

data/motion-prime/screens/_navigation_mixin.rb

@@ -74,7 +74,7 @@ module MotionPrime
         screen = screen.new if screen.respond_to?(:new)
 
         # Set parent, title & modal properties
-        screen.parent_screen = self if screen.respond_to?("parent_screen=")
+        screen.parent_screen = self.weak_ref if screen.respond_to?("parent_screen=")
         screen.title = args[:title] if args[:title] && screen.respond_to?("title=")
         screen.modal = args[:modal] if args[:modal] && screen.respond_to?("modal=")
 
@@ -98,13 +98,11 @@ module MotionPrime
 
       def close_screen_navigational(args = {})
         if args[:to_screen] && args[:to_screen].is_a?(UIViewController)
-          self.parent_screen = args[:to_screen]
+          self.parent_screen = args[:to_screen].weak_ref
 
           screens = self.navigation_controller.childViewControllers
-          app_delegate.close_screens(screens[screens.index(parent_screen)+1..-1])
           self.navigation_controller.popToViewController(args[:to_screen], animated: args[:animated])
         else
-          app_delegate.close_screens(self)
           self.navigation_controller.popViewControllerAnimated(args[:animated])
         end
         send_on_return(args)

data/motion-prime/screens/base_screen.rb

@@ -34,11 +34,13 @@ module MotionPrime
       @on_appear_happened = true
     end
 
-    def on_destroy
-      BW::Reactor.schedule do
-        pp 'destroying screen'
-        @main_section = nil
-      end
+    # def dealloc
+    #   pp 'Deallocating Screen'
+    #   super
+    # end
+
+    def visible?
+      self.isViewLoaded && view.window
     end
   end
 end

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

@@ -41,7 +41,7 @@ module MotionPrime
 
     def create_navigation_button(title, args = {})
       args[:style]  ||= UIBarButtonItemStylePlain
-      args[:target] ||= self
+      args[:target] = (args[:target] || self).weak_ref
       args[:action] ||= nil
       # TODO: Find better place for this code, may be just create custom control
       if args[:image]

data/motion-prime/sections/_cell_section_mixin.rb

@@ -38,7 +38,7 @@ module MotionPrime
     def init_container_element(options = {})
       @container_element ||= begin
         options.merge!({
-          screen: screen.try(:weak_ref),
+          screen: screen,
           section: self.weak_ref,
           has_drawn_content: true
         })

data/motion-prime/sections/_draw_section_mixin.rb

@@ -20,7 +20,7 @@ module MotionPrime
         render_image_elements
       elsif prerender_enabled?
         prerender_elements_for_state(state)
-        draw_in(rect, state)
+        draw_in(rect, state) if cached_draw_image[state]
       else
         draw_background_in_context(UIGraphicsGetCurrentContext(), rect)
         draw_elements(rect)

data/motion-prime/sections/base_section.rb

@@ -25,16 +25,16 @@ module MotionPrime
     define_callbacks :render
 
     def initialize(options = {})
+      options[:screen] = options[:screen].try(:weak_ref)
       @options = options
-      self.screen = options[:screen].try(:weak_ref)
+      self.screen = options[:screen]
       @model = options[:model]
       @name = options[:name] ||= default_name
       @options_block = options[:block]
     end
 
     def dealloc
-      pp 'deallocating section. elements count: ', self.elements.try(:count)
-      self.elements = nil
+      # pp 'deallocating section. elements count: ', self.elements.try(:count), self.to_s
 
       NSNotificationCenter.defaultCenter.removeObserver self
       self.delegate = nil if self.respond_to?(:delegate)
@@ -237,7 +237,7 @@ module MotionPrime
         # in next element with same name in another class
         options = opts.clone
         options[:type] ||= (options[:text] || options[:attributed_text_options]) ? :label : :view
-        options.merge(screen: screen.try(:weak_ref), section: self.weak_ref)
+        options.merge(screen: screen, section: self.weak_ref)
       end
 
     private

data/motion-prime/sections/form.rb

@@ -133,48 +133,17 @@ module MotionPrime
       table_view.contentInset = current_inset
     end
 
+    def table_delegate
+      @table_delegate ||= FormDelegate.new(section: self)
+    end
+
     # ALIASES
     def on_input_change(text_field); end
-    def on_input_edit(text_field); end
+    def on_input_edit_begin(text_field); end
+    def on_input_edit_end(text_field); end
     def on_input_return(text_field)
       text_field.resignFirstResponder
     end
-    def textFieldShouldReturn(text_field)
-      on_input_return(text_field)
-    end
-    def textFieldShouldBeginEditing(text_field)
-      text_field.respond_to?(:readonly) ? !text_field.readonly : true
-    end
-    def textFieldDidBeginEditing(text_field)
-      on_input_edit(text_field)
-    end
-    def textViewDidBeginEditing(text_view)
-      on_input_edit(text_view)
-    end
-    def textViewDidChange(text_view) # bug in iOS 7 - cursor is out of textView bounds
-      line = text_view.caretRectForPosition(text_view.selectedTextRange.start)
-      overflow = line.origin.y + line.size.height -
-        (text_view.contentOffset.y + text_view.bounds.size.height - text_view.contentInset.bottom - text_view.contentInset.top)
-      if overflow > 0
-        offset = text_view.contentOffset
-        offset.y += overflow + text_view.textContainerInset.bottom
-        UIView.animate(duration: 0.2) do
-          text_view.setContentOffset(offset)
-        end
-      end
-    end
-
-    def textView(text_view, shouldChangeTextInRange:range, replacementText:string)
-      textField(text_view, shouldChangeCharactersInRange:range, replacementString:string)
-    end
-
-    def textField(text_field, shouldChangeCharactersInRange:range, replacementString:string)
-      limit = (self.class.text_field_limits || {}).find do |field_name, limit|
-        view("#{field_name}:input") == text_field
-      end.try(:last)
-      return true unless limit
-      allow_string_replacement?(text_field, limit, range, string)
-    end
 
     def allow_string_replacement?(target, limit, range, string)
       if string.length.zero? || (range.length + limit - target.text.length) >= string.length

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

@@ -80,7 +80,7 @@ module MotionPrime
         focus
         form.on_input_change(view(:input))
       end
-      view(:input).delegate = self.form
+      view(:input).delegate = self.form.table_delegate
     end
 
     def observing_errors?

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

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

data/motion-prime/sections/table.rb

@@ -7,17 +7,18 @@ module MotionPrime
     include HasStyleChainBuilder
     include HasSearchBar
 
-    class_attribute :async_data_options, :section_header_options
+    class_attribute :async_data_options, :section_header_options, :pull_to_refresh_block
+
     attr_accessor :table_element, :did_appear, :section_headers, :section_header_options
     attr_reader :decelerating
     before_render :render_table
+    after_render :init_pull_to_refresh
+    delegate :init_pull_to_refresh, to: :table_delegate
 
-    def dealloc
-      pp 'deallocating table. sections count:', @data.try(:count)
-      @data = nil
-      @async_loaded_data = nil
-      super
-    end
+    # def dealloc
+    #   pp 'deallocating table. sections count:', @data.try(:count)
+    #   super
+    # end
 
     def table_data
       []
@@ -107,12 +108,15 @@ module MotionPrime
       styles
     end
 
+    def table_delegate
+      @table_delegate ||= TableDelegate.new(section: self)
+    end
+
     def render_table
-      delegate = TableDelegate.new(section: self)
       options = {
         styles: table_styles.values.flatten,
-        delegate: delegate,
-        data_source: delegate,
+        delegate: table_delegate,
+        data_source: table_delegate,
         style: (UITableViewStyleGrouped unless flat_data?)
       }
       if async_data? && self.class.async_data_options.has_key?(:estimated_row_height)
@@ -390,6 +394,10 @@ module MotionPrime
         section = options.delete(:id)
         self.section_header_options[section] = options
       end
+
+      def pull_to_refresh(&block)
+        self.pull_to_refresh_block = block
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ module MotionPrime
     def add_pull_to_refresh(options = {}, &block)
       screen.automaticallyAdjustsScrollViewInsets = false
 
-      table_view.addPullToRefreshWithActionHandler(block)
+      table_view.addPullToRefreshWithActionHandler(block) # block must be a variable
       screen.setup table_view.pullToRefreshView, styles: [:base_pull_to_refresh]
     end
 

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

@@ -5,6 +5,13 @@ module MotionPrime
       self.table_section = options[:section].try(:weak_ref)
     end
 
+    def init_pull_to_refresh
+      return unless block = table_section.class.pull_to_refresh_block
+      table_section.add_pull_to_refresh do
+        table_section.instance_eval(&block)
+      end
+    end
+
     def numberOfSectionsInTableView(table)
       table_section.number_of_sections(table)
     end

data/motion-prime/support/mp_cell_with_section.rb

@@ -3,6 +3,7 @@ class MPCellWithSection < UITableViewCell
 
   def setSection(section)
     @section = section.try(:weak_ref)
+    @section_name = section.name
   end
 
   def drawRect(rect)
@@ -11,6 +12,7 @@ class MPCellWithSection < UITableViewCell
   end
 
   def draw_in(rect)
-    section and section.draw_in(rect) if section.respond_to?(:draw_in)
+    return unless section
+    section.draw_in(rect) if section.respond_to?(:draw_in)
   end
 end

data/motion-prime/support/tab_bar_controller.rb

@@ -7,7 +7,7 @@ module MotionPrime
 
       screens.each_with_index do |screen, index|
         if screen.is_a?(Hash)
-          screen, image, title = screen[:screen], screen[:image], screen[:title]
+          screen, image, title = screen[:screen].try(:weak_ref), screen[:image], screen[:title]
           title ||= screen.title
           image = image.uiimage if image
           screen.tabBarItem = UITabBarItem.alloc.initWithTitle title, image: image, tag: index
@@ -24,7 +24,7 @@ module MotionPrime
       controller.viewControllers = view_controllers
       controller
     end
-    
+
     def open_tab(tab)
       controller = viewControllers[tab]
       if controller

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Iskander Haziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -268,6 +268,7 @@ files:
 - motion-prime/sections/form/base_field_section.rb
 - motion-prime/sections/form/base_header_section.rb
 - motion-prime/sections/form/date_field_section.rb
+- motion-prime/sections/form/form_delegate.rb
 - motion-prime/sections/form/password_field_section.rb
 - motion-prime/sections/form/select_field_section.rb
 - motion-prime/sections/form/string_field_section.rb