Make merge and merge! consistent

Author: ptoomey3

lib/secure_headers/headers/content_security_policy_config.rb

@@ -54,7 +54,10 @@ def directive_value(directive)
     end
 
     def merge(new_hash)
-      ContentSecurityPolicy.combine_policies(self.to_h, new_hash)
+      new_config = self.dup
+      puts new_config.inspect
+      new_config.send(:from_hash, new_hash)
+      new_config
     end
 
     def merge!(new_hash)

spec/lib/secure_headers_spec.rb

@@ -391,7 +391,7 @@ module SecureHeaders
 
             hash = SecureHeaders.header_hash_for(request)
             expect(hash["Content-Security-Policy"]).to eq("default-src 'self'; script-src 'self'")
-            expect(hash["Content-Security-Policy-Report-Only"]).to eq("default-src 'self'; script-src 'self' foo.com")
+            expect(hash["Content-Security-Policy-Report-Only"]).to eq("default-src 'self'; script-src foo.com")
           end
 
           it "allows you to opt-out of enforced CSP" do