motion-prime 0.9.3 → 0.9.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjQ0MTllNzk1MTE2ODViNTZjMDE0NzFhMTU2Nzk1ZjI1Njg3MDhjZQ==
+    YTEwYzU5NjkxYjdmZjk4NjU2MGViODJlY2U4YmI5NDBkMDJhNDJmZQ==
   data.tar.gz: !binary |-
-    NzQ0YTk2NjA2NWUxOGE5N2NjMjFkZTA2YjJlZTlhNzVkMDQ0M2I2ZA==
+    Nzg1YmZmODZiYmM3MTM0NzI5YmExNWExNDdkNmUxN2IwNGRiZGI1MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGY3OWE1OTNkNGVjMWQ4NjFiNjgzOGNjMjhiNTQ5ZTUwODEyNmMwMGVlNGIz
-    NTg2OTM3ZmMyNzcxMDE2YTNkNDJhNTg1MGEzNjE1YjAwNTNlMzljMzdlNjM2
-    ZTU2NzZlZWNkYmIzZWUxMjMwODg2MWQ1OWYxZjIyOTA2ZjdiNmY=
+    YTU0Y2QyNTMyMDlhNzcwMWU3M2RjNmY3OTgyM2Q4NDlhZDNiZTdiMWY4MDk4
+    NzdiODU5NzgxODc3NDlhODRlN2EzYzdiNTA2MDQ3YmY0MTQwOWRiYjc2MWRh
+    YWI5NjJlOGQ0MmFjNTUwMGVmZWMxYjRjMmY2ZjJhZjQ0NGU2YjA=
   data.tar.gz: !binary |-
-    Y2QxNWVhMGRkZTBlMTE2YWM5NzU4MjJhNjMwNGI0ODAwYWVmNTU3NzY2NTU3
-    YzM2NzJmZGU3ODczYjQ1ZGJlNzllNDgzYmE1OGQ3NjQzY2IyZDdiMjBmOGYx
-    MDg1YTVmOWM1MGUyMGMwNTkwYTQ4ZmU2N2JhYzIyNjcyOTUyZjI=
+    ODJhNDcxMDg5YWE3YjVkOWRlMmQ2MWIzZGFjZjA1NzQ2ZTY5MmFjMGYxNTFj
+    NTAxYzljOWZhMWE0NmQ1NmI5YjIxMmRkM2QwYjg5OTdiZTZjZDU2MTM2YzUw
+    MTlhYjNiM2Y4NzFkNGY2NzdlYjcwOThlZTYyM2Y4OTJmZGRmODg=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+=== 0.9.4
+* Ability to render multiple sections inside screen action.
+
 === 0.9.3
 * Small refactor required for working prime_awesome
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.9.3)
+    motion-prime (0.9.4)
       activesupport
       afmotion (~> 2.0.0)
       bubble-wrap (~> 1.5.0)

data/files/Gemfile

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

data/motion-prime/screens/_sections_mixin.rb

@@ -9,52 +9,64 @@ module MotionPrime
       base.class_attribute :_section_options
     end
 
-    def add_sections
-      @main_section = nil
-      create_sections
-      render_sections
+    attr_accessor :_action_section_options
+
+    def main_section
+      @main_section || all_sections.first
     end
 
     def all_sections
       Array.wrap(@sections.try(:values))
     end
 
-    def create_sections
-      section_options = self.class._section_options
-      return unless section_options
-      @sections = {}
-      section_options.map do |name, options|
-        section = create_section(name, options.clone)
-        @sections[name] = section if section
-      end
+    def set_section(name, options = {})
+      self._action_section_options ||= {}
+      self._action_section_options[name.to_sym] = options
     end
+    alias_method :section, :set_section
 
-    def create_section(name, options)
-      section_class = class_factory("#{name}_section")
-      options = normalize_options(options).merge(screen: self)
-      !options.has_key?(:if) || options[:if] ? section_class.new(options) : nil
-    end
+    protected
+      def add_sections
+        @main_section ||= nil
+        create_sections
+        render_sections
+      end
 
-    def set_section(name, options = {})
-      @main_section = create_section(name, options)
-      @main_section.render
-    end
+      def create_sections
+        section_options = self.class.section_options.merge(action_section_options)
+        return unless section_options
+        @sections = {}
+        section_options.map do |name, options|
+          section = create_section(name, options.clone)
+          @sections[name] = section if section
+        end
+      end
 
-    def render_sections
-      return unless @sections
-      if all_sections.count > 1
-        @main_section = MotionPrime::TableSection.new(model: all_sections, screen: self)
-        @main_section.render
-      else
-        all_sections.first.render
+      def create_section(name, options)
+        section_class = class_factory("#{name}_section")
+        options = normalize_options(options).merge(screen: self)
+        !options.has_key?(:if) || options[:if] ? section_class.new(options) : nil
       end
-    end
 
-    def main_section
-      @main_section || all_sections.first
-    end
+      def action_section_options
+        _action_section_options || {}
+      end
+
+      def render_sections
+        return unless @sections.present?
+        if all_sections.count > 1
+          @main_section = MotionPrime::TableSection.new(model: all_sections, screen: self)
+          @main_section.render
+        else
+          all_sections.first.render
+        end
+      end
 
     module ClassMethods
+      def section_options
+        _section_options || {}
+      end
+
       def section(name, options = {})
         self._section_options ||= {}
         self._section_options[name.to_sym] = options

data/motion-prime/screens/screen.rb

@@ -22,7 +22,7 @@ module MotionPrime
 
     define_callbacks :render
 
-    before_render :add_sections
+    after_render :add_sections
 
     def render
     end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Iskander Haziev