summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormo <mo@mokhan.ca>2018-05-07 15:18:48 -0600
committermo <mo@mokhan.ca>2018-05-07 15:18:48 -0600
commit54ab2db6336b1116927200d6afc25e2af35282c8 (patch)
tree7b081a638df9aeadbb58fcdceed387c3b7431f77
parentd767b44d93952403f4c5111f2bc85d50f51e8f13 (diff)
merge in default headers.
-rw-r--r--lib/net/hippie/client.rb4
-rw-r--r--lib/net/hippie/version.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/net/hippie/client.rb b/lib/net/hippie/client.rb
index b43e036..0433c02 100644
--- a/lib/net/hippie/client.rb
+++ b/lib/net/hippie/client.rb
@@ -8,14 +8,14 @@ module Net
}
def initialize(
- headers: DEFAULT_HEADERS,
+ headers: {},
certificate: nil,
key: nil,
passphrase: nil,
mapper: JsonMapper.new
)
@certificate = certificate
- @default_headers = headers
+ @default_headers = DEFAULT_HEADERS.merge(headers)
@key = key
@mapper = mapper
end
diff --git a/lib/net/hippie/version.rb b/lib/net/hippie/version.rb
index ecd2d6d..d6ad3fd 100644
--- a/lib/net/hippie/version.rb
+++ b/lib/net/hippie/version.rb
@@ -1,5 +1,5 @@
module Net
module Hippie
- VERSION = "0.1.1"
+ VERSION = "0.1.2"
end
end