motion-prime 0.9.9.1 → 0.9.9.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzRmOTFjOTY1ODY2OTFlZTUwZDNlMDE1MWEwZDliYWVkMjBjM2VhNA==
+    ZmRjOTcxMGQ4OTVhODgwZjk1MmUyZjY3YWQxNDc2ODk3MDc2MTE5Yg==
   data.tar.gz: !binary |-
-    YTY0M2Q1ZjAzMDI0MmY3ODE2ZGRkNmZmYTliNDY2NTQ4NjhjYjM3ZA==
+    OWY3OTg1M2M3ZDk3ZDg0MjY1NjAyMGRkM2M2ZTU1YzJkM2VjYjQ1MQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTgxZWNhZjE5ZDQwMDgwM2MxOWUzNWU2NzEyOTE5Nzk3MjI1YzcxMmEyYWFj
-    YmJjZjBkNGYxMWUyY2FiNDAyMGM1YzEwYjE5OGQwYjc2ZmQ0NWMyYzdmODAx
-    MWFmNTRkMDI1Yzc0NTRmMGJkN2IzZWM4ZDRhZGFkN2U1NDFhNWQ=
+    ODhiZjRjNDJjMTY3ZDkzOTEzOGUzMmNkYWZiOWI3MjQ4NDlmMzRjZjNlM2Mw
+    NzIxZTQ5MzlkZThmYmIzMTkxNWMzNDFmNmZjOTc4YjZmYTdlYmQ0YTliODZm
+    MTMxMjQ2NmUwYjIyNjA1MmQ3MWVkOThlY2UzZTRmODg5NTQzNDE=
   data.tar.gz: !binary |-
-    ZTdmNjgyMzdhMjY1MDc2ZThlMTkwYjk4YjgxOTgzNTljYTZiZGI5ZTUyMTIy
-    ZDZkOTM3Y2EzM2E4NWVlZjQ2ZWI4OTU4MmFkYjMyYWIwMzEzN2ZlZGFhZjU4
-    ZDU4NmJhMWEwOWNhMTE5NTcxYTQ4N2Q4OTcwYjgyN2Y1OTcxNDQ=
+    NmYzMTFhZDQ0MzFiNjIyODczZmZkZjdiYjQzNTFhY2FjOTA0MmIyNzdjMjE1
+    ODg4OWViMjAzOGQ3MTU0YTJiNDI5NWQyMDBmMDZiZGM5OTMxMDY3MjFlZGYx
+    MGJlODc3NDc1OTYwNmY0MzMwYWE1YTZkMzU1Njk3NzkxM2RkOWM=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+=== 0.9.9.2
+* bug fixes
+
 === 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"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.9.9.1)
+    motion-prime (0.9.9.2)
       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.1)
+    sugarcube (1.6.2)
     thor (0.19.1)
     xcodeproj (0.16.1)
       activesupport (~> 3.0)

data/files/Gemfile

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

data/motion-prime/elements/_content_text_mixin.rb

@@ -41,7 +41,7 @@ module MotionPrime
 
     def width_for_attributed_text(attributed_text)
       min, max = computed_options[:min_width].to_f, computed_options[:max_width]
-      return min if attributed_text.blank?
+      return min if attributed_text.to_s.blank?
 
       rect = get_content_rect(attributed_text, Float::MAX)
       [[rect.size.width.ceil, max].compact.min, min].max.ceil
@@ -61,8 +61,7 @@ module MotionPrime
 
     def height_for_attributed_text(attributed_text)
       min, max = computed_options[:min_height].to_f, computed_options[:max_height]
-      return min if attributed_text.blank?
-
+      return min if attributed_text.to_s.blank?
       rect = get_content_rect(attributed_text, computed_options[:width] - content_padding_width)
       [[rect.size.height.ceil, max].compact.min, min].max.ceil
     end

data/motion-prime/elements/base_element.rb

@@ -96,17 +96,21 @@ module MotionPrime
       compute_options!
     end
 
-    def rerender!
+    def rerender!(changed_options = [])
       render_target = view.try(:superview)
       view.try(:removeFromSuperview)
       render(render_target: render_target)
+
+      if (changed_options & [:text, :size_to_fit]).any? && respond_to?(:size_to_fit)
+        size_to_fit
+      end
       section.try(:on_element_render, self)
     end
 
     def update_with_options(new_options = {})
       options.merge!(new_options)
       reload!
-      rerender!
+      rerender!(new_options.keys)
     end
 
     def update_options(new_options)

data/motion-prime/elements/draw.rb

@@ -51,7 +51,7 @@ module MotionPrime
       rerender!
     end
 
-    def rerender!
+    def rerender!(changed_options = [])
       section.cached_draw_image = nil
       view.try(:setNeedsDisplay)
     end

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

