Bug with structures fix.

Author: sinarionn

Diff for: .swift-version

@@ -1 +1 @@
-4.0.1
+4.1

Diff for: CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.2.1](https://github.com/sinarionn/ReusableView/releases/tag/1.2.1)
+
+Fixed bug with structures hidden behind protocols
+
+
 ## [1.2.0](https://github.com/sinarionn/ReusableView/releases/tag/1.2.0)
 
 MacOS support added

Diff for: Plists/ReusableView.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Diff for: ReusableView.podspec

@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
   s.name         = "ReusableView"
-  s.version      = "1.2.0"
+  s.version      = "1.2.1"
   s.summary      = "Reusable and NonReusable viewModel containers"
 
   s.homepage     = "https://github.com/sinarionn/ReusableView"

Diff for: Sources/Helpers.swift

@@ -10,11 +10,21 @@ import Foundation
 import RxSwift
 
 internal func associate(_ object: Any?, withValue value: Any?,  by key: UnsafeRawPointer, policy: objc_AssociationPolicy = .OBJC_ASSOCIATION_RETAIN_NONATOMIC) {
-    object.map{ objc_setAssociatedObject($0, key, value, policy) }
+    object.map{ objc_setAssociatedObject($0, key, value.map(AssociationWrapper.init), policy) }
 }
 
 internal func associated<T>(with object: Any, by key: UnsafeRawPointer) -> T? {
-    return objc_getAssociatedObject(object, key) as? T
+    let wrapper = objc_getAssociatedObject(object, key) as? AssociationWrapper
+    return wrapper?.value as? T
+}
+
+// unfortunately i was forced to start using such wrappers due to a new bug with structures hidden behind protocols
+internal class AssociationWrapper {
+    let value: Any
+    
+    init(value: Any) {
+        self.value = value
+    }
 }
 
 extension Reactive where Base: AnyObject {

Diff for: Tests/ReusableViewTests.swift

@@ -154,8 +154,27 @@ class ReusableViewTests: XCTestCase {
         object.viewModel = "a"
         waitForExpectations(timeout: 1, handler: nil)
     }
+    
+    func testViewModelStruct() {
+        let reusable = TestReusable<TestStruct>()
+        reusable.viewModel = TestStruct(value: "1")
+        XCTAssertTrue(reusable.viewModel?.value == "1")
+    }
+    
+    func testViewModelStructErased() {
+        let reusable = TestReusable<TestStructType>()
+        reusable.viewModel = TestStruct(value: "1") as TestStructType
+        XCTAssertTrue(reusable.viewModel?.value == "1")
+    }
 }
 
+fileprivate struct TestStruct: TestStructType {
+    let value: String
+}
+
+protocol TestStructType {
+    var value: String { get }
+}
 
 fileprivate class TestableNonEquatable {
 }