motion-prime 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a7abdeb0d07ef7b8ff96929509ca71f4d9735b2
-  data.tar.gz: 506e027301a4ce09c546ae0a89103813bf708158
+  metadata.gz: 73f4e57020b81f82e56d7fe886ddb9373d2c73b0
+  data.tar.gz: 4864c4e58bc967c5359813421a016e15d5ce16c8
 SHA512:
-  metadata.gz: 4890d0d9e1f0231b41194eef01979d6b6f9314c465e8b4a4e5b9280ee1dc67924c148d746ab8263d7c996cf9eec39ba1c16827e7d4072a22cc162c0e2eead179
-  data.tar.gz: 114bd8c2ab635bd8ce17a4963965b03428bb71a045fdcec832c4e11d9e23841b386b0b295096d97aa7330a1b4a9e564ad2b702c4ff4f74cf96fac0f2806429c1
+  metadata.gz: 25a1b1d3ef76d3d5ddfe3299a52dfcf00d6d8361b334145e4fe91cc389fcfada501f937c1d10067d6a56dcfae8a2fc9950837c61029ad6b06c913f4fc7a4dba9
+  data.tar.gz: c8fa03c270d0af8427b3182851c6ee6b0b9919a36d53646273949fdee90d93b21548253772d8697129d7df48b59a70f24492b19dd32a8d8d9ef33fa1031d858b

data/.travis.yml

@@ -1,4 +1,6 @@
 language: objective-c
 before_install:
-    - (ruby --version)
+  - (ruby --version)
+gemfile:
+  - Gemfile
 script: ./travis.sh

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 1.0.7
+* Bug fixes
+* Only include bubble wrap core (not all modules)
+
 === 1.0.6
 * Memory leak fixes
 * Fix pagination of page view section

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    motion-prime (1.0.6)
-      activesupport
+    motion-prime (1.0.7)
+      activesupport (~> 3.2.19)
       afmotion (~> 2.1.0)
       bubble-wrap (~> 1.6.0)
       cocoapods
@@ -10,6 +10,7 @@ PATH
       motion-cocoapods
       motion-require
       motion-support (~> 0.2.6)
+      rake
       rm-digest
       sugarcube (~> 1.6.0)
       thor
@@ -17,7 +18,7 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.17)
+    activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     afmotion (2.1.5)
@@ -26,48 +27,57 @@ GEM
     bubble-wrap (1.6.0)
       bubble-wrap-http (= 1.6.0)
     bubble-wrap-http (1.6.0)
-    claide (0.5.0)
-    cocoapods (0.32.1)
+    claide (0.7.0)
+    cocoapods (0.34.4)
       activesupport (>= 3.2.15, < 4)
-      claide (~> 0.5.0)
-      cocoapods-core (= 0.32.1)
-      cocoapods-downloader (~> 0.5.0)
-      cocoapods-try (~> 0.2.0)
+      claide (~> 0.7.0)
+      cocoapods-core (= 0.34.4)
+      cocoapods-downloader (~> 0.7.2)
+      cocoapods-plugins (~> 0.3.1)
+      cocoapods-trunk (~> 0.3.1)
+      cocoapods-try (~> 0.4.1)
       colored (~> 1.2)
       escape (~> 0.0.4)
       json_pure (~> 1.8)
-      nap (~> 0.7)
+      nap (~> 0.8)
       open4 (~> 1.3)
-      xcodeproj (~> 0.16.1)
-    cocoapods-core (0.32.1)
-      activesupport (>= 3.2.15, < 4)
+      xcodeproj (~> 0.19.4)
+    cocoapods-core (0.34.4)
+      activesupport (>= 3.2.15)
       fuzzy_match (~> 2.0.4)
       json_pure (~> 1.8)
-      nap (~> 0.5)
-    cocoapods-downloader (0.5.0)
-    cocoapods-try (0.2.0)
+      nap (~> 0.8.0)
+    cocoapods-downloader (0.7.2)
+    cocoapods-plugins (0.3.1)
+      nap
+    cocoapods-trunk (0.3.1)
+      json_pure (~> 1.8)
+      nap (>= 0.8)
+      netrc (= 0.7.8)
+    cocoapods-try (0.4.1)
     colored (1.2)
     escape (0.0.4)
     fuzzy_match (2.0.4)
-    i18n (0.6.9)
+    i18n (0.6.11)
     json_pure (1.8.1)
-    methadone (1.5.1)
+    methadone (1.7.0)
       bundler
-    motion-cocoapods (1.4.1)
+    motion-cocoapods (1.4.2)
       cocoapods (>= 0.32.1)
     motion-redgreen (0.1.0)
     motion-require (0.2.0)
     motion-stump (0.3.2)
     motion-support (0.2.6)
       motion-require (>= 0.0.6)
-    multi_json (1.9.3)
-    nap (0.7.0)
-    open4 (1.3.3)
-    rake (10.3.1)
+    multi_json (1.10.1)
+    nap (0.8.0)
+    netrc (0.7.8)
+    open4 (1.3.4)
+    rake (10.3.2)
     rm-digest (0.0.2)
     sugarcube (1.6.3)
     thor (0.19.1)
-    xcodeproj (0.16.1)
+    xcodeproj (0.19.4)
       activesupport (~> 3.0)
       colored (~> 1.2)
 
@@ -79,4 +89,3 @@ DEPENDENCIES
   motion-prime!
   motion-redgreen
   motion-stump
-  rake

data/bin/prime

@@ -7,7 +7,7 @@ class App
   include Methadone::Main
   include Methadone::CLILogging
   include Methadone::SH
-  
+
   main do |command, *opts|
     case command.to_sym
     when :new then create_base(*opts)
@@ -52,7 +52,7 @@ class App
     info "Command: pod setup"
     sh "cd ./#{name}; pod setup"
     info "Command: rake pod:install"
-    sh "cd ./#{name}; rake pod:install"
+    sh "cd ./#{name}; bundle exec rake pod:install"
   end
 
   def self.generate(resource, name)

data/files/Gemfile

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

data/lib/motion-prime.rb

@@ -2,8 +2,10 @@ require 'motion-require'
 require 'motion-support'
 require 'motion-support/core_ext/hash'
 require 'sugarcube-common'
-require 'bubble-wrap'
+
+require 'bubble-wrap/core'
 require 'bubble-wrap/reactor'
+
 require 'rm-digest'
 require 'afmotion'
 require File.expand_path('../../motion-prime/env.rb', __FILE__)
@@ -17,7 +19,7 @@ Motion::Project::App.setup do |app|
 
   app.pods do
     pod 'NanoStore', '~> 2.7.7'
-    pod 'SDWebImage'
+    pod 'SDWebImage', '~> 3.7.1'
     pod 'SVPullToRefresh', git: 'https://github.com/droidlabs/SVPullToRefresh.git'
     pod 'MBAlertView'
     pod 'MBProgressHUD', '~> 0.8'

data/motion-prime.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rake"
   spec.add_development_dependency("motion-stump")
   spec.add_development_dependency("motion-redgreen")
 
   spec.add_dependency "cocoapods"
+  spec.add_dependency "rake"
   spec.add_dependency "motion-cocoapods"
   spec.add_dependency "motion-require"
   spec.add_dependency "motion-support", '~> 0.2.6'
@@ -30,5 +30,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "methadone"
   spec.add_dependency "rm-digest"
   spec.add_dependency "thor"
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activesupport", "~> 3.2.19"
 end

data/motion-prime/api_client.rb

@@ -16,6 +16,7 @@ class ApiClient
       params.merge!(credentials: config.http_auth.to_hash)
     end
     if config.sign_request?
+      params.delete(:sign)
       signature = RmDigest::MD5.hexdigest(
         config.signature_secret + params.keys.map(&:to_s).sort.join
       )
@@ -72,14 +73,14 @@ class ApiClient
 
   def request!(method, path, data, files = nil, options = {}, &block)
     use_callback = block_given?
-    path = path_with_base(path, config.api_namespace)
+    path_with_base = path_with_base(path, config.api_namespace)
     client_method = files.present? ? :"multipart_#{method}" : method
-    AFMotion::Client.shared.send client_method, path, data do |response, form_data, progress|
+    AFMotion::Client.shared.send client_method, path_with_base, data do |response, form_data, progress|
       if form_data && files.present?
         append_files_to_data(files, form_data)
       elsif progress
         # handle progress
-      elsif !response.success? && allow_queue?(method, path, options)
+      elsif !response.success? && allow_queue?(method, path_with_base, options)
         queue(method: method, path: path, params: data)
       elsif response.operation.response.nil?
         block.call if use_callback
@@ -123,7 +124,9 @@ class ApiClient
   end
 
   def queue(item)
-    queue_list = MotionPrime::JSON.parse(user_defaults['api_client_queue']) || []
+    queue_json = user_defaults['api_client_queue']
+    queue_list = MotionPrime::JSON.parse(queues) if queue_list.present?
+    queue_list ||= []
     queue_list.push(item)
     user_defaults['api_client_queue'] = MotionPrime::JSON.generate(queue_list)
   end
@@ -154,8 +157,9 @@ class ApiClient
     end
 
     def process_queue
-      queue_list = user_defaults['api_client_queue']
-      user_defaults['api_client_queue'] = []
+      queue_json = user_defaults['api_client_queue']
+      queue_list = MotionPrime::JSON.parse(queue_json) if queue_json.present?
+      user_defaults['api_client_queue'] = nil
       Array.wrap(queue_list).each do |item|
         request(item[:method], item[:path], item[:params].clone.symbolize_keys)
       end

data/motion-prime/elements/base_element.rb

@@ -24,6 +24,7 @@ module MotionPrime
       @options = options
       @screen = options[:screen]
       @section = options[:section]
+      @_has_section = @section.present?
 
       @view_class = options[:view_class] || 'UIView'
       @name = options[:name]
@@ -49,6 +50,8 @@ module MotionPrime
       end
       Prime.logger.dealloc_message :element, self, self.name
       super
+    rescue # "undefined `super` method" bug fix
+      Prime.logger.debug "Undefined `super` in `base_element`"
     end
 
     def add_target(target = nil, action = 'on_click:', event = :touch)
@@ -94,7 +97,9 @@ module MotionPrime
       compute_style_options(raw_options)
       raw_options = Styles.for(styles).deep_merge(raw_options)
       @computed_options = raw_options
-      normalize_options(@computed_options, section.try(:elements_eval_object), %w[
+      return unless @_has_section
+      NSLog('ERRROR') unless section
+      normalize_options(@computed_options, section.send(:elements_eval_object), %w[
         font font_name font_size 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

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

@@ -80,19 +80,26 @@ module MotionPrime
       return if @loading || image_data || !computed_options[:url]
       @loading = true
 
-      ref_key = allocate_strong_references
+      refs = strong_references
       BW::Reactor.schedule do
+        return unless refs.all?(&:weakref_alive?)
         manager = SDWebImageManager.sharedManager
         manager.downloadWithURL(computed_options[:url],
           options: 0,
           progress: lambda{ |r_size, e_size|  },
           completed: lambda{ |image, error, type, finished|
-            if !image || allocated_references_released?
+            if !image || !refs.all?(&:weakref_alive?)
               @loading = false
-              release_strong_references(ref_key)
               return
             end
 
+            if Prime.env.development? && false
+              image_cache = SDImageCache.sharedImageCache
+              image_cache.clearMemory
+              image_cache.clearDisk
+              image_cache.cleanDisk
+            end
+
             if computed_options[:post_process].present?
               image = computed_options[:post_process][:method].to_proc.call(computed_options[:post_process][:target], image)
             end
@@ -104,7 +111,6 @@ module MotionPrime
               self.view.performSelectorOnMainThread :setNeedsDisplay, withObject: nil, waitUntilDone: true
             end
             @loading = false
-            release_strong_references(ref_key)
           }
         )
       end

data/motion-prime/elements/image.rb

@@ -11,24 +11,20 @@ module MotionPrime
       raise "You must set default image for `#{name}`" unless computed_options[:default]
 
       view.setImage(computed_options[:default].uiimage)
-      ref_key = allocate_strong_references
+      refs = strong_references
       BW::Reactor.schedule do
         manager = SDWebImageManager.sharedManager
         manager.downloadWithURL(computed_options[:url],
           options: 0,
           progress: lambda{ |r_size, e_size|  },
           completed: lambda{ |image, error, type, finished|
-            unless image
-              release_strong_references(ref_key)
-              return
-            end
+            return if !image || !refs.all?(&:weakref_alive?)
 
             if computed_options[:post_process].present?
               image = computed_options[:post_process][:method].to_proc.call(computed_options[:post_process][:target], image)
             end
 
             self.performSelectorOnMainThread :set_image, withObject: image, waitUntilDone: true
-            release_strong_references(ref_key)
           }
         )
       end

data/motion-prime/models/_association_mixin.rb

@@ -24,8 +24,7 @@ module MotionPrime
     # @return [Prime::Model] model
     def save!
       _bags.values.each do |bag|
-        bag.store = self.store
-        bag.save
+        bag.save# unless bag.store
       end
       super
     rescue StoreError => e

data/motion-prime/models/_nano_bag_mixin.rb

@@ -131,9 +131,11 @@ module MotionPrime
 
     def save!
       self.store ||= MotionPrime::Store.shared_store
+      self.store.save_interval = savedObjects.count + unsavedObjects.count
       error_ptr = Pointer.new(:id)
       result = self.saveAndReturnError(error_ptr)
       raise StoreError, error_ptr[0].description if error_ptr[0]
+      self.store.save_interval = 1
       result
     end
 

data/motion-prime/models/_sync_mixin.rb

@@ -254,7 +254,6 @@ module MotionPrime
       if should_save
         models_to_save = bags_options.inject([]) { |result, (key, bag_options)| result + bag_options[:save] }
         models_to_delete = bags_options.inject([]) { |result, (key, bag_options)| result + bag_options[:delete] }
-        self.store.save_interval = [models_to_save.count, 1].max
 
         models_to_save.each(&:save)
         models_to_delete.each(&:delete)
@@ -270,8 +269,6 @@ module MotionPrime
       end
 
       save if should_save && (bags_changed || has_changed?)
-
-      self.store.save_interval = 1
     end
 
     def fetch_has_many_with_attributes(key, data, sync_options = {})

data/motion-prime/models/json.rb

@@ -12,6 +12,9 @@ module MotionPrime
     def self.parse(str_data, &block)
       return nil unless str_data
       data = str_data.respond_to?(:to_data) ? str_data.to_data : str_data
+      if data.respond_to?(:dataUsingEncoding)
+        data = data.dataUsingEncoding(NSUTF8StringEncoding)
+      end
       opts = NSJSONReadingMutableContainers | NSJSONReadingMutableLeaves | NSJSONReadingAllowFragments
       error = Pointer.new(:id)
       obj = NSJSONSerialization.JSONObjectWithData(data, options: opts, error: error)

data/motion-prime/sections/_async_table_mixin.rb

@@ -112,27 +112,28 @@ module Prime
       # TODO: we do we need to keep screen ref too?
       queue_id = @preloader_queue.count
 
-      allocate_strong_references(queue_id)
-
       @preloader_queue[queue_id] = {
         state: :in_progress,
         target_index: service.sum_index(index, load_count-1),
         from_index: index
       }
 
+      cell_refs = data.map &:weak_ref
+      refs = strong_references
       BW::Reactor.schedule(queue_id) do |queue_id|
         result = load_count.times do |offset|
-          if @preloader_queue[queue_id][:state] == :cancelled
-            release_strong_references(queue_id)
-            break
-          end
-          if allocated_references_released?
+          break if @preloader_queue[queue_id][:state] == :cancelled
+          unless refs.all?(&:weakref_alive?)
             @preloader_queue[queue_id][:state] = :dealloc
-            release_strong_references(queue_id)
             break
           end
 
+
+          cell_refs_by_group = flat_data? ? cell_refs : cell_refs[index.section]
+          cell_ref = cell_refs_by_group[index.row]
+          return unless cell_ref.weakref_alive?
           if section = preload_section_by_index(index)
+            return unless section == cell_ref.strong_ref
             on_cell_section_preloaded(section, index)
           end
 
@@ -147,7 +148,6 @@ module Prime
           @preloader_queue[queue_id][:state] = :completed
           on_queue_preloaded(queue_id, index)
         end
-        release_strong_references(queue_id)
       end
       queue_id
     end

data/motion-prime/sections/_cell_section_mixin.rb

@@ -63,7 +63,7 @@ module MotionPrime
 
     def display
       @pending_display = false
-      container_view.setNeedsDisplay
+      container_view.try(:setNeedsDisplay)
     end
 
     def cell

data/motion-prime/support/mp_button.rb

@@ -34,7 +34,9 @@ class MPButton < UIButton
   end
 
   def apply_padding?
-    super && !@custom_title_inset_drawn
+    # TODO: we should run super method here, but for some reason it doesn't work in RM 2.32
+    ![padding_top, padding_left, padding_right, padding_bottom].all?(&:zero?) &&
+    !@custom_title_inset_drawn
   end
 
   def drawRect(rect)

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "1.0.6"
+  VERSION = "1.0.7"
 end

data/travis.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env sh
-
+sudo chown -R travis ~/Library/RubyMotion
+mkdir -p ~/Library/RubyMotion/build
 sudo motion update
-sudo gem install bundler
-sudo bundle install
-#sudo pod setup
-sudo bundle exec rake pod:install
-sudo bundle exec rake clean &&
-sudo bundle exec rake spec output=colorized
+bundle install
+pod repo update --silent
+bundle exec rake pod:install
+bundle exec rake clean
+bundle exec rake spec output=colorized

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: motion-stump
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -26,7 +26,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: motion-stump
+  name: motion-redgreen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -40,13 +40,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: motion-redgreen
+  name: cocoapods
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -54,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cocoapods
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -197,16 +197,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.19
 description: RubyMotion apps development framework
 email:
 - gvalmon@gmail.com