motion-prime 0.8.2 → 0.8.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzY4ZDViYzJiOGMwNWM5YTdhN2UwZjNlYTNlOWQ0OTc0MDM4NDM4Yw==
+    MDAzNzE5ODQ3ZTNkZjlmZjA0ZGE3MmI5YzUxZDc4ZGRhMWQxOGEyMg==
   data.tar.gz: !binary |-
-    ODRiYzRiZDAxNTMzYzdiNzVmNTg3N2FhNjY0M2E1ZGQ2NDU5YjdlZQ==
+    YzAyMzQxYjRhMzFmNzlkZDBkMzg4ZDcwZTBjMWIyMjBjMGE3NTFhOA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MDAyNTU2NzE0ODhhZWIxNzg5M2Y3ZWRlOWVlYWE0MjJmMDEzM2ZlMzE2NDI1
-    ZmMyODZjZGEyYjBmYmJlODZhZWRmYzZmZjg3OWE5ZmMzMDkxMjBkMGE2YjY1
-    NDNiMjMzN2I1NWRhNjVjNjJkYTc3NmZhYTI0ZmRlYTcxYjA4ZWM=
+    NmFmMzVmYTg5ZGIxMTQwYmUwMzJhZDhlMjU1YzUxZWVkYWRlZjFjNmFjYjIy
+    OGYxNTk4ZDFiODA2ODRkYjAzMWMyN2I2NWNiMWEwNmJjZWUwMTRhYjJjMzYw
+    MTEyYjVlM2UwNGEwYmIwYWU4MmM1MDVhZGQzY2Q5YmVhYmJhNmI=
   data.tar.gz: !binary |-
-    MWJiZDQ3OGJlN2QzNWRlNjVhNTg2MGQyN2U2NThlNTUwNmUyMmFhMGZiN2Y1
-    MmQ2YzY0MjFmYzA4YjU4NzVkOThkY2Q4ZmNiM2Q4YTFiMjBlMWE1OGI2MWFm
-    NmZjOGQ2YWU5NGQ4NDJjM2Y2ZTc2MGUxN2IxMzExNGQ0YzViZTU=
+    MGI1OTU0NzZjZjMwY2ZkZjM0NWQzMDgyMGRiMDE5ODViMTFmMzZmMzY1NWRj
+    NmMxYzk0NjBlOTFiNGYxYzE4NDNmY2U1NGU2MDJhMjNhMmY4ZDM1MmM3ODNj
+    OWVhNTQ1YTVlODBlOThjYWNiNGI2NGNlZWNkMjFkOWRkODcwYTQ=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 0.8.3
+* Ability to pass UIButton to set_navigation_left_button/set_navigation_right_button
+* Bug fixes
+
 === 0.8.2
 * bug fixes.
 * added #clone method for Model.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.8.2)
+    motion-prime (0.8.3)
       afmotion (~> 2.0.0)
       bubble-wrap (~> 1.4.0)
       cocoapods
@@ -45,7 +45,7 @@ GEM
     i18n (0.6.9)
     json (1.8.1)
     json_pure (1.8.1)
-    methadone (1.3.1)
+    methadone (1.3.2)
       bundler
     motion-cocoapods (1.4.0)
       cocoapods (>= 0.26.2)

data/files/Gemfile

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

data/motion-prime/elements/_content_text_mixin.rb

@@ -83,7 +83,9 @@ module MotionPrime
         if is_a?(TextViewElement)
           options |= NSStringDrawingUsesFontLeading | NSStringDrawingTruncatesLastVisibleLine
         end
-        text.boundingRectWithSize([width, Float::MAX], options: options, context:nil)
+        rect = text.boundingRectWithSize([width, Float::MAX], options: options, context:nil)
+        rect.size.height += 1 # {font_size: 13, line_spacing: 2, number_of_lines: 2} computed height = 28, but we need 29 to fit the text
+        rect
       end
 
       def button_content_text

data/motion-prime/elements/base_element.rb

