formotion 1.6 → 1.7

data/lib/formotion/version.rb

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

data/spec/functional/map_row_spec.rb

@@ -21,8 +21,8 @@ describe "FormController/MapRow" do
   def map_row
     @form.row(:map)
   end
-  
-  it "should only one pin" do
+
+  it "should have only one pin" do
     map_row.object.annotations.size.should == 1
   end
 
@@ -31,7 +31,7 @@ describe "FormController/MapRow" do
     coord.latitude.should == 47.5
     coord.longitude.should == 8.5
   end
-  
+
   it "should set a new pin with new position" do
     map_row.value = CLLocationCoordinate2D.new(48.5, 9.5)
     wait 1 do
@@ -42,4 +42,151 @@ describe "FormController/MapRow" do
     end
   end
 
-end
+  it "should have the default map type" do
+    wait 1 do
+      map_row.object.map.mapType.should == MKMapTypeStandard
+    end
+  end
+
+  it "should allow map interaction" do
+    wait 1 do
+      map_row.object.map.isUserInteractionEnabled.should == true
+    end
+  end
+
+end
+
+describe "FormController/MapRow MapType" do
+  tests Formotion::FormController
+
+  # By default, `tests` uses @controller.init
+  # this isn't ideal for our case, so override.
+  def controller
+    row_settings = {
+      title: "Map",
+      key: :map,
+      type: :map,
+      value: {
+        coord: CLLocationCoordinate2D.new(48.5, 9.5),
+        type: MKMapTypeHybrid,
+        enabled: false
+      }
+    }
+    @form ||= Formotion::Form.new(
+      sections: [{
+        rows:[row_settings]
+    }])
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+  end
+
+  def map_row
+    @form.row(:map)
+  end
+
+  it "should have the hybrid map type" do
+    wait 1 do
+      map_row.object.map.mapType.should == MKMapTypeHybrid
+    end
+  end
+
+  it "should not allow map interaction" do
+    wait 1 do
+      map_row.object.map.isUserInteractionEnabled.should == false
+    end
+  end
+
+end
+
+describe "FormController/MapRow Pin" do
+  tests Formotion::FormController
+
+  # By default, `tests` uses @controller.init
+  # this isn't ideal for our case, so override.
+  def controller
+    row_settings = {
+      title: "Map",
+      key: :map,
+      type: :map,
+      value: {
+        coord: CLLocationCoordinate2D.new(48.5, 9.5),
+        pin: {
+          coord: CLLocationCoordinate2D.new(48.4, 9.4),
+          title: "Formotion",
+          subtitle: "Is Awesome"
+        }
+      }
+    }
+    @form ||= Formotion::Form.new(
+      sections: [{
+        rows:[row_settings]
+    }])
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+  end
+
+  def map_row
+    @form.row(:map)
+  end
+
+  it "should have only one pin" do
+    map_row.object.annotations.size.should == 1
+  end
+
+  it "should be a pin at the predefined position" do
+    coord = map_row.object.annotations[0].coordinate
+    coord.latitude.should.be.close 48.4, 0.2
+    coord.longitude.should.be.close 9.4, 0.2
+  end
+
+  it "should be different than the map center" do
+    pin_coord = map_row.object.annotations[0].coordinate
+    map_center = map_row.object.map.centerCoordinate
+
+    pin_coord.should.not.be.same_as map_center
+  end
+
+  it "should have a title" do
+    pin = map_row.object.annotations[0]
+    pin.title.should == "Formotion"
+  end
+
+  it "should have a subtitle" do
+    pin = map_row.object.annotations[0]
+    pin.subtitle.should == "Is Awesome"
+  end
+
+end
+
+describe "FormController/MapRow No Pin" do
+  tests Formotion::FormController
+
+  # By default, `tests` uses @controller.init
+  # this isn't ideal for our case, so override.
+  def controller
+    row_settings = {
+      title: "Map",
+      key: :map,
+      type: :map,
+      value: {
+        coord: CLLocationCoordinate2D.new(48.5, 9.5),
+        pin: nil
+      }
+    }
+    @form ||= Formotion::Form.new(
+      sections: [{
+        rows:[row_settings]
+    }])
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+  end
+
+  def map_row
+    @form.row(:map)
+  end
+
+  it "should have zero pins" do
+    map_row.object.annotations.size.should == 0
+  end
+
+end