@@ -15,8 +15,7 @@ module MotionPrime
     def draw_in(rect)
       return if computed_options[:hidden]
       draw_background_in_context(UIGraphicsGetCurrentContext())
-      # 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)
+      if computed_options[:draw_in_rect]
         draw_in_context(UIGraphicsGetCurrentContext())
       else
         draw_with_layer

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

@@ -94,6 +94,12 @@ module MotionPrime
         computed_options[:width] ||= cached_content_outer_width
         computed_options[:height] ||= cached_content_outer_height
         reset_computed_values
+      elsif computed_options.slice(:width, :left, :right).values.none?
+        computed_options[:width] ||= cached_content_outer_width
+        reset_computed_values
+      elsif computed_options.slice(:height, :top, :bottom).values.none?
+        computed_options[:height] ||= cached_content_outer_height
+        reset_computed_values
       end
     end
 

data/motion-prime/sections/grid.rb

@@ -55,7 +55,7 @@ module MotionPrime
     end
 
     def cell_sections_for_group(section)
-      data[section, grid_size]
+      data[section*grid_size, grid_size]
     end
 
     # Table View Delegate

data/motion-prime/support/_control_content_alignment.rb

@@ -20,7 +20,8 @@ module MotionPrime
         padding_top.to_i
       else # center label
         padding_top_offset = padding_top.to_i - (self.paddingBottom || self.padding).to_i
-        (bounds_height - line_height)/2 + 1 + padding_top_offset
+        (bounds_height - line_height)/2 + padding_top_offset
+        # TODO: check in which cases we should add `1` here
       end
     end
 

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.9.9.1"
+  VERSION = "0.9.9.2"
 end

data/motion-prime/views/_frame_calculator_mixin.rb

@@ -23,31 +23,41 @@ module MotionPrime
       temp_height = height || 0.0
 
       if left && left > 0 && left <= 1 && value_type != 'absolute' && left.is_a?(Float)
-        left = max_width * left
+        left = (max_width * left).round(2)
       end
 
       if right && right > 0 && right <= 1 && value_type != 'absolute' && right.is_a?(Float)
-        right = max_width * right
+        right = (max_width * right).round(2)
+      end
+
+      if top && top > 0 && top <= 1 && value_type != 'absolute' && top.is_a?(Float)
+        top = (max_height * top).round(2)
+      end
+
+      if bottom && bottom > 0 && bottom <= 1 && value_type != 'absolute' && bottom.is_a?(Float)
+        bottom = (max_height * bottom).round(2)
       end
 
       # calculate left and right if width is relative, e.g 0.7
       if width && width > 0 && width <= 1 && value_type != 'absolute' && width.is_a?(Float)
         if right.nil?
           left ||= 0
-          right = max_width - max_width * width - left
+          right = (max_width - max_width * width - left).round(2)
         else
-          left = max_width - max_width * width - right
+          left = (max_width - max_width * width - right).round(2)
         end
+        width = (max_width * width).round(2)
       end
 
       # calculate top and bottom if height is relative, e.g 0.7
       if height && height > 0 && height <= 1 && value_type != 'absolute' && height.is_a?(Float)
         if bottom.nil?
           top ||= 0
-          bottom = max_height - max_height * height
+          bottom = (max_height - max_height * height - top).round(2)
         else
-          top = max_height - max_height * height
+          top = (max_height - max_height * height - bottom).round(2)
         end
+        height = (max_height * height).round(2)
       end
 
       if !left.nil? && !right.nil?

data/motion-prime/views/view_builder.rb

