motion-prime 0.9.6 → 0.9.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDhjOWNjZjBiYWMwMGM0YTE5YzRkZTBmZWQyNDZmMzdiM2VjOTE5OQ==
+    ZmEyMGMyMWQ4OTEwOGI2N2Y5YzZjYmI3MWRmY2Y4MzYzMGNiYjU2MQ==
   data.tar.gz: !binary |-
-    ZTllMmM5YWMyZjg4MDNhYzVhOWY5YzEzM2ExNzZiNWY1NTcwN2E5OA==
+    YzI4NzhiNWJiYjJmY2EyMmFiM2M0MjE4MzVmMWM5OWMxNzNjYTdlMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YWQ4YTdhYjhkOWFjMDhmZjc0ZjZkMWY3MmMxYjA4ZWQwMzE1MWMxYjhkZjFl
-    OTQ3NjNjMWRjODI1NGQ4Y2RlOGU2N2ZhOGU5OGM1Nzc4MzZjMTU2NGRmMWM1
-    N2YxYmEwM2Q1MjFmZGIwOTNhZjcwZmQyZGQwNmIzYzNmMzQyYjA=
+    OTlkZGM4MTg1YTI1NjVjOWU0M2U4MzYzNzQ5NzlhZWY5OWVkNjFjMTNkODY2
+    NDAwZjNiMTRlZmJlZDFjMzExODZlOTVhM2YxZmFiMzgwNWVmY2JhOWI1MTI4
+    ZGQ3MTYxOGI4NTAzNmVlMzQ0NDIyNTIxNDdiNmI0NWE4ZDMyMzM=
   data.tar.gz: !binary |-
-    M2M2MjUzNjk0OWI0ZWRkY2I3MzA4YTIxNzcxMTRjNDhiNTg5NjM3ZDNiOWIz
-    ZTJjNzg5NTAyODgzODU2MjM2M2Y4MTFiYjc3ZDk4YjE4NzI4ZGRjY2MwYzQ0
-    ZjA0YjY0N2IwZDY4OTMwNTU0YTFkMTlmMDBhMjYzMzVkNmM0NzA=
+    MTNlNWRkMDhkNTJiZWU1NTQ2NDA2ODAzMzRhYmQzMzEwODEyYzQ1NjFmOGM5
+    YWZjNWM0ZmY5ZTAyNTQyOGFjYTAzNjY0YzU2YjE1NjgzMWY2ZDhmZjdjMDY2
+    YWYyNDViYTQ2NzJjNzFmMDI3ZGM3ZTBkMDA4MjczYmE4N2YzYjE=

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+=== 0.9.7
+* BREAKING CHANGE: screen#set_options renamed to screen#set_options_for.
+* BREAKING CHANGE: section#reload_section renamed to section#hard_reload_section. in common cases use section#reload.
+* BREAKING CHANGE: form#reload_cell_section renamed to form#hard_reload_cell_section. in common cases use form#reload_cell_sections.
+* BREAKING CHANGE: table#reset_data renamed to table#reset_table_data
+
 === 0.9.6
 * BREAKING CHANGE: proc for form field option will be executed in context of form, not field.
 * BREAKING CHANGE: screen#setup renamed to screen#set_options.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.9.6)
+    motion-prime (0.9.7)
       activesupport
       afmotion (~> 2.1.0)
       bubble-wrap (~> 1.5.0)
@@ -20,9 +20,9 @@ GEM
     activesupport (3.2.17)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    afmotion (2.1.0)
+    afmotion (2.1.2)
       motion-cocoapods (~> 1.4.0)
-      motion-require (~> 0.0.7)
+      motion-require (>= 0.1)
     bubble-wrap (1.5.0)
     claide (0.4.0)
     cocoapods (0.29.0)
@@ -54,7 +54,7 @@ GEM
     motion-cocoapods (1.4.0)
       cocoapods (>= 0.26.2)
     motion-redgreen (0.1.0)
-    motion-require (0.0.7)
+    motion-require (0.2.0)
     motion-stump (0.3.1)
     motion-support (0.2.6)
       motion-require (>= 0.0.6)
@@ -63,8 +63,8 @@ GEM
     open4 (1.3.3)
     rake (10.1.1)
     rm-digest (0.0.2)
-    sugarcube (1.5.4)
-    thor (0.18.1)
+    sugarcube (1.5.5)
+    thor (0.19.1)
     xcodeproj (0.14.1)
       activesupport (~> 3.0)
       colored (~> 1.2)

data/README.md

@@ -70,6 +70,7 @@ MotionPrime is yet another framework written on RubyMotion for creating really f
 ## Samples
 
 * [Simple to-do app](https://github.com/motionprime/prime_sample_todo)
+* [Send mail with attached file](https://github.com/cactis/email_attachment_example)
 
 ## Documentation
 
@@ -84,16 +85,6 @@ MotionPrime is yet another framework written on RubyMotion for creating really f
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-## Help us with documentation
-
-We are using [Docco](http://jashkenas.github.io/docco/) to generate documentation.
-
-Please install the tool and run this to update documentation:
-
-```
-$ cd doc && docco code/*.rb --layout linear
-```
-
 ## Thanks for using MotionPrime!
 
 Hope, you'll enjoy MotionPrime!

data/Rakefile

@@ -17,7 +17,6 @@ Bundler.require
 require 'motion-support'
 require 'motion-prime'
 require 'motion-stump'
-require 'motion-redgreen'
 
 Motion::Project::App.setup do |app|
   app.name = 'Prime'

data/app/app_delegate.rb

@@ -1,4 +1,4 @@
-class AppDelegate
+class AppDelegate < MotionPrime::BaseAppDelegate
   def application(application, didFinishLaunchingWithOptions:launchOptions)
     true
   end

data/bin/prime

@@ -47,7 +47,7 @@ class App
       clone_template(template_name, repo)
       sh "motion create #{name} --template=#{template_name}"
     end
-    info "Command: bundle instal"
+    info "Command: bundle install"
     sh "cd ./#{name}; bundle install"
     info "Command: pod setup"
     sh "cd ./#{name}; pod setup"

data/files/Gemfile

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

data/motion-prime/api_client.rb

@@ -17,7 +17,7 @@ class ApiClient
     end
     if config.sign_request?
       signature = RmDigest::MD5.hexdigest(
-        config.signature_secret + filter_sign_params(params).keys.map(&:to_s).sort.join
+        config.signature_secret + params.keys.map(&:to_s).sort.join
       )
       params.merge!(sign: signature)
     end
@@ -53,45 +53,60 @@ class ApiClient
   end
 
   def request(method, path, params = {}, options = {}, &block)
-    params.merge!(access_token: access_token)
-    data = request_params(params)
-    files = data.delete(:_files)
-    use_callback = block_given?
+    files = params.delete(:_files)
+    data = request_params(params.merge(access_token: access_token))
 
-    client_method = files.present? ? :"multipart_#{method}" : method
+    if !options.has_key?(:allow_queue) && config.default_methods_queue.include?(method.to_sym)
+      options[:allow_queue] = true
+    end
+
+    if !options.has_key?(:allow_cache) && config.default_methods_cache.include?(method.to_sym)
+      options[:allow_cache] = true
+    end
+
+    if allow_cache?(method, path, options)
+      cached_request!(method, path, data, files, options, &block)
+    else
+      request!(method, path, data, files, options, &block)
+    end
+  end
+
+  def request!(method, path, data, files = nil, options = {}, &block)
+    use_callback = block_given?
     path = "#{config.api_namespace}#{path}" unless path.starts_with?('http')
+    client_method = files.present? ? :"multipart_#{method}" : method
     AFMotion::Client.shared.send client_method, path, data do |response, form_data, progress|
       if form_data && files.present?
-        files.each do |file_data|
-          form_data.appendPartWithFileData(file_data[:data], name: file_data[:name], fileName:"avatar.png", mimeType: "image/jpeg")
-        end
+        append_files_to_data(files, form_data)
       elsif progress
         # handle progress
-      elsif !response.success? && options[:allow_queue] && config.allow_queue?
-        add_to_queue(method: method, path: path, params: params)
+      elsif !response.success? && allow_queue?(method, path, options)
+        queue(method: method, path: path, params: params)
       elsif response.operation.response.nil?
         block.call if use_callback
       else
-        block.call(prepared_object(response.object), response.operation.response.statusCode) if use_callback
-        process_queue
+        prepared_response = prepare_response_object(response.object)
+        block.call(prepared_response, response.operation.response.statusCode) if use_callback
+        process_queue if config.allow_queue?
       end
     end
   end
 
-  def process_queue
-    queue = user_defaults['api_client_queue']
-    user_defaults['api_client_queue'] = []
-    Array.wrap(queue).each do |item|
-      request(item[:method], item[:path], item[:params].clone.symbolize_keys)
+  def cached_request!(method, path, data, files = nil, options = {}, &block)
+    use_callback = block_given?
+    params = data.map { |key, value| "#{key}=#{value}" }.join('&')
+    cache_key = [method, path, params].join(' ')
+    response = read_cache(cache_key)
+    if response && use_callback
+      block.call(prepare_response_object(response), 200)
+    else
+      request!(method, path, data, files, options) do |response, status|
+        write_cache(cache_key, response)
+        block.call(response, status) if use_callback
+      end
     end
   end
 
-  def add_to_queue(item)
-    queue = user_defaults['api_client_queue'].clone || []
-    queue.push(item)
-    user_defaults['api_client_queue'] = queue
-  end
-
   def get(path, params = {}, options = {}, &block)
     request(:get, path, params, options, &block)
   end
@@ -101,18 +116,47 @@ class ApiClient
   end
 
   def post(path, params = {}, options = {}, &block)
-    options[:allow_queue] = true unless options.has_key?(:allow_queue)
     request(:post, path, params, options, &block)
   end
 
   def delete(path, params = {}, options = {}, &block)
-    options[:allow_queue] = true unless options.has_key?(:allow_queue)
     request(:delete, path, params, options, &block)
   end
 
-  private
-    def filter_sign_params(params)
-      params.except(:_files)
+  def queue(item)
+    queue_list = user_defaults['api_client_queue'].clone || []
+    queue_list.push(item)
+    user_defaults['api_client_queue'] = queue_list
+  end
+
+  # TODO: temporary solution, add real caching system here
+  def read_cache(key)
+    puts "read cache #{key}"
+    @cache ||= {}
+    @cache[key]
+  end
+
+  # TODO: temporary solution, add real caching system here
+  def write_cache(key, data)
+    @cache ||= {}
+    @cache[key] = data
+  end
+
+  protected
+    def allow_queue?(method, path, options)
+      options[:allow_queue] && config.allow_queue?
+    end
+
+    def allow_cache?(method, path, options)
+      options[:allow_cache] && config.allow_cache?
+    end
+
+    def process_queue
+      queue_list = user_defaults['api_client_queue']
+      user_defaults['api_client_queue'] = []
+      Array.wrap(queue_list).each do |item|
+        request(item[:method], item[:path], item[:params].clone.symbolize_keys)
+      end
     end
 
     def config
@@ -123,11 +167,23 @@ class ApiClient
       @user_defaults ||= NSUserDefaults.standardUserDefaults
     end
 
-    def prepared_object(object)
+    def append_files_to_data(files, data)
+      files.each do |file|
+        name = file[:name]
+        file_name = file[:file_name] || "avatar.png"
+        mime_type = file[:mime_type] || "image/jpeg"
+        data.appendPartWithFileData(
+          file[:data], name: name, fileName: file_name, mimeType: mime_type
+        )
+      end
+      data
+    end
+
+    def prepare_response_object(object)
       if object.is_a?(Hash)
         object.with_indifferent_access
       elsif object.is_a?(Array)
-        object.map(&:with_indifferent_access)
+        object.map{ |obj| prepare_response_object(obj) }
       else
         object
       end

data/motion-prime/config/base.rb

@@ -1,5 +1,6 @@
 motion_require './config.rb'
 MotionPrime::Config.configure do |config|
+  # MODELS
   if MotionPrime.env.test?
     config.model.store_type = :memory
   else
@@ -7,16 +8,6 @@ MotionPrime::Config.configure do |config|
   end
   config.model.auto_generate_id = true
 
-  config.fonts do |fonts|
-    fonts.base = :system
-  end
-
-  config.colors do |colors|
-    colors.navigation_base = 0x1b75bc
-    colors.base = 0x1b75bc
-    colors.dark = 0x333333
-    colors.error = 0xef471f
-  end
   config.api_client do |api|
     api.base = "http://example.com"
     api.client_id = ""
@@ -26,8 +17,26 @@ MotionPrime::Config.configure do |config|
     api.auth_path = '/oauth/token'
     api.api_namespace = '/api'
     api.allow_queue = false
+    api.allow_cache = false
+    api.default_methods_queue = [:post, :delete]
+    api.default_methods_cache = [:get]
   end
+
+  # APPEARANCE
+  config.fonts do |fonts|
+    fonts.base = :system
+  end
+  config.colors do |colors|
+    colors.navigation_base = 0x1b75bc
+    colors.base = 0x1b75bc
+    colors.dark = 0x333333
+    colors.error = 0xef471f
+  end
+  
+  # SECTIONS
   config.prime.cell_section.mixins = [Prime::CellSectionMixin]
-  config.logger.level = :info
+
+  # LOGGER
   config.logger.dealloc_items = ['screen']
+  config.logger.level = :info
 end

data/motion-prime/config/config.rb

@@ -1,5 +1,7 @@
 module MotionPrime
   class Config
+    attr_accessor :attributes
+    
     def initialize(attributes = {})
       @attributes = attributes || {}
     end
@@ -13,8 +15,8 @@ module MotionPrime
     end
     alias :[]= :store
 
-    def fetch(key)
-      @attributes[key.to_sym]
+    def fetch(key, default = nil)
+      @attributes[key.to_sym] || default
     end
 
     def nil?
@@ -31,7 +33,11 @@ module MotionPrime
     end
 
     def to_hash
-      @attributes
+      hash = {}
+      @attributes.each do |key, value|
+        hash[key] = value.is_a?(MotionPrime::Config) ? value.to_hash : value
+      end
+      hash
     end
 
     class << self

data/motion-prime/core_ext/kernel.rb

@@ -1,6 +1,7 @@
 class Kernel
   def pp(*attrs)
     NSLog([*attrs].map(&:inspect).join(' '))
+    attrs
   end
 
   def class_name_without_kvo
@@ -39,7 +40,7 @@ class Kernel
       return false
     end
     key ||= @_strong_references.keys.last
-    @_strong_references.delete(key)
+    @_strong_references.try(:delete, key)
     key
   end
 

data/motion-prime/core_ext/nil_class.rb

@@ -0,0 +1,5 @@
+class NilClass
+  def weakref_alive?
+    false
+  end
+end

data/motion-prime/delegate/app_delegate.rb

@@ -23,6 +23,11 @@ module MotionPrime
       user_was = @current_user
       @current_user = nil
       NSNotificationCenter.defaultCenter.postNotificationName(:on_current_user_reset, object: user_was)
+      api_client.access_token = current_user.try(:access_token)
+    end
+
+    def api_client
+      @api_client ||= ApiClient.new(access_token: current_user.try(:access_token))
     end
   end
 end

data/motion-prime/elements/base_element.rb

@@ -92,14 +92,29 @@ module MotionPrime
     end
 
     def reload!
+      reset_computed_values
       compute_options!
     end
 
+    def rerender!
+      render_target = view.try(:superview)
+      view.try(:removeFromSuperview)
+      render(render_target: render_target)
+      section.try(:on_element_render, self)
+    end
+
     def update_with_options(new_options = {})
       options.merge!(new_options)
       reload!
-      view.try(:removeFromSuperview)
-      render
+      rerender!
+    end
+
+    def update_options(options)
+      ViewStyler.new(view, view.superview.try(:bounds), options).apply
+    end
+
+    def update
+      update_with_options({})
     end
 
     def hide
@@ -118,6 +133,10 @@ module MotionPrime
     end
 
     protected
+      def reset_computed_values
+        @content_height = nil
+        @content_width = nil
+      end
 
       # Compute options sent inside block, e.g.
       # element :button do