motion-prime 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDQ1ZmFmOTg1ZWQ4MTliMDI3ZmY4ZmE0NGM5OTA2YjJjZjk4NmIxYQ==
+    MjY2ZDk2NzU1ZmRhZTE4Zjc0OTk5ZmQzYmI3MzdhYmM5ZWM5M2VlOA==
   data.tar.gz: !binary |-
-    ODQzMzg0NGZiYzgxMDM5MTMwZGEzNGM4ODcwOTg5ZGEzNWE1OTEwMA==
+    OGQxMTU0YWRhZTAzMGQ1YTc3NDdkYTU2NThlOTcwZTMwY2Y4NzJhOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjkyZGFmYTg3NzQ3ZDM0ZGRmOTg4MThiNTNlMDNjNGEwZDc3YTI5YmRhZGFi
-    MGU5ZjQ2MTJiNmIzMzc0YWFmMTg0ZTBhNzY0NzQxMzU3OTFlZDVjNjRkNzA4
-    YjVlM2EzNmU0MTkyOWYxM2I2MTg0N2VlYjg2NmE0NzY4NzA1NWQ=
+    NmQxZGEyNjg5OGVhNGU3OTA4ZWIwNmQ0YTMyMGVjYjZjYzEwYzE4NTlkNzZk
+    NjdmOTRmNWUyMjkyOGQ0NTY4MzM3NTgwZDljOGU3MTZhN2Y1NzA2ZWU4N2Nl
+    Zjg3Mzk2Zjk0YmQ2NDQ0OGYwOTQ3MjZhOTQ1OWIyNTQyNzNlMGE=
   data.tar.gz: !binary |-
-    NzEwYTA3NjRkMTUxZGQ1NGQzMjk2MTQzMWFlYWM2NzkxZmZkNzkxN2E5NTAy
-    OTg2MWY1ZmMzMzcwYzhmNzYyODIyZTFhNzczM2ZlZTY1OGQ0ZWUwM2E0MDcy
-    ODA2ZTI2MmVkZGRiODljM2NjNmY2MzIzNzRmMTBlNjI1NTFhYjU=
+    ZGUxNDFjMTk3MmZkM2ZkMGY3ZDRkMjA5MThjNjA5YTJmN2U1MTE3ODBmZTc5
+    NDdlNjNkYzdiZWJiZWZiNGRjZDg4M2I4MjhlOWY0NjQ1ZTJhY2E5N2ZmZjRi
+    ODJkMTk0ZDc0ZDdhZTYzNjhjMjM1YmEyZDRmMTg4ZTkyZjFlMzg=

data/CHANGELOG.md

@@ -1,10 +1,14 @@
-=== 0.3.1.beta
+=== 0.3.2
+* Refactor screens
+* Fix paddings for draw sections
+* Draw label now supports corner radius
+
+=== 0.3.1
 * Added universal AppDelegate#open_screen method for opening screens.
 * Old AppDelegate#open_screen method renamed to AppDelegate#open_content_screen
 * Ability to add inherited styles
-* Small refactoring
 * Update project template
-
+* Small refactoring
 
 === 0.3.0
 * Added iOS 7 support

data/Gemfile.lock

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

data/README.md

