subordinate 0.5.0 → 0.5.1

data/lib/subordinate/client.rb

@@ -35,7 +35,9 @@ module Subordinate
     def build_endpoint
       endpoint = ssl ? "https://" : "http://"
       endpoint << "#{self.username}:#{self.api_token}@" if self.authenticated?
-      endpoint << "#{self.subdomain}.#{self.domain}:#{self.port}"
+      endpoint << "#{self.subdomain}."                  if self.subdomain
+      endpoint << "#{self.domain}"                      if self.domain
+      endpoint << ":#{self.port}"                       if self.port
       self.api_endpoint = endpoint
     end
 

data/lib/subordinate/version.rb

@@ -1,3 +1,3 @@
 module Subordinate
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/subordinate/client/view_spec.rb

@@ -74,7 +74,7 @@ describe Subordinate::Client do
 
   describe "#add_job_to_view" do
     it "responds with a success" do
-      stub_request(:post, "#{subordinate.api_endpoint}/view/#{ENV["VIEW"]}/addJobToView").
+      stub_request(:post, "#{subordinate.api_endpoint}/view/#{ENV["VIEW"]}/addJobToView?name=#{ENV['JOB']}").
       to_return(:status => 200, :body => "", :headers => {})
 
       subordinate.add_job_to_view(ENV["VIEW"], ENV["JOB"]).status.should == 200
@@ -83,7 +83,7 @@ describe Subordinate::Client do
 
   describe "#remove_job_from_view" do
     it "responds with a success" do
-      stub_request(:post, "#{subordinate.api_endpoint}/view/#{ENV["VIEW"]}/removeJobFromView").
+      stub_request(:post, "#{subordinate.api_endpoint}/view/#{ENV["VIEW"]}/removeJobFromView?name=#{ENV['JOB']}").
       to_return(:status => 200, :body => "", :headers => {})
 
       subordinate.remove_job_from_view(ENV["VIEW"], ENV["JOB"]).status.should == 200

data/spec/subordinate/client_spec.rb

@@ -13,6 +13,11 @@ describe Subordinate::Client do
   end
 
   describe "#initialize" do
+    let(:domain)    { "woofound.com" }
+    let(:subdomain) { "awesome" }
+    let(:port)      { 2000 }
+    let(:ssl)       { false }
+
     it "can be initialized" do
       Subordinate::Client.new.class.should == Subordinate::Client
     end
@@ -27,26 +32,27 @@ describe Subordinate::Client do
       raise_exception
     end
 
+    it "generates an endpoint without username and api token" do
+      client = Subordinate::Client.new(:api_key => ENV["API_KEY"] )
+      client.api_endpoint.should_not include("#{ENV["USERNAME"]}:#{ENV["API_KEY"]}")
+    end
+
     it "can be configured to use a new domain via options" do
-      domain = "woofound.com"
       client = Subordinate::Client.new(:api_key => ENV["API_KEY"], :domain => domain )
       client.domain.should == domain
     end
 
     it "can be configured to use a new subdomain via options" do
-      subdomain = "awesome"
       client = Subordinate::Client.new(:api_key => ENV["API_KEY"], :subdomain => subdomain )
       client.subdomain.should == subdomain
     end
 
     it "can be configured to use a new port via options" do
-      port = 2000
       client = Subordinate::Client.new(:api_key => ENV["API_KEY"], :port => port )
       client.port.should == port
     end
 
     it "can be configured to use a different ssl option via options" do
-      ssl = false
       client = Subordinate::Client.new(:api_key => ENV["API_KEY"], :ssl => ssl )
       client.ssl.should == ssl
     end

data/spec/subordinate/configuration_spec.rb

@@ -0,0 +1,119 @@
+require "spec_helper"
+
+# Configuration Spec
+describe Subordinate::Client do
+  before do
+    Subordinate.reset!
+    Subordinate.configure do |c|
+      c.subdomain = ENV["SUBDOMAIN"]
+      c.domain    = ENV["DOMAIN"]
+      c.port      = ENV["PORT"]
+      c.ssl       = false
+    end
+  end
+
+  describe "configuration" do
+    let(:domain)    { "woofound.com" }
+    let(:subdomain) { "awesome" }
+    let(:port)      { 2000 }
+    let(:ssl)       { false }
+
+    describe "with a domain" do
+      before do
+        Subordinate.reset!
+        Subordinate.configure do |c|
+          c.domain = domain
+        end
+      end
+
+      let(:client) { Subordinate.new }
+
+      it "sets the domain for the client" do
+        client.domain.should == domain
+      end
+
+      it "builds an endpoint with the domain" do
+        client.api_endpoint.should include(domain)
+      end
+    end
+
+    # SUBDOMAIN
+    describe "with a subdomain" do
+      before do
+        Subordinate.reset!
+        Subordinate.configure do |c|
+          c.subdomain = subdomain
+        end
+      end
+
+      let(:client) { Subordinate.new }
+
+      it "sets the subdomain for the client" do
+        client.subdomain.should == subdomain
+      end
+
+      it "builds an endpoint with the subdomain" do
+        client.api_endpoint.should include(subdomain)
+      end
+    end
+
+    describe "without a subdomain" do
+      it "builds an endpoint without a subdomain" do
+        client = Subordinate.new(:subdomain => nil)
+        client.api_endpoint.should == "http://#{ENV["DOMAIN"]}:#{ENV["PORT"]}"
+      end
+    end
+
+    # PORT
+    describe "with a port" do
+      before do
+        Subordinate.reset!
+        Subordinate.configure do |c|
+          c.port = port
+        end
+      end
+
+      let(:client) { Subordinate.new }
+
+      it "sets the port for the client" do
+        client.port.should == port
+      end
+
+      it "builds an endpoint with the port" do
+        client.api_endpoint.should include("#{port}")
+      end
+    end
+
+    describe "without a port" do
+      it "builds an endpoint without a port" do
+        client = Subordinate.new(:port => nil)
+        client.api_endpoint.should == "http://#{ENV["SUBDOMAIN"]}.#{ENV["DOMAIN"]}"
+      end
+    end
+
+    # SSL
+    describe "with a ssl" do
+      before do
+        Subordinate.reset!
+        Subordinate.configure do |c|
+          c.ssl = ssl
+        end
+      end
+
+      let(:client) { Subordinate.new }
+
+      it "sets the ssl for the client" do
+        client.ssl.should == ssl
+      end
+
+      it "builds an endpoint with the ssl set to false" do
+        client.api_endpoint.should include("http://")
+      end
+
+      it "builds an endpoint with the ssl set to true" do
+        client = Subordinate.new(:ssl => true)
+        client.api_endpoint.should include("https://")
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: subordinate
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -258,6 +258,7 @@ files:
 - spec/subordinate/client/system_spec.rb
 - spec/subordinate/client/view_spec.rb
 - spec/subordinate/client_spec.rb
+- spec/subordinate/configuration_spec.rb
 - subordinate.gemspec
 homepage: https://github.com/jasontruluck/subordinate
 licenses: []
@@ -273,7 +274,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2873629329486478111
+      hash: -1675897956094488163
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -282,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2873629329486478111
+      hash: -1675897956094488163
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -301,4 +302,5 @@ test_files:
 - spec/subordinate/client/system_spec.rb
 - spec/subordinate/client/view_spec.rb
 - spec/subordinate/client_spec.rb
+- spec/subordinate/configuration_spec.rb
 has_rdoc: