motion-prime 0.2.1 → 0.3.0

data/motion-prime/views/styles.rb

@@ -7,21 +7,31 @@ module MotionPrime
       @namespace = namespace
     end
 
-    def style(name, options = {})
-      name = "#{@namespace}_#{name}".to_sym if @namespace
-      @@repo[name] ||= {}
-      if parent = options.delete(:parent)
-        parent ="#{@namespace}_#{parent}".to_sym if @namespace
-        @@repo[name].deep_merge! self.class.for(parent)
+    def style(*args)
+      names = Array.wrap(args)
+      options = names.pop if args.last.is_a?(Hash)
+
+      raise "No style rules specified for `#{names.join(', ')}`. Namespace: `#{@namespace}`" unless options
+      names.each do |name|
+        name = "#{@namespace}_#{name}".to_sym if @namespace
+
+        @@repo[name] ||= {}
+        if parent = options.delete(:parent)
+          namespace = options.delete(:parent_namspace) || @namespace
+          parent ="#{namespace}_#{parent}".to_sym if namespace
+          @@repo[name].deep_merge! self.class.for(parent)
+        end
+        @@repo[name].deep_merge! options
       end
-      @@repo[name].deep_merge! options
     end
 
     class << self
       include HasNormalizer
 
-      def define(namespace = nil, &block)
-        self.new(namespace).instance_eval(&block)
+      def define(*namespaces, &block)
+        Array.wrap(namespaces).each do |namespace|
+          self.new(namespace).instance_eval(&block)
+        end
       end
 
       def for(style_names)

data/motion-prime/views/view_builder.rb

