Merge branch 'release/0.4.4'

Author: msaps

.travis.yml

@@ -1,11 +1,18 @@
 language: objective-c
 osx_image: xcode8.2
+branches:
+  only:
+  - master
+  - develop
+  
 script:
 - xcodebuild -workspace Pageboy.xcworkspace -scheme Pageboy -destination 'platform=iOS
   Simulator,name=iPhone 7,OS=10.1' build test
 - pod lib lint --quick
+
 after_success:
 - bash <(curl -s https://codecov.io/bash)
+
 notifications:
   slack:
     on_success: change

Pageboy.podspec

@@ -4,7 +4,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, "9.0"
   s.requires_arc = true
 
-  s.version      = "0.4.3"
+  s.version      = "0.4.4"
   s.summary      = "A simple, highly informative page view controller."
   s.description  = <<-DESC
   					Pageboy is a page view controller that provides simplified data source management, enhanced delegation and other useful features.

Sources/Pageboy/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.3</string>
+	<string>0.4.4</string>
 	<key>CFBundleVersion</key>
 	<string>AUTO_GENERATED</string>
 	<key>NSPrincipalClass</key>

Sources/Pageboy/PageboyScrollDetection.swift

@@ -61,8 +61,9 @@ extension PageboyViewController: UIPageViewControllerDelegate, UIScrollViewDeleg
             contentOffset = scrollView.contentOffset.y
         }
 
+        let scrollIndexDiff = CGFloat(abs((self.expectedTransitionIndex ?? currentIndex + 1) - currentIndex))
         let scrollOffset = contentOffset - pageSize
-        let pageOffset = (CGFloat(currentIndex) * pageSize) + scrollOffset
+        let pageOffset = (CGFloat(currentIndex) * pageSize) + (scrollOffset * scrollIndexDiff)
         var pagePosition = pageOffset / pageSize
 
         // do not continue if a page change is detected

Sources/Pageboy/PageboyViewController.swift

@@ -260,10 +260,8 @@ open class PageboyViewController: UIViewController {
             guard let viewController = self.viewControllers?[rawIndex] else { return }
 
             let direction = NavigationDirection.forPage(rawIndex, previousPage: self.currentIndex ?? rawIndex)
-            self.delegate?.pageboyViewController(self,
-                                                 willScrollToPageAtIndex: rawIndex,
-                                                 direction: direction,
-                                                 animated: animated)
+            self.pageViewController(self.pageViewController,
+                                    willTransitionTo: [viewController])
 
             self.isScrollingAnimated = true
             self.pageViewController.setViewControllers([viewController],

Sources/PageboyTests/PageboyDataSourceTests.swift

@@ -102,4 +102,18 @@ class PageboyDataSourceTests: PageboyTests {
                   "Default Page index is not using correct .last PageIndex when specified.")
     }
 
+    /// Test whether reloadPages fully reloads 
+    /// PageboyViewController.
+    func testPageboyViewControllerReloadBehavior() {
+        self.dataSource.numberOfPages = 5
+        self.pageboyViewController.dataSource = self.dataSource
+        let initialPageCount = self.pageboyViewController.viewControllers?.count
+        
+        self.dataSource.numberOfPages = 3
+        self.pageboyViewController.reloadPages()
+        let reloadPageCount = self.pageboyViewController.viewControllers?.count
+        
+        XCTAssert(initialPageCount == 5 && reloadPageCount == 3,
+                  "reloadPages is not correctly reloading view controllers.")
+    }
 }

Sources/PageboyTests/TestComponents/TestPageboyDataSource.swift

@@ -20,6 +20,7 @@ class TestPageboyDataSource: Any, PageboyViewControllerDataSource {
             return nil
         }
 
+        viewControllers.removeAll()
         for index in 0..<numberOfPages {
             let viewController = TestPageChildViewController()
             viewController.index = index