@@ -1,4 +1,4 @@
-# MotionPrime [![Build Status](https://travis-ci.org/droidlabs/motion-prime.png)](https://travis-ci.org/droidlabs/motion-prime)
+# MotionPrime [![Build Status](https://travis-ci.org/droidlabs/motion-prime.png)](https://travis-ci.org/droidlabs/motion-prime) [![Code Climate](https://codeclimate.com/github/droidlabs/motion-prime.png)](https://codeclimate.com/github/droidlabs/motion-prime) [![Roadchange](http://roadchange.com/droidlabs/motion-prime/badge.png)](http://roadchange.com/droidlabs/motion-prime) 
 
 ![Prime](https://s3-us-west-2.amazonaws.com/webmate/assets/prime.jpg)
 

data/ROADMAP.md

@@ -0,0 +1,12 @@
+=== 0.4.0
+* rename support/dm_* to support/mp_*
+* "id" attribute should always be added to model by default
+* add DSL for ViewStyles#setValue conditions
+* add auto-symbol-value for Prime::Config.color items
+
+=== 0.5.0
+* add testing framework
+* add auth backends to ApiClient: password auth and facebook auth
+
+=== 0.6.0
+* add sections/screens/models generator

data/motion-prime/api_client.rb

@@ -52,6 +52,7 @@ class ApiClient
   end
 
   def resource_url(path)
+    # return if path.blank?
     "#{MotionPrime::Config.api.base}#{path}"
   end
 

data/motion-prime/app_delegate.rb

@@ -32,7 +32,7 @@ module MotionPrime
     # TODO: move to private methods
     def open_root_screen(screen)
       screen.send(:on_screen_load) if screen.respond_to?(:on_screen_load)
-      screen.ensure_wrapper_controller_in_place if screen.respond_to?(:ensure_wrapper_controller_in_place)
+      screen.wrap_in_navigation if screen.respond_to?(:wrap_in_navigation)
 
       screen = screen.main_controller if screen.respond_to?(:main_controller)
 

data/motion-prime/elements/_content_padding_mixin.rb

@@ -0,0 +1,49 @@
+module MotionPrime
+  module ElementContentPaddingMixin
+    def content_padding_left
+      view.try(:padding_left) ||
+        computed_options[:padding_left] ||
+        computed_options[:padding] ||
+        view_class.constantize.default_padding_left || 0
+    end
+
+    def content_padding_right
+      view.try(:padding_right) ||
+        computed_options[:padding_right] ||
+        computed_options[:padding] ||
+        view_class.constantize.default_padding_right || 0
+    end
+
+    def content_padding_top
+      view.try(:padding_top) ||
+        computed_options[:padding_top] ||
+        computed_options[:padding] ||
+        view_class.constantize.default_padding_top || 0
+    end
+
+    def content_padding_bottom
+      view.try(:padding_bottom) ||
+        computed_options[:padding_bottom] ||
+        computed_options[:padding] ||
+        view_class.constantize.default_padding_bottom || 0
+    end
+
+    def content_padding_height
+      content_padding_top + content_padding_bottom
+    end
+
+    def content_padding_width
+      content_padding_left + content_padding_right
+    end
+
+    def content_outer_height
+      height = content_padding_height + content_height
+      [[height, computed_options[:min_outer_height]].compact.max, computed_options[:max_outer_height]].compact.min
+    end
+
+    def content_outer_width
+      width = content_padding_width + content_width
+      [[width, computed_options[:min_outer_width]].compact.max, computed_options[:max_outer_width]].compact.min
+    end
+  end
+end

data/motion-prime/elements/_field_dimensions_mixin.rb

@@ -1,43 +1,59 @@
 module MotionPrime
   module ElementFieldDimensionsMixin
     def text_value
-      text = view ? view.text : computed_options[:text].to_s
-      text.empty? ? computed_options[:placeholder] : text
+      if button?
+        text = view ? view.titleLabel.text : computed_options[:title]
+      else
+        text = view ? view.text : computed_options[:text]
+      end.to_s
     end
 
-    def font
-      computed_options[:font] || :system.uifont
+    def content_text
+      text = text_value
+      if !button? && text.empty?
+        text = computed_options[:placeholder]
+      end
+      text.to_s
     end
 
-    def computed_width
-      min_width = computed_options[:min_width] || 20
-      return min_width if text_value.to_s.empty?
+    def font
+      if button?
+        font = computed_options[:title_label][:font]
+      else
+        font = computed_options[:placeholder_font] if text_value.empty?
+        font ||= computed_options[:font]
+      end
+      font || :system.uifont
+    end
 
-      padding_left = view.try(:padding_left) || computed_options[:padding_left] || computed_options[:padding] || view_class.constantize::DEFAULT_PADDING_LEFT
-      padding_right = view.try(:padding_right) || computed_options[:padding_right] || padding_left
-      max_width = computed_options[:max_width] || Float::MAX
+    def content_width
+      min_width = computed_options[:min_width].to_f
+      return min_width if content_text.empty?
 
-      attributed_text = NSAttributedString.alloc.initWithString(text_value, attributes: {NSFontAttributeName => font })
+      attributed_text = NSAttributedString.alloc.initWithString(content_text, attributes: {NSFontAttributeName => font })
       rect = attributed_text.boundingRectWithSize([Float::MAX, Float::MAX], options:NSStringDrawingUsesLineFragmentOrigin, context:nil)
 
-      width = (rect.size.width + padding_left + padding_right).ceil
-      [[width, max_width].min, min_width].max
+      width = rect.size.width.ceil
+      [[width, computed_options[:max_width]].compact.min, min_width].max
     end
 
-    def computed_height
-      text = view ? view.titleLabel.text : computed_options[:title]
-      return 0 if text.blank?
+    def content_height
+      min_height = computed_options[:min_height].to_f
+      return min_height if content_text.blank?
 
       width = computed_options[:width]
-      font = computed_options[:title_label][:font] || :system.uifont
       raise "Please set element width for height calculation" unless width
 
       attributes = {NSFontAttributeName => font }
-      attributed_text = NSAttributedString.alloc.initWithString(text, attributes: attributes)
+      attributed_text = NSAttributedString.alloc.initWithString(content_text, attributes: attributes)
       rect = attributed_text.boundingRectWithSize([width, Float::MAX], options:NSStringDrawingUsesLineFragmentOrigin, context:nil)
-
-      padding_top = computed_options[:padding_top] || computed_options[:padding] || view.try(:default_padding_top)
-      rect.size.height + padding_top*2
+      height = rect.size.height.ceil
+      [[height, computed_options[:max_height]].compact.min, min_height].max
     end
+
+    private
+      def button?
+        self.is_a?(ButtonElement)
+      end
   end
 end

data/motion-prime/elements/_text_dimensions_mixin.rb

@@ -31,9 +31,5 @@ module MotionPrime
 
       rect.size.width
     end
-
-    def content_outer_height
-      content_height + computed_inner_top + computed_inner_bottom
-    end
   end
 end

data/motion-prime/elements/base.rb

@@ -16,11 +16,10 @@ module MotionPrime
 
     def initialize(options = {})
       @options = options
-      @section = options.delete(:section)
-
+      @section = options[:section]
       @name = options[:name]
-      @block = options.delete(:block)
-      @view_class = options.delete(:view_class) || "UIView"
+      @block = options[:block]
+      @view_class = options[:view_class] || "UIView"
       @view_name = self.class_name_without_kvo.demodulize.underscore.gsub('_element', '')
     end
 
@@ -46,9 +45,9 @@ module MotionPrime
       @computed_options ||= {}
       block_options = compute_block_options || {}
       compute_style_options(options, block_options)
-      @computed_options.merge!(options)
+      @computed_options.merge!(options.except(:section, :name, :block, :view_class))
       @computed_options.merge!(block_options)
-      normalize_options(@computed_options, section, %w[text font title_label padding padding_left padding_right max_width width left right])
+      normalize_options(@computed_options, section, %w[text placeholder font title_label padding padding_left padding_right min_width min_outer_width max_width max_outer_width width left right])
     end
 
     # Compute options sent inside block, e.g.
@@ -96,7 +95,21 @@ module MotionPrime
       Styles.for(styles)
     end
 
-    private
+    def update_with_options(new_options = {})
+      options.merge!(new_options)
+      compute_options!
+      view.try(:removeFromSuperview)
+      @view = nil
+      render(to: screen)
+    end
+
+    def hide
+      view.hidden = true
+    end
+
+    def show
+      view.hidden = false
+    end
 
     class << self
       def factory(type, options = {})

data/motion-prime/elements/button.rb

@@ -1,5 +1,6 @@
 module MotionPrime
   class ButtonElement < BaseElement
+    include MotionPrime::ElementContentPaddingMixin
     include MotionPrime::ElementFieldDimensionsMixin
 
     after_render :size_to_fit
@@ -7,7 +8,7 @@ module MotionPrime
     def size_to_fit
       if computed_options[:size_to_fit] || style_options[:size_to_fit]
         if computed_options[:width]
-          view.setHeight computed_height
+          view.setHeight content_outer_height
         end
       end
     end

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

@@ -2,6 +2,7 @@ motion_require '../draw.rb'
 module MotionPrime
   class LabelDrawElement < DrawElement
     include MotionPrime::ElementTextDimensionsMixin
+    include MotionPrime::ElementContentPaddingMixin
 
     def draw_in(rect)
       options = computed_options
@@ -13,19 +14,29 @@ module MotionPrime
       bg_color = options[:background_color]
       if bg_color
         rect = CGRectMake(
-          computed_left, computed_top, computed_outer_width, computed_outer_height
+          computed_left, computed_top, computed_width, computed_height
         )
-        bg_color.uicolor.setFill
-        UIRectFill(rect)
+
+        if computed_options[:layer] && radius = options[:layer][:corner_radius]
+          bezierPath = UIBezierPath.bezierPathWithRoundedRect rect, cornerRadius: radius
+          context = UIGraphicsGetCurrentContext()
+          CGContextSetStrokeColorWithColor(context, bg_color.uicolor.cgcolor)
+          CGContextSetFillColorWithColor(context, bg_color.uicolor.cgcolor)
+          bezierPath.stroke
+          bezierPath.fill
+        else
+          bg_color.uicolor.setFill
+          UIRectFill(rect)
+        end
       end
 
       # render text
-      color = options[:text_color]
-      color.uicolor.set if color
+      color = options[:text_color] || :black
+      color.uicolor.set
       font = options[:font] || :system
       if options[:number_of_lines] != 0
         options[:text].to_s.drawAtPoint(
-          CGPointMake(computed_left, computed_top),
+          CGPointMake(computed_inner_left, computed_inner_top),
           withFont: font.uifont
         )
       else
@@ -45,9 +56,9 @@ module MotionPrime
 
     def size_to_fit_if_needed
       if computed_options[:size_to_fit]
-        @computed_options[:width] = content_width
+        @computed_options[:width] = content_outer_width
         if computed_options[:width]
-          @computed_options[:height] = content_height
+          @computed_options[:height] = content_outer_height
         end
         reset_computed_values
       end

data/motion-prime/elements/error_message.rb

@@ -1,10 +1,11 @@
 motion_require './label'
 module MotionPrime
   class ErrorMessageElement < LabelElement
+    include MotionPrime::ElementContentPaddingMixin
     include MotionPrime::ElementTextDimensionsMixin
 
     def view_class
-      "UILabel"
+      "MPLabel"
     end
   end
 end

data/motion-prime/elements/image.rb

@@ -7,6 +7,7 @@ module MotionPrime
 
     def fetch_image
       return unless computed_options[:url]
+      raise "You must set default image for `#{name}`" unless computed_options[:default]
       view.setImageWithURL NSURL.URLWithString(computed_options[:url]),
                         placeholderImage: computed_options[:default].uiimage
     end

data/motion-prime/elements/label.rb

@@ -1,32 +1,32 @@
 module MotionPrime
   class LabelElement < BaseElement
+    include MotionPrime::ElementContentPaddingMixin
     include MotionPrime::ElementTextDimensionsMixin
 
     before_render :size_to_fit_if_needed
     after_render :size_to_fit
 
+    def view_class
+      "MPLabel"
+    end
+
     def size_to_fit
       if computed_options[:size_to_fit] || style_options[:size_to_fit]
         if computed_options[:width]
-          view.setHeight content_height + 2 # TODO maybe set width too as it can be wider
+          view.setHeight([content_outer_height, computed_options[:height]].compact.min)
         else
           view.sizeToFit
+          # we should re-set values, because sizeToFit do not use padding
+          view.setWidth(view.bounds.size.width + content_padding_width)
+          view.setHeight(view.bounds.size.height + content_padding_height)
         end
       end
     end
 
     def size_to_fit_if_needed
       if computed_options[:size_to_fit] && computed_options[:width]
-        @computed_options[:height_to_fit] = content_height
+        @computed_options[:height_to_fit] = content_outer_height
       end
     end
-
-    def computed_inner_top
-      computed_options[:top].to_i
-    end
-
-    def computed_inner_bottom
-      computed_options[:bottom].to_i
-    end
   end
 end

data/motion-prime/elements/text_field.rb

@@ -1,6 +1,8 @@
 module MotionPrime
   class TextFieldElement < BaseElement
+    include MotionPrime::ElementContentPaddingMixin
     include MotionPrime::ElementFieldDimensionsMixin
+    
     def view_class
       "DMTextField"
     end

data/motion-prime/models/bag.rb

@@ -32,10 +32,12 @@ module MotionPrime
     # @return self
     def add(object_or_array)
       error_ptr = Pointer.new(:id)
+      prepared = prepare_for_store(object_or_array)
+
       if object_or_array.is_a?(Array)
-        self.addObjectsFromArray(prepare_for_store(object_or_array), error:error_ptr)
+        self.addObjectsFromArray(prepared, error:error_ptr)
       else
-        self.addObject(prepare_for_store(object_or_array), error:error_ptr)
+        self.addObject(prepared, error:error_ptr)
       end
       raise StoreError, error_ptr[0].description if error_ptr[0]
       self
@@ -45,9 +47,12 @@ module MotionPrime
 
     def prepare_for_store(object)
       if object.is_a?(Array)
-        object.map { |entity| prepare_for_store(entity) }
+        object.map { |entity| prepare_for_store(entity) }.compact
       else
         object.bag_key = self.key
+        if object.id.present? && self.store && self.find(id: object.id).any?
+          raise StoreError, "duplicated item added `#{object.class_name_without_kvo}` with `id` = #{object.id}"
+        end
         object
       end
     end