data/spec/functional/web_link_row_spec.rb

@@ -0,0 +1,35 @@
+describe "FormController/WebLinkRow" do
+  tests Formotion::FormController
+
+  # By default, `tests` uses @controller.init
+  # this isn't ideal for our case, so override.
+  def controller
+    row_settings = {
+      title: "WebLink",
+      key: :web_link,
+      type: :web_link,
+      value: "http://www.rubymotion.com"
+    }
+    @form ||= Formotion::Form.new(
+      sections: [{
+        rows:[row_settings]
+    }])
+
+    @controller ||= Formotion::FormController.alloc.initWithForm(@form)
+  end
+
+  def weblink_row
+    @form.row(:web_link)
+  end
+
+  it "should accept a string" do
+    weblink_row.value.should == "http://www.rubymotion.com"
+  end
+
+  it "should accept a NSURL" do
+    weblink_row.value = NSURL.URLWithString("http://www.rubymotion.com")
+    weblink_row.value.is_a?(NSURL).should == true
+    weblink_row.value.absoluteString.should == "http://www.rubymotion.com"
+  end
+
+end

data/spec/row_spec.rb

@@ -1,4 +1,29 @@
 describe "Rows" do
+
+  before do
+    @image_name = "tags_row"
+    @image = UIImage.imageNamed(@image_name)
+    @remote_image_url = "http://placekitten.com/80/80?t=#{Time.now.to_i}"
+    @remote_placeholder_image_name = 'camera'
+    @remote_placeholder_image = UIImage.imageNamed(@remote_placeholder_image_name)
+
+    string_hash = {title: "TITLE", subtitle: "SUBTITLE", image: @image_name, type: :object, section: Formotion::Section.new({index: 0})}
+    @string_image_row = Formotion::Row.new(string_hash)
+    @string_image_row.index = 0
+
+    image_hash = string_hash.merge({image: @image})
+    @image_row = Formotion::Row.new(image_hash)
+    @image_row.index = 0
+
+    remote_image_hash = image_hash.merge({image: @remote_image_url})
+    @remote_image_row = Formotion::Row.new(remote_image_hash)
+    @remote_image_row.index = 0
+
+    remote_placeholder_image_hash = remote_image_hash.merge({image_placeholder: @remote_placeholder_image})
+    @remote_placeholder_image_row = Formotion::Row.new(remote_placeholder_image_hash)
+    @remote_placeholder_image_row.index = 0
+  end
+
   it "method_missing should work" do
     r = Formotion::Row.new
     r.title = "LABEL"
@@ -13,6 +38,89 @@ describe "Rows" do
     r = Formotion::Row.new(hash)
     r.title.should == "TITLE"
     r.subtitle.should == "SUBTITLE"
+    r.image.should == nil
+  end
+
+  it "should set an image on the cell with a String" do
+    @string_image_row.image.should == @image_name
+
+    cell = @string_image_row.make_cell
+    cell.imageView.image.should.not == nil
+  end
+
+  it "should set an image on the cell with a UIImage" do
+    @image_row.image.should == @image
+
+    cell = @image_row.make_cell
+    cell.imageView.image.should == @image
+  end
+
+  it "should change the image after cell creation" do
+    @image_row.image.should == @image
+
+    cell = @image_row.make_cell
+    cell.imageView.image.should == @image
+
+    new_image = UIImage.imageNamed("camera")
+    @image_row.image = new_image
+
+    cell.imageView.image.should.not == @image
+    cell.imageView.image.should == new_image
+  end
+
+  it "should set an image on the cell using a remote URL" do
+
+    @remote_image_row.image.should == @remote_image_url
+
+    cell = @remote_image_row.make_cell
+
+    wait 1 do
+      cell.imageView.image.should != nil
+      cell.imageView.image.is_a?(UIImage).should == true
+    end
+
+  end
+
+  it "should set a remote image with a placeholder" do
+    @remote_placeholder_image_row.image.should == @remote_image_url
+    @remote_placeholder_image_row.image_placeholder.should == @remote_placeholder_image
+
+    cell = @remote_placeholder_image_row.make_cell
+
+    wait 1 do
+      cell.imageView.image.size.should != @remote_placeholder_image.size
+    end
+  end
+
+  it "should set a remote image after another image has already been set" do
+    cell = @remote_placeholder_image_row.make_cell
+
+    wait 1 do
+      img = cell.imageView.image
+      cell.imageView.image.size.should != @remote_placeholder_image.size
+
+      @remote_placeholder_image_row.image = "http://placekitten.com/80/80?t=#{Time.now.to_i}"
+      wait 1 do
+        cell.imageView.image.should != img
+      end
+    end
+
+  end
+
+  it "should set a local image after a remote image has already been set" do
+    cell = @remote_placeholder_image_row.make_cell
+
+    wait 1 do
+      img = cell.imageView.image
+      cell.imageView.image.size.should != @remote_placeholder_image.size
+
+      new_image = UIImage.imageNamed("camera")
+      @remote_placeholder_image_row.image = new_image
+
+      cell.imageView.image.should.not == img
+      cell.imageView.image.should == new_image
+    end
+
   end
 
   it "the question mark methods should work" do
@@ -31,4 +139,4 @@ describe "Rows" do
     r.items = lambda { [1, 2, 3].reverse }
     r.items.should == [3, 2, 1]
   end
-end
+end

data/spec/row_type/web_link_spec.rb

@@ -0,0 +1,23 @@
+describe "Web Link Row" do
+  tests_row :web_link
+
+  before do
+    @link_url = "http://www.rubymotion.com"
+  end
+
+  it "should initialize with correct settings" do
+    @row.object.class.should == Formotion::RowType::WebLinkRow
+  end
+
+  it "should have a cell indicator" do
+    cell = @row.make_cell
+    cell.accessoryType.should == UITableViewCellAccessoryDisclosureIndicator
+  end
+
+  it "should accept a string value" do
+    @row.value = @link_url
+    cell = @row.make_cell
+    @row.value.is_a?(String).should == true
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formotion
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.7'
 platform: ruby
 authors:
 - Clay Allsopp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bubble-wrap
@@ -82,6 +82,10 @@ files:
 - examples/KitchenSink/README.md
 - examples/KitchenSink/Rakefile
 - examples/KitchenSink/app/app_delegate.rb
+- examples/KitchenSink/resources/arrow-up.png
+- examples/KitchenSink/resources/arrow-up@2x.png
+- examples/KitchenSink/resources/email.png
+- examples/KitchenSink/resources/email@2x.png
 - examples/KitchenSink/spec/main_spec.rb
 - examples/Login/.gitignore
 - examples/Login/Rakefile
@@ -162,9 +166,12 @@ files:
 - lib/formotion/row_type/tags_row.rb
 - lib/formotion/row_type/template_row.rb
 - lib/formotion/row_type/text_row.rb
+- lib/formotion/row_type/web_link_row.rb
 - lib/formotion/row_type/web_view_row.rb
 - lib/formotion/section/section.rb
 - lib/formotion/version.rb
+- resources/camera.png
+- resources/camera@2x.png
 - resources/tags_row-selected.png
 - resources/tags_row-selected@2x.png
 - resources/tags_row.png
@@ -189,6 +196,7 @@ files:
 - spec/functional/template_row_ext_spec.rb
 - spec/functional/template_row_spec.rb
 - spec/functional/text_row_spec.rb
+- spec/functional/web_link_row_spec.rb
 - spec/functional/web_view_row_spec.rb
 - spec/helpers/row_test_helpers.rb
 - spec/row_spec.rb
@@ -211,6 +219,7 @@ files:
 - spec/row_type/switch_spec.rb
 - spec/row_type/template_spec.rb
 - spec/row_type/text_spec.rb
+- spec/row_type/web_link_spec.rb
 - spec/section_spec.rb
 - spec/support/ui_control_wrap_extension.rb
 homepage: https://github.com/clayallsopp/Formotion
@@ -258,6 +267,7 @@ test_files:
 - spec/functional/template_row_ext_spec.rb
 - spec/functional/template_row_spec.rb
 - spec/functional/text_row_spec.rb
+- spec/functional/web_link_row_spec.rb
 - spec/functional/web_view_row_spec.rb
 - spec/helpers/row_test_helpers.rb
 - spec/row_spec.rb
@@ -280,5 +290,6 @@ test_files:
 - spec/row_type/switch_spec.rb
 - spec/row_type/template_spec.rb
 - spec/row_type/text_spec.rb
+- spec/row_type/web_link_spec.rb
 - spec/section_spec.rb
 - spec/support/ui_control_wrap_extension.rb