@@ -89,7 +89,20 @@ module MotionPrime
           'UICollectionView' => Proc.new{|klass, options|
             unless layout = options.delete(:layout)
               layout = UICollectionViewFlowLayout.alloc.init
-              total_width = options[:parent_bounds].size.width / (options.delete(:grid_size) || 4)
+              total_width = options[:parent_bounds].size.width / (options.delete(:grid_size) || 3)
+              if horizontal_spacing = options.delete(:horizontal_spacing)
+                layout.setMinimumInteritemSpacing horizontal_spacing
+              end
+              if vertical_spacing = options.delete(:vertical_spacing)
+                layout.setMinimumLineSpacing vertical_spacing
+              end
+              if scroll_direction = options.delete(:scroll_direction)
+                if scroll_direction == :horizontal
+                 layout.setScrollDirection UICollectionViewScrollDirectionHorizontal
+                else
+                  layout.setScrollDirection UICollectionViewScrollDirectionVertical
+                end
+              end
               width = total_width - layout.minimumInteritemSpacing
               layout.setItemSize CGSizeMake(width, options.delete(:item_height) || 100)
             end

data/spec/unit/elements/label_spec.rb

@@ -0,0 +1,94 @@
+describe MotionPrime::Section do
+  before do
+    @screen = BaseScreen.new
+  end
+
+  describe "view label" do
+    before do
+      @section = SampleViewSection.new(screen: @screen)
+      @section.create_elements
+    end
+
+    describe "size_to_fit option" do
+      before do
+        @section.element(:description).options.merge!({
+          text: '',
+          size_to_fit: true
+        })
+      end
+
+      it "should set zero size" do
+        @section.render
+        @section.view(:description).bounds.size.width.should.be.zero
+        @section.view(:description).bounds.size.height.should.be.zero
+      end
+
+      it "should update bounds with text" do
+        @section.render
+        @section.element(:description).update_with_options(text: 'test')
+        @section.view(:description).bounds.size.width.should > 0
+        @section.view(:description).bounds.size.height.should > 0
+      end
+    end
+
+    # describe "`top` with zero `height`" do
+    #   before do
+    #     @section.element(:description).options.merge!({
+    #       top: 20
+    #     })
+    #   end
+
+    #   it "should set top" do
+    #     @section.render
+    #     @section.view(:description).origin.y.should == 20
+    #   end
+    # end
+  end
+
+  describe "draw label" do
+    before do
+      @section = SampleDrawSection.new(screen: @screen)
+      @section.create_elements
+    end
+
+    describe "size_to_fit option" do
+      before do
+        @section.element(:description).options.merge!({
+          text: '',
+          size_to_fit: true
+        })
+      end
+
+      it "should set zero size" do
+        @section.render
+        @section.element(:description).size_to_fit_if_needed
+        @section.element(:description).computed_options[:width].should.be.zero
+        @section.element(:description).computed_options[:height].should.be.zero
+      end
+
+      it "should update bounds with text" do
+        @section.render
+        @section.element(:description).update_with_options(text: 'test')
+        @section.element(:description).size_to_fit_if_needed
+        @section.element(:description).computed_options[:width].should > 0
+        @section.element(:description).computed_options[:height].should > 0
+      end
+    end
+
+    describe "`top` with zero `height`" do
+      before do
+        @section.element(:description).options.merge!({
+          top: 20
+        })
+      end
+
+      it "should set top" do
+        @section.render
+        @section.container_view.bounds = UIScreen.mainScreen.bounds
+        @section.element(:description).size_to_fit_if_needed
+        @section.element(:description).draw_options[:top_left_corner].y.should == 20
+        @section.element(:description).draw_options[:inner_rect].origin.y.should == 20
+      end
+    end
+  end
+end

data/spec/unit/support/frame_calculator_mixin_spec.rb

@@ -40,4 +40,37 @@ describe MotionPrime::FrameCalculatorMixin do
     result = @subject.calculate_frame_for(@parent_bounds, {width: 100, left: 10, right: 10})
     result.size.width.should == 100
   end
+
+  it "should calculate relative width" do
+    result = @subject.calculate_frame_for(@parent_bounds, {width: 0.5})
+    result.size.width.should == 150
+    result.origin.x.should == 0
+  end
+
+  it "should calculate relative height" do
+    result = @subject.calculate_frame_for(@parent_bounds, {height: 0.5})
+    result.size.height.should == 100
+  end
+
+  it "should calculate left based on relative width and absolute right" do
+    result = @subject.calculate_frame_for(@parent_bounds, {width: 0.5, right: 70})
+    result.origin.x.should == 80
+  end
+
+  it "should calculate top based on relative height and absolute bottom" do
+    result = @subject.calculate_frame_for(@parent_bounds, {height: 0.5, bottom: 70})
+    result.origin.y.should == 30
+  end
+
+  it "should calculate relative left and width" do
+    result = @subject.calculate_frame_for(@parent_bounds, {left: 0.2, width: 0.4})
+    result.origin.x.should == 60
+    result.size.width.should == 120
+  end
+
+  it "should calculate relative top and height" do
+    result = @subject.calculate_frame_for(@parent_bounds, {top: 0.2, height: 0.4})
+    result.origin.y.should == 40
+    result.size.height.should == 80
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.9.9.1
+  version: 0.9.9.2
 platform: ruby
 authors:
 - Iskander Haziev
@@ -400,6 +400,7 @@ files:
 - spec/helpers/has_content.rb
 - spec/unit/config/store_spec.rb
 - spec/unit/delegate/delegate_spec.rb
+- spec/unit/elements/label_spec.rb
 - spec/unit/models/association_collection_spec.rb
 - spec/unit/models/associations_spec.rb
 - spec/unit/models/bag_spec.rb
@@ -459,6 +460,7 @@ test_files:
 - spec/helpers/has_content.rb
 - spec/unit/config/store_spec.rb
 - spec/unit/delegate/delegate_spec.rb
+- spec/unit/elements/label_spec.rb
 - spec/unit/models/association_collection_spec.rb
 - spec/unit/models/associations_spec.rb
 - spec/unit/models/bag_spec.rb