Fix array map backward compatibility with v3.2.

DeclarativeHub · Mar 14, 2015 · 47492ad · 47492ad
1 parent b642068
commit 47492ad
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 8 deletions.
diff --git a/Bond.podspec b/Bond.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
   s.name         = "Bond"
-  s.version      = "3.3.0"
+  s.version      = "3.3.1"
   s.summary      = "A Swift binding framework"
 
   s.description  = <<-DESC
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.social_media_url   = "http://twitter.com/srdanrasic"
   s.ios.deployment_target = "8.0"
   s.osx.deployment_target = "10.10"
-  s.source       = { :git => "https://github.com/SwiftBond/Bond.git", :tag => "v3.3.0" }
+  s.source       = { :git => "https://github.com/SwiftBond/Bond.git", :tag => "v3.3.1" }
   s.source_files  = "Bond"
   s.osx.exclude_files = "Bond/Bond+UI*"
   s.framework     = 'SystemConfiguration'

diff --git a/Bond/Bond+Arrays.swift b/Bond/Bond+Arrays.swift
@@ -684,10 +684,20 @@ public extension DynamicArray
     return _map(self, f, DynamicArrayMapCacheValue(count: self.count, repeatedValue: nil))
   }
 
+  public func map<U>(f: T -> U) -> DynamicArray<U> {
+    let mapf = { (o: T, i: Int) -> U in f(o) }
+    return _map(self, mapf, DynamicArrayMapCacheValue(count: self.count, repeatedValue: nil))
+  }
+
   public func map<U: AnyObject>(f: (T, Int) -> U) -> DynamicArray<U> {
     return _map(self, f, DynamicArrayMapCacheObject(count: self.count, repeatedValue: nil))
   }
 
+  public func map<U: AnyObject>(f: T -> U) -> DynamicArray<U> {
+    let mapf = { (o: T, i: Int) -> U in f(o) }
+    return _map(self, mapf, DynamicArrayMapCacheObject(count: self.count, repeatedValue: nil))
+  }
+
   public func filter(f: T -> Bool) -> DynamicArray<T> {
     return _filter(self, f)
   }

diff --git a/Bond/Info.plist b/Bond/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.0</string>
+	<string>3.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/BondTests/Info.plist b/BondTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.0</string>
+	<string>3.3.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/README.md b/README.md
@@ -86,7 +86,7 @@ override func viewDidLoad() {
   tableViewDataSourceBond = UITableViewDataSourceBond(tableView: self.tableView)
 
   // map repositories to cells and bind
-  repositories.map { [unowned self] (repository: Repository, index: Int) -> RepositoryTableViewCell in
+  repositories.map { [unowned self] (repository: Repository) -> RepositoryTableViewCell in
     let cell = self.tableView.dequeueReusableCellWithIdentifier("cell") as RepositoryTableViewCell
     repository.name ->> cell.nameLabel
     repository.photo ->> cell.avatarImageView
@@ -495,7 +495,7 @@ override func viewDidLoad() {
 
 ```swift
   // map repositories to cells and bind
-  repositories.map { [unowned self] (repository: Repository, index: Int) -> UITableViewCell in
+  repositories.map { [unowned self] (repository: Repository) -> UITableViewCell in
     let cell = self.tableView.dequeueReusableCellWithIdentifier("cell") as RepositoryTableViewCell
     repository.name ->> cell.nameLabel
     repository.photo ->> cell.avatarImageView
@@ -519,13 +519,13 @@ If your table view needs to display more than one section, you can feed it with
 
 
 ```swift
-  let sectionOfApples = apples.map { [unowned self] (apple: Apple, index: Int) -> UITableViewCell in
+  let sectionOfApples = apples.map { [unowned self] (apple: Apple) -> UITableViewCell in
     let cell = self.tableView.dequeueReusableCellWithIdentifier("cell") as AppleTableViewCell
     cell.nameLabel = apple.name
     return cell
   }
 
-  let sectionOfPears = pears.map { [unowned self] (pear: Pear, index: Int) -> UITableViewCell in
+  let sectionOfPears = pears.map { [unowned self] (pear: Pear) -> UITableViewCell in
     let cell = self.tableView.dequeueReusableCellWithIdentifier("cell") as PearTableViewCell
     cell.nameLabel = pear.name
     return cell