@@ -31,7 +31,21 @@ module MotionPrime
       def default_views_map
         {
           'UIView' => Proc.new {|klass, options| klass.alloc.initWithFrame CGRectZero },
+          'UILabel' => Proc.new {|klass, options|
+            if options[:line_spacing]
+              options[:attributed_text_options] = {
+                text: options.delete(:text),
+                line_spacing: options.delete(:line_spacing)
+              }
+            end
+            klass.alloc.initWithFrame CGRectZero
+          },
           'UIControl' => Proc.new {|klass, options| klass.alloc.init },
+          'UISwitch' => Proc.new {|klass, options|
+            view = klass.alloc.init
+            view.setOn options.delete(:on)
+            view
+          },
           'UIActionSheet' => Proc.new {|klass, options|
             title = options.delete(:title) || ''
             delegate = options.delete(:delegate)
@@ -53,7 +67,7 @@ module MotionPrime
             is_custom_button = options[:background_image] || options[:title_color]
             default_button_type = is_custom_button ? :custom : :rounded
             button_type = (options.delete(:button_type) || default_button_type).uibuttontype
-            klass.buttonWithType button_type
+            button = klass.buttonWithType button_type
           },
           'UIImageView' => Proc.new{|klass, options|
             image = options.delete(:image)
@@ -77,7 +91,9 @@ module MotionPrime
           },
           'UITableView' => Proc.new{|klass, options|
             style = options.delete(:style) || UITableViewStylePlain
-            klass.alloc.initWithFrame CGRectZero, style: style
+            view = klass.alloc.initWithFrame CGRectZero, style: style
+            view.tableFooterView = UIView.new
+            view
           },
           'UITableViewCell' => Proc.new{|klass, options|
             style = options.delete(:style) || UITableViewCellStyleDefault

data/motion-prime/views/view_styler.rb

@@ -26,9 +26,14 @@ module MotionPrime
       right   = options.delete(:right)
       bottom  = options.delete(:bottom)
       left    = options.delete(:left)
+      value_type = options.delete(:value_type).to_s # absolute/relative
+
+      if options[:height_to_fit].present? && height.nil? && (top.nil? || bottom.nil?)
+        height = options[:height_to_fit]
+      end
 
       if width.nil? && height.nil? && right.nil? && bottom.nil?
-        options[:frame] = CGRectZero
+        options[:frame] = bounds
       else
         frame = CGRectZero
         max_width = bounds.size.width
@@ -37,7 +42,7 @@ module MotionPrime
         height = 0.0 if height.nil?
 
         # calculate left and right if width is relative, e.g 0.7
-        if width > 0 && width <= 1
+        if width && width > 0 && width <= 1 && value_type != 'absolute'
           if right.nil?
             left ||= 0
             right = max_width - max_width * width
@@ -47,7 +52,7 @@ module MotionPrime
         end
 
         # calculate top and bottom if height is relative, e.g 0.7
-        if height > 0 && height <= 1
+        if height && height > 0 && height <= 1 && value_type != 'absolute'
           if bottom.nil?
             top ||= 0
             bottom = max_height - max_height * height
@@ -98,10 +103,11 @@ module MotionPrime
     end
 
     def setValue(value, forUndefinedKey: key)
-      return if value.nil?
+      # return if value.nil?
       # 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
 
       # apply options
       if key.end_with?('title_color')
@@ -113,7 +119,7 @@ module MotionPrime
       elsif key.end_with?('title_shadow_color')
         view.setTitleShadowColor value.uicolor, forState: UIControlStateNormal
       elsif key.end_with?('color')
-        color = value.uicolor
+        color = value.try(:uicolor)
         color = color.cgcolor if view.is_a?(CALayer)
         view.send :"#{key.camelize(:lower)}=", color
       elsif key.end_with?('background_image')
@@ -124,10 +130,58 @@ module MotionPrime
         else
           view.setBackgroundColor value.uiimage.uicolor
         end
+      elsif key.end_with?('background_view')
+        if view.is_a?(UITableView)
+          bg_view = UIView.alloc.initWithFrame(view.bounds)
+          bg_view.backgroundColor = value[:color].uicolor
+          view.backgroundView = bg_view
+        else
+          view.setValue value, forKey: key.camelize(:lower)
+        end
       elsif key.end_with?('image')
         view.setValue value.uiimage, forKey: key.camelize
+      elsif key.end_with?('_content_offset')
+        current_inset = view.contentInset
+        current_inset.send("#{key.partition('_').first}=", value)
+        view.contentInset = current_inset
+      elsif key == 'autocapitalization'
+        view.autocapitalizationType = UITextAutocapitalizationTypeNone if value === false
       elsif key == 'keyboard_type'
         view.setKeyboardType value.uikeyboardtype
+      elsif key == 'mask'
+        radius = value[:radius]
+        bounds = CGRectMake(0, 0, value[:width], value[:height])
+        mask_path = UIBezierPath.bezierPathWithRoundedRect(bounds, byRoundingCorners: UIRectCornerAllCorners, cornerRadii: CGSizeMake(radius, radius))
+        mask_layer = CAShapeLayer.layer
+        mask_layer.frame = bounds
+        mask_layer.path = mask_path.CGPath
+        view.layer.mask = mask_layer
+        # TODO: apply for corner_radius_top/bottom
+        # CAShapeLayer *shape = [[CAShapeLayer alloc] init];
+        # shape.path = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, self.bounds.size.width, self.bounds.size.height) byRoundingCorners:UIRectCornerTopLeft|UIRectCornerTopRight cornerRadii:CGSizeMake(10, 10)].CGPath;
+        # self.layer.mask = shape;
+        # self.layer.masksToBounds = YES;
+      elsif key == 'attributed_text_options'
+        attributes = {}
+        if line_spacing = value[:line_spacing]
+          paragrahStyle = NSMutableParagraphStyle.alloc.init
+          paragrahStyle.setLineSpacing(line_spacing)
+          attributes[NSParagraphStyleAttributeName] = paragrahStyle
+        end
+
+
+        attributedString = NSAttributedString.alloc.initWithString(value[:text], attributes: attributes)
+        if underline_range = value[:underline]
+          attributedString = NSMutableAttributedString.alloc.initWithAttributedString(attributedString)
+          attributedString.addAttributes({NSUnderlineStyleAttributeName => NSUnderlineStyleSingle}, range: underline_range)
+        end
+
+        if view.is_a?(UIButton)
+          view.setAttributedTitle attributedString, forState: UIControlStateNormal
+        else
+          view.attributedText = attributedString
+        end
+
       elsif value.is_a?(Hash)
         self.class.new(view.send(key.camelize(:lower).to_sym), nil, value).apply
       else

data/spec/models/errors_spec.rb

@@ -10,19 +10,19 @@ describe "Model Errors" do
     end
 
     it "should not be blank after adding error" do
-      @user.errors.add(:foo, 'bar')
+      @user.errors.add(:name, 'bar')
       @user.errors.blank?.should == false
     end
 
     it "should not present after reset" do
-      @user.errors.add(:foo, 'bar')
+      @user.errors.add(:name, 'bar')
       @user.errors.present?.should == true
       @user.errors.reset
       @user.errors.present?.should == false
     end
 
     it "should be convertable to string" do
-      @user.errors.add(:foo, 'bar')
+      @user.errors.add(:name, 'bar')
       @user.errors.to_s.match(/bar/).should != nil
     end
   end

data/travis.sh

@@ -1,7 +1,8 @@
 #!/usr/bin/env sh
 
-sudo gem install bundler &&
-sudo bundle install &&
+sudo gem install bundler
+sudo bundle install
+sudo pod install
 sudo bundle exec rake clean &&
 sudo bundle exec rake spec &&
 sudo bundle exec rake clean &&

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Iskander Haziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,10 +150,25 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: methadone
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: RubyMotion apps development framework
 email:
 - gvalmon@gmail.com
-executables: []
+executables:
+- prime.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -165,6 +180,7 @@ files:
 - README.md
 - Rakefile
 - app/app_delegate.rb
+- bin/prime.rb
 - doc/FAQ.md
 - doc/SECTION.md
 - doc/STYLE.md
@@ -186,10 +202,13 @@ files:
 - files/resources/images/navigation/button@2x.png
 - lib/motion-prime.rb
 - motion-prime.gemspec
+- motion-prime/api_client.rb
 - motion-prime/app_delegate.rb
 - motion-prime/config/base.rb
 - motion-prime/config/config.rb
-- motion-prime/elements/_text_height_mixin.rb
+- motion-prime/core_ext/kernel.rb
+- motion-prime/elements/_field_dimensions_mixin.rb
+- motion-prime/elements/_text_dimensions_mixin.rb
 - motion-prime/elements/base.rb
 - motion-prime/elements/button.rb
 - motion-prime/elements/draw.rb
@@ -202,9 +221,11 @@ files:
 - motion-prime/elements/map.rb
 - motion-prime/elements/text_field.rb
 - motion-prime/elements/text_view.rb
+- motion-prime/helpers/cell_section.rb
 - motion-prime/helpers/has_authorization.rb
 - motion-prime/helpers/has_normalizer.rb
 - motion-prime/helpers/has_search_bar.rb
+- motion-prime/helpers/has_style_chain_builder.rb
 - motion-prime/models/association.rb
 - motion-prime/models/association_collection.rb
 - motion-prime/models/bag.rb
@@ -217,6 +238,7 @@ files:
 - motion-prime/models/store.rb
 - motion-prime/models/store_extension.rb
 - motion-prime/models/sync.rb
+- motion-prime/mp.rb
 - motion-prime/screens/_aliases_mixin.rb
 - motion-prime/screens/_base_mixin.rb
 - motion-prime/screens/_navigation_bar_mixin.rb
@@ -228,19 +250,20 @@ files:
 - motion-prime/sections/draw.rb
 - motion-prime/sections/form.rb
 - motion-prime/sections/form/base_field_section.rb
+- motion-prime/sections/form/base_header_section.rb
 - motion-prime/sections/form/date_field_section.rb
 - motion-prime/sections/form/password_field_section.rb
 - motion-prime/sections/form/select_field_section.rb
 - motion-prime/sections/form/string_field_section.rb
 - motion-prime/sections/form/submit_field_section.rb
 - motion-prime/sections/form/switch_field_section.rb
-- motion-prime/sections/form/table_field_section.rb
 - motion-prime/sections/form/text_field_section.rb
 - motion-prime/sections/form/text_with_button_field_section.rb
 - motion-prime/sections/tabbed.rb
 - motion-prime/sections/table.rb
 - motion-prime/sections/table/refresh_mixin.rb
 - motion-prime/styles/base.rb
+- motion-prime/styles/form.rb
 - motion-prime/support/_key_value_store.rb
 - motion-prime/support/dm_button.rb
 - motion-prime/support/dm_cell_with_section.rb

data/motion-prime/elements/_text_height_mixin.rb

@@ -1,17 +0,0 @@
-module MotionPrime
-  module ElementTextHeightMixin
-    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
-      computed_options[:text].sizeWithFont(font,
-            constrainedToSize: [width, Float::MAX],
-            lineBreakMode: UILineBreakModeWordWrap).height
-    end
-
-    def content_outer_height
-      content_height + computed_inner_top + computed_inner_bottom
-    end
-  end
-end

data/motion-prime/sections/form/table_field_section.rb

@@ -1,51 +0,0 @@
-motion_require '../table.rb'
-module MotionPrime
-  class TableFieldSection < TableSection
-    attr_accessor :form, :cell_element, :delegate
-    after_render :on_render
-
-    def initialize(options = {})
-      @form = options.delete(:form)
-      @delegate = options.delete(:delegate) || form
-      @container_options = options.delete(:container)
-      super
-    end
-
-    def on_render
-      add_pull_to_refresh do
-        model.sync! do
-          finish_pull_to_refresh
-        end
-      end if @options[:pull_to_refresh] && model.present?
-    end
-
-    def render_table
-      @styles ||= []
-      @styles += [
-        :"#{form.name}_table",
-        :"#{form.name}_#{name}_table"]
-      super
-    end
-
-    def cell
-      cell_element || begin
-        first_element = elements.values.first
-        first_element.view.superview
-      end
-    end
-
-    def on_click(table, index)
-      section = data[index.row]
-      delegate.send("#{name}_selected", section) if delegate.respond_to?("#{name}_selected")
-    end
-
-    def self.delegate_method(method_name)
-      define_method method_name do |*args|
-        delegate.send("#{name}_#{method_name}", *args) if delegate.respond_to?("#{name}_#{method_name}")
-      end
-    end
-
-    delegate_method :table_data
-    delegate_method :container_height
-  end
-end