Release 2.6.0

Author: rwbutler

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.6.0] - 2019-12-24
+### Added
+Features are now grouped by section on `FeatureFlagsViewController` where sections are present.
+
 ## [2.5.1] - 2019-12-23
 ### Changed
 Fix for broken SPM build due to lack of specifity in Package.swift exclusion rule.

Example/FeatureFlags/AppDelegate.swift

@@ -16,6 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions
         launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+        FeatureFlags.deleteAllFeaturesFromCache()
         let navigationController = UINavigationController()
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = navigationController

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FeatureFlags'
-  s.version          = '2.5.1'
+  s.version          = '2.6.0'
   s.swift_version    = '5.0'
   s.summary          = 'Feature flagging, A/B testing, MVT and phased feature roll out for iOS.'
   s.description      = <<-DESC

FeatureFlags.podspec

@@ -44,6 +44,10 @@ public struct FeatureFlags {
         return .json // default
     }()
 
+    public static func deleteAllFeaturesFromCache() {
+        FeatureFlags.clearCache()
+    }
+    
     /// Removes the specified feature from the cache however the feature will remain in in-memory configuration.
     static func deleteFeatureFromCache(named name: Feature.Name) {
         // Load cached configuration, if exists
@@ -69,12 +73,15 @@ public struct FeatureFlags {
 
     /// Returns only feature flags of the specified type. Used by `FeatureFlagsViewController` to provide
     /// filtering.
-    public static func filter(_ section: String) -> [Feature]? {
+    public static func filter(_ section: String?) -> [Feature]? {
+        guard let filterSection = section else {
+            return configuration?.filter { $0.section == nil }
+        }
         return configuration?.filter {
             guard let featureSection = $0.section else {
                 return false
             }
-            return section == featureSection
+            return filterSection == featureSection
         }
     }
 
@@ -131,10 +138,14 @@ public struct FeatureFlags {
     }
 
     /// Returns all sections titles for those features which have a section specified.
-    public static func sections() -> [String] {
+    public static func sections() -> [String?] {
         let allSections = configuration?.compactMap { $0.section }
         let distinctSections = allSections?.mapDistinct { $0 } ?? []
-        return distinctSections.sorted()
+        var sortedSections: [String?] = distinctSections.sorted()
+        if FeatureFlags.filter(nil) != nil { // Check whether features without sections exist
+            sortedSections.append(nil)
+        }
+        return sortedSections
     }
 
     /// Transient update - will not be persisted

FeatureFlags/Classes/Core/FeatureFlags.swift

@@ -36,18 +36,19 @@ class FeatureDetailsViewController: UITableViewController {
         case enabled
         case unlocked
         case labels
+        case section
         case testVariations
         case testVariationAssignment
     }
 
     private func cells(for featureType: FeatureType) -> [CellType] {
         switch featureType {
         case .featureFlag:
-            return [.featureType, .enabled, .labels]
+            return [.featureType, .enabled, .labels, .section]
         case .unlockFlag:
-            return [.featureType, .enabled, .unlocked, .labels]
+            return [.featureType, .enabled, .unlocked, .labels, .section]
         case .featureTest(.ab), .featureTest(.mvt), .featureTest(.featureFlagAB):
-            return [.featureType, .enabled, .testVariations, .testVariationAssignment, .labels]
+            return [.featureType, .enabled, .testVariations, .testVariationAssignment, .labels, .section]
         case .deprecated:
             return []
         }
@@ -91,6 +92,9 @@ class FeatureDetailsViewController: UITableViewController {
             bindTestVariationCell(cell, to: feature)
         case .testVariationAssignment:
             bindTestVariationAssignmentCell(cell, to: feature)
+        case .section:
+            cell.textLabel?.text = "Section"
+            cell.detailTextLabel?.text = feature.section ?? "Uncategorized"
         }
         return cell
     }

FeatureFlags/Classes/UI/Details/View Controller/FeatureDetailsViewController.swift

@@ -0,0 +1,32 @@
+//
+//  FeatureFlagsViewController+UIViewControllerPreviewing.swift
+//  FeatureFlags
+//
+//  Created by Ross Butler on 23/12/2019.
+//
+
+import Foundation
+
+extension FeatureFlagsViewController: UIViewControllerPreviewingDelegate {
+    
+    private func detailViewController(for indexPath: IndexPath) -> FeatureDetailsViewController {
+        let viewController = FeatureDetailsViewController(style: .grouped)
+        viewController.feature = viewModel.feature(for: indexPath)
+        return viewController
+    }
+    
+    func previewingContext(_ previewingContext: UIViewControllerPreviewing,
+                           viewControllerForLocation location: CGPoint) -> UIViewController? {
+        if let indexPath = tableView.indexPathForRow(at: location) {
+            previewingContext.sourceRect = tableView.rectForRow(at: indexPath)
+            return detailViewController(for: indexPath)
+        }
+        return nil
+    }
+    
+    func previewingContext(_ previewingContext: UIViewControllerPreviewing,
+                           commit viewControllerToCommit: UIViewController) {
+        navigationController?.pushViewController(viewControllerToCommit, animated: true)
+    }
+    
+}