postmark 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0db315ab0a2f924dca2620b8fc4d18f8c07445e5
-  data.tar.gz: 9a322908b988cd2e61126a16359ec95ad02cd391
+  metadata.gz: 76623008dfbb09504295182472b645b013700da6
+  data.tar.gz: 8648dba9d5ed435d630493777d8b42552369df54
 SHA512:
-  metadata.gz: 1ae0e033687041435061769f2d9e39cbe3de8cf1d46e5939c808aeaa69f88ad844eb9578d1d3cf8babbeae355d64223b4355edfb17c58fee4778d933c5537c4b
-  data.tar.gz: 7adbede1755f986942d4260cc44c4d96e2ac03aeea90804162a352184d17f75a4dbfca7348950ada41df6f468092e004cb82c8980086ad5d626dc6423ed3c4c4
+  metadata.gz: f6b5c6789fa0d38c1d4ba35a426febce12b11c3bd09a9450e388d9cf1c17d2c5312ae67611e33d9d2cc750173e2020c86920b4100ea9f46b7a847e18cfe88fd6
+  data.tar.gz: e3324835f12c6a203fdc78147a400c039714d5a0045917823b95d4bdd2890f7afbad80ab7a816aaea12785ba2c6cee62132016ec25eb3ad027ce86b481ee0782

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = Changelog
 
+== 1.9.1
+
+* Fix a bug when port setting is not respected.
+* Made `Postmark::HttpClient#protocol` method public.
+
 == 1.9.0
 
 * Added methods to access domains API endoints

data/VERSION

@@ -1 +1 @@
-1.9.0
+1.9.1

data/lib/postmark/http_client.rb

@@ -42,6 +42,10 @@ module Postmark
       do_request { |client| client.delete(url_path(path + to_query_string(query)), headers) }
     end
 
+    def protocol
+      self.secure ? 'https' : 'http'
+    end
+
     protected
 
     def apply_options(options = {})
@@ -49,7 +53,7 @@ module Postmark
       DEFAULTS.merge(options).each_pair do |name, value|
         instance_variable_set(:"@#{name}", value)
       end
-      @port = options[:port] || @secure ? 443 : 80
+      @port = options[:port] || (@secure ? 443 : 80)
     end
 
     def to_query_string(hash)
@@ -57,10 +61,6 @@ module Postmark
       "?" + hash.map { |key, value| "#{CGI.escape(key.to_s)}=#{CGI.escape(value.to_s)}" }.join("&")
     end
 
-    def protocol
-      self.secure ? "https" : "http"
-    end
-
     def url
       URI.parse("#{protocol}://#{self.host}:#{self.port}/")
     end

data/lib/postmark/version.rb

@@ -1,3 +1,3 @@
 module Postmark
-  VERSION = '1.9.0'
+  VERSION = '1.9.1'
 end

data/spec/unit/postmark/http_client_spec.rb

@@ -54,7 +54,7 @@ describe Postmark::HttpClient do
     let(:proxy_user) { "provided proxy user" }
     let(:proxy_pass) { "provided proxy pass" }
     let(:host) { "providedhostname.org" }
-    let(:port) { 443 }
+    let(:port) { 4443 }
     let(:path_prefix) { "/provided/path/prefix" }
     let(:http_open_timeout) { 42 }
     let(:http_read_timeout) { 42 }
@@ -83,6 +83,20 @@ describe Postmark::HttpClient do
     its(:path_prefix) { should == path_prefix }
     its(:http_open_timeout) { should == http_open_timeout }
     its(:http_read_timeout) { should == http_read_timeout }
+
+    it 'uses port 80 for plain HTTP connections' do
+      expect(Postmark::HttpClient.new(api_token, :secure => false).port).to eq(80)
+    end
+
+    it 'uses port 443 for secure HTTP connections' do
+      expect(Postmark::HttpClient.new(api_token, :secure => true).port).to eq(443)
+    end
+
+    it 'respects port over secure option' do
+      client = Postmark::HttpClient.new(api_token, :port => 80, :secure => true)
+      expect(client.port).to eq(80)
+      expect(client.protocol).to eq('https')
+    end
   end
 
   describe "#post" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: postmark
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Petyo Ivanov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake