motion-prime 0.5.1 → 0.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWVkMTljOTZkZDI3YThhODdjZGU3OWU4NWE1MzU2ZDY2ZmU1YTY2YQ==
+    YzJhZGY0OTNiNDY5YmZmOWQ0NDZhNGEzOWY4MjM3ZDU3YjUzODVkOQ==
   data.tar.gz: !binary |-
-    ZjExNDBjZmEwZWQ4MWU3NmE5MGJhNmVkNDVmMWUyYmNkN2E3M2JmMg==
+    ZDcyYmRiYWM3MWQyYmI5OTA0M2U2YzcyYTlmZGFkNjBjZWIzMWJlMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWE1ZDk0YjZhZTZmYTA0ODg5NzIwYTBjZmU5NzA5OWM4YzVmMzZhOGQzODI1
-    ZDkwNGRhYmE0YjA3NmYyMjBiMzYzZThlMjQyYjVhZGQ4YzAwN2QzOTZiZmE3
-    MTJhMjIwYzBjMDYzOTRkNWIzYmE4YWRhNmI3ZTAwNWY2NmEzNWQ=
+    NzAwYWU2NDlmYjUyZGVhZjkxMzcyZGE0ZTBiNmYyN2EwZmEyNGMzYjJmNTcz
+    N2IyZmRkNWVjZjU0ZDVmNGQxYmYxZGJkOTE0YTdkZTBjMDc3MmMwZDU2NjJk
+    NWUyYWRjN2E4NDg4YWEwY2U0N2MyMDhlMzI2OTY0MDJmNjRiZGE=
   data.tar.gz: !binary |-
-    ZTgzMDY0MjA4MGJjYmYxMTA4NDYzOGQ2NTI1MTgzOGNiZTNiMmFkMTA4NWQ5
-    MTkyYzQ1OTIwMGM2ODliZTkwZTYwMTNiZjJkYTE3NzliZDhiNzQwZTM2MjFk
-    NjQ4NTA0YTExMmVhYjNiNGNhNjY2MmM2OTllMGEwMWE1Y2QxNTQ=
+    MmYyY2I4MTQ5ZTA4OGIxZjYzOWFhOTc1NDk5NWI5YWMwZjJmN2Q0NGU1Y2Jm
+    MTQwZGU3ZDlmNTgwMThkZGQ2OTBmMjU5NTY3OTY3OGQ5NzA3NjQxODYwZThj
+    MThjMjgxMmQ0YzU0MTYyZDljZGY1NTI0NzllZGExYzRkZjMxYmU=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+=== 0.5.2
+* fix bugs.
+
 === 0.5.1
 * configurations and style definitions runs in correct order.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.5.1)
+    motion-prime (0.5.2)
       bubble-wrap
       cocoapods
       methadone

data/files/Gemfile

@@ -5,7 +5,7 @@ gem 'motion-support', '~> 0.2.4'
 gem 'sugarcube', '~> 1.3.7', require: 'sugarcube-classic'
 gem 'bubble-wrap', '~> 1.3.0'
 
-gem 'motion-prime', '~> 0.5.0', path: '../'
+gem 'motion-prime', '~> 0.5.1'
 
 # add reside menu for sidebar support
 gem 'prime_reside_menu', '~> 0.1.3'

data/files/Gemfile.lock

@@ -1,15 +1,3 @@
-PATH
-  remote: ../
-  specs:
-    motion-prime (0.5.0)
-      bubble-wrap
-      cocoapods
-      methadone
-      motion-cocoapods
-      motion-require
-      motion-support
-      sugarcube
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -44,6 +32,14 @@ GEM
       bundler
     motion-cocoapods (1.4.0)
       cocoapods (>= 0.26.2)
+    motion-prime (0.5.1)
+      bubble-wrap
+      cocoapods
+      methadone
+      motion-cocoapods
+      motion-require
+      motion-support
+      sugarcube
     motion-require (0.0.7)
     motion-support (0.2.5)
       motion-require (>= 0.0.6)
@@ -67,7 +63,7 @@ PLATFORMS
 DEPENDENCIES
   bubble-wrap (~> 1.3.0)
   motion-cocoapods (~> 1.4.0)
-  motion-prime (~> 0.5.0)!
+  motion-prime (~> 0.5.1)
   motion-support (~> 0.2.4)
   prime_reside_menu (~> 0.1.3)
   sugarcube (~> 1.3.7)

data/files/app/screens/application_screen.rb

@@ -1,5 +1,5 @@
 class ApplicationScreen < Prime::Screen
-  before_load :setup_navigation
+  before_render :setup_navigation
 
   def setup_navigation
     set_navigation_left_button 'menu', image: 'images/menu_button.png', action: :toggle_sidebar

data/motion-prime/core_ext/kernel.rb

@@ -11,6 +11,10 @@ class Kernel
     WeakRef.new(self)
   end
 
+  def strong_ref
+    self
+  end
+
   def clear_instance_variables(options = {})
     ivars = self.instance_variables.clone
     ivars.each do |ivar|

data/motion-prime/elements/_content_text_mixin.rb

@@ -21,7 +21,8 @@ module MotionPrime
       options = {
         text: content_text,
         font: content_font,
-        line_spacing: computed_options[:line_spacing]
+        line_spacing: computed_options[:line_spacing],
+        line_height: computed_options[:line_height]
       }
       computed_options[:html].present? ? html_string(options) : attributed_string(options)
     end

data/motion-prime/elements/_text_mixin.rb

@@ -13,7 +13,7 @@ module MotionPrime
     def html_string(options)
       styles = []
       styles << "color: #{options[:text_color].hex};" if options[:text_color]
-      styles << "line-height: #{options[:line_spacing].to_f + options[:font].pointSize}px;"
+      styles << "line-height: #{options.fetch(:line_height, options[:line_spacing].to_f + options[:font].pointSize)}px;"
       styles << "font-family: '#{options[:font].familyName}';"
       styles << "font-size: #{options[:font].pointSize}px;"
       styles << "text-align: #{options[:text_alignment_name]};" if options[:text_alignment_name]
@@ -28,13 +28,17 @@ module MotionPrime
       # DTCoreTextFontDescriptor.setOverrideFontName(Prime::Config.font.bold_italic, forFontFamily: 'Calibri', bold: true, italic: true)
 
       text = "#{options[:text]}<style>* { #{styles.join} }</style>"
-      NSAttributedString.alloc.initWithData(text.dataUsingEncoding(NSString.defaultCStringEncoding), options: html_options, documentAttributes: nil, error: nil)
+      NSAttributedString.alloc.initWithData(text.dataUsingEncoding(NSUTF8StringEncoding), options: html_options, documentAttributes: nil, error: nil)
     end
 
     def attributed_string(options)
       paragrahStyle = NSMutableParagraphStyle.alloc.init
 
-      paragrahStyle.setLineSpacing(options[:line_spacing]) if options[:line_spacing]
+      if options[:line_height]
+        paragrahStyle.setMinimumLineHeight(options[:line_height])
+      elsif options[:line_spacing]
+        paragrahStyle.setLineSpacing(options[:line_spacing])
+      end
       paragrahStyle.setAlignment(options[:text_alignment]) if options[:text_alignment]
       paragrahStyle.setLineBreakMode(options[:line_break_mode]) if options[:line_break_mode]
       attributes = {}

data/motion-prime/elements/draw.rb

@@ -65,18 +65,23 @@ module MotionPrime
     end
 
     def hide
+      return if computed_options[:hidden]
       computed_options[:hidden] = true
+      section.cached_draw_image = nil
       view.setNeedsDisplay
     end
 
     def show
+      return if !computed_options[:hidden]
       computed_options[:hidden] = false
+      section.cached_draw_image = nil
       view.setNeedsDisplay
     end
 
     def update_with_options(new_options = {})
       options.merge!(new_options)
       compute_options!
+      section.cached_draw_image = nil
       view.setNeedsDisplay
     end
 

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

@@ -4,11 +4,6 @@ module MotionPrime
     include DrawBackgroundMixin
     attr_accessor :image_data
 
-    def dealloc
-      @break_async_block = true
-      super
-    end
-
     def draw_options
       image = image_data || computed_options[:image]
       image ||= computed_options[:default] if computed_options[:url]
@@ -73,11 +68,17 @@ module MotionPrime
       return if image_data || !computed_options[:url]
       BW::Reactor.schedule do
         manager = SDWebImageManager.sharedManager
+        @screen_ref = screen.strong_ref
+        @section_ref = section.strong_ref
         manager.downloadWithURL(computed_options[:url],
           options: 0,
           progress: lambda{ |r_size, e_size|  },
           completed: lambda{ |image, error, type, finished|
-            break if @break_async_block || !image
+            if !image || screen.retainCount == 1 || section.retainCount == 1
+              @screen_ref = @section_ref = nil
+              return
+            end
+
             self.image_data = image
 
             section.cached_draw_image = nil
@@ -86,6 +87,7 @@ module MotionPrime
             else
               self.view.performSelectorOnMainThread :setNeedsDisplay, withObject: nil, waitUntilDone: false
             end
+            @screen_ref = @section_ref = nil
           }
         )
       end

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

@@ -30,6 +30,7 @@ module MotionPrime
         line_break_mode_name: line_break_mode_name,
         line_break_mode: line_break_mode,
         line_spacing: options[:line_spacing],
+        line_height: options[:line_height],
         underline: options[:underline],
         top_left_corner: top_left_corner,
         inner_rect: inner_rect
@@ -49,7 +50,7 @@ module MotionPrime
 
       UIGraphicsPushContext(context)
       options = draw_options
-      if options[:is_html] || options[:line_spacing] || options[:underline]
+      if options[:is_html] || options[:line_spacing] || options[:line_height] || options[:underline]
         prepared_text = options[:is_html] ? html_string(options) : attributed_string(options)
 
         if options[:inner_rect]

data/motion-prime/env.rb

@@ -14,6 +14,10 @@ module MotionPrime
       env
     end
 
+    def ==(obj)
+      env == obj
+    end
+
     def method_missing(name, *args, &block)
       if /(.+)?$/.match(name.to_s)
         env == name.to_s.gsub('?', '')

data/motion-prime/screens/_aliases_mixin.rb

@@ -28,7 +28,5 @@ module MotionPrime
     end
 
     def on_rotate; end;
-
-    def on_load; end
   end
 end

data/motion-prime/screens/_base_mixin.rb

@@ -13,20 +13,10 @@ module MotionPrime
     attr_accessor :parent_screen, :modal, :params, :main_section, :options, :tab_bar
     class_attribute :current_screen
 
-    included do
-      define_callbacks :load
-    end
-
     def app_delegate
       UIApplication.sharedApplication.delegate
     end
 
-    def on_screen_load
-      run_callbacks :load do
-        on_load
-      end
-    end
-
     # Setup the screen, this method will be called when you run MPViewController.new
     # @param options [hash] Options passed to setup
     # @return [MotionPrime::Screen] Ready to use screen
@@ -74,11 +64,11 @@ module MotionPrime
           t ? @title = t : @title ||= self.to_s
         end
       end
-      def before_load(method_name)
-        set_callback :load, :before, method_name
+      def before_render(method_name)
+        set_callback :render, :before, method_name
       end
-      def after_load(method_name)
-        set_callback :load, :after, method_name
+      def after_render(method_name)
+        set_callback :render, :after, method_name
       end
       def create_with_options(screen, navigation = true, options = {})
         if screen.is_a?(Symbol)

data/motion-prime/screens/screen.rb

@@ -20,6 +20,8 @@ module MotionPrime
 
     extend HasClassFactory
 
+    define_callbacks :render
+
     def render
     end
 
@@ -30,15 +32,14 @@ module MotionPrime
     def will_appear
       unless @on_appear_happened
         setup view, styles: default_styles do
-          render
+          run_callbacks :render { render }
         end
       end
       @on_appear_happened = true
     end
 
     def dealloc
-      pp 'Deallocating Screen'
-      @main_section.instance_variable_set(:"@break_preload", true) # TODO: find a better option
+      pp self.object_id, 'Deallocating Screen', self.retainCount
       # FIXME: calling instance_eval in title method (_base_screen_mixin) instance variables need to be cleared manually
       # clear_instance_variables cause BAD_ACCESS errors too
       @main_section = nil

data/motion-prime/sections/base_section.rb

@@ -37,7 +37,7 @@ module MotionPrime
     end
 
     def dealloc
-      # pp 'deallocating section', self.name, self.elements.try(:count), self.to_s, self.object_id
+      pp 'deallocating section', self.name, self.elements.try(:count), self.to_s, self.object_id
       NSNotificationCenter.defaultCenter.removeObserver self # unbinding events created in bind_keyboard_events
       super
     end
@@ -72,7 +72,6 @@ module MotionPrime
       @section_loading = true
       create_elements
       @section_loading = false
-
       return @section_loaded = true
     end
 

data/motion-prime/sections/table.rb

@@ -15,12 +15,6 @@ module MotionPrime
     after_render :init_pull_to_refresh
     delegate :init_pull_to_refresh, to: :table_delegate
 
-    def dealloc
-      cancel_block = proc { :cancelled }.weak!
-      @preloader_queue.map!(&cancel_block) if @preloader_queue.present?
-      super
-    end
-
     def table_data
       []
     end
@@ -55,14 +49,6 @@ module MotionPrime
       @preloader_cancelled = false
       @data_stamp = nil
       @preloader_queue[-1] = :cancelled if @preloader_queue.present?
-      # @ids.each do |id|
-      #   table_view.dequeueReusableCellWithIdentifier(id)
-      # end if @ids
-      # table_view.valueForKey('_reusableTableCells').removeAllObjects
-
-      # releasing table_delegate
-      # @table_delegate = nil
-      # table_view.delegate = table_delegate
     end
 
     def table_styles
@@ -379,22 +365,36 @@ module MotionPrime
         load_count = [left_to_load, limit].compact.min
         @preloader_cancelled = false
         @preloader_queue ||= []
+        @strong_refs ||= []
 
         # 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
 
           result = load_count.times do |offset|
-            break if @break_preload || @preloader_queue[queue_id] == :cancelled
+            if @preloader_queue[queue_id] == :cancelled
+              @strong_refs[queue_id] = nil
+              break
+            end
+
+            if screen.retainCount == 1
+              @strong_refs[queue_id] = nil
+              @preloader_queue[queue_id] = :dealloc
+              break
+            end
+
             load_cell_by_index(index, preload: true)
             unless offset == load_count - 1
               index = service.sum_index(index, 1)
             end
           end
+
           if result
             on_async_data_preloaded(index)
             @preloader_queue[queue_id] = :completed
           end
+          @strong_refs[queue_id] = nil
         end
         load_count
       end

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

@@ -22,6 +22,16 @@ module MotionPrime
     end
 
     def tableView(table, cellForRowAtIndexPath: index)
+      curCallTime = Time.now.to_f
+      curCallOffset = table.contentOffset.y
+      if @prevCallTime
+        timeDelta = curCallTime - @prevCallTime
+        offsetDelta = curCallOffset - @prevCallOffset
+        @deceleration_speed = offsetDelta/timeDelta
+      end
+      @prevCallTime = curCallTime
+      @prevCallOffset = curCallOffset
+
       table_section.cell_for_index(table, index)
     end
 

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/motion-prime/views/view_builder.rb

@@ -32,10 +32,11 @@ module MotionPrime
         {
           'UIView' => Proc.new {|klass, options| klass.alloc.initWithFrame CGRectZero },
           'UILabel' => Proc.new {|klass, options|
-            if options.slice(:line_spacing, :underline, :fragment_color).any?
+            if options.slice(:line_spacing, :line_height, :underline, :fragment_color).any?
               options[:attributed_text_options] = {
                 text: options.delete(:text),
                 line_spacing: options.delete(:line_spacing),
+                line_height: options.delete(:line_height),
                 fragment_color: options.delete(:fragment_color),
                 underline: options.delete(:underline)
               }
@@ -132,11 +133,13 @@ module MotionPrime
           },
           'UIWebView' => Proc.new{|klass, options|
             web_view = klass.alloc.initWithFrame CGRectZero
+            if delegate = options.delete(:delegate)
+              web_view.delegate = delegate
+            end
             if url = options.delete(:url)
               request = NSURLRequest.requestWithURL url.nsurl
-              web_view.loadRequest request
+              web_view.loadRequest(request)
             end
-            web_view.delegate = options.delete(:delegate)
             web_view
           }
         }

data/motion-prime/views/view_styler.rb

@@ -106,9 +106,9 @@ module MotionPrime
         view.mask = mask_layer
       elsif key == 'attributed_text_options'
         attributes = {}
-        if line_spacing = value[:line_spacing]
+        if line_spacing = value[:line_spacing] || line_height = value[:line_height]
           paragrahStyle = NSMutableParagraphStyle.alloc.init
-          paragrahStyle.setLineSpacing(line_spacing)
+          line_height ? paragrahStyle.setMinimumLineHeight(line_height) : paragrahStyle.setLineSpacing(line_spacing)
           attributes[NSParagraphStyleAttributeName] = paragrahStyle
         end
 

data/spec/prime/env.rb

@@ -0,0 +1,20 @@
+describe "Prime.env" do
+
+  before do 
+    ENV['PRIME_ENV'] = 'staging'
+  end
+
+  it 'to_s should return string' do
+    Prime.env.to_s.is_a?(String).should.be.true
+  end
+
+  it 'should be comparable with string' do
+    (Prime.env == 'staging').should.be.true
+    (Prime.env == 'test').should.be.false
+  end
+
+  it 'should respond to question mark' do
+    Prime.env.staging?.should.be.true
+    Prime.env.test?.should.be.false
+  end
+end

data/spec/screens/screen_spec.rb

@@ -2,7 +2,6 @@ describe MotionPrime::Screen do
 
   before do
     @screen = BaseScreen.new()
-    @screen.on_load
     @screen.will_appear
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -325,6 +325,7 @@ files:
 - spec/models/model_spec.rb
 - spec/models/store_extension_spec.rb
 - spec/models/store_spec.rb
+- spec/prime/env.rb
 - spec/screens/screen_spec.rb
 - travis.sh
 homepage: ''
@@ -366,4 +367,5 @@ test_files:
 - spec/models/model_spec.rb
 - spec/models/store_extension_spec.rb
 - spec/models/store_spec.rb
+- spec/prime/env.rb
 - spec/screens/screen_spec.rb