@@ -29,7 +29,12 @@ module MotionPrime
       @view_name = self.class_name_without_kvo.demodulize.underscore.gsub(/(_draw)?_element/, '')
 
       if Prime.env.development?
-        @_element_info = "#{@name} #{view_name} #{section.try(:name)} #{screen.class}"
+        info = []
+        info << @name
+        info << view_name
+        info << section.try(:name)
+        info << screen.class
+        @_element_info = info.join(' ')
         @@_allocated_elements ||= []
         @@_allocated_elements << @_element_info
       end

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

@@ -101,7 +101,7 @@ module MotionPrime
 
     def update_with_options(new_options = {})
       super
-      self.image_data = nil if new_options.has_key?(:url)
+      self.image_data = nil if new_options.slice(:url, :image).any?
     end
   end
 end

data/motion-prime/elements/label.rb

@@ -26,7 +26,7 @@ module MotionPrime
 
     def size_to_fit_if_needed
       if computed_options[:size_to_fit] && computed_options[:width]
-        @computed_options[:height_to_fit] = cached_content_outer_height
+        @computed_options[:height_to_fit] = content_outer_height
       end
     end
 

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

@@ -13,6 +13,7 @@ module MotionPrime
     end
 
     def set_navigation_right_button(title, args = {})
+      puts title.inspect
       navigationItem.rightBarButtonItem = create_navigation_button(title, args)
     end
 
@@ -44,30 +45,44 @@ module MotionPrime
       args[:style]  ||= UIBarButtonItemStylePlain
       args[:action] ||= nil
       # TODO: Find better place for this code, may be just create custom control
-      if args[:image]
-        image = args[:image].uiimage
-        face = UIButton.buttonWithType UIButtonTypeCustom
-        face.bounds = CGRectMake(0, 0, image.size.width, image.size.height)
-        face.setImage image, forState: UIControlStateNormal
-        face.on :touch do
+      if title.is_a?(UIButton)
+        title.on :touch do
           args[:action].to_proc.call(self)
-        end
-        UIBarButtonItem.alloc.initWithCustomView(face)
+        end if args[:action]
+        title.sizeToFit
+        UIBarButtonItem.alloc.initWithCustomView(title)
+      elsif args[:image]
+        create_navigation_button_with_icon(title, args)
       elsif args[:icon]
-        image = args[:icon].uiimage
-        face = UIButton.buttonWithType UIButtonTypeCustom
-        face.setImage(image, forState: UIControlStateNormal)
-        face.setTitle(title, forState: UIControlStateNormal)
-        face.setContentHorizontalAlignment UIControlContentHorizontalAlignmentLeft
-        face.sizeToFit
-        face.on :touch do
-          args[:action].to_proc.call(self)
-        end
-        UIBarButtonItem.alloc.initWithCustomView(face)
+        create_navigation_button_with_icon(title, args)
       else
         UIBarButtonItem.alloc.initWithTitle(title,
           style: args[:style], target: args[:target] || self, action: args[:action])
       end
     end
+
+    def create_navigation_button_with_image(title, args)
+      image = args[:icon].uiimage
+      face = UIButton.buttonWithType UIButtonTypeCustom
+      face.setImage(image, forState: UIControlStateNormal)
+      face.setTitle(title, forState: UIControlStateNormal)
+      face.setContentHorizontalAlignment UIControlContentHorizontalAlignmentLeft
+      face.sizeToFit
+      face.on :touch do
+        args[:action].to_proc.call(self)
+      end if args[:action]
+      UIBarButtonItem.alloc.initWithCustomView(face)
+    end
+
+    def create_navigation_button_with_icon(title, args)
+      image = args[:image].uiimage
+      face = UIButton.buttonWithType UIButtonTypeCustom
+      face.bounds = CGRectMake(0, 0, image.size.width, image.size.height)
+      face.setImage image, forState: UIControlStateNormal
+      face.on :touch do
+        args[:action].to_proc.call(self)
+      end if args[:action]
+      UIBarButtonItem.alloc.initWithCustomView(face)
+    end
   end
 end

data/motion-prime/sections/_async_table_mixin.rb

@@ -33,6 +33,10 @@ module Prime
 
     def height_for_index(table, index)
       section = cell_section_by_index(index)
+      unless section
+        Prime.logger.debug "could not find section with index #{index} for #{self.to_s}"
+        return 0
+      end
       preload_section_by_index(index)
       section.container_height
     end
@@ -171,6 +175,7 @@ module Prime
 
       def preload_section_by_index(index)
         section = cell_section_by_index(index)
+
         if section.create_elements && !section.container_element && async_data? # perform only if just loaded
           section.load_container_with_elements(container: container_element_options_for(index))
           section

data/motion-prime/sections/table.rb

@@ -100,18 +100,24 @@ module MotionPrime
     def delete_cell_sections(sections)
       paths = []
       Array.wrap(sections).each do |section|
-        paths << NSIndexPath.indexPathForRow(@data.index(section), inSection: 0)
+        index = @data.try(:index, section)
+        next Prime.logger.debug("Delete cell section: `#{section.name}` is not in the list") unless index
+        paths << NSIndexPath.indexPathForRow(index, inSection: 0)
         delete_from_data(section)
       end
-      table_view.beginUpdates
-      table_view.deleteRowsAtIndexPaths(paths, withRowAnimation: UITableViewRowAnimationLeft)
-      table_view.endUpdates
+      if paths.any?
+        table_view.beginUpdates
+        table_view.deleteRowsAtIndexPaths(paths, withRowAnimation: UITableViewRowAnimationLeft)
+        table_view.endUpdates
+      end
       paths
     end
 
     def delete_from_data(section)
       # section will not deallocate if you'll just write @data.delete(section)
-      index = @data.index(section)
+      unless index = @data.try(:index, section)
+        Prime.logger.debug("Delete cell section from @data: `#{section.name}` is not in the list") and return
+      end
       @data[index] = nil
       @data.delete_at(index)
     end

data/motion-prime/services/logger.rb

@@ -12,15 +12,15 @@ module MotionPrime
     end
 
     def error(*args)
-      pp(*args) if LOGGER_ERROR_LEVEL <= current_level
+      pp("PRIME_ERROR", *args) if LOGGER_ERROR_LEVEL <= current_level
     end
 
     def info(*args)
-      pp(*args) if LOGGER_INFO_LEVEL <= current_level
+      pp("PRIME_INFO", *args) if LOGGER_INFO_LEVEL <= current_level
     end
 
     def debug(*args)
-      pp(*args) if LOGGER_DEBUG_LEVEL <= current_level
+      pp("PRIME_DEBUG", *args) if LOGGER_DEBUG_LEVEL <= current_level
     end
 
     def dealloc_message(type, object, *args)

data/motion-prime/styles/form.rb

@@ -34,14 +34,11 @@ MotionPrime::Styles.define :base_form do
     font: proc { :app_base.uifont(12) },
     size_to_fit: true
 
-  style :field_error_message,
+  style :field_error_message, mixins: [:multiline],
     top: nil,
     bottom: 0,
     width: 280,
     left: 0,
-    line_break_mode: :word_wrap,
-    number_of_lines: 0,
-    size_to_fit: true,
     text_color: :app_error,
     font: proc { :app_base.uifont(12) }
 

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/motion-prime/views/_frame_calculator_mixin.rb

@@ -51,7 +51,7 @@ module MotionPrime
 
       if !left.nil? && !right.nil?
         frame.origin.x = left
-        width = max_width - left - right
+        width = max_width - left - right if options[:height_to_fit].nil?
       elsif !right.nil?
         frame.origin.x = max_width - width - right
       elsif !left.nil?
@@ -72,8 +72,10 @@ module MotionPrime
         frame.origin.y = max_height / 2 - height / 2
       end
       frame.size.height = height
-
       frame
+    rescue => e
+      Prime.logger.error "can't calculate frame in #{self.class.name}. #{e}"
+      CGRectMake(0,0,0,0)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake