RubyGems - motion-prime - Versions diffs - 0.6.0 → 0.7.0 - Mend

motion-prime 0.6.0 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (46) hide show

checksums.yaml +8 -8
data/CHANGELOG.md +4 -0
data/Gemfile +1 -0
data/Gemfile.lock +6 -1
data/ROADMAP.md +7 -6
data/bin/prime +31 -16
data/doc/code/models.rb +5 -1
data/doc/code/tables.rb +54 -0
data/doc/docs/getting_started.html +7 -0
data/doc/docs/index.html +205 -0
data/doc/docs/models.html +13 -0
data/doc/docs/screens.html +7 -0
data/doc/docs/sections.html +7 -0
data/doc/docs/tables.html +128 -0
data/files/Gemfile +3 -3
data/lib/motion-prime.rb +2 -0
data/motion-prime.gemspec +3 -2
data/motion-prime/api_client.rb +35 -36
data/motion-prime/config/base.rb +0 -2
data/motion-prime/core_ext/kernel.rb +2 -1
data/motion-prime/elements/base_element.rb +7 -2
data/motion-prime/elements/spinner.rb +7 -0
data/motion-prime/elements/table_view.rb +7 -0
data/motion-prime/helpers/has_search_bar.rb +11 -5
data/motion-prime/models/_finder_mixin.rb +5 -12
data/motion-prime/models/_nano_bag_mixin.rb +1 -1
data/motion-prime/models/_sync_mixin.rb +52 -37
data/motion-prime/screens/_base_mixin.rb +4 -0
data/motion-prime/screens/_navigation_mixin.rb +3 -3
data/motion-prime/screens/screen.rb +1 -1
data/motion-prime/sections/base_section.rb +12 -12
data/motion-prime/sections/form/base_field_section.rb +1 -1
data/motion-prime/sections/form/date_field_section.rb +5 -0
data/motion-prime/sections/form/password_field_section.rb +1 -1
data/motion-prime/sections/form/string_field_section.rb +1 -1
data/motion-prime/sections/form/text_field_section.rb +1 -1
data/motion-prime/sections/table.rb +7 -0
data/motion-prime/sections/table/table_delegate.rb +14 -4
data/motion-prime/support/mp_spinner.rb +16 -0
data/motion-prime/support/mp_table_view.rb +6 -0
data/motion-prime/support/tab_bar_controller.rb +3 -3
data/motion-prime/support/temp_fixes.rb +6 -0
data/motion-prime/version.rb +1 -1
data/motion-prime/views/layout.rb +2 -1
data/motion-prime/views/view_builder.rb +1 -1
metadata +24 -2

data/doc/docs/screens.html CHANGED Viewed

@@ -49,6 +49,13 @@
                   </a>
                 </li>
+                <li>
+                  <a class="source" href="tables.html">
+                    tables.rb
+                  </a>
+                </li>
             </ol>
           </div>

data/doc/docs/sections.html CHANGED Viewed

@@ -49,6 +49,13 @@
                   </a>
                 </li>
+                <li>
+                  <a class="source" href="tables.html">
+                    tables.rb
+                  </a>
+                </li>
             </ol>
           </div>

data/doc/docs/tables.html ADDED Viewed

