From f523e1775339af605825ec40f2f856ec0e16d326 Mon Sep 17 00:00:00 2001
From: Tom Johnson <tom@dp.la>
Date: Fri, 2 Mar 2018 16:04:01 -0800
Subject: [PATCH 1/2] Replace `Hydra::Presenter#to_model` delegation with
 `self`

Beginning in `v3.5.1`, `SimpleForm::FormBuilder` calls `#to_model` (via
ActionView's `#convert_to_model`) in its initializer. This prevents
`Hydra::Presenter` inheritors from being used correctly when sent to the
form. Replacing the delegated method with one that returns `self` restores the
correct behavior to `SimpleForm::FormBuilder` and related view helpers.

Client code can still access the model by calling the `#model` accessor.

Fixes #139.
---
 app/presenters/hydra/presenter.rb | 13 +++++++++----
 hydra-editor.gemspec              |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/presenters/hydra/presenter.rb b/app/presenters/hydra/presenter.rb
index 2f93061..b84a016 100644
--- a/app/presenters/hydra/presenter.rb
+++ b/app/presenters/hydra/presenter.rb
@@ -14,8 +14,13 @@ def initialize(object)
       @model = object
     end
 
-    delegate :to_key, :to_param, :to_model, :persisted?, :new_record?,
-             :[], :model_name, to: :model
+    delegate :to_key, :to_param, :persisted?, :new_record?, :[], :model_name, to: :model
+
+    ##
+    # @return [#to_model] self
+    def to_model
+      self
+    end
 
     module ClassMethods
       def model_name
@@ -33,8 +38,8 @@ module Presenter
     included do
       class_attribute :_terms, instance_accessor: false
 
-      # You may want to set your own field_metadata_service that can 
-      # answer the questions about a fields cardinality regardless of the 
+      # You may want to set your own field_metadata_service that can
+      # answer the questions about a fields cardinality regardless of the
       # cardinality of the model
       class_attribute :field_metadata_service
       # This default service just give us the cardiality defined in the model.
diff --git a/hydra-editor.gemspec b/hydra-editor.gemspec
index e339148..0ebec5c 100644
--- a/hydra-editor.gemspec
+++ b/hydra-editor.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", ">= 4.2.0", "< 6"
   s.add_dependency "active-fedora", ">= 9.0.0"
   s.add_dependency "cancancan", "~> 1.8"
-  s.add_dependency "simple_form", '~> 3.2', '<= 3.5.0'
+  s.add_dependency "simple_form", '~> 3.2'
   s.add_dependency 'sprockets-es6'
   s.add_dependency "almond-rails", '~> 0.1'
 

From 5da194afb72a6f77d7c64604bed490c083091736 Mon Sep 17 00:00:00 2001
From: Tom Johnson <tom@dp.la>
Date: Mon, 5 Mar 2018 11:15:56 -0800
Subject: [PATCH 2/2] Bump version to 4.0.0.rc1

---
 lib/hydra_editor/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/hydra_editor/version.rb b/lib/hydra_editor/version.rb
index b6c8cab..9e892bf 100644
--- a/lib/hydra_editor/version.rb
+++ b/lib/hydra_editor/version.rb
@@ -1,3 +1,3 @@
 module HydraEditor
-  VERSION = '3.4.0.beta'.freeze
+  VERSION = '4.0.0.rc1'.freeze
 end