motion-prime 0.9.9 → 0.9.9.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODMzMDQ2MmI4YTBmYTY4NWZiOTQzZjQ5NGVmMGEyNTFiN2NiZDhhOQ==
+    YzRmOTFjOTY1ODY2OTFlZTUwZDNlMDE1MWEwZDliYWVkMjBjM2VhNA==
   data.tar.gz: !binary |-
-    MDRmZmM2Y2QwY2Q5ZDI0MzY4OTkyZjg4MTQ1YTQ3NDFkMjA0YmM5ZA==
+    YTY0M2Q1ZjAzMDI0MmY3ODE2ZGRkNmZmYTliNDY2NTQ4NjhjYjM3ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDJlMGEwMzAxNjE5ZTVlMzIxYTJiMWI5ODg4N2JhYjIwMjQzMDg2NGVjYjA0
-    YWVkMmZhNDA5MjgwMjZhMGU3YzNhM2UyNjBkZTJjZWJmZDRjNDU2NjdjOWNm
-    ZTEwYzUwMGRjMjlmYTc5OGEzOTlkMmEwODQ0NzRmM2Q4ZWNiMzY=
+    NTgxZWNhZjE5ZDQwMDgwM2MxOWUzNWU2NzEyOTE5Nzk3MjI1YzcxMmEyYWFj
+    YmJjZjBkNGYxMWUyY2FiNDAyMGM1YzEwYjE5OGQwYjc2ZmQ0NWMyYzdmODAx
+    MWFmNTRkMDI1Yzc0NTRmMGJkN2IzZWM4ZDRhZGFkN2U1NDFhNWQ=
   data.tar.gz: !binary |-
-    MGYxMmZiZGU1YzM2NWIzOTI2OGI0Zjc5MjlhYzQ2ZDU5YjM2ZWJhYTI1MjBj
-    YTE5Nzc4MzdhN2JjYThjN2VmYTc5YjdiMWQ3MDY2YzM5ZmVmNmYwM2QyM2Zl
-    MWNmMzY1MGU4MzA3NGRjOTdiNGMxYWNmNWNlZGE4ZjdhZDRjMmY=
+    ZTdmNjgyMzdhMjY1MDc2ZThlMTkwYjk4YjgxOTgzNTljYTZiZGI5ZTUyMTIy
+    ZDZkOTM3Y2EzM2E4NWVlZjQ2ZWI4OTU4MmFkYjMyYWIwMzEzN2ZlZGFhZjU4
+    ZDU4NmJhMWEwOWNhMTE5NTcxYTQ4N2Q4OTcwYjgyN2Y1OTcxNDQ=

data/CHANGELOG.md

@@ -1,5 +1,11 @@
+=== 0.9.9.1
+* BREAKING CHANGE: width/height value have more priority than right/bottom
+* BREAKING CHANGE: all methods starting with "table" in table section renamed to start with "collection"
+* bug: content_vertical_alignment conflicts with padding.
+* bug: content_vertical_alignment has not ideal centering.
+
 === 0.9.9
-* BREAKING CHANGE: table delegate methods in table section does not accept table_view as first param.
+* BREAKING CHANGE: table delegate methods in table section does not accept collection_view as first param.
   See https://github.com/droidlabs/motion-prime/commit/c8f7b2e4fd1665a45309585484ac211381854f62
 * Bug fixes
 
@@ -11,7 +17,7 @@
 * BREAKING CHANGE: screen#set_options renamed to screen#set_options_for.
 * BREAKING CHANGE: section#reload_section renamed to section#hard_reload_section. in common cases use section#reload.
 * BREAKING CHANGE: form#reload_cell_section renamed to form#hard_reload_cell_section. in common cases use form#reload_cell_sections.
-* BREAKING CHANGE: table#reset_data renamed to table#reset_table_data
+* BREAKING CHANGE: table#reset_data renamed to table#reset_collection_data
 
 === 0.9.6
 * BREAKING CHANGE: proc for form field option will be executed in context of form, not field.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.9.9)
+    motion-prime (0.9.9.1)
       activesupport
       afmotion (~> 2.1.0)
       bubble-wrap (~> 1.6.0)
@@ -65,7 +65,7 @@ GEM
     open4 (1.3.3)
     rake (10.3.1)
     rm-digest (0.0.2)
-    sugarcube (1.6.0)
+    sugarcube (1.6.1)
     thor (0.19.1)
     xcodeproj (0.16.1)
       activesupport (~> 3.0)

data/ROADMAP.md

@@ -1,10 +1,8 @@
 === 1.0.0
-* bug: content_vertical_alignment conflicts with padding.
-* bug: content_vertical_alignment has not ideal centering.
 * bug: if mp label do not have text and was set as hidden, it should unhide after setting text.
 * bug: size_to_fit works incorrect with relative width.
 * bug: bind_keyboard_close breaks bind_guesture
-* bug: dealloc of Prime::Section will not be called for cell created in table_data using #map.
+* bug: dealloc of Prime::Section will not be called for cell created in collection_data using #map.
 * bug: images does not render after reload table if using draw_with_layer (prerender not enabled).
 * add dsl for push notifications
 * add some extensions/middleware system, at least for networking.

data/files/Gemfile

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

data/generators/templates/scaffold/table.rb

@@ -1,5 +1,5 @@
 class <%= @p_class_name %>IndexTableSection < Prime::TableSection
-  def table_data
+  def collection_data
     <%= @s_class_name %>.all.map do |model|
       <%= @p_class_name %>IndexCellSection.new(model: model)
     end

data/generators/templates/table.rb

@@ -1,5 +1,5 @@
 class <%= @table_class_name %> < Prime::TableSection
-  def table_data
+  def collection_data
     # This method should return Array of sections, e.g:
     <%= @model_class_name %>.map do |model|
       <%= @cell_class_name %>.new(model: model)

data/motion-prime/config/base.rb

@@ -1,4 +1,4 @@
-motion_require './config.rb'
+motion_require './config'
 MotionPrime::Config.configure do |config|
   # MODELS
   if MotionPrime.env.test?
@@ -32,7 +32,7 @@ MotionPrime::Config.configure do |config|
     colors.dark = 0x333333
     colors.error = 0xef471f
   end
-  
+
   # SECTIONS
   config.prime.cell_section.mixins = [Prime::CellSectionMixin]
 

data/motion-prime/elements/_content_text_mixin.rb

@@ -1,4 +1,4 @@
-motion_require './_text_mixin.rb'
+motion_require './_text_mixin'
 module MotionPrime
   module ElementContentTextMixin
     include ElementTextMixin

data/motion-prime/elements/base_element.rb

@@ -85,7 +85,7 @@ module MotionPrime
       raw_options = Styles.for(styles).merge(raw_options)
       @computed_options = raw_options
       normalize_options(@computed_options, section.try(:elements_eval_object), %w[
-        text placeholder font title_label
+        font text placeholder title_label
         padding padding_left padding_right padding_top padding_bottom
         left right min_width min_outer_width max_width max_outer_width width
         top bottom min_height min_outer_height max_height max_outer_height height])
@@ -134,6 +134,14 @@ module MotionPrime
       view.setUserInteractionEnabled true
     end
 
+    def cell_section?
+      section.respond_to?(:cell_section_name)
+    end
+
+    def cell_element?
+      @view_class == 'UICollectionViewCell' || @view_class == 'UITableViewCell'
+    end
+
     protected
       def reset_computed_values
         @content_height = nil
@@ -150,10 +158,9 @@ module MotionPrime
 
       def compute_style_options(*style_sources)
         has_errors = section.respond_to?(:observing_errors?) && observing_errors? && has_errors?
-        is_cell_section = section.respond_to?(:cell_section_name)
 
         @styles = []
-        if is_cell_section
+        if cell_section?
           @styles += compute_cell_style_options(style_sources, has_errors)
         end
 
@@ -178,7 +185,7 @@ module MotionPrime
 
         # custom style (from options or block options), using for TableViews as well
         @styles += custom_styles
-        # puts @view_class.to_s + @styles.inspect, ''
+        # pp @view_class.to_s + @styles.inspect; puts()
         @styles
       end
 
@@ -193,7 +200,7 @@ module MotionPrime
         if section.section_styles
           section.section_styles.each { |type, values| base_styles[type] += values }
         end
-        if @view_name != 'base' && @view_name != 'table_view_cell'
+        if @view_name != 'base' && !cell_element?
           # form element: _input
           # table element: _image
           suffixes[:common] << @view_name.to_sym
@@ -213,7 +220,7 @@ module MotionPrime
           build_styles_chain(base_styles[:common], suffixes.values.flatten)
         elsif suffixes[:specific].any?
           build_styles_chain(base_styles[:common], suffixes[:specific])
-        elsif @view_name == 'table_view_cell'
+        elsif cell_element?
           base_styles[:common]
         end
         all_styles += Array.wrap(common_styles)
