Merge pull request #149 from dry-rb/rollback-to_hash-deprecation

Rollback to_hash deprecation

lib/dry/struct.rb

@@ -159,7 +159,8 @@ def to_h
         result[key.name] = Hashify[self[key.name]] if attributes.key?(key.name)
       end
     end
-    deprecate :to_hash, :to_h, message: "Implicit convertion structs to hashes is deprecated. Use .to_h"
+    alias_method :to_hash, :to_h
+    # deprecate :to_hash, :to_h, message: "Implicit convertion structs to hashes is deprecated. Use .to_h"
 
     # Create a copy of {Dry::Struct} with overriden attributes
     #

lib/dry/struct/class_interface.rb

@@ -247,7 +247,7 @@ def check_schema_duplication(new_keys)
 
       # @param [Hash{Symbol => Object},Dry::Struct] attributes
       # @raise [Struct::Error] if the given attributes don't conform {#schema}
-      def new(attributes = default_attributes, safe = false)
+      def new(attributes = default_attributes, safe = false, &block)
         if attributes.is_a?(Struct)
           if equal?(attributes.class)
             attributes
@@ -257,7 +257,7 @@ def new(attributes = default_attributes, safe = false)
             # User.new(super_user)
             #
             # We may deprecate this behavior in future forcing people to be explicit
-            new(attributes.to_h, safe)
+            new(attributes.to_h, safe, &block)
           end
         elsif safe
           load(schema.call_safe(attributes) { |output = attributes| return yield output })

spec/integration/struct_spec.rb

@@ -56,6 +56,15 @@ def construct_user(attributes)
       expect(construct_user(user)).to be_instance_of(user_type)
     end
 
+    it 'supports safe call when a struct is given' do
+      subtype = Class.new(root_type) { attribute :age, 'string' }
+      user = subtype[
+        name: :Jane, age: 'twenty-one', root: true, address: { city: 'NYC', zipcode: 123 }
+      ]
+
+      expect(root_type.new(user, true) { :fallback }).to be(:fallback)
+    end
+
     context 'with default' do
       it 'resolves missing values with defaults' do
         struct = Class.new(Dry::Struct) do