formotion 1.7 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71061dad41a80a78a4e7b26faa6fb78d284beaee
-  data.tar.gz: 4d6462cfe38e455077bf4736376beb84ef1ba46a
+  metadata.gz: ed8446942f6c85ea538307350689da1cafe64b9c
+  data.tar.gz: 6f9d750dcde96960edfcb415f6c94a1ffdd78efc
 SHA512:
-  metadata.gz: 0217c216bf843420d86d38f2ef6120af5f4057d68328cae4bb28aa65d0628aeb78a8c5af21eeef22fa90a944713fae98f2827b21dc1750dc11400947b83ea4e9
-  data.tar.gz: 116b36b2b66855546e79d7033fcf1473926c8d3085e049c14ff8b803a8e7e737768decb49b29ffff9ebc6144e4ed5510da27afc542f309524deec2e9a185600c
+  metadata.gz: 999f07ab03dbebaf2061b3e45cada0af5150af28f1c71bd16f60ccf95ebbdd0599d359cf12639543745dd4830ab00b1756a56da95badf168b22e045d71123d57
+  data.tar.gz: 21675bd656d0b7a9c832418f7c8c4ba7a7b52e4312d70ff7b24a1e4b3e7a92c6876b75ebd6c4e64dab0fd6e45802405929b5a0446b64e80cf4060d515b5ab36d

data/.travis.yml

@@ -1,3 +1,10 @@
 language: objective-c
 install: bundle install
+before_install:
+    - (ruby --version)
+    - sudo chown -R travis ~/Library/RubyMotion
+    - mkdir -p ~/Library/RubyMotion/build
+    - sudo motion update
+    - bundle install
+    - bundle exec rake pod:install
 script: bundle exec rake spec:units

data/Formotion.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.license = 'MIT'
 
-  s.add_dependency "bubble-wrap", "~> 1.4.0"
-  s.add_dependency "motion-require", "~> 0.0.3"
+  s.add_dependency "bubble-wrap", ">= 1.4.0"
+  s.add_dependency "motion-require", ">= 0.1.0"
   s.add_development_dependency 'rake'
-end
+end

data/LIST_OF_ROW_TYPES.md

@@ -7,6 +7,7 @@
 [Currency](#currency)<br/>
 [Date](#date)<br/>
 [Object](#object)<br/>
+[Activity](#activity)<br/>
 
 **Other**<br/>
 [Static](#static)<br/>
@@ -236,7 +237,28 @@ the default is the Apple default of 1.
 Same as StringRow with the difference that it would not change the row.value to string.
 The object needs a to_s method.
 
+### <a name="activity"></a> Activity row
 
+```ruby
+{
+  title: "Share something",
+  type: :activity,
+  value: "Something I want to share."
+}
+```
+
+Creates a `UIActivityViewController` for you with the contents of `:value`. You can also pass a Hash to value:
+
+```ruby
+{
+  title: "Share something",
+  type: :activity,
+  value: {
+    items: "Something I want to share.", # Can be a String, NSURL, or UIImage or Array of those types
+    excluded: [] # Types of activities to exclude. See the UIActivity class docs for a list of activity types.
+  }
+}
+```
 
 ## Other
 

data/lib/formotion/patch/ui_text_field.rb

@@ -115,7 +115,7 @@ class UITextField_Delegate
       return self.textFieldShouldEndEditing_callback.call(theTextField)
     end
 
-    if Device.ios_version >= "7.0"
+    if BW::Device.ios_version >= "7.0"
       theTextField.text = theTextField.text.gsub("\u00a0", " ").strip
     end
 
@@ -134,7 +134,7 @@ class UITextField_Delegate
     end
 
     # fix for UITextField in iOS7 http://stackoverflow.com/questions/19569688/uitextfield-spacebar-does-not-advance-cursor-in-ios-7/20129483#20129483
-    if Device.ios_version >= "7.0"
+    if BW::Device.ios_version >= "7.0"
       if range.location == theTextField.text.length && string == " "
         theTextField.text = theTextField.text.stringByAppendingString("\u00a0")
         return false

data/lib/formotion/row/row.rb

@@ -102,6 +102,9 @@ module Formotion
       # OPTIONS: :done (a black translucent toolbar with a right-aligned "Done" button)
       # DEFAULT is nil
       :input_accessory,
+      # Call a method when the input accessory is tapped.
+      # Default is nil
+      :done_action,
       # Cell selection style
       # OPTIONS: :blue, :gray, :none
       # DEFAULT is :blue

data/lib/formotion/row_type/activity_view_row.rb

@@ -0,0 +1,34 @@
+motion_require 'object_row'
+
+module Formotion
+  module RowType
+    class ActivityRow < ObjectRow
+
+      def after_build(cell)
+        super
+
+        cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator
+        self.row.text_field.hidden = true
+
+        row.value = {items:[row.value]} unless row.value.is_a?(Hash)
+        row.value = {
+          excluded: [],
+          animated: true,
+          app_activities: nil,
+          completion: nil
+        }.merge(row.value)
+        row.value[:items] = [row.value[:items]] unless row.value[:items].is_a?(Array)
+
+      end
+
+      def on_select(tableView, tableViewDelegate)
+        activity_vc = UIActivityViewController.alloc.initWithActivityItems(row.value[:items], applicationActivities:row.value[:app_activities])
+        activity_vc.modalTransitionStyle = UIModalTransitionStyleCoverVertical
+        activity_vc.excludedActivityTypes = row.value[:excluded]
+
+        row.form.controller.presentViewController(activity_vc, animated:row.value[:animated], completion:row.value[:completion])
+      end
+
+    end
+  end
+end

data/lib/formotion/row_type/base.rb

@@ -4,7 +4,7 @@ module Formotion
       attr_accessor :row, :tableView
 
       def self.field_buffer
-        if Device.iphone? or App.window.size.width <= 320
+        if BW::Device.iphone? or App.window.size.width <= 320 or BW::Device.ios_version >= "7.0"
           20
         else
           64
@@ -111,6 +111,41 @@ module Formotion
         block.call
         @semaphore = false
       end
+
+      # Creates the inputAccessoryView to show
+      # if input_accessory property is set on row.
+      # :done is currently the only supported option.
+      def input_accessory_view(input_accessory)
+        case input_accessory
+        when :done
+          @input_accessory ||= begin
+            tool_bar = UIToolbar.alloc.initWithFrame([[0, 0], [0, 44]])
+            tool_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
+            tool_bar.translucent = true
+
+            left_space = UIBarButtonItem.alloc.initWithBarButtonSystemItem(
+                UIBarButtonSystemItemFlexibleSpace,
+                target: nil,
+                action: nil)
+
+            done_button = UIBarButtonItem.alloc.initWithBarButtonSystemItem(
+                UIBarButtonSystemItemDone,
+                target: self,
+                action: :done_editing)
+
+            tool_bar.items = [left_space, done_button]
+
+            tool_bar
+          end
+        else
+          nil
+        end
+      end
+
+      def done_editing
+        NSLog "Please implement the done_editing method in your new cell type."
+      end
+
     end
   end
 end

data/lib/formotion/row_type/date_row.rb

@@ -43,7 +43,7 @@ module Formotion
         # work around an iOS7 bug: http://bit.ly/KcwKSv
         if row.picker_mode == :countdown
           self.picker.setDate(self.picker.date, animated:true)
-          picker.countDownDuration = self.row.value
+          picker.countDownDuration = self.row.value.to_f
         end
 
         update

data/lib/formotion/row_type/map_row.rb

@@ -120,6 +120,8 @@ module Formotion
             formotion_field.frame = field_frame
           end
         end
+
+        nil
       end
 
       def on_select(tableView, tableViewDelegate)

data/lib/formotion/row_type/number_row.rb

@@ -5,7 +5,7 @@ module Formotion
     class NumberRow < StringRow
 
       def keyboardType
-        if Device.ipad?
+        if BW::Device.ipad?
           return UIKeyboardTypeNumberPad
         end
         UIKeyboardTypeDecimalPad
@@ -13,4 +13,4 @@ module Formotion
 
     end
   end
-end
+end

data/lib/formotion/row_type/picker_row.rb

@@ -8,38 +8,6 @@ module Formotion
       include RowType::ItemsMapper
       include RowType::MultiChoiceRow
 
-      def input_accessory_view(input_accessory)
-        case input_accessory
-        when :done
-          @input_accessory ||= begin
-            tool_bar = UIToolbar.alloc.initWithFrame([[0, 0], [0, 44]])
-            tool_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
-            tool_bar.translucent = true
-
-            left_space = UIBarButtonItem.alloc.initWithBarButtonSystemItem(
-                UIBarButtonSystemItemFlexibleSpace,
-                target: nil,
-                action: nil)
-
-            done_button = UIBarButtonItem.alloc.initWithBarButtonSystemItem(
-                UIBarButtonSystemItemDone,
-                target: self,
-                action: :done_editing)
-
-            tool_bar.items = [left_space, done_button]
-
-            tool_bar
-          end
-        else
-          nil
-        end
-      end
-
-      # Callback for "Done" button in input_accessory_view
-      def done_editing
-        self.row.text_field.endEditing(true)
-      end
-
       def after_build(cell)
         self.row.text_field.inputView = self.picker
         self.row.text_field.text = name_for_value(row.value).to_s
@@ -102,4 +70,4 @@ module Formotion
       end
     end
   end
-end
+end

data/lib/formotion/row_type/string_row.rb

@@ -147,39 +147,9 @@ module Formotion
         self.row.text_field.text = row_value
       end
 
-      # Creates the inputAccessoryView to show
-      # if input_accessory property is set on row.
-      # :done is currently the only supported option.
-      def input_accessory_view(input_accessory)
-        case input_accessory
-        when :done
-          @input_accessory ||= begin
-            tool_bar = UIToolbar.alloc.initWithFrame([[0, 0], [0, 44]])
-            tool_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
-            tool_bar.translucent = true
-
-            left_space = UIBarButtonItem.alloc.initWithBarButtonSystemItem(
-                UIBarButtonSystemItemFlexibleSpace,
-                target: nil,
-                action: nil)
-
-            done_button = UIBarButtonItem.alloc.initWithBarButtonSystemItem(
-                UIBarButtonSystemItemDone,
-                target: self,
-                action: :done_editing)
-
-            tool_bar.items = [left_space, done_button]
-
-            tool_bar
-          end
-        else
-          nil
-        end
-      end
-
-      # Callback for "Done" button in input_accessory_view
       def done_editing
         self.row.text_field.endEditing(true)
+        self.row.done_action.call unless self.row.done_action.nil?
       end
 
     end

data/lib/formotion/row_type/subform_row.rb

@@ -33,8 +33,12 @@ module Formotion
 
       def update_cell(cell)
         subform = row.subform.to_form
-        if row.display_key and subform.render[row.display_key]
-          self.display_key_label.text = subform.render[row.display_key]
+        if row.display_key && render_row = subform.row(row.display_key)
+          rendered_value = render_row.value_for_save_hash
+          if render_row.object && render_row.object.respond_to?('row_value')
+            rendered_value = render_row.object.row_value
+          end
+          self.display_key_label.text = rendered_value
         end
       end
 

data/lib/formotion/row_type/text_row.rb

@@ -22,6 +22,7 @@ module Formotion
         field.returnKeyType = row.return_key || UIReturnKeyDefault
         field.autocapitalizationType = row.auto_capitalization if row.auto_capitalization
         field.autocorrectionType = row.auto_correction if row.auto_correction
+        field.inputAccessoryView = input_accessory_view(row.input_accessory) if row.input_accessory
 
         # must be set prior to placeholder!
         field.font = BW::Font.new(row.font) if row.font
@@ -89,6 +90,11 @@ module Formotion
         field.resignFirstResponder
       end
 
+      def done_editing
+        dismissKeyboard
+        self.row.done_action.call unless self.row.done_action.nil?
+      end
+
     end
   end
 end

data/lib/formotion/row_type/web_link_row.rb

@@ -1,3 +1,5 @@
+motion_require 'object_row'
+
 module Formotion
   module RowType
     class WebLinkRow < ObjectRow

data/lib/formotion/version.rb

@@ -1,3 +1,3 @@
 module Formotion
-  VERSION = "1.7"
+  VERSION = "1.8"
 end

data/spec/functional/activity_vew_row_spec.rb

@@ -0,0 +1,147 @@
+describe "FormController/ActivityRow" do
+  tests Formotion::FormController
+
+  # By default, `tests` uses @controller.init
+  # this isn't ideal for our case, so override.
+  def controller
+    row_settings = {
+      title: "Activity View",
+      key: :activity,
+      type: :activity,
+      value: "Share the joys of Rubymotion! http://www.rubymotion.com"
+    }
+    @form ||= Formotion::Form.new(
+      sections: [{
+        rows:[row_settings]
+    }])
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+  end
+
+  def activity_row
+    @form.row(:activity)
+  end
+
+  it "should initialize with correct settings" do
+    activity_row.object.class.should == Formotion::RowType::ActivityRow
+  end
+
+  it "should initialize with defaults" do
+    activity_row.value[:excluded].should == []
+    activity_row.value[:animated].should == true
+    activity_row.value[:app_activities].should == nil
+    activity_row.value[:completion].should == nil
+  end
+
+  it "should have an array as the items" do
+    activity_row.value[:items].is_a?(Array).should == true
+  end
+end
+
+describe "FormController/ActivityRow Hash" do
+  tests Formotion::FormController
+
+  # By default, `tests` uses @controller.init
+  # this isn't ideal for our case, so override.
+  def controller
+    row_settings = {
+      title: "Activity View",
+      key: :activity,
+      type: :activity,
+      value: {
+        items: "Share the joys of Rubymotion! http://www.rubymotion.com"
+      }
+    }
+    @form ||= Formotion::Form.new(
+      sections: [{
+        rows:[row_settings]
+    }])
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+  end
+
+  def activity_row
+    @form.row(:activity)
+  end
+
+  it "should turn the items string into an array" do
+    activity_row.value[:items].is_a?(Array).should == true
+  end
+end
+
+describe "FormController/ActivityRow Exclusions" do
+  tests Formotion::FormController
+
+  # By default, `tests` uses @controller.init
+  # this isn't ideal for our case, so override.
+  def controller
+    row_settings = {
+      title: "Activity View",
+      key: :activity,
+      type: :activity,
+      value: {
+        items: "Share the joys of Rubymotion! http://www.rubymotion.com",
+        excluded: [
+          UIActivityTypeAddToReadingList,
+          UIActivityTypeAirDrop,
+          UIActivityTypeCopyToPasteboard,
+          UIActivityTypePrint
+        ]
+      }
+    }
+    @form ||= Formotion::Form.new(
+      sections: [{
+        rows:[row_settings]
+    }])
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+  end
+
+  def activity_row
+    @form.row(:activity)
+  end
+
+  it "should exclude certain activity types" do
+    activity_row.value[:excluded].is_a?(Array).should == true
+    activity_row.value[:excluded].count.should == 4
+    activity_row.value[:excluded][0].should == UIActivityTypeAddToReadingList
+  end
+end
+
+describe "FormController/ActivityRow MultipleItems" do
+  tests Formotion::FormController
+
+  # By default, `tests` uses @controller.init
+  # this isn't ideal for our case, so override.
+  def controller
+    row_settings = {
+      title: "Activity View",
+      key: :activity,
+      type: :activity,
+      value: {
+        items: ["Share the joys of Rubymotion! http://www.rubymotion.com", UIImage.imageNamed("tags_row-selected")],
+        excluded: [
+          UIActivityTypeAddToReadingList,
+          UIActivityTypeAirDrop,
+          UIActivityTypeCopyToPasteboard,
+          UIActivityTypePrint
+        ]
+      }
+    }
+    @form ||= Formotion::Form.new(
+      sections: [{
+        rows:[row_settings]
+    }])
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+  end
+
+  def activity_row
+    @form.row(:activity)
+  end
+
+  it "should allow sharing images" do
+    activity_row.value[:items].first.is_a?(String).should == true
+    activity_row.value[:items].last.is_a?(UIImage).should == true
+  end
+end

data/spec/helpers/row_test_helpers.rb

@@ -14,7 +14,12 @@ module Bacon
     def tests_row(row_settings, &block)
       if row_settings.is_a? Symbol
         type = row_settings
-        row_settings = { type: type, key: type, title: type.capitalize.to_s }
+        row_settings = {
+          type: type,
+          key: type,
+          title: type.capitalize.to_s,
+          input_accessory: :done
+        }
       end
       before do
         @row = Formotion::Row.new(row_settings)
@@ -23,4 +28,4 @@ module Bacon
       end
     end
   end
-end
+end

data/spec/row_type/currency_spec.rb

@@ -36,7 +36,8 @@ describe "Number Row" do
     cell = @row.make_cell
     set_formatter_locale("it_IT")
     @row.value = 3004.35
-    @row.text_field.text.should == "€ 3.004,35"
+    @row.text_field.text.should.start_with?("€")
+    @row.text_field.text.should.end_with?("3.004,35")
   end
 
   it "should work with different locale and setting text_field#text" do

data/spec/row_type/date_spec.rb

@@ -15,7 +15,7 @@ describe "Date Row" do
   it "should have no value by default" do
     cell = @row.make_cell
 
-    @row.text_field.text.should == nil
+    @row.text_field.text.to_s.should == ""
   end
 
   it "should use custom value" do
@@ -35,7 +35,7 @@ describe "Date Row" do
     cell = @row.make_cell
 
     @row.object.picker.date = Time.at MILLENIUM
-    @row.object.picker.trigger UIControlEventValueChanged
+    @row.object.picker.sendActionsForControlEvents UIControlEventValueChanged
 
     @row.value.should == MILLENIUM
     @row.text_field.text.should == '1/1/00'
@@ -73,7 +73,7 @@ describe "Date Row" do
       @row.picker_mode = mode
       cell = @row.make_cell
       @row.object.picker.date = Time.at MILLENIUM
-      @row.object.picker.trigger UIControlEventValueChanged
+      @row.object.picker.sendActionsForControlEvents UIControlEventValueChanged
 
       @row.text_field.text.should == expected_output
     end

data/spec/row_type/string_spec.rb

@@ -61,6 +61,15 @@ describe "String Row Type" do
     @row.text_field.keyboardType.should == UIKeyboardTypeDefault
   end
 
+  # Input Accessory
+  it "should have an input accessory" do
+    cell = @row.make_cell
+    @row.text_field.inputAccessoryView.should != nil
+  end
+
+  it "should call the done_action when hitting the 'done' button" do
+  end
+
   describe "on_select" do
 
     it "should call _on_select" do

data/spec/row_type/text_spec.rb

@@ -45,4 +45,13 @@ describe "Text Row" do
     @row.text_field.placeholder.should == 'placeholder'
   end
 
-end
+  # Input Accessory
+  it "should have an input accessory" do
+    cell = @row.make_cell
+    @row.text_field.inputAccessoryView.should != nil
+  end
+
+  it "should call the done_action when hitting the 'done' button" do
+  end
+
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: formotion
 version: !ruby/object:Gem::Version
-  version: '1.7'
+  version: '1.8'
 platform: ruby
 authors:
 - Clay Allsopp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: motion-require
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +138,7 @@ files:
 - lib/formotion/patch/ui_text_view_placeholder.rb
 - lib/formotion/row/row.rb
 - lib/formotion/row/row_cell_builder.rb
+- lib/formotion/row_type/activity_view_row.rb
 - lib/formotion/row_type/back_row.rb
 - lib/formotion/row_type/base.rb
 - lib/formotion/row_type/button.rb
@@ -181,6 +182,7 @@ files:
 - spec/formable/kvo_spec.rb
 - spec/formable/subclass_spec.rb
 - spec/formable_spec.rb
+- spec/functional/activity_vew_row_spec.rb
 - spec/functional/character_spec.rb
 - spec/functional/check_row_spec.rb
 - spec/functional/date_row_spec.rb
@@ -252,6 +254,7 @@ test_files:
 - spec/formable/kvo_spec.rb
 - spec/formable/subclass_spec.rb
 - spec/formable_spec.rb
+- spec/functional/activity_vew_row_spec.rb
 - spec/functional/character_spec.rb
 - spec/functional/check_row_spec.rb
 - spec/functional/date_row_spec.rb