@@ -223,7 +230,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 == 'table_view_cell'
+        elsif suffixes[:specific].empty? && cell_element?
           base_styles[:specific]
         end
         all_styles += Array.wrap(specific_base_common_suffix_styles)

data/motion-prime/elements/collection_view_cell.rb

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

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

@@ -15,7 +15,12 @@ module MotionPrime
     def draw_in(rect)
       return if computed_options[:hidden]
       draw_background_in_context(UIGraphicsGetCurrentContext())
-      computed_options[:draw_in_rect] ? draw_in_context(UIGraphicsGetCurrentContext()) : draw_with_layer
+      # bug - when it's a CollectionView we get invalid frame when drawing in a layer
+      if computed_options[:draw_in_rect] || view.is_a?(MPCollectionCellWithSection)
+        draw_in_context(UIGraphicsGetCurrentContext())
+      else
+        draw_with_layer
+      end
       load_image
     end
 
@@ -64,7 +69,7 @@ module MotionPrime
     end
 
     def strong_references
-      [section, (section.table if section.respond_to?(:cell_section_name))].compact
+      [section, (section.collection_section if section.respond_to?(:cell_section_name))].compact
     end
 
     def load_image

data/motion-prime/elements/table_view_cell.rb

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

data/motion-prime/helpers/has_normalizer.rb

@@ -48,7 +48,7 @@ module MotionPrime
       if element?
         [self.class.name, self.name, section.try(:name)]
       elsif self.is_a?(Section)
-        [self.class.name, self.name, @table.try(:class).try(:name)]
+        [self.class.name, self.name, @collection_section.try(:class).try(:name)]
       else
         [self.class.name]
       end

data/motion-prime/helpers/has_search_bar.rb

@@ -11,7 +11,7 @@ module MotionPrime
       if target
         target.addSubview @_search_bar
       elsif is_a?(TableSection)
-        self.table_view.tableHeaderView = @_search_bar
+        self.collection_view.tableHeaderView = @_search_bar
       end
 
       @search_callback = block

data/motion-prime/models/_nano_bag_mixin.rb

@@ -1,4 +1,4 @@
-motion_require './_finder_mixin.rb'
+motion_require './_finder_mixin'
 module MotionPrime
   module NanoBagMixin
     include FilterMixin

data/motion-prime/models/model.rb

@@ -1,12 +1,12 @@
 motion_require '../helpers/has_authorization'
-motion_require './_nano_bag_mixin.rb'
-motion_require './_finder_mixin.rb'
-motion_require './_base_mixin.rb'
-motion_require './_sync_mixin.rb'
-motion_require './_association_mixin.rb'
-motion_require './_dirty_mixin.rb'
-motion_require './store.rb'
-motion_require './store_extension.rb'
+motion_require './_nano_bag_mixin'
+motion_require './_finder_mixin'
+motion_require './_base_mixin'
+motion_require './_sync_mixin'
+motion_require './_association_mixin'
+motion_require './_dirty_mixin'
+motion_require './store'
+motion_require './store_extension'
 module MotionPrime
   class Model < NSFNanoObject
     include MotionPrime::HasAuthorization

data/motion-prime/models/store.rb

@@ -1,4 +1,4 @@
-motion_require '../config/base.rb'
+motion_require '../config/base'
 module MotionPrime
   class Store
     def self.create(type = nil, path = nil)

data/motion-prime/screens/screen.rb

@@ -1,6 +1,6 @@
-motion_require '../support/mp_view_controller.rb'
-motion_require '../views/layout.rb'
-motion_require '../screens/_base_mixin.rb'
+motion_require '../support/mp_view_controller'
+motion_require '../views/layout'
+motion_require '../screens/_base_mixin'
 motion_require './extensions/_indicators_mixin'
 motion_require './extensions/_navigation_bar_mixin'
 motion_require '../helpers/has_authorization'

data/motion-prime/sections/_async_form_mixin.rb

@@ -1,13 +1,13 @@
 module Prime
   module AsyncFormMixin
-    def reload_table_data
+    def reload_collection_data
       # FIXME: duplicated cells (see cached_cell error)
       return super unless async_data?
       sections = NSMutableIndexSet.new
       number_of_groups.times do |section_id|
         sections.addIndex(section_id)
       end
-      table_view.reloadSections sections, withRowAnimation: UITableViewRowAnimationFade
+      collection_view.reloadSections sections, withRowAnimation: UITableViewRowAnimationFade
     end
   end
 end

data/motion-prime/sections/_async_table_mixin.rb

@@ -24,9 +24,9 @@ module Prime
     # Reset async loaded table data and preloader queue.
     #
     # @return [Boolean] true
-    def reset_table_data
-      super # must be before to update fixed_table_data
-      @async_loaded_data = async_data? ? fixed_table_data : nil
+    def reset_collection_data
+      super # must be before to update fixed_collection_data
+      @async_loaded_data = async_data? ? fixed_collection_data : nil
       Array.wrap(@preloader_queue).each { |queue| queue[:state] = :cancelled }
       @preloader_next_starts_from = nil
     end
@@ -151,9 +151,9 @@ module Prime
     end
 
     private
-      def set_table_data
+      def set_collection_data
         sections = load_sections_async
-        prepare_table_cell_sections(sections)
+        prepare_collection_cell_sections(sections)
         @data = sections
         reset_data_stamps
         @data
@@ -163,9 +163,9 @@ module Prime
         @async_loaded_data || begin
           ref_key = allocate_strong_references
           BW::Reactor.schedule_on_main do
-            @async_loaded_data = fixed_table_data
+            @async_loaded_data = fixed_collection_data
             @data = nil
-            reload_table_data
+            reload_collection_data
             on_async_data_loaded
             release_strong_references(ref_key)
           end

data/motion-prime/sections/_cell_section_mixin.rb

@@ -1,11 +1,11 @@
-# This Mixin will be included only to sections, which added as cell to table section.
+# This Mixin will be included only to sections, which added as cell to collection section.
 module MotionPrime
   module CellSectionMixin
     extend ::MotionSupport::Concern
 
     # include SectionWithContainerMixin # already included in draw_section_mixin
 
-    attr_writer :table
+    attr_writer :collection_section
     attr_reader :pending_display
 
     included do
@@ -13,12 +13,17 @@ module MotionPrime
       container_element type: :table_view_cell
     end
 
+    def collection_section
+      @collection_section ||= options[:collection_section].try(:weak_ref)
+    end
+
     def table
-      @table ||= options[:table].try(:weak_ref)
+      Prime.logger.info "Section#table is deprecated: #{caller[0]}"
+      collection_section
     end
 
     def section_styles
-      @section_styles ||= table.try(:cell_section_styles, self) || {}
+      @section_styles ||= collection_section.try(:cell_section_styles, self) || {}
     end
 
     def cell_type
@@ -29,31 +34,31 @@ module MotionPrime
 
     def cell_section_name
       self.class.custom_cell_section_name || begin
-        return name unless table
-        table_name = table.name.gsub('_table', '')
+        return name unless collection_section
+        table_name = collection_section.name.gsub('_table', '')
         name.gsub("#{table_name}_", '')
       end
     end
 
     def container_bounds
-      @container_bounds ||= CGRectMake(0, 0, table.table_view.bounds.size.width, container_height)
+      @container_bounds ||= CGRectMake(0, 0, collection_section.collection_view.bounds.size.width, container_height)
     end
 
-    # should do nothing, because table section will care about it.
+    # should do nothing, because collection section will care about it.
     def render_container(options = {}, &block)
       block.call
     end
 
     def init_container_element(options = {})
       options[:styles] ||= []
-      options[:styles] = [:"#{table.name}_first_cell"] if table.data.first == self
-      options[:styles] = [:"#{table.name}_last_cell"] if table.data.last == self
+      options[:styles] = [:"#{collection_section.name}_first_cell"] if collection_section.data.first == self
+      options[:styles] = [:"#{collection_section.name}_last_cell"] if collection_section.data.last == self
       super(options)
     end
 
     def pending_display!
       @pending_display = true
-      display unless table.decelerating
+      display unless collection_section.decelerating
     end
 
     def display

data/motion-prime/sections/_draw_section_mixin.rb

@@ -1,3 +1,4 @@
+motion_require '_section_with_container_mixin'
 module MotionPrime
   module DrawSectionMixin
     extend ::MotionSupport::Concern

data/motion-prime/sections/{__section_with_container_mixin.rb → _section_with_container_mixin.rb}

@@ -18,8 +18,8 @@ module MotionPrime
           has_drawn_content: true
         })
         container_element_options = self.class.container_element_options.clone
-        type = container_element_options.delete(:type)
-        options.merge!(container_element_options)
+        options = (container_element_options || {}).merge(options)
+        type = options.delete(:type)
         MotionPrime::BaseElement.factory(type, options)
       end
     end