keymaker 0.0.1 → 0.0.2

data/README.md

@@ -78,6 +78,7 @@ Coming soon
 - Avdi Grimm
 - Micah Cooper
 - Stephen Caudill
+- Travis Anderson
 
 ## Copyright
 Copyright (c) 2012 [Rogelio J. Samour](mailto:rogelio@therubymug.com)

data/keymaker.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'keymaker'
-  s.version           = '0.0.1'
-  s.date              = '2012-06-06'
+  s.version           = '0.0.2'
+  s.date              = '2012-06-07'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -82,7 +82,9 @@ Gem::Specification.new do |s|
     lib/keymaker/serialization.rb
     lib/keymaker/service.rb
     lib/keymaker/update_node_properties_request.rb
-    spec/lib/keymaker_integration_spec.rb
+    spec/keymaker/configuration_spec.rb
+    spec/keymaker/service_spec.rb
+    spec/keymaker_spec.rb
     spec/spec_helper.rb
     spec/support/keymaker.rb
   ]

data/lib/keymaker/configuration.rb

@@ -33,6 +33,15 @@ module Keymaker
         url_opts[:scheme] = protocol
         url_opts[:host] = server
         url_opts[:port] = port
+      end
+    end
+
+    def connection_service_root_url
+      Addressable::URI.new(connection_url_opts)
+    end
+
+    def connection_url_opts
+      url_opts.tap do |url_opts|
         url_opts[:user] = username if username
         url_opts[:password] = password if password
       end

data/lib/keymaker/service.rb

@@ -15,7 +15,7 @@ module Keymaker
     end
 
     def connection
-      @connection ||= Faraday.new(url: config.service_root) do |conn|
+      @connection ||= Faraday.new(url: config.connection_service_root_url) do |conn|
         conn.request :json
         conn.use FaradayMiddleware::ParseJson, content_type: /\bjson$/
         conn.adapter :net_http

data/lib/keymaker.rb

@@ -24,7 +24,7 @@ require 'keymaker/node'
 
 module Keymaker
 
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 
   def self.service
     @service ||= Keymaker::Service.new(Keymaker::Configuration.new)

data/spec/keymaker/configuration_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Keymaker::Configuration do
+
+  context "with credentials provided" do
+    let(:options) { { username: "jconnor", password: "easymoney" } }
+    let(:config) do
+      Keymaker::Configuration.new(options)
+    end
+
+    describe "#node_uri" do
+      it "should not contain credentials" do
+        config.node_uri(42).should_not include("jconnor:easymoney@")
+      end
+    end
+  end
+
+end

data/spec/keymaker/service_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Keymaker::Service  do
+
+  context "with credentials provided" do
+    let(:options) { { username: "jconnor", password: "easymoney" } }
+    let(:config) do
+      Keymaker::Configuration.new(options)
+    end
+    let(:service) { Keymaker::Service.new(config) }
+
+    describe "#connection" do
+      it "includes the username and password" do
+        Faraday.should_receive(:new).with(url: config.connection_service_root_url)
+        service.connection
+      end
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keymaker
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -158,7 +158,9 @@ files:
 - lib/keymaker/serialization.rb
 - lib/keymaker/service.rb
 - lib/keymaker/update_node_properties_request.rb
-- spec/lib/keymaker_integration_spec.rb
+- spec/keymaker/configuration_spec.rb
+- spec/keymaker/service_spec.rb
+- spec/keymaker_spec.rb
 - spec/spec_helper.rb
 - spec/support/keymaker.rb
 homepage: https://github.com/therubymug/keymaker
@@ -175,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3417876533899238016
+      hash: 3389385073700397945
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -189,6 +191,8 @@ signing_key:
 specification_version: 2
 summary: A multi-layer REST API wrapper for neo4j.
 test_files:
-- spec/lib/keymaker_integration_spec.rb
+- spec/keymaker/configuration_spec.rb
+- spec/keymaker/service_spec.rb
+- spec/keymaker_spec.rb
 - spec/spec_helper.rb
 - spec/support/keymaker.rb