From 1266a9144649a396e273fd2dd91f9f2e48244b56 Mon Sep 17 00:00:00 2001
From: Max Sokolov <i@maxsokolov.net>
Date: Thu, 16 Jun 2016 23:59:25 +0300
Subject: [PATCH] addAction -> action

---
 .../Presentation/Controllers/MainController.swift    |  4 ++--
 Demo/Resources/Storyboards/LaunchScreen.storyboard   |  2 +-
 Demo/Resources/Storyboards/Main.storyboard           | 12 ++++++------
 README.md                                            |  6 ++----
 Sources/HeightStrategy.swift                         |  1 +
 Sources/TableRow.swift                               |  2 +-
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Demo/Classes/Presentation/Controllers/MainController.swift b/Demo/Classes/Presentation/Controllers/MainController.swift
index 3569741..a9694cb 100644
--- a/Demo/Classes/Presentation/Controllers/MainController.swift
+++ b/Demo/Classes/Presentation/Controllers/MainController.swift
@@ -37,13 +37,13 @@ class MainController: UIViewController {
         let row3 = TableRow<String, StoryboardImageTableViewCell>(item: "3", actions: [a])
 
         row1
-            .addAction(TableRowAction(.shouldHighlight) { (data) -> Bool in
+            .action(TableRowAction(.shouldHighlight) { (data) -> Bool in
 
                 print("1")
                 
                 return false
             })
-            .addAction(TableRowAction(.click) { (data) in
+            .action(TableRowAction(.click) { (data) in
                 
                 print("2")
             })
diff --git a/Demo/Resources/Storyboards/LaunchScreen.storyboard b/Demo/Resources/Storyboards/LaunchScreen.storyboard
index 0a546bb..580ceb8 100644
--- a/Demo/Resources/Storyboards/LaunchScreen.storyboard
+++ b/Demo/Resources/Storyboards/LaunchScreen.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15G7b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
diff --git a/Demo/Resources/Storyboards/Main.storyboard b/Demo/Resources/Storyboards/Main.storyboard
index 4edf1ae..4d18da9 100644
--- a/Demo/Resources/Storyboards/Main.storyboard
+++ b/Demo/Resources/Storyboards/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="dOU-ON-YYD">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15G7b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="dOU-ON-YYD">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
@@ -26,7 +26,7 @@
         <!--Main Controller-->
         <scene sceneID="bgC-Xq-OSw">
             <objects>
-                <viewController id="grv-aL-Qbb" customClass="MainController" customModule="TabletDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="grv-aL-Qbb" customClass="MainController" customModule="TableKitDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="COn-EH-LKP"/>
                         <viewControllerLayoutGuide type="bottom" id="iga-ib-rj1"/>
@@ -39,7 +39,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="StoryboardImageTableViewCell" rowHeight="141" id="IBY-tW-SgU" customClass="StoryboardImageTableViewCell" customModule="TabletDemo" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="StoryboardImageTableViewCell" rowHeight="141" id="IBY-tW-SgU" customClass="StoryboardImageTableViewCell" customModule="TableKitDemo" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="92" width="600" height="141"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="IBY-tW-SgU" id="UNZ-nz-200">
@@ -85,7 +85,7 @@
                                             <outlet property="titleLabel" destination="YnK-4H-0SS" id="ilA-7H-pq7"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="StoryboardTableViewCell" id="nE5-Y5-OFf" customClass="StoryboardTableViewCell" customModule="TabletDemo" customModuleProvider="target">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="StoryboardTableViewCell" id="nE5-Y5-OFf" customClass="StoryboardTableViewCell" customModule="TableKitDemo" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="233" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="nE5-Y5-OFf" id="3yF-sl-yNq">
@@ -117,7 +117,7 @@
         <!--Header Footer Controller-->
         <scene sceneID="Jd0-of-RF9">
             <objects>
-                <viewController id="sSs-TX-Ch0" customClass="HeaderFooterController" customModule="TabletDemo" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="sSs-TX-Ch0" customClass="HeaderFooterController" customModule="TableKitDemo" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="s9s-Gu-3M6"/>
                         <viewControllerLayoutGuide type="bottom" id="Tux-up-dnH"/>
@@ -130,7 +130,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="StoryboardTableViewCell" id="lqW-2N-6mf" customClass="StoryboardTableViewCell" customModule="TabletDemo" customModuleProvider="target">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="StoryboardTableViewCell" id="lqW-2N-6mf" customClass="StoryboardTableViewCell" customModule="TableKitDemo" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="92" width="600" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lqW-2N-6mf" id="tjN-ow-437">
diff --git a/README.md b/README.md
index 71eae3a..439f178 100644
--- a/README.md
+++ b/README.md
@@ -82,12 +82,10 @@ let row = TableRow<String, StringTableViewCell>(item: "some", actions: [action])
 Or, using nice chaining approach:
 ```swift
 let row = TableRow<String, StringTableViewCell>(item: "some")
-
-row
-	.addAction(TableRowAction(.click) { (data) in
+	.action(TableRowAction(.click) { (data) in
 	
 	})
-	.addAction(TableRowAction(.shouldHighlight) { (data) -> Bool in
+	.action(TableRowAction(.shouldHighlight) { (data) -> Bool in
 		return false
 	})
 ```
diff --git a/Sources/HeightStrategy.swift b/Sources/HeightStrategy.swift
index f6a5ad6..c6e7d25 100644
--- a/Sources/HeightStrategy.swift
+++ b/Sources/HeightStrategy.swift
@@ -33,6 +33,7 @@ public protocol CellHeightCalculatable {
 public class PrototypeHeightStrategy: CellHeightCalculatable {
 
     public weak var tableView: UITableView?
+    private var prototypes = [String: UITableViewCell]()
     private var cachedHeights = [Int: CGFloat]()
     private var separatorHeight = 1 / UIScreen.mainScreen().scale
     
diff --git a/Sources/TableRow.swift b/Sources/TableRow.swift
index ff33a2e..3dac46b 100644
--- a/Sources/TableRow.swift
+++ b/Sources/TableRow.swift
@@ -88,7 +88,7 @@ public class TableRow<ItemType, CellType: ConfigurableCell where CellType.T == I
     
     // MARK: - actions -
     
-    public func addAction(action: TableRowAction<ItemType, CellType>) -> Self {
+    public func action(action: TableRowAction<ItemType, CellType>) -> Self {
 
         actions[action.type.key] = action
         return self