motion-prime 0.7.0 → 0.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmU3NjAzNmZmNTZhOTZmZjczN2Y4MjFiMTcxOTI5ODVhZDdmZTI5OA==
+    NDNjNzg4MDdmZGRhMWZjY2M4ZDljZmY0NGYyOTFmOWNmM2E0NjEyNg==
   data.tar.gz: !binary |-
-    ZWI3ZDRiMWVkYzE2MmJkNzYzZjRmNTc1MGY2YjE1ZTUyYWJhNDNhNw==
+    NDlmNmQ1NDhhY2YwOGQ0OTdkZGE2ZWNmYmU2ZmM1MjQ3YjFjMTE0Nw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDgyODhmMjQyMzhiNTM0OTA1OWE5NTQ0OGM0ZTYwZDkxNjk1NDVmOTU1MmY1
-    N2RmNzA2NDY1YzA2Yjc1YWNlZjgxY2JmODcyODdmOTBiYzA5ZmQ1ZGVjZTAy
-    OGI5ZmRiNWRmMTEzNmI4OTYzZjc5ZTZiZGViNWRlMTMzNDliNGM=
+    MzIwOWMzMDc3YjNmNjk5MjNiZTUyMzYxZWRmODYyYzVmM2I2ZWFiY2RmOTU4
+    NWRjZGI0MjY5NDdjOGYwMTFlYjFjMDJlN2NkZDlmNDk1YWFkZjY5YmM0MTc5
+    M2RjMGQwZmM3ZWUzNmUzZWI5NjVmN2M4M2JhMDAyNDViOWY0MDE=
   data.tar.gz: !binary |-
-    ZGU5ZDFmMzczNWI5ODVlYjc5OWUyNDIyYjQ2OTdmNjlkNGJmYWQ4MjI3MjZi
-    MGQwMTg0ZWYwMTYzYTBlNGIwYjc0MzQ1MGQ1NWE3MDlmYzljN2M4NmI0YjRl
-    NGMzNjA0NjNhZGYxZmY2M2I5NzdkNzU4OGMzOTlmZDdiYThhNGI=
+    Zjk5ODM4OTVmMGY3NjliYmM0MjMyZmNmMjUzYzg1YWQwNThmMWI2MGUyZGYx
+    ZTQ1YTk4OWRlNDBlNTQ0ZGFiYjQ1MjY3NDNjNmUwZjhiZWVmYjQwYjk4MzAw
+    ZGJhYzU3NjZmYjVlNzYwMDA3ZWE4NDljN2FlNDg2YWE3ZTRhZTc=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+=== 0.7.1
+* fix memory leaks for UITabbarController
+* Improved logger.
+* Better support for attributed text.
+* Fix default vertical align for draw labels.
+
 === 0.7.0
 * Added Model.find(1) syntax support where 1 is :id attribute.
 * Migrate to AFMotion.

data/Gemfile

@@ -2,7 +2,4 @@ source 'http://rubygems.org'
 
 gem 'motion-cocoapods', '~> 1.4.0'
 gem 'motion-support', '~> 0.2.4'
-gem 'sugarcube', '~> 1.3.7', require: 'sugarcube-classic'
-gem 'bubble-wrap', '~> 1.3.0'
-gem 'afmotion', '~> 2.0.0'
 gemspec

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.7.0)
+    motion-prime (0.7.1)
       afmotion (~> 2.0.0)
-      bubble-wrap
+      bubble-wrap (~> 1.4.0)
       cocoapods
       methadone
       motion-cocoapods
       motion-require
       motion-support
       rm-digest
-      sugarcube
+      sugarcube (~> 1.3.11)
 
 GEM
   remote: http://rubygems.org/
@@ -21,7 +21,7 @@ GEM
     afmotion (2.0.0)
       motion-cocoapods (~> 1.4.0)
       motion-require (~> 0.0.7)
-    bubble-wrap (1.3.0)
+    bubble-wrap (1.4.0)
     claide (0.4.0)
     cocoapods (0.28.0)
       activesupport (>= 3.2.15, < 4)
@@ -59,7 +59,7 @@ GEM
     open4 (1.3.0)
     rake (10.1.0)
     rm-digest (0.0.2)
-    sugarcube (1.3.7)
+    sugarcube (1.3.11)
     xcodeproj (0.14.1)
       activesupport (~> 3.0)
       colored (~> 1.2)
@@ -69,12 +69,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  afmotion (~> 2.0.0)
-  bubble-wrap (~> 1.3.0)
   motion-cocoapods (~> 1.4.0)
   motion-prime!
   motion-redgreen
   motion-stump
   motion-support (~> 0.2.4)
   rake
-  sugarcube (~> 1.3.7)

data/ROADMAP.md

@@ -1,5 +1,5 @@
 === 0.8.0
-* handle and fix memory leaks for UITabbarController
+* add cell preload for reverse scrolling table.
 * deprecate root level :title option for submit field
 * rename submit element in submit field to button element
 * rename date_picker element in date_picker field to input element

data/files/Gemfile

@@ -2,13 +2,11 @@ source 'http://rubygems.org'
 
 gem 'motion-cocoapods', '~> 1.4.0'
 gem 'motion-support', '~> 0.2.4'
-gem 'sugarcube', '~> 1.3.7', require: 'sugarcube-classic'
-gem 'bubble-wrap', '~> 1.4.0'
 
-gem 'motion-prime', '0.7.0'
+gem 'motion-prime', '0.7.1'
 
 # add reside menu for sidebar support
 gem 'prime_reside_menu', '~> 0.1.4'
 
 # or add sliding menu for sidebar support
-# gem 'prime_sliding_menu', '~> 0.1.3'
+# gem 'prime_sliding_menu', '~> 0.1.5'

data/motion-prime.gemspec

@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency "motion-cocoapods"
   spec.add_dependency "motion-require"
   spec.add_dependency "motion-support"
-  spec.add_dependency 'bubble-wrap'
-  spec.add_dependency 'sugarcube'
+  spec.add_dependency 'bubble-wrap', '~> 1.4.0'
+  spec.add_dependency 'sugarcube', '~> 1.3.11'
   spec.add_dependency 'afmotion', '~> 2.0.0'
   spec.add_dependency "methadone"
   spec.add_dependency "rm-digest" 

data/motion-prime/config/base.rb

@@ -21,4 +21,6 @@ MotionPrime::Config.configure do |config|
     api.allow_queue = false
   end
   config.prime.cell_section.mixins = [Prime::CellSectionMixin]
+  config.logger.level = :info
+  config.logger.dealloc_items = ['screen', 'tab_bar']
 end

data/motion-prime/config/config.rb

@@ -53,6 +53,7 @@ module MotionPrime
         end
         setup_models
         setup_colors
+        setup_logger
       end
 
       def setup_models
@@ -72,6 +73,11 @@ module MotionPrime
         end
         Symbol.css_colors.merge!(colors)
       end
+
+      def setup_logger
+        Prime::Logger.level = @base_config.logger.level
+        Prime::Logger.dealloc_items =  @base_config.logger.dealloc_items
+      end
     end
 
     def method_missing(name, *args, &block)

data/motion-prime/elements/_content_text_mixin.rb

@@ -50,6 +50,10 @@ module MotionPrime
       @content_height ||= content_height
     end
 
+    def attributed_text?
+      computed_options.slice(:html, :line_spacing, :line_height, :underline, :fragment_color).any? || computed_options[:attributed_text_options]
+    end
+
     private
       def get_content_rect(width)
         raise "Please set element width for content size calculation" unless width

data/motion-prime/elements/_text_mixin.rb

@@ -32,25 +32,46 @@ module MotionPrime
     end
 
     def attributed_string(options)
-      paragrahStyle = NSMutableParagraphStyle.alloc.init
+      attributes = {}
+      line_height = options[:line_height]
+      line_spacing = options[:line_spacing]
+      text_alignment = options[:text_alignment]
+      line_break_mode = options[:line_break_mode]
 
-      if options[:line_height]
-        paragrahStyle.setMinimumLineHeight(options[:line_height])
-      elsif options[:line_spacing]
-        paragrahStyle.setLineSpacing(options[:line_spacing])
+      if line_height || line_spacing || text_alignment || line_break_mode
+        paragrah_style = NSMutableParagraphStyle.alloc.init
+        if line_height
+          paragrah_style.setMinimumLineHeight(line_height)
+        elsif line_spacing
+          paragrah_style.setLineSpacing(line_spacing)
+        end
+        if text_alignment
+          text_alignment = text_alignment.uitextalignment if text_alignment.is_a?(Symbol)
+          paragrah_style.setAlignment(text_alignment)
+        end
+        if line_break_mode
+          line_break_mode = line_break_mode.uilinebreakmode if line_break_mode.is_a?(Symbol)
+          paragrah_style.setLineBreakMode(line_break_mode)
+        end
+        attributes[NSParagraphStyleAttributeName] = paragrah_style
       end
-      paragrahStyle.setAlignment(options[:text_alignment]) if options[:text_alignment]
-      paragrahStyle.setLineBreakMode(options[:line_break_mode]) if options[:line_break_mode]
-      attributes = {}
-      attributes[NSParagraphStyleAttributeName] = paragrahStyle
-      attributes[NSForegroundColorAttributeName] = options[:text_color]
-      attributes[NSFontAttributeName] = options[:font]
-
-      prepared_text = NSMutableAttributedString.alloc.initWithString(options[:text] || '', attributes: attributes)
-      if underline_range = options[:underline]
-        # FIXME
-        # prepared_text = NSMutableAttributedString.alloc.initWithAttributedString(prepared_text)
-        # prepared_text.addAttributes({NSUnderlineStyleAttributeName => NSUnderlineStyleSingle}, range: underline_range)
+
+      attributes[NSForegroundColorAttributeName] = options[:text_color].uicolor if options[:text_color]
+      attributes[NSFontAttributeName] = options[:font].uifont if options[:font]
+
+      prepared_text = NSMutableAttributedString.alloc.initWithString(options[:text].to_s, attributes: attributes)
+      underline_range = options[:underline]
+      fragment_color = options[:fragment_color]
+      if paragrah_style && (underline_range || fragment_color) && options.fetch(:number_of_lines, 1) == 1
+        Prime.logger.debug "If attributed text has paragraph style and underline - you must set number of lines != 1"
+      end
+
+      if underline_range
+        underline_range = [0, options[:text].length] if underline_range === true
+        prepared_text.addAttributes({NSUnderlineStyleAttributeName => NSUnderlineStyleSingle}, range: underline_range)
+      end
+      if fragment_color
+        prepared_text.addAttributes({NSForegroundColorAttributeName => fragment_color[:color].uicolor}, range: fragment_color[:range])
       end
       prepared_text
     end

data/motion-prime/elements/base_element.rb

@@ -22,6 +22,7 @@ module MotionPrime
       @options = options
       @screen = options[:screen]
       @section = options[:section]
+
       @view_class = options[:view_class] || 'UIView'
       @name = options[:name]
       @block = options[:block]
@@ -29,7 +30,7 @@ module MotionPrime
     end
 
     # def dealloc
-    #   pp 'Deallocating elemenet', self.name, self.to_s, view_class#, view.try(:to_s)
+    #   pp 'Deallocating elemenet', self.name, self.to_s, computed_options[:text]
     #   super
     # end
 

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

@@ -90,7 +90,9 @@ module MotionPrime
     def set_text_position
       if computed_options.slice(:padding_top, :padding_bottom, :padding).values.none?
         computed_options[:width] ||= computed_width
-        @padding_top = (computed_outer_height - cached_content_height)/2
+        content_height = cached_content_height
+        content_height = computed_outer_height if content_height > computed_outer_height
+        @padding_top = (computed_outer_height - content_height)/2
         # @padding_top += 1 unless @padding_top.zero?
       end
     end

data/motion-prime/elements/label.rb

@@ -1,7 +1,8 @@
 module MotionPrime
   class LabelElement < BaseElement
-    include MotionPrime::ElementContentPaddingMixin
-    include MotionPrime::ElementContentTextMixin
+    include ElementContentPaddingMixin
+    include ElementContentTextMixin
+    include ElementTextMixin
 
     before_render :size_to_fit_if_needed
     after_render :size_to_fit
@@ -28,5 +29,17 @@ module MotionPrime
         @computed_options[:height_to_fit] = cached_content_outer_height
       end
     end
+
+    def set_text(value)
+      computed_options[:text] = value
+      styler = ViewStyler.new(view, CGRectZero, computed_options)
+      if styler.options[:attributed_text]
+        view.attributedText = styler.options[:attributed_text]
+      else
+        view.text = value
+      end
+      @content_height = nil
+      size_to_fit
+    end
   end
 end

data/motion-prime/models/model.rb

@@ -24,8 +24,9 @@ module MotionPrime
       @errors ||= Errors.new(self.weak_ref)
     end
 
-    # def dealloc
-    #   pp 'deall model'
-    # end
+    def dealloc
+      Prime.logger.dealloc_message :model, self
+      super
+    end
   end
 end

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

@@ -41,5 +41,38 @@ module MotionPrime
       MBHUDView.hudWithBody message,
         type: hud_type, hidesAfter: time, show: true
     end
+
+    def show_spinner(message = nil)
+      if message.present?
+        spinner_message_element.set_text(message)
+        spinner_message_element.show
+      end
+      spinner_element.show
+      spinner_element.view.init_animation
+    end
+
+    def hide_spinner
+      spinner_element.hide
+      spinner_message_element.hide
+    end
+
+    private
+
+      def spinner_element
+        @_spinner_element ||= self.spinner({
+          styles: base_styles_for('spinner'),
+          hidden: true})
+      end
+
+      def spinner_message_element
+        @_spinner_message_element ||= self.label({
+          styles: base_styles_for('spinner_message'),
+          text: '',
+          hidden: true})
+      end
+
+      def base_styles_for(name)
+        ([:base] + default_styles).map { |base| :"#{base}_#{name}" }
+      end
   end
 end

data/motion-prime/screens/screen.rb

@@ -45,7 +45,7 @@ module MotionPrime
     end
 
     def dealloc
-      pp 'Deallocating Screen', self.object_id, self.to_s
+      Prime.logger.dealloc_message :screen, self
       # FIXME: calling instance_eval in title method (_base_screen_mixin) instance variables need to be cleared manually
       clear_instance_variables(except: [:_search_bar])
       super

data/motion-prime/sections/_draw_section_mixin.rb

@@ -78,7 +78,7 @@ module MotionPrime
     end
 
     def strong_references
-      [self, screen].map(&:strong_ref)
+      [self, screen.main_controller].map(&:strong_ref)
     end
 
     private

data/motion-prime/sections/base_section.rb

@@ -37,7 +37,7 @@ module MotionPrime
     end
 
     def dealloc
-      # pp 'Deallocating section', self.name, self.to_s, self.object_id
+      Prime.logger.dealloc_message :section, self, self.name
       NSNotificationCenter.defaultCenter.removeObserver self # unbinding events created in bind_keyboard_events
       super
     end
@@ -281,9 +281,6 @@ module MotionPrime
       self.elements.select { |key, element| element.is_a?(BaseElement) }
     end
 
-    def events_off
-    end
-
     protected
       def bind_keyboard_close
         bindings = self.class.keyboard_close_bindings

data/motion-prime/sections/form.rb

@@ -209,12 +209,6 @@ module MotionPrime
       section.container_height
     end
 
-    def events_off
-      fields.values.each do |section|
-        section.events_off
-      end
-    end
-
     class << self
       def field(name, options = {}, &block)
         options[:name] = name

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

@@ -22,6 +22,7 @@ module MotionPrime
     end
 
     def dealloc
+      picker = view(:date_picker)
       picker.setDelegate nil
       super
     end

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

@@ -8,9 +8,5 @@ module MotionPrime
     end
     element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
     after_render :bind_text_input
-
-    def events_off
-      view(:input).off :change
-    end
   end
 end

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

@@ -18,9 +18,5 @@ module MotionPrime
         form.send(options[:action]) if options[:action]
       end
     end
-
-    def events_off
-      view(:button).off :touch_down
-    end
   end
 end

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

@@ -10,9 +10,5 @@ module MotionPrime
 
     element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
     after_render :bind_text_input
-
-    def events_off
-      view(:input).off :change
-    end
   end
 end

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

@@ -12,9 +12,5 @@ module MotionPrime
         form.send(options[:action]) if options[:action]
       end
     end
-
-    def events_off
-      view(:submit).off :touch
-    end
   end
 end

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

@@ -9,9 +9,5 @@ module MotionPrime
 
     element :error_message, type: :error_message, text: proc { observing_errors? and all_errors.join("\n") }
     after_render :bind_text_input
-
-    def events_off
-      view(:input).off :change
-    end
   end
 end

data/motion-prime/sections/table.rb

@@ -20,7 +20,7 @@ module MotionPrime
     end
 
     def dealloc
-      pp 'Deallocating table', self.to_s, self.table_view.to_s
+      Prime.logger.dealloc_message :table, self, self.table_view.to_s
       table_delegate.clear_delegated
       table_view.setDataSource nil
       super
@@ -390,7 +390,7 @@ module MotionPrime
         # TODO: do not release parent_objcets unless finished
         BW::Reactor.schedule(@preloader_queue.count) do |queue_id|
           @preloader_queue[queue_id] = :in_progress
-          @strong_refs[queue_id] = screen.strong_ref
+          @strong_refs[queue_id] = screen.main_controller.strong_ref
           result = load_count.times do |offset|
             if @preloader_queue[queue_id] == :cancelled
               @strong_refs[queue_id] = nil

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

@@ -15,10 +15,10 @@ module MotionPrime
       Array.wrap(@delegated_views).each { |view| view.setDelegate(nil) }
     end
 
-    def dealloc
-      pp 'Deallocating table_delegate for ', @section_instance
-      super
-    end
+    # def dealloc
+    #   pp 'Deallocating table_delegate for ', @section_instance
+    #   super
+    # end
 
     def init_pull_to_refresh
       return unless block = table_section.class.pull_to_refresh_block

data/motion-prime/services/logger.rb

@@ -3,8 +3,9 @@ module MotionPrime
     LOGGER_ERROR_LEVEL = 0
     LOGGER_INFO_LEVEL = 1
     LOGGER_DEBUG_LEVEL = 2
+    LOGGER_DEALLOC_LEVEL = 3
 
-    class_attribute :level
+    class_attribute :level, :dealloc_items
 
     def initialize
       @default_level = Config.logger.level.nil? ? :info : Config.logger.level
@@ -22,6 +23,18 @@ module MotionPrime
       pp(*args) if LOGGER_DEBUG_LEVEL <= current_level
     end
 
+    def dealloc_message(type, object, *args)
+      if LOGGER_DEALLOC_LEVEL <= current_level
+        if dealloc_items.include?(type.to_s)
+          pp "Deallocating #{type}", object.object_id, object.to_s, *args
+        end
+      end
+    end
+
+    def dealloc_items
+      self.class.dealloc_items || []
+    end
+
     def current_level
       current_level = self.class.level || @default_level
       case current_level.to_s
@@ -30,7 +43,9 @@ module MotionPrime
       when 'info'
         LOGGER_INFO_LEVEL
       when 'debug'
-        LOGGER_DEBUG_LEVE
+        LOGGER_DEBUG_LEVEL
+      when 'dealloc'
+        LOGGER_DEALLOC_LEVEL
       else
         2
       end

data/motion-prime/styles/base.rb

@@ -50,4 +50,16 @@ MotionPrime::Styles.define :base do
     width: 300,
     height: 150,
     top: 30, left: 0
+
+  style :spinner,
+    annular: true,
+    center: proc { screen.view.center }, width: 37, height: 37,
+    progress_tint_color: proc { :app_base.uicolor },
+    background_tint_color: proc { :black.uicolor(0.05) },
+    progress: 0.25
+
+  style :spinner_message, mixins: [:multiline],
+    top: proc { screen.view.center.y + 38 }, left: 50, width: 220, text_alignment: :center,
+    font: proc { MotionPrime::Config.font.name.uifont(18) },
+    line_spacing: 6
 end

data/motion-prime/support/mp_spinner.rb

@@ -1,5 +1,6 @@
 class MPSpinner < MBRoundProgressView
   def init_animation
+    return if @firstTimestamp
     displayLink = CADisplayLink.displayLinkWithTarget(self, selector: :"handleDisplayLink:")
     displayLink.addToRunLoop(NSRunLoop.currentRunLoop, forMode:NSDefaultRunLoopMode)
   end

data/motion-prime/support/mp_table_view.rb

@@ -1,6 +1,6 @@
 class MPTableView < UITableView
-  def dealloc
-    pp 'Deallocating table view', self.to_s
-    super
-  end
+  # def dealloc
+  #   pp 'Deallocating table view', self.to_s
+  #   super
+  # end
 end

data/motion-prime/support/tab_bar_controller.rb

@@ -15,7 +15,7 @@ module MotionPrime
 
         screen.send(:on_screen_load) if screen.respond_to?(:on_screen_load)
         screen.wrap_in_navigation if screen.respond_to?(:wrap_in_navigation)
-        screen.tab_bar = controller if screen.respond_to?(:tab_bar=)
+        screen.tab_bar = controller.weak_ref if screen.respond_to?(:tab_bar=)
         view_controllers << screen.main_controller.strong_ref
       end
 
@@ -31,6 +31,12 @@ module MotionPrime
       controller
     end
 
+    def dealloc
+      Prime.logger.dealloc_message :tab_bar, self
+      clear_instance_variables
+      super
+    end
+
     protected
       def self.init_screen_with_options(options, tag: tag)
         screen, title = options.delete(:screen), options.delete(:title)

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/motion-prime/views/styles.rb

@@ -13,7 +13,7 @@ module MotionPrime
 
       if options.present?
         parent = options.delete(:parent)
-        if parent_namespace = options.delete(:parent_namespace) || @namespace
+        if parent && (parent_namespace = options.delete(:parent_namespace) || @namespace)
           parent ="#{parent_namespace}_#{parent}".to_sym
         end
         mixins = Array.wrap(options.delete(:mixins)).map { |mixin_name| :"_mixin_#{mixin_name}" }
@@ -21,8 +21,8 @@ module MotionPrime
         names.each do |name|
           name = "#{@namespace}_#{name}".to_sym if @namespace
           @@repo[name] ||= {}
-          @@repo[name].deep_merge!(self.class.for(parent)) if parent
-          @@repo[name].deep_merge!(self.class.for(mixins)) if mixins.present?
+          @@repo[name].deep_merge!(self.class.for(parent, debug_missing: true, type: :parent, name: name)) if parent
+          @@repo[name].deep_merge!(self.class.for(mixins, debug_missing: true, type: :mixin, name: name)) if mixins.present?
           @@repo[name].deep_merge! options
         end
       elsif !block_given?
@@ -57,10 +57,12 @@ module MotionPrime
         end
       end
 
-      def for(style_names)
+      def for(style_names, options = {})
         style_options = {}
         Array.wrap(style_names).each do |name|
-          style_options.deep_merge!(@@repo[name] || {})
+          styles = @@repo[name]
+          Prime.logger.debug "No styles found for `#{name}` (element: `#{options[:name]}`, type: #{options.fetch(:type, 'general')})" if options[:debug_missing] && styles.blank?
+          style_options.deep_merge!(styles || {})
         end
         style_options
       end

data/motion-prime/views/view_builder.rb