@@ -0,0 +1,128 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>tables.rb</title>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <link rel="stylesheet" media="all" href="public/stylesheets/normalize.css" />
+  <link rel="stylesheet" media="all" href="docco.css" />
+</head>
+<body>
+  <div class="container">
+    <div class="page">
+      <div class="header">
+          <h1>tables.rb</h1>
+          <div class="toc">
+            <h3>Table of Contents</h3>
+            <ol>
+                <li>
+                  <a class="source" href="getting_started.html">
+                    getting_started.rb
+                  </a>
+                </li>
+                <li>
+                  <a class="source" href="models.html">
+                    models.rb
+                  </a>
+                </li>
+                <li>
+                  <a class="source" href="screens.html">
+                    screens.rb
+                  </a>
+                </li>
+                <li>
+                  <a class="source" href="sections.html">
+                    sections.rb
+                  </a>
+                </li>
+                <li>
+                  <a class="source" href="tables.html">
+                    tables.rb
+                  </a>
+                </li>
+            </ol>
+          </div>
+      </div>
+        <p><strong> What is a TableSection? </strong></p>
+<p>&quot;TableSection&quot; is a &quot;Section&quot; which have some sugar to work with UITableViews.</p>
+<p><strong> Create a Cell Section. </strong></p>
+<p>Inherit it from <code>Prime::Section</code>. </p>
+<p>Each element inside this section will be part of one cell.</p>
+          <div class='highlight'><pre><span class="class"><span class="keyword">class</span> <span class="title">FooCellSection</span> <span class="inheritance">&lt; <span class="parent">Prime::Section</span></span></span>
+  element <span class="symbol">:title</span>, <span class="symbol">text:</span> proc { model[<span class="symbol">:title</span>] }
+<span class="keyword">end</span></pre></div>
+        <p><strong> Create a Table Section. </strong></p>
+<p>Just inherit it from <code>Prime::TableSection</code>. </p>
+<p>The key method which should be created is <code>table_data</code>. It should return array of any sections.</p>
+          <div class='highlight'><pre><span class="class"><span class="keyword">class</span> <span class="title">FooTableSection</span> <span class="inheritance">&lt; <span class="parent">Prime::TableSection</span></span></span>
+  <span class="function"><span class="keyword">def</span> <span class="title">table_data</span></span>
+    my_foo_items.map <span class="keyword">do</span> |fruit_name|
+      model = {<span class="symbol">title:</span> fruit_name}
+      <span class="constant">FooCellSection</span>.new(<span class="symbol">model:</span> model)
+    <span class="keyword">end</span>
+  <span class="keyword">end</span>
+  <span class="function"><span class="keyword">def</span> <span class="title">my_foo_items</span></span>
+    <span class="string">%w[Orange Apricot Banana]</span>
+  <span class="keyword">end</span>
+<span class="keyword">end</span></pre></div>
+        <p><strong> Render table to a Screen. </strong></p>
+          <div class='highlight'><pre><span class="class"><span class="keyword">class</span> <span class="title">FooScreen</span> <span class="inheritance">&lt; <span class="parent">Prime::Screen</span></span></span>
+  <span class="function"><span class="keyword">def</span> <span class="title">render</span></span>
+    <span class="variable">@main_section</span> = <span class="constant">FooTableSection</span>.new(<span class="symbol">screen:</span> <span class="keyword">self</span>)
+    <span class="variable">@main_section</span>.render
+  <span class="keyword">end</span>
+<span class="keyword">end</span></pre></div>
+        <p><strong> Style it. </strong></p>
+<p>Of course, don&#39;t forget to add styles for table cells.</p>
+          <div class='highlight'><pre><span class="constant">Prime::Styles</span>.define <span class="symbol">:foo_cell</span> <span class="keyword">do</span>
+  style <span class="symbol">:title</span>,
+    <span class="symbol">left:</span> <span class="number">20</span>,
+    <span class="symbol">top:</span> <span class="number">5</span>,
+    <span class="symbol">width:</span> <span class="number">200</span>,
+    <span class="symbol">height:</span> <span class="number">20</span>
+<span class="keyword">end</span></pre></div>
+      <div class="fleur">h</div>
+    </div>
+  </div>
+</body>
+</html>

data/files/Gemfile CHANGED Viewed

@@ -5,10 +5,10 @@ gem 'motion-support', '~> 0.2.4'
 gem 'sugarcube', '~> 1.3.7', require: 'sugarcube-classic'
 gem 'bubble-wrap', '~> 1.4.0'
-gem 'motion-prime', '0.6.0'
+gem 'motion-prime', '0.7.0'
 # add reside menu for sidebar support
-gem 'prime_reside_menu', '~> 0.1.3'
+gem 'prime_reside_menu', '~> 0.1.4'
 # or add sliding menu for sidebar support
-# gem 'prime_sliding_menu', '~> 0.1.1'
+# gem 'prime_sliding_menu', '~> 0.1.3'

data/lib/motion-prime.rb CHANGED Viewed

@@ -1,9 +1,11 @@
 require 'motion-require'
 require 'motion-support'
+require 'motion-support/core_ext/hash'
 require 'sugarcube-common'
 require 'bubble-wrap'
 require 'bubble-wrap/reactor'
 require 'rm-digest'
+require 'afmotion'
 require File.expand_path('../../motion-prime/env.rb', __FILE__)
 require File.expand_path('../../motion-prime/prime.rb', __FILE__)

data/motion-prime.gemspec CHANGED Viewed

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "motion-support"
   spec.add_dependency 'bubble-wrap'
   spec.add_dependency 'sugarcube'
-  spec.add_dependency("methadone")
-  spec.add_dependency("rm-digest")
+  spec.add_dependency 'afmotion', '~> 2.0.0'
+  spec.add_dependency "methadone"
+  spec.add_dependency "rm-digest"
 end

data/motion-prime/api_client.rb CHANGED Viewed

@@ -3,27 +3,23 @@ class ApiClient
   def initialize(options = {})
     self.access_token = options[:access_token]
+    AFMotion::Client.build_shared(config.base) do
+      header "Accept", "application/json"
+      response_serializer AFJSONResponseSerializer.serializerWithReadingOptions(NSJSONReadingMutableContainers)
+    end
   end
   def request_params(data)
-    data = data.clone
-    files = data.delete(:files)
-    params = {
-      payload: data,
-      no_redirect: !config.allow_redirect,
-      format: config.request_format
-    }
-    if files.present?
-      params.merge!(files: files)
-    end
+    params = data.clone
     if config.http_auth?
       params.merge!(credentials: config.http_auth.to_hash)
     end
     if config.sign_request?
       signature = RmDigest::MD5.hexdigest(
-        config.signature_secret + data.keys.map(&:to_s).sort.join
+        config.signature_secret + params.keys.map(&:to_s).sort.join
       )
-      params[:payload].merge!(sign: signature)
+      params.merge!(sign: signature)
     end
     params
   end
@@ -37,24 +33,15 @@ class ApiClient
       client_secret: config.client_secret
     }
     use_callback = block_given?
-    BW::HTTP.post("#{config.base}#{config.auth_path}", request_params(data)) do |response|
-      body = response.body.to_s
-      auth_data = if body.present?
-        parse_json(body)
-      else
-        false
-      end
+    AFMotion::Client.shared.post(config.auth_path, request_params(data)) do |response|
+      auth_data = response.object
       self.access_token = auth_data[:access_token] if auth_data
-      block.call(auth_data, response.status_code) if use_callback
+      block.call(auth_data, response.operation.response.statusCode) if use_callback
     end
     true
   end
-  def api_url(path)
-    return path if path =~ /^http(s)?:\/\//
-    "#{config.base}#{config.api_namespace}#{path}"
-  end
   def page_url(path)
     "#{config.base}#{path}"
   end
@@ -67,13 +54,22 @@ class ApiClient
   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?
-    BW::HTTP.send method, api_url(path), request_params(params) do |response|
-      if !response.ok? && options[:allow_queue] && config.allow_queue?
+    client_method = files.present? ? :"multipart_#{method}" : method
+    AFMotion::Client.shared.send client_method, "#{config.api_namespace}#{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
+      elsif progress
+        # handle progress
+      elsif !response.success? && options[:allow_queue] && config.allow_queue?
         add_to_queue(method: method, path: path, params: params)
       else
-        json = parse_json(response.body.to_s)
-        block.call(json, response.status_code) if use_callback
+        block.call(prepared_object(response.object), response.operation.response.statusCode) if use_callback
         process_queue
       end
     end
@@ -117,14 +113,17 @@ class ApiClient
       MotionPrime::Config.api_client
     end
-    def parse_json(text)
-      Prime::JSON.parse(text)
-    rescue
-      NSLog("Can't parse json: #{text}")
-      false
-    end
     def user_defaults
       @user_defaults ||= NSUserDefaults.standardUserDefaults
     end
+    def prepared_object(object)
+      if object.is_a?(Hash)
+        object.with_indifferent_access
+      elsif object.is_a?(Array)
+        object.map(&:with_indifferent_access)
+      else
+        object
+      end
+    end
 end

data/motion-prime/config/base.rb CHANGED Viewed

@@ -18,8 +18,6 @@ MotionPrime::Config.configure do |config|
     api.sign_request = false
     api.auth_path = '/oauth/token'
     api.api_namespace = '/api'
-    api.request_format = :form_data
-    api.allow_redirect = false
     api.allow_queue = false
   end
   config.prime.cell_section.mixins = [Prime::CellSectionMixin]

data/motion-prime/core_ext/kernel.rb CHANGED Viewed

@@ -17,8 +17,9 @@ class Kernel
   def clear_instance_variables(options = {})
     ivars = self.instance_variables
+    excluded_ivars = Array.wrap(options[:except]).map(&:to_s)
     clear_block = proc { |ivar|
-      next if Array.wrap(options[:except]).include?(ivar[1..-1])
+      next if excluded_ivars.include?(ivar[1..-1])
       self.instance_variable_set(ivar, nil)
     }.weak!
     ivars.each(&clear_block)

data/motion-prime/elements/base_element.rb CHANGED Viewed

@@ -29,7 +29,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, view_class#, view.try(:to_s)
     #   super
     # end
@@ -45,10 +45,15 @@ module MotionPrime
     end
     def render!(&block)
-      screen.add_view class_factory(view_class), computed_options do |view|
+      view = screen.add_view class_factory(view_class), computed_options do |view|
         @view = view
         block.try(:call, view, self)
       end
+      if computed_options.has_key?(:delegate) && computed_options[:delegate].respond_to?(:delegated_by)
+        computed_options[:delegate].delegated_by(view)
+      end
+      view
     end
     # Lazy-computing options

data/motion-prime/elements/spinner.rb ADDED Viewed

@@ -0,0 +1,7 @@
+module MotionPrime
+  class SpinnerElement < BaseElement
+    def view_class
+      "MPSpinner"
+    end
+  end
+end

data/motion-prime/elements/table_view.rb ADDED Viewed

@@ -0,0 +1,7 @@
+module MotionPrime
+  class TableViewElement < BaseElement
+    def view_class
+      "MPTableView"
+    end
+  end
+end

data/motion-prime/helpers/has_search_bar.rb CHANGED Viewed

@@ -4,21 +4,27 @@ module MotionPrime
     def add_search_bar(options = {}, &block)
       target = options.delete(:target)
-      search_bar = create_search_bar(options)
-      search_bar.delegate = self
+      @_search_bar = create_search_bar(options)
+      @_search_bar.setDelegate self
       if target
-        target.addSubview search_bar
+        target.addSubview @_search_bar
       elsif is_a?(TableSection)
-        self.table_view.tableHeaderView = search_bar
+        self.table_view.tableHeaderView = @_search_bar
       end
       @search_callback = block
-      search_bar
+      @_search_bar
     rescue
       NSLog("can't add search bar to #{self.class_name_without_kvo}")
     end
+    def dealloc
+      @_search_bar.try(:setDelegate, nil)
+      @_search_bar = nil
+      super
+    end
     def create_search_bar(options = {})
       name = is_a?(TableSection) ? name : self.class_name_without_kvo.underscore
       screen = is_a?(TableSection) ? self.screen : self

data/motion-prime/models/_finder_mixin.rb CHANGED Viewed

@@ -42,7 +42,7 @@ module MotionPrime
       # Find model by criteria
       #
       # @example:
-      #   User.find(:name, NSFEqualTo, "Bob") # => [<User#1>]
+      #   User.find(1) # => [<User#1>]
       #   User.find(:name => "Bob") # => [<User#1>]
       #   User.find(:name => {NSFEqualTo => "Bob"}) # => [<User#1>]
       #
@@ -56,19 +56,12 @@ module MotionPrime
           else
             sort_options = {}
           end
-        elsif arg[0] && arg[1] && arg[2]
-          # standard way to find
-          options = {arg[0] => {arg[1] => arg[2]}}
-          if arg[4] && arg[4].is_a?(Hash)
-            sort_options = arg[4][:sort] || {}
-          else
-            sort_options = {}
-          end
+        elsif arg[0] && arg[0].is_a?(Integer)
+          return find(id: arg[0])
         elsif arg.empty?
-          options = {}
-          sort_options = {}
+          raise "Please use Model#all to find all records."
         else
-          raise "unexpected parameters #{arg}"
+          raise "Unexpected parameters: #{arg}."
         end
         search = NSFNanoSearch.searchWithStore(self.store)