motion-prime 0.1.7 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjdhZjg1NjJhYTYxNGZlMTA1ZWNkZGQ0ZmUwZTg3YzdiZjBkM2MyNw==
+    ZTdmYjFmM2NhYWE3ZGQyNzFjYWZjYjg2NzUzOTFkMTkwZmVjYTBjMw==
   data.tar.gz: !binary |-
-    Mjg3NjUzNDE3ZTA1ZDVkZmZmZWMwNDUwMmMxZjlhNDczN2I5NWVjNg==
+    NmI1OTFjNGRmYmZjOTYyNWExOGJlMjQ4YjVjYzc4M2M0Y2M3ZWQ4Zg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MWVjMjhiMThkMjk3N2M1NWQ5MzU4ZjBjMDc3MWY5MmFiYzEwMWFlN2NlNzE0
-    OTM0NzM5NDMwZDMxNjhlODAzNjdiN2I3MmMyMGFlNDhiYjhjZmQ3MjFlOGI5
-    NjkzZTM5ZTQzZDNhMDMyZjgyYzg4MmUzYjYyZDI5ZGUzMjY1OWI=
+    ODdiZTc3ZmIyM2ZlZDJhOTg1YTU2OGEyODFhZWE5MGI2NWUzY2ZiYTQ5NzU5
+    ZGFlYmRkZDllYjY4MjA4YjA3YTE5YmZlNmE4NjU5Zjk3OTVhNTJkM2IwMDI4
+    NGIzYTRjYzg5MzBhMmM1NjY0NmJmY2U4MWMzN2JiODczZWNmMjY=
   data.tar.gz: !binary |-
-    MDY1MzIwNjJlOThmN2Q2NWZhZjI0YjJkMDZlMzBhNDI2MTc3MjZhNmYzMmRj
-    MGI2ODFhNWVlY2MyMjBhNTc4M2VjN2E2ZmM2ZWJlZDE1MGM2ODVmOTE1NjNk
-    YjNhZGYwNjZiZDRkMzQwZmIyYzBhMTRlNGFjZjdjODAxMzcyNzM=
+    MjBiMDY2NTg1ZWM1OGU3ZDUzYTcyYmY5YTgyMWVlNmE2M2EzYTE0YjVmYjBk
+    YzExOTI5ZDQ3MDZlN2Q1MDkwNjE0ZTU0OTRlM2Q1NjA2Y2ZmNThmZmUxNzUy
+    OThlMzU4NTI5ZDJkOTIwMmE3MDA2OTZkM2I2OTAwZDViY2ZmMzU=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+=== 0.2.0
+* MP::BaseModel improvements
+* Added ability to observe form field errors
+* Use MP::Config for style configurations
+
 === 0.1.7
 * MP::BaseModel#fetch_associations now supports callback option
 * MP::LabelDrawElement now supports `size_to_fit` option

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.1.7)
+    motion-prime (0.2.0)
       bubble-wrap
       cocoapods
       motion-cocoapods

data/files/app/config/base.rb

@@ -1,6 +1,9 @@
-APP_CONFIG = {}
-APP_CONFIG[:css_color_base] = 0x3aa9b6
-APP_CONFIG[:css_color_dark] = 0x41929c
+MP = MotionPrime unless defined?(MP)
+
+MP::Config.color do |color|
+  color.base = 0x3aa9b6
+  color.dark = 0x41929c
+end
 
 # setup model's store
-MotionPrime::Store.connect
+MP::Store.connect

data/files/app/styles/sidebar.rb

@@ -2,7 +2,7 @@ MotionPrime::Styles.define :sidebar do
   # navigation layout
   # ----------
   style :screen,
-    background_color: APP_CONFIG[:css_color_base],
+    background_color: MP::Config.color.base,
     opaque: true
 
   style :table,
@@ -10,8 +10,8 @@ MotionPrime::Styles.define :sidebar do
     left: 0,
     width: 320,
     bottom: 0,
-    background_color: APP_CONFIG[:css_color_base],
-    separator_color: APP_CONFIG[:css_color_dark],
+    background_color: MP::Config.color.base,
+    separator_color: MP::Config.color.dark,
     opaque: true
 
   style :table_cell,
@@ -19,7 +19,7 @@ MotionPrime::Styles.define :sidebar do
     opaque: true
 
   style :action_title,
-    background_color: APP_CONFIG[:css_color_base],
+    background_color: MP::Config.color.base,
     text_color: :white,
     top: 10,
     width: 320,

data/lib/motion-prime.rb

@@ -4,4 +4,5 @@ Motion::Require.all(Dir.glob(File.expand_path('../../motion-prime/**/*.rb', __FI
 
 Motion::Project::App.setup do |app|
   app.detect_dependencies = false
+  app.fonts = [File.expand_path('../../resources/fonts/ubuntu.ttf', __FILE__)]
 end

data/motion-prime/config/base.rb

@@ -5,4 +5,9 @@ MotionPrime::Config.model do |model|
   else
     model.store_type = :file
   end
+end
+MotionPrime::Config.font.name = "Ubuntu"
+MotionPrime::Config.color do |color|
+  color.base = 0x424242
+  color.error = 0xef471f
 end

data/motion-prime/elements/_text_height_mixin.rb

@@ -1,6 +1,7 @@
 module MotionPrime
   module ElementTextHeightMixin
-    def height
+    def content_height
+      return 0 if computed_options[:text].blank?
       width = computed_options[:width]
       font = computed_options[:font] || :system.uifont
       raise "Please set element width for height calculation" unless width
@@ -9,9 +10,8 @@ module MotionPrime
             lineBreakMode: UILineBreakModeWordWrap).height
     end
 
-    def outer_height
-      height + computed_options[:top].to_i +
-      computed_options[:bottom].to_i
+    def content_outer_height
+      content_height + computed_inner_top + computed_inner_bottom
     end
   end
 end

data/motion-prime/elements/base.rb

@@ -8,13 +8,14 @@ module MotionPrime
     include HasNormalizer
 
     attr_accessor :options, :section, :name,
-                  :view_class, :view, :styles, :screen
+                  :view_class, :view, :view_name, :styles, :screen
 
     define_callbacks :render
 
     def initialize(options = {})
       @options = options
       @section = options.delete(:section)
+      @observe_errors_for = options.delete(:observe_errors_for)
       @name = options[:name]
       @block = options.delete(:block)
       @view_class = options.delete(:view_class) || "UIView"
@@ -39,7 +40,7 @@ module MotionPrime
     end
 
     def compute_options!
-      @computed_options = options
+      @computed_options = normalize_options(options, section)
       compute_block_options
       compute_style_options
       @computed_options = normalize_options(@computed_options, section)
@@ -56,9 +57,14 @@ module MotionPrime
     end
 
     def compute_style_options
-      @styles = [:"base_#{@view_name}"]
-      @styles += Array.wrap(@computed_options.delete(:styles))
-      @styles += [:"#{section.name}_#{name}"] if section.present?
+      @styles = []
+      @styles << :"#{section.name}_#{name}" if section.present?
+      @styles << :"base_#{@view_name}"
+      if section && @observe_errors_for && @observe_errors_for.errors[section.name].present?
+        @styles << :"base_#{name}_with_errors"
+      end
+      custom_styles = @computed_options.delete(:styles)
+      @styles += [*custom_styles]
       @computed_options.merge!(style_options)
     end
 

data/motion-prime/elements/draw.rb

@@ -18,46 +18,125 @@ module MotionPrime
       view.bounds.size.height
     end
 
+    def computed_padding_left
+      computed_options[:padding_left] ||
+      computed_options[:padding] || 0
+    end
+
+    def computed_padding_right
+      computed_options[:padding_right] ||
+      computed_options[:padding] || 0
+    end
+
+    def computed_padding_top
+      computed_options[:padding_top] ||
+      computed_options[:padding] || 0
+    end
+
+    def computed_padding_bottom
+      computed_options[:padding_bottom] ||
+      computed_options[:padding] || 0
+    end
+
     def computed_width
-      width = computed_options[:width]
-      width = 0.0 if width.nil?
-
-      # calculate width if width is relative, e.g 0.7
-      if width > 0 && width <= 1
-        width * computed_max_width
-      else
-        width > computed_max_width ? computed_max_width : width
+      @computed_width ||= begin
+        width = computed_options[:width]
+        width = 0.0 if width.nil?
+
+        # calculate width if width is relative, e.g 0.7
+        if width > 0 && width <= 1
+          width * computed_max_width
+        else
+          width > computed_max_width ? computed_max_width : width
+        end
+      end
+    end
+
+    # content width + content padding
+    def computed_outer_width
+      @computed_outer_width ||= begin
+        computed_width + computed_padding_left + computed_padding_right
       end
     end
 
     def computed_height
-      height = computed_options[:height]
-      height = 0.0 if height.nil?
-
-      # calculate height if height is relative, e.g 0.7
-      if height > 0 && height <= 1
-        height * computed_max_height
-      else
-        height > computed_max_height ? computed_max_height : height
+      @computed_height ||= begin
+        height = computed_options[:height]
+        height = 0.0 if height.nil?
+
+        # calculate height if height is relative, e.g 0.7
+        if height > 0 && height <= 1
+          height * computed_max_height
+        else
+          height > computed_max_height ? computed_max_height : height
+        end
+      end
+    end
+
+    # content height + content padding
+    def computed_outer_height
+      @computed_outer_height ||= begin
+        computed_height + computed_padding_top + computed_padding_bottom
       end
     end
 
     def computed_left
-      left = computed_options[:left]
-      right = computed_options[:right]
-      return left if left
-      return 0 if right.nil?
+      @computed_left ||= begin
+        left = computed_options[:left]
+        right = computed_options[:right]
+        return left if left
+        return 0 if right.nil?
 
-      computed_max_width - (computed_width + right)
+        computed_max_width - (computed_width + right)
+      end
+    end
+
+    # content left + content padding
+    def computed_inner_left
+      @computed_inner_left ||= begin
+        computed_left + computed_padding_left
+      end
     end
 
     def computed_top
-      top = computed_options[:top]
-      bottom = computed_options[:bottom]
-      return top if top
-      return 0 if bottom.nil?
+      @computed_top ||= begin
+        top = computed_options[:top]
+        bottom = computed_options[:bottom]
+        return top if top
+        return 0 if bottom.nil?
+
+        computed_max_height - (computed_height + bottom)
+      end
+    end
 
-      computed_max_height - (computed_height + bottom)
+    # content top + content padding
+    def computed_inner_top
+      @computed_inner_top ||= begin
+        computed_top + computed_padding_top
+      end
+    end
+
+    def computed_bottom
+      computed_options[:bottom] || 0
+    end
+
+    def computed_inner_bottom
+      computed_bottom + computed_padding_bottom
+    end
+
+    def computed_right
+      computed_options[:right] || 0
+    end
+
+    def computed_inner_right
+      computed_right + computed_padding_right
+    end
+
+    def reset_computed_values
+      [:left, :top, :right, :bottom, :width, :height].each do |key|
+        instance_variable_set "@compited_#{key}", nil
+        instance_variable_set "@compited_inner_#{key}", nil
+      end
     end
 
     class << self

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

@@ -7,8 +7,8 @@ module MotionPrime
       image_rect = CGRectMake(
         computed_left,
         computed_top,
-        computed_options[:width],
-        computed_options[:height]
+        computed_width,
+        computed_height
       )
       # draw already initialized image
       if image_data

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

@@ -7,10 +7,19 @@ module MotionPrime
       options = computed_options
       return if options[:hidden]
 
-      if options[:size_to_fit]
-        @computed_options[:height] = outer_height
+      size_to_fit_if_needed
+
+      # render background
+      bg_color = options[:background_color]
+      if bg_color
+        rect = CGRectMake(
+          computed_left, computed_top, computed_outer_width, computed_outer_height
+        )
+        bg_color.uicolor.setFill
+        UIRectFill(rect)
       end
 
+      # render text
       color = options[:text_color]
       color.uicolor.set if color
       font = options[:font] || :system
@@ -21,7 +30,8 @@ module MotionPrime
         )
       else
         rect = CGRectMake(
-          computed_left, computed_top, computed_width, computed_height
+          computed_inner_left, computed_inner_top,
+          computed_width, computed_height
         )
         line_break = options.has_key?(:line_break_mode) ? options[:line_break_mode] : :wordwrap
         alignment = options.has_key?(:text_alignment) ? options[:text_alignment] : :left
@@ -32,5 +42,12 @@ module MotionPrime
         )
       end
     end
+
+    def size_to_fit_if_needed
+      if computed_options[:size_to_fit]
+        @computed_options[:height] = content_height
+        reset_computed_values
+      end
+    end
   end
 end

data/motion-prime/elements/error_message.rb

@@ -0,0 +1,23 @@
+module MotionPrime
+  class ErrorMessageElement < BaseElement
+    include MotionPrime::ElementTextHeightMixin
+
+    after_render :size_to_fit
+
+    def view_class
+      "UILabel"
+    end
+
+    def size_to_fit
+      view.size.height = self.content_height
+    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/label.rb

@@ -9,5 +9,13 @@ module MotionPrime
         view.sizeToFit
       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/models/association.rb

@@ -13,7 +13,6 @@ module MotionPrime
     end
   end
   module ModelAssociationClassMethods
-
     # Defines bag associated with model, creates accessor for bag
     #
     # @param [String] name - the name of bag

data/motion-prime/models/base.rb

@@ -3,207 +3,23 @@ motion_require './bag.rb'
 motion_require './finder.rb'
 motion_require './model.rb'
 motion_require './store.rb'
+motion_require './sync.rb'
+motion_require './association.rb'
 motion_require './store_extension.rb'
 module MotionPrime
   class BaseModel < NSFNanoObject
-    class_attribute :_sync_url
-    class_attribute :_updatable_attributes
-    class_attribute :_associations
-    alias_method :attributes, :info
     include MotionPrime::HasAuthorization
-
     include MotionPrime::ModelMethods
-    extend MotionPrime::ModelClassMethods
-
-    extend MotionPrime::ModelFinderMethods
     include MotionPrime::ModelAssociationMethods
+    include MotionPrime::ModelSyncMethods
 
+    extend MotionPrime::ModelClassMethods
+    extend MotionPrime::ModelFinderMethods
     extend MotionPrime::ModelAssociationClassMethods
+    extend MotionPrime::ModelSyncClassMethods
 
-    def sync_url
-      normalize_sync_url(self.class.sync_url)
-    end
-
-    def model_name
-      self.class.name.underscore
-    end
-
-    def new_record?
-      id.blank?
-    end
-
-    # destroy on server and delete on local
-    def destroy(&block)
-      use_callback = block_given?
-      api_client.delete(sync_url) do
-        block.call() if use_callback
-      end
-      delete
-    end
-
-    # sync with server and save on local
-    def sync!(sync_options = {}, &block)
-      sync(sync_options.merge(save: true), &block)
-    end
-
-    # sync with with server
-    # TODO: order of fetch/update should be based on updated time
-    def sync(sync_options = {}, &block)
-      use_callback = block_given?
-      should_fetch = sync_options[:fetch]
-      should_update = sync_options[:update]
-
-      should_fetch = false if sync_url.blank?
-      should_update = false if sync_url.blank?
-
-      should_fetch = !new_record? if should_fetch.nil?
-      should_update = new_record? if should_update.nil?
-
-      fetch_with_url self.sync_url do
-        save if sync_options[:save]
-        block.call if use_callback
-      end if should_fetch
-      update_with_url self.sync_url do
-        save if sync_options[:save]
-
-        # run callback only if it wasn't run on fetch
-        block.call if use_callback && !should_fetch
-      end if should_update
-
-      fetch_associations(sync_options) do
-        # run callback only if it wasn't run on fetch or update
-        block.call if use_callback && !should_fetch && !should_update
-      end
-    end
-
-    # fetch from server using url
-    def fetch_with_url(url, &block)
-      api_client.get(url) do |data|
-        if data.present?
-          fetch_with_attributes(data, &block)
-        end
-      end
-    end
-
-    # update on server using url
-    def update_with_url(url, &block)
-      use_callback = block_given?
-      post_data = { model_name => filtered_updatable_attributes}
-      api_client.send(id ? :put : :post, url, post_data) do |data|
-        self.id ||= data['id']
-        block.call() if use_callback
-      end
-    end
-
-    # set attributes, using fetch
-    def fetch_with_attributes(attrs, &block)
-      attrs.each do |key, value|
-        if respond_to?(:"fetch_#{key}")
-          self.send(:"fetch_#{key}", value)
-        elsif respond_to?(:"#{key}=")
-          self.send(:"#{key}=", value)
-        end
-      end
-      block.call(self) if block_given?
-    end
-
-    def fetch_associations(sync_options = {}, &block)
-      use_callback = block_given?
-      associations = self.class._associations || {}
-
-      associations.keys.each_with_index do |key, index|
-        if use_callback && associations.count - 1 == index
-          fetch_association(key, sync_options, &block)
-        else
-          fetch_association(key, sync_options)
-        end
-      end
-    end
-
-    def fetch_association(key, sync_options = {}, &block)
-      options = self.class._associations[key]
-      return unless options[:sync_url]
-      options[:type] == :many ?
-      fetch_has_many(key, options, sync_options, &block) :
-      fetch_has_one(key, options, sync_options, &block)
-    end
-
-    def fetch_has_many(key, options = {}, sync_options = {}, &block)
-      old_collection = self.send(key)
-      use_callback = block_given?
-      puts "SYNC: started sync for #{key} in #{self.class.name}"
-      api_client.get normalize_sync_url(options[:sync_url]) do |data|
-        data = data[options[:sync_key]] if options[:sync_key]
-        if data.present?
-          # Update/Create existing records
-          data.each do |attributes|
-            model = old_collection.detect{ |model| model.id == attributes[:id]}
-            unless model
-              model = key.singularize.to_s.classify.constantize.new
-              self.send(:"#{key}_bag") << model
-            end
-            model.fetch_with_attributes(attributes)
-            model.save if sync_options[:save]
-          end
-          old_collection.each do |old_model|
-            model = data.detect{ |model| model[:id] == old_model.id}
-            unless model
-              old_model.delete
-            end
-          end
-          save if sync_options[:save]
-          puts "SYNC: finished sync for #{key} in #{self.class.name}"
-          block.call if use_callback
-        else
-          puts "SYNC ERROR: failed sync for #{key} in #{self.class.name}"
-          block.call if use_callback
-        end
-      end
-    end
-
-    def fetch_has_one(key, options = {}, &block)
-      # TODO: add implementation
-    end
-
-    def inspect
-      "#<#{self.class}:0x#{self.object_id.to_s(16)}> " + MotionPrime::JSON.generate(attributes)
-    end
-
-    def filtered_updatable_attributes
-      return attributes if self.class.updatable_attributes.blank?
-      self.class.updatable_attributes.to_a.inject({}) do |hash, attribute|
-        key, options = *attribute
-        return hash if options[:if] && !send(options[:if])
-        if block = options[:block]
-          value = instance_eval(&block)
-        else
-          value = attributes[key]
-        end
-        hash.merge!(key => value)
-      end
-    end
-
-    def normalize_sync_url(url)
-      url.to_s.gsub(':id', id.to_s)
-    end
-
-    class << self
-      def sync_url(url = nil)
-        url ? self._sync_url = url : self._sync_url
-      end
-
-      def updatable_attributes(*attrs)
-        return self._updatable_attributes if attrs.blank?
-        attrs.each do |attribute|
-          updatable_attribute attribute
-        end
-      end
-
-      def updatable_attribute(attribute, options = {}, &block)
-        options[:block] = block if block_given?
-        self._updatable_attributes ||= {}
-        self._updatable_attributes[attribute] = options
-      end
+    def errors
+      @errors ||= Errors.new(self)
     end
   end
 end