motion-prime 0.3.1 → 0.3.2

data/motion-prime/support/dm_button.rb

@@ -1,7 +1,7 @@
 class DMButton < UIButton
-  include MotionPrime::KeyValueStore
-  DEFAULT_PADDING_LEFT = 5
-  attr_accessor :paddingLeft, :paddingRight, :paddingTop, :padding, :sizeToFit
+  include MotionPrime::SupportKeyValueStore
+  include MotionPrime::SupportPaddingAttribute
+  attr_accessor :sizeToFit
 
   def setTitle(value)
     setTitle value, forState: UIControlStateNormal
@@ -16,35 +16,35 @@ class DMButton < UIButton
     super
   end
 
-  def padding_left
-    self.paddingLeft || self.padding || DEFAULT_PADDING_LEFT
+  def self.default_padding_left
+    5
   end
 
-  def padding_right
-    self.paddingRight || padding_left || DEFAULT_PADDING_LEFT
+  def self.default_padding_right
+    5
   end
 
-  def padding_top
-    self.paddingTop || self.padding || default_padding_top
+  def padding_top # to center title label
+    self.paddingTop || self.padding || begin
+      single_line_height = self.font.pointSize
+      (self.bounds.size.height - single_line_height)/2 + 1
+    end
   end
 
-  def default_padding_top # to center title label
-    single_line_height = self.font.pointSize
-    (self.bounds.size.height - single_line_height)/2 + 1
+  def padding_bottom
+    self.bounds.size.height - (self.font.pointSize + padding_top)
   end
 
-  def drawPadding(rect)
-    return if @custom_title_inset_drawn || [padding_top, padding_left, padding_right].all?(&:zero?)
+  def apply_padding!(rect)
+    self.setTitleEdgeInsets(padding_insets)
+  end
 
-    height_diff = self.bounds.size.height - (self.font.pointSize + padding_top*2)
-    self.setTitleEdgeInsets UIEdgeInsetsMake(
-      padding_top, padding_left,
-      padding_top + height_diff, padding_right
-    )
+  def apply_padding?
+    super && !@custom_title_inset_drawn
   end
 
   def drawRect(rect)
-    drawPadding(rect)
+    apply_padding(rect)
     super
   end
 end

data/motion-prime/support/dm_text_field.rb

@@ -2,11 +2,9 @@
 # * support padding, padding_left, padding_right options
 # * support placeholder_color, placeholder_font options
 class DMTextField < UITextField
-  DEFAULT_PADDING_LEFT = 5
-  include MotionPrime::KeyValueStore
-
-  attr_accessor :paddingLeft, :paddingRight, :paddingTop, :padding,
-    :placeholderColor, :placeholderFont
+  include MotionPrime::SupportKeyValueStore
+  include MotionPrime::SupportPaddingAttribute
+  attr_accessor :placeholderColor, :placeholderFont
 
   # placeholder position
   def textRectForBounds(bounds)
@@ -25,21 +23,19 @@ class DMTextField < UITextField
     self.placeholder.drawInRect(rect, withFont: font)
   end
 
-  def padding_left
-    self.paddingLeft || self.padding || DEFAULT_PADDING_LEFT
-  end
-
-  def padding_right
-    self.paddingRight || self.padding_left
+  def padding_top # to center title label
+    self.paddingTop || self.padding || begin
+      single_line_height = self.font.pointSize
+      (self.bounds.size.height - single_line_height)/2 + 2
+    end
   end
 
-  def padding_top
-    self.paddingTop || self.padding || default_padding_top
+  def self.default_padding_left
+    5
   end
 
-  def default_padding_top # to center title label
-    single_line_height = self.font.pointSize
-    (self.bounds.size.height - single_line_height)/2 + 2
+  def self.default_padding_right
+    5
   end
 
   private
@@ -50,5 +46,4 @@ class DMTextField < UITextField
         bounds.origin.x + padding_left, bounds.origin.y + padding_top,
         bounds.size.width - (padding_left + padding_right), bounds.size.height - padding_top*2)
     end
-
 end

data/motion-prime/support/dm_text_view.rb

@@ -2,7 +2,7 @@
 # * support padding, padding_left, padding_right options
 # * support placeholder, placeholder_color, placeholder_font options
 class DMTextView < UITextView
-  include MotionPrime::KeyValueStore
+  include MotionPrime::SupportKeyValueStore
   DEFAULT_PADDING_LEFT = 7
 
   attr_accessor :paddingLeft, :paddingTop, :padding,

data/motion-prime/support/mp_label.rb

@@ -0,0 +1,9 @@
+class MPLabel < UILabel
+  include MotionPrime::SupportKeyValueStore
+  include MotionPrime::SupportPaddingAttribute
+
+  def drawTextInRect(rect)
+    rect = UIEdgeInsetsInsetRect(rect, padding_insets)
+    super(rect)
+  end
+end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/motion-prime/views/layout.rb

@@ -11,6 +11,7 @@ module MotionPrime
       options = builder.options.merge(calculate_frame: true, bounds: bounds)
       view = builder.view
       if render_target = options.delete(:render_target)
+        options[:bounds] = render_target.bounds
         render_target.addSubview(view)
       elsif view_stack.any?
         view_stack.last.addSubview(view)

data/motion-prime/views/styles.rb

@@ -14,7 +14,7 @@ module MotionPrime
       if block_given?
         raise "Only style names are available for nested styles, received: `#{args.inspect}`. Namespace: `#{@namespace}`" if options.present?
         names.each do |name|
-          puts namespace = [@namespace, name].compact.join('_')
+          namespace = [@namespace, name].compact.join('_')
           self.class.new(namespace).instance_eval(&block)
         end
       else

data/motion-prime/views/view_styler.rb

@@ -36,6 +36,7 @@ module MotionPrime
         options[:frame] = bounds
       else
         frame = CGRectZero
+
         max_width = bounds.size.width
         max_height = bounds.size.height
         width = 0.0 if width.nil?
@@ -107,7 +108,10 @@ module MotionPrime
       # ignore options
       return if key == 'size_to_fit' && view.is_a?(UILabel)
       return if (key == 'url' || key == 'default') && view.is_a?(UIImageView)
-      return if %w[max_width min_width height_to_fit container].include? key.to_s
+      return if %w[
+        max_width max_outer_width min_width min_outer_width
+        max_height max_outer_height min_height min_outer_width
+        height_to_fit container].include? key.to_s
 
       # apply options
       if key.end_with?('title_color')

data/spec/helpers/models.rb

@@ -3,38 +3,45 @@ class User < MotionPrime::BaseModel
 end
 
 class Plane < MotionPrime::BaseModel
-  attributes :name, :age
+  attributes :id, :name, :age
 end
 
 class Listing < MotionPrime::BaseModel
+  attribute :id
   attribute :name
 end
 
 class Todo < MotionPrime::BaseModel
+  attribute :id
   attribute :title
   bag :items
 end
 
 class TodoItem < MotionPrime::BaseModel
+  attribute :id
   attribute :completed
   attribute :text
 end
 
 class Page < MotionPrime::BaseModel
+  attribute :id
   attribute :text
   attribute :index
 end
 
 class Animal < MotionPrime::BaseModel
+  attribute :id
   attribute :name
 end
 
 class Autobot < MotionPrime::BaseModel
+  attribute :id
   attribute :name
 end
 
 module CustomModule; end
 class CustomModule::Car < MotionPrime::BaseModel
+  attribute :id
   attribute :name
   attribute :created_at
 end

data/travis.sh

@@ -5,6 +5,4 @@ sudo bundle install
 sudo pod setup
 sudo bundle exec rake pod:install
 sudo bundle exec rake clean &&
-sudo bundle exec rake spec &&
-sudo bundle exec rake clean &&
-sudo bundle exec rake spec osx=true
+sudo bundle exec rake spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Iskander Haziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-27 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -178,6 +178,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
+- ROADMAP.md
 - Rakefile
 - app/app_delegate.rb
 - bin/prime
@@ -209,6 +210,7 @@ files:
 - motion-prime/config/base.rb
 - motion-prime/config/config.rb
 - motion-prime/core_ext/kernel.rb
+- motion-prime/elements/_content_padding_mixin.rb
 - motion-prime/elements/_field_dimensions_mixin.rb
 - motion-prime/elements/_text_dimensions_mixin.rb
 - motion-prime/elements/base.rb
@@ -243,10 +245,11 @@ files:
 - motion-prime/mp.rb
 - motion-prime/screens/_aliases_mixin.rb
 - motion-prime/screens/_base_mixin.rb
-- motion-prime/screens/_navigation_bar_mixin.rb
 - motion-prime/screens/_navigation_mixin.rb
 - motion-prime/screens/_orientations_mixin.rb
 - motion-prime/screens/base_screen.rb
+- motion-prime/screens/extensions/_indicators_mixin.rb
+- motion-prime/screens/extensions/_navigation_bar_mixin.rb
 - motion-prime/screens/sidebar_container_screen.rb
 - motion-prime/sections/base.rb
 - motion-prime/sections/draw.rb
@@ -268,12 +271,14 @@ files:
 - motion-prime/styles/base.rb
 - motion-prime/styles/form.rb
 - motion-prime/support/_key_value_store.rb
+- motion-prime/support/_padding_attribute.rb
 - motion-prime/support/dm_button.rb
 - motion-prime/support/dm_cell_with_section.rb
 - motion-prime/support/dm_text_field.rb
 - motion-prime/support/dm_text_view.rb
 - motion-prime/support/dm_view_controller.rb
 - motion-prime/support/dm_view_with_section.rb
+- motion-prime/support/mp_label.rb
 - motion-prime/support/navigation_controller.rb
 - motion-prime/support/ui_search_bar_custom.rb
 - motion-prime/support/ui_view.rb