motion-prime 0.7.1 → 0.7.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDNjNzg4MDdmZGRhMWZjY2M4ZDljZmY0NGYyOTFmOWNmM2E0NjEyNg==
+    MDk3ZTI2ODAzMjJjMmRlMTRlMDUyZjY5YTZkNjM0MWY0N2ExM2E3MQ==
   data.tar.gz: !binary |-
-    NDlmNmQ1NDhhY2YwOGQ0OTdkZGE2ZWNmYmU2ZmM1MjQ3YjFjMTE0Nw==
+    NGRmNjY2MGU2ODE4MThhNTVhYzc4NTQ0YzA0NjI2NDNlMTdiN2E0Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MzIwOWMzMDc3YjNmNjk5MjNiZTUyMzYxZWRmODYyYzVmM2I2ZWFiY2RmOTU4
-    NWRjZGI0MjY5NDdjOGYwMTFlYjFjMDJlN2NkZDlmNDk1YWFkZjY5YmM0MTc5
-    M2RjMGQwZmM3ZWUzNmUzZWI5NjVmN2M4M2JhMDAyNDViOWY0MDE=
+    MTA5NmMwMDhkN2U0OGZhZjgxYzJlOTQ4MTY1ZTYyZTNmNzM1NTM5MTVlZjY4
+    NjJmMjgxYjg4NTk0ZDRiNjEwODg5YjJmNzliZGZhNDIyMWQyZjNhYjY1ZTFj
+    NzQ5ZmRmNmQyMDZiY2NiZDA2ODMxNWYxNDVjOGZlNWQxMjBlNDY=
   data.tar.gz: !binary |-
-    Zjk5ODM4OTVmMGY3NjliYmM0MjMyZmNmMjUzYzg1YWQwNThmMWI2MGUyZGYx
-    ZTQ1YTk4OWRlNDBlNTQ0ZGFiYjQ1MjY3NDNjNmUwZjhiZWVmYjQwYjk4MzAw
-    ZGJhYzU3NjZmYjVlNzYwMDA3ZWE4NDljN2FlNDg2YWE3ZTRhZTc=
+    YmJmNWQxNDFjM2RhZTQwZTMyNWRiYzJjYTFkNDIyNjg4Nzg3ZTVhOTQxZDYy
+    ZTg5MDYwMDA4YzViZGIwOTJmNDMyYjA5MDNlZTJmMzg3MTg1MDcxZDUwZDkw
+    MDFjYWIxOWEzNWNlMmZlZjgwMTk2MmZiMmY3ZTFiZjdjZmNhYWY=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 0.7.2
+* Added simpler syntax for rendering sections in screen. E.g. section :my_profile.
+* Bug fixes.
+
 === 0.7.1
 * fix memory leaks for UITabbarController
 * Improved logger.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.7.1)
+    motion-prime (0.7.2)
       afmotion (~> 2.0.0)
       bubble-wrap (~> 1.4.0)
       cocoapods

data/README.md

@@ -42,10 +42,7 @@ MotionPrime is yet another framework written on RubyMotion for creating really f
   class MainScreen < Prime::Screen
     title 'Main screen'
 
-    def render
-      @main_section = MyProfileSection.new(screen: self)
-      @main_section.render
-    end
+    section :my_profile
   end
 
   # app/sections/my_profile.rb

data/ROADMAP.md

@@ -4,14 +4,17 @@
 * rename submit element in submit field to button element
 * rename date_picker element in date_picker field to input element
 * add more and better default options for fields
+* Rename model to data in sections.
 
 === 0.9.0
 * bug: if mp label do not have text and was set as hidden, it should unhide after setting text
+* bug: size_to_fit works incorrect with relative width.
 * add cleanup for section events
 * add dsl for push notifications
 * add some extensions/middleware system, at least for networking.
 * create "display_network_error" extension.
 * add different templates. some templates should be more like final app.
+* add size_to_fit support for images.
 
 === 1.0.0
 * add sections/screens/models generator

data/files/Gemfile

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

data/motion-prime/api_client.rb

@@ -68,6 +68,8 @@ class ApiClient
         # handle progress
       elsif !response.success? && options[:allow_queue] && config.allow_queue?
         add_to_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

data/motion-prime/elements/web_view.rb

@@ -0,0 +1,12 @@
+module MotionPrime
+  class WebViewElement < BaseElement    
+    def view_class
+      "UIWebView"
+    end
+
+    def dealloc
+      view.try(:setDelegate, nil)
+      super
+    end
+  end
+end

data/motion-prime/models/_sync_mixin.rb

@@ -244,7 +244,7 @@ module MotionPrime
     def fetch_has_many_with_attributes(key, data, sync_options = {})
       old_collection = self.send(key)
       model_class = key.classify.constantize
-      self.store.save_interval = data.count
+      self.store.save_interval = data.present? ? data.count : 1
       # Update/Create existing records
       track_changed_attributes do
         data.each do |attributes|

data/motion-prime/screens/_base_mixin.rb

@@ -1,6 +1,7 @@
 motion_require "./_aliases_mixin"
 motion_require "./_orientations_mixin"
 motion_require "./_navigation_mixin"
+motion_require "./_sections_mixin"
 module MotionPrime
   module ScreenBaseMixin
     extend ::MotionSupport::Concern
@@ -9,6 +10,7 @@ module MotionPrime
     include MotionPrime::ScreenAliasesMixin
     include MotionPrime::ScreenOrientationsMixin
     include MotionPrime::ScreenNavigationMixin
+    include MotionPrime::ScreenSectionsMixin
 
     attr_accessor :parent_screen, :modal, :params, :main_section, :options, :tab_bar
     class_attribute :current_screen

data/motion-prime/screens/_sections_mixin.rb

@@ -0,0 +1,57 @@
+module MotionPrime
+  module ScreenSectionsMixin
+    extend ::MotionSupport::Concern
+
+    include HasClassFactory
+    include HasNormalizer
+
+    def self.included(base)
+      base.class_attribute :_section_options
+    end
+
+    def add_sections
+      create_sections
+      render_sections
+    end
+
+    def create_sections
+      section_options = self.class._section_options
+      return unless section_options
+      @sections = {}
+      section_options.map do |name, options|
+        @sections[name] = create_section(options.clone)
+      end
+    end
+
+    def create_section(options)
+      section_class = class_factory("#{options.delete(:name)}_section")
+      options = normalize_options(options).merge(screen: self)
+      section_class.new(options)
+    end
+
+    def render_sections
+      return unless @sections
+      if @sections.count > 1
+        @main_section = MotionPrime::TableSection.new(model: @sections.values, screen: self)
+        @main_section.render
+      else
+        @sections.first.render
+      end
+    end
+
+    def main_section
+      @main_section || @sections.first
+    end
+
+    module ClassMethods
+      def section(name, options = {})
+        self._section_options ||= {}
+        self._section_options[name.to_sym] = options.merge(name: name)
+
+        define_method name do
+          @sections[name]
+        end
+      end
+    end
+  end
+end

data/motion-prime/screens/screen.rb

@@ -22,6 +22,8 @@ module MotionPrime
 
     define_callbacks :render
 
+    before_render :add_sections
+
     def render
     end
 

data/motion-prime/sections/table.rb

@@ -16,7 +16,7 @@ module MotionPrime
     delegate :init_pull_to_refresh, to: :table_delegate
 
     def table_data
-      []
+      @model || []
     end
 
     def dealloc

data/motion-prime/styles/form.rb

@@ -69,9 +69,8 @@ MotionPrime::Styles.define :base_form do
     right: 0,
     top: 30,
     height: 35,
-    title_color: 0x16759a,
     title_shadow_color: :white,
-    contentHorizontalAlignment: UIControlContentHorizontalAlignmentLeft,
+    content_horizontal_alignment: :left,
     layer: {
       border_color: :gray,
       border_width: 1

data/motion-prime/support/mp_spinner.rb

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

data/motion-prime/version.rb

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

data/motion-prime/views/_frame_calculator_mixin.rb

@@ -21,18 +21,26 @@ module MotionPrime
       width = 0.0 if width.nil?
       height = 0.0 if height.nil?
 
+      if left && left > 0 && left <= 1 && value_type != 'absolute' && left.is_a?(Float)
+        left = max_width * left
+      end
+
+      if right && right > 0 && right <= 1 && value_type != 'absolute' && right.is_a?(Float)
+        right = max_width * right
+      end
+
       # calculate left and right if width is relative, e.g 0.7
-      if width && width > 0 && width <= 1 && value_type != 'absolute'
+      if width && width > 0 && width <= 1 && value_type != 'absolute' && width.is_a?(Float)
         if right.nil?
           left ||= 0
-          right = max_width - max_width * width
+          right = max_width - max_width * width - left
         else
-          left = max_width - max_width * width
+          left = max_width - max_width * width - right
         end
       end
 
       # calculate top and bottom if height is relative, e.g 0.7
-      if height && height > 0 && height <= 1 && value_type != 'absolute'
+      if height && height > 0 && height <= 1 && value_type != 'absolute' && width.is_a?(Float)
         if bottom.nil?
           top ||= 0
           bottom = max_height - max_height * height

data/motion-prime/views/view_builder.rb

@@ -120,7 +120,11 @@ module MotionPrime
           'UIWebView' => Proc.new{|klass, options|
             web_view = klass.alloc.initWithFrame CGRectZero
             if delegate = options.delete(:delegate)
-              web_view.setDelegate delegate
+              if delegate == :section
+                web_view.setDelegate options[:section].strong_ref
+              else
+                web_view.setDelegate delegate
+              end
             end
             if url = options.delete(:url)
               request = NSURLRequest.requestWithURL url.nsurl

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -279,6 +279,7 @@ files:
 - motion-prime/elements/text_field.rb
 - motion-prime/elements/text_view.rb
 - motion-prime/elements/view_with_section.rb
+- motion-prime/elements/web_view.rb
 - motion-prime/env.rb
 - motion-prime/helpers/has_authorization.rb
 - motion-prime/helpers/has_class_factory.rb
@@ -304,6 +305,7 @@ files:
 - motion-prime/screens/_base_mixin.rb
 - motion-prime/screens/_navigation_mixin.rb
 - motion-prime/screens/_orientations_mixin.rb
+- motion-prime/screens/_sections_mixin.rb
 - motion-prime/screens/extensions/_indicators_mixin.rb
 - motion-prime/screens/extensions/_navigation_bar_mixin.rb
 - motion-prime/screens/screen.rb