@@ -31,23 +31,6 @@ module MotionPrime
       def default_views_map
         {
           'UIView' => Proc.new {|klass, options| klass.alloc.initWithFrame CGRectZero },
-          'UILabel' => Proc.new {|klass, options|
-            if options.slice(:line_spacing, :line_height, :underline, :fragment_color).any?
-              options[:attributed_text_options] = {
-                text: options.delete(:text),
-                html: options.delete(:html),
-                line_spacing: options.delete(:line_spacing),
-                line_height: options.delete(:line_height),
-                fragment_color: options.delete(:fragment_color),
-                underline: options.delete(:underline)
-              }
-              [:text_alignment].each do |key|# add keys which must follow after attributed text here
-                value = options.delete(key)
-                options[key] = value unless value.nil?
-              end
-            end
-            klass.alloc.initWithFrame CGRectZero
-          },
           'UIControl' => Proc.new {|klass, options| klass.alloc.init },
           'UISwitch' => Proc.new {|klass, options|
             view = klass.alloc.init

data/motion-prime/views/view_styler.rb

@@ -3,6 +3,7 @@ module MotionPrime
     include FrameCalculatorMixin
     include HasStyles
     include HasClassFactory
+    include ElementTextMixin
 
     attr_reader :view, :options
 
@@ -10,6 +11,7 @@ module MotionPrime
       @options = Styles.extend_and_normalize_options options
       @view = view
       prepare_frame_for(bounds) if @options.delete(:calculate_frame)
+      prepare_options!
     end
 
     def apply
@@ -41,6 +43,29 @@ module MotionPrime
       end
     end
 
+    def prepare_options!
+      if options.slice(:html, :line_spacing, :line_height, :underline, :fragment_color).any?
+        text_options = extract_attributed_text_options(options)
+
+        html = text_options.delete(:html)
+        text_options[:text] = html if html
+        options[:attributed_text] = html ? html_string(text_options) : attributed_string(text_options)
+
+        # ios 7 bug fix when text is invisible
+        options[:number_of_lines] = 0 if text_options.slice(:line_height, :line_spacing, :text_alignment, :line_break_mode).any? && options.fetch(:number_of_lines, 1) == 1
+      end
+    end
+
+    def extract_attributed_text_options(options)
+      text_attributes = [
+        :text, :html, :line_spacing, :line_height, :underline, :fragment_color,
+        :text_alignment, :font, :line_break_mode, :number_of_lines
+      ]
+      attributed_text_options = options.slice(*text_attributes)
+      options.except!(*text_attributes)
+      attributed_text_options
+    end
+
     def set_option(key, value)
       # return if value.nil?
       # ignore options
@@ -104,43 +129,11 @@ module MotionPrime
         mask_layer.frame = bounds
         mask_layer.path = mask_path.CGPath
         view.mask = mask_layer
-      elsif key == 'attributed_text_options'
-        attributes = {}
-        if value[:html] # TODO: use _text_mixin
-          styles = []
-          styles << "color: #{options[:text_color].hex};" if options[:text_color]
-          styles << "line-height: #{options[:line_height] || (options[:line_spacing].to_f + options[:font].pointSize)}px;"
-          styles << "font-family: '#{options[:font].familyName}';"
-          styles << "font-size: #{options[:font].pointSize}px;"
-
-          html_options = {
-            NSDocumentTypeDocumentAttribute => NSHTMLTextDocumentType,
-            NSCharacterEncodingDocumentAttribute => NSNumber.numberWithInt(NSUTF8StringEncoding)
-          }
-          text = "#{value[:html]}<style>* { #{styles.join} }</style>"
-          view.attributedText = NSAttributedString.alloc.initWithData(text.dataUsingEncoding(NSUTF8StringEncoding), options: html_options, documentAttributes: nil, error: nil)
+      elsif key == 'attributed_text'
+        if view.is_a?(UIButton)
+          view.setAttributedTitle value, forState: UIControlStateNormal
         else
-          if line_spacing = value[:line_spacing] || line_height = value[:line_height]
-            paragrahStyle = NSMutableParagraphStyle.alloc.init
-            line_height ? paragrahStyle.setMinimumLineHeight(line_height) : paragrahStyle.setLineSpacing(line_spacing)
-            attributes[NSParagraphStyleAttributeName] = paragrahStyle
-          end
-
-          attributedString = NSAttributedString.alloc.initWithString(value[:text].to_s, attributes: attributes)
-          if underline_range = value[:underline]
-            underline_range = [0, value[:text].length] if underline_range === true
-            attributedString = NSMutableAttributedString.alloc.initWithAttributedString(attributedString)
-            attributedString.addAttributes({NSUnderlineStyleAttributeName => NSUnderlineStyleSingle}, range: underline_range)
-          end
-          if fragment_color = value[:fragment_color]
-            attributedString = NSMutableAttributedString.alloc.initWithAttributedString(attributedString)
-            attributedString.addAttributes({NSForegroundColorAttributeName => fragment_color[:color].uicolor}, range: fragment_color[:range])
-          end
-          if view.is_a?(UIButton)
-            view.setAttributedTitle attributedString, forState: UIControlStateNormal
-          else
-            view.attributedText = attributedString
-          end
+          view.attributedText = value
         end
       elsif key == 'gradient'
         gradient = prepare_gradient(value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -113,30 +113,30 @@ dependencies:
   name: bubble-wrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: sugarcube
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.11
 - !ruby/object:Gem::Dependency
   name: afmotion
   requirement: !ruby/object:Gem::Requirement