ProMotion-form 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a5e782943d995a200866bab9067db1a937cbb69
-  data.tar.gz: b9a0527f77ced2d3eb4a0072e27b5d83016c23fc
+  metadata.gz: d903204fe76ee994fc1344fef6cb072158f3b27d
+  data.tar.gz: a666e3693a1d65b4f0c29dbcc5a6fc68902895f4
 SHA512:
-  metadata.gz: 9bf7baa4f40e171f977a97e7d65db23599ae94178ec8dfe939679d48f888de578d325200fefee00d46804ad66d56ccc8f8263582aacce1178b3db37b24a6d034
-  data.tar.gz: 07ceb43547db03ba16c15231c404546de764458d7f687ee8fd5fa47145bd215ac9a9743a842917e48b322e71558d23a6b943f0290ddebbfd6d80512a13d46d2a
+  metadata.gz: b697146f4529a0c759c32c786bf870dfed63b3a5eaac6be25ebc929d8df5d39e8b2565dba2614a70c8b9460384ef72606d60b00de273ae22e3cda275e664ab0c
+  data.tar.gz: 7c7e0724be01b84ff8b3a6407c86d96c19bbb06150b41712bbb3165a0eb771292c2627771a6053292b32742c794b8db3b36d69e8b1aa3722c9bb6e3fc897a74f

data/README.md

@@ -160,6 +160,7 @@ Here are sample form fields with some explanation
   class: NSArray, # explicitly set the class of the field value
   template: { type: :image }, # set the field types of a collection (`class` must be NSArray or NSOrderedSet)
   sortable: true, # make the field sortable (`class` must be NSArray or NSOrderedSet)
+  image: 'thumbnail', # the name of the image to display on the left side of the cell. You can also pass an instance of an image: UIImage.imageNamed('thumbnail')
 }
 ```
 
@@ -191,16 +192,41 @@ Here are sample form fields with some explanation
 * `:properties` - a flexible way to set cell properties (see Styling section below)
 *  string keys - you can also define styling parameters as top-level strings
 
+##### Common Properties:
+
+The properties hash provides access to all [`UITableViewCell`](https://developer.apple.com/library/prerelease/ios/documentation/UIKit/Reference/UITableViewCell_Class/index.html) properties. Here are some examples of common properties:
+
+* `textLabel` - The `UILabel` used for displaying the `:title` text.
+* `detailTextLabel` - The `UILabel` used for displaying the `:value` text.
+* `imageView` - The `UIImageView` that is displayed on the left side of the cell. ProMotion-form provides the `image:` helper on the cell hash for specifying this image.
+
+* `contentView` - The default superview for content displayed by the cell.
+* `backgroundColor` - The background color of the cell.
+* `backgroundView` - The background view of the cell. The default is nil.
+
+* `accessoryType` - The icon that appears on the right side of the cell. You may specify one of the following constants:
+  * `UITableViewCellAccessoryNone` (default)
+  * `UITableViewCellAccessoryDisclosureIndicator`
+  * `UITableViewCellAccessoryDetailDisclosureButton`
+  * `UITableViewCellAccessoryCheckmark`
+  * `UITableViewCellAccessoryDetailButton`
+* `accessoryView` - An instance of your own custom accessory view.
+
+* `selectionStyle` - The background view that applies when the cell is tapped (selected). You may specify one of the following constants:
+  * `UITableViewCellSelectionStyleNone`
+  * `UITableViewCellSelectionStyleBlue`
+  * `UITableViewCellSelectionStyleGray`
+  * `UITableViewCellSelectionStyleDefault` (default)
+
 ## Styling
 
 #### Method 1: Put them into a hash
 
 ```
-  properties: {
-    "accessoryView"        => CustomAccessory.new,
-    "backgroundColor"      => UIColor.colorWhite,
-    "detailTextLabel.font" => UIFont.fontWithName("MyFont", size:20),
-  },
+properties: {
+  "accessoryView"        => CustomAccessory.new,
+  "backgroundColor"      => UIColor.colorWhite,
+  "detailTextLabel.font" => UIFont.fontWithName("MyFont", size:20),
 }
 ```
 
@@ -246,10 +272,64 @@ end
 #### Method 4: Combine styles, with overrides (using '+')
 
 ```
-  properties: style(:basic, :alert) + {
-    "backgroundColor" => UIColor.yellowColor,
-  },
+properties: style(:basic, :alert) + {
+  "backgroundColor" => UIColor.yellowColor,
+}
+```
+
+Note that you can use symbols for keys instead of strings:
+
+```
+properties: {
+  backgroundColor: UIColor.colorWhite,
+  textLabel: {
+    font: UIFont.fontWithName("MyFont", size:20)
+  }
+}
+```
+
+However, if you are combining styles, you may want to specify they keys as strings so that the rest of your styles are not overwritten:
+
+```
+{
+  properties: style(:basic, :bold),
 }
+
+# ...
+
+def styles
+  {
+    basic: {
+      textLabel: {
+        color: UIColor.redColor
+        font: UIFont.fontWithName("MyFont", size:20)
+      }
+    },
+    bold: {
+      # This textLabel hash would overwrite the previous hash, so the red color would not be applied
+      textLabel: {
+        font: UIFont.fontWithName("MyBoldFont", size:20)
+      }
+    }
+  }
+end
+```
+
+Example of using strings with dot notation for combining styles:
+
+```
+def styles
+  {
+    basic: {
+      'textLabel.color' => UIColor.redColor
+      'textLabel.font'  => UIFont.fontWithName("MyFont", size:20)
+    },
+    bold: {
+      # This textLabel would include the red color because we only chose to overwrite the font property
+      'textLabel.font'  => UIFont.fontWithName("MyBoldFont", size:20)
+    }
+  }
+end
 ```
 
 #### update_form_data
@@ -285,8 +365,11 @@ This is a Struct with a `#fields` method (which is used to build the form in FXF
 ## Contributing
 
 1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Make some specs pass
-5. Push to the branch (`git push origin my-new-feature`)
-6. Create new Pull Request
+2. Install the gem dependencies: `bundle install`
+3. Install the CocoaPod dependencies: `bundle exec rake pod:install`
+4. Create your feature branch (`git checkout -b my-new-feature`)
+5. Run the test suite: `bundle exec rake spec`
+6. Make your changes. Add some specs.
+7. Commit your changes (`git commit -am 'Add some feature'`)
+8. Push to the branch (`git push -u origin my-new-feature`)
+9. Create new Pull Request

data/lib/ProMotion/form/form.rb

@@ -63,10 +63,13 @@ module ProMotion
       data.update(FormStyle.to_style(input[:style     ])) if input[:style     ]
 
       # pass non-helper keys to FXForms
-      helpers = [ :cell_class, :name, :style, :properties ]
+      helpers = [ :cell_class, :name, :style, :properties, :label ]
       (input.keys - helpers).each {|key| data[key] = input[key] }
 
       # process "after" helper keys
+      if input[:title].nil? or input[:title].empty? # FXForms crashes on empty strings
+        input[:title] = ' '
+      end
       data[:key  ] ||= input[:name ] || input[:title].downcase.gsub(/[^0-9a-z]/i, '_').to_sym
       data[:title] ||= input[:label] || input[:name ].to_s
       data[:cell ] ||= input[:cell_class] if input[:cell_class]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-form
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jamon Holmgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Adds PM::FormScreen support to ProMotion, similar to Formotion but lighter.