diplomat 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f2bf40d8cc3eea258753340fb38086dc71c8f2f
-  data.tar.gz: e3db694a3793a961971686d989adfcbc98292c4e
+  metadata.gz: 0b0b78c3defb59f640674929aa84736f259b301d
+  data.tar.gz: 57dc6f99df3cb29304ac35a3c0154cdc3476bb25
 SHA512:
-  metadata.gz: ea31b94d60f6f5bc15ac1d1ec3632dc8b02eff9dac5d7cce5e1979ba1fe5c74a54f6d83f35f9314e8c5b5563c669c5af711bfed879bec9a6bbfd2fb77d1bf7a0
-  data.tar.gz: c27de31b09f4d25a59964d61a59d3d393bc158a3774b41bb53c82ef5e19cfaa68b2246e139142c2e9cc88f45b10c46d9139a8a7b7efb6ff8004993992daa862f
+  metadata.gz: 5622c913dcec5213b2fb595ab1e9f9fc4d869502f9b95d7e1794980203511c000a16966e98d6a32abe7e77852f8308b4bf52031e8b19651518a832dc785dae3a
+  data.tar.gz: 0f2e7d0534fa3fd79a497a01b126b3b1251c3fb4a949d447c949bb8968c5e626e8963df0a70c8afd0864491e463e370fa3dd51d72c3ac7728970994e95ae86f6

data/README.md

@@ -73,16 +73,25 @@ Looking up a service is easy as pie:
 
 ```ruby
 foo_service = Diplomat::Service.get('foo')
-# => #<OpenStruct Node="hotel", Address="1.2.3.4", ServiceID="hotel_postgres", ServiceName="hotel_postgres", ServiceTags=["postgres"], ServicePort=5432> 
+# => #<OpenStruct Node="hotel", Address="1.2.3.4", ServiceID="hotel_foo", ServiceName="foo", ServiceTags=["foo"], ServicePort=5432> 
+```
+Or if you have multiple nodes per service:
+
+```ruby
+foo_service = Diplomat::Service.get('foo', :all)
+# => [#<OpenStruct Node="hotel", Address="1.2.3.4", ServiceID="hotel_foo", ServiceName="foo", ServiceTags=["foo"], ServicePort=5432>,#<OpenStruct Node="indigo", Address="1.2.3.5", ServiceID="indigo_foo", ServiceName="foo", ServiceTags=["foo"], ServicePort=5432>]
 ```
 
 ### Todo
 
- - Deleting Keys
- - Listing available Services, PUTting and DELETEing services
- - Health
- - Members
- - Status
+ - Updating docs with latest changes
+ - PUTting and DELETEing services
+ - Allowing the custom configuration of the consul url to connect to
+ - - ~~Deleting Keys~~ **Needs a test**
+ - ~~Listing available Services~~ **Done**
+ - ~~Health~~ **Done**
+ - ~~Members~~ **Done**
+ - ~~Status~~ **Done**
 
 ## Enjoy!
 

data/features/configuration.feature

@@ -0,0 +1,9 @@
+Feature: Configuration
+
+  Scenario: I'm Setting up Diplomat with a default config
+    Given I am setting up a default diplomat
+    Then I should be able to get and put keys
+
+  Scenario: I'm Setting up Diplomat with a custom config
+    Given I am setting up a custom diplomat
+    Then I should be able to get and put keys

data/features/step_definitions/setup_diplomat.rb

@@ -0,0 +1,22 @@
+require 'diplomat'
+Given /^I am setting up a default diplomat$/ do
+end
+
+Given /^I am setting up a custom diplomat$/ do
+  class StubMiddleware
+    def initialize(app, options = {})
+      @app = app
+      @options = options
+    end
+    def call(env)
+      @app.call(env)
+    end
+  end
+
+  expect {
+    Diplomat.configure do |config|
+      config.url = "http://localhost:8500"
+      config.middleware = StubMiddleware
+    end
+  }.to_not raise_error
+end

data/features/step_definitions/test_key_value.rb

@@ -0,0 +1,9 @@
+Then /^I should be able to get and put keys$/ do
+  # High-fructose Corn Syrup
+  Diplomat.put('drink', 'Irn Bru')
+  expect(Diplomat.get('drink')).to eq("Irn Bru")
+
+  # Sugar
+  Diplomat::Kv.put('cake', 'Sponge')
+  expect(Diplomat::Kv.get('cake')).to eq('Sponge')
+end

data/lib/diplomat.rb

@@ -4,7 +4,7 @@ module Diplomat
 
     attr_accessor :root_path
     attr_accessor :lib_path
-    attr_accessor :url
+    attr_accessor :configuration
 
     # Internal: Requires internal Faraday libraries.
     # @param *libs One or more relative String names to Faraday classes.
@@ -15,23 +15,26 @@ module Diplomat
     end
 
     alias require_lib require_libs
-
-    private
-
-    def method_missing(name, *args, &block)
-      Diplomat::Kv.new.send(name, *args, &block)
-    end
-
   end
 
   self.root_path = File.expand_path "..", __FILE__
   self.lib_path = File.expand_path "../diplomat", __FILE__
 
-  # TODO: Make this configurable and overridable
-  self.url = "http://localhost:8500"
+  require_libs "configuration", "rest_client", "kv", "service", "members", "check", "health"
+  self.configuration ||= Diplomat::Configuration.new
 
+  class << self
 
+    # Build optional configuration by yielding a block to configure
+    def configure
+      self.configuration ||= Diplomat::Configuration.new
+      yield(configuration)
+    end
 
-  require_libs "rest_client", "kv", "service", "members", "check", "health"
+    private
 
+    def method_missing(name, *args, &block)
+      Diplomat::Kv.new.send(name, *args, &block)
+    end
+  end
 end

data/lib/diplomat/configuration.rb

@@ -0,0 +1,18 @@
+module Diplomat
+  class Configuration
+    attr_accessor :middleware
+    attr_accessor :url
+
+    def initialize
+      @middleware = []
+      @url = "http://localhost:8500"
+    end
+
+    def middleware=(middleware)
+      return @middleware = middleware if middleware.is_a? Array
+      @middleware = [middleware]
+    end
+
+  end
+end
+

data/lib/diplomat/rest_client.rb

@@ -13,9 +13,11 @@ module Diplomat
     # Build the API Client
     # @param api_connection [Faraday::Connection,nil] supply mock API Connection
     def start_connection api_connection=nil
-      @conn = api_connection ||= Faraday.new(:url => Diplomat::url) do |faraday|
+      @conn = api_connection ||= Faraday.new(:url => Diplomat.configuration.url) do |faraday|
         faraday.request  :url_encoded
-        faraday.response :logger
+        Diplomat.configuration.middleware.each do |middleware|
+          faraday.use middleware
+        end
         faraday.adapter  Faraday.default_adapter
         faraday.use      Faraday::Response::RaiseError
       end

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - John Hamelink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -159,8 +173,12 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- features/configuration.feature
+- features/step_definitions/setup_diplomat.rb
+- features/step_definitions/test_key_value.rb
 - lib/diplomat.rb
 - lib/diplomat/check.rb
+- lib/diplomat/configuration.rb
 - lib/diplomat/health.rb
 - lib/diplomat/kv.rb
 - lib/diplomat/members.rb
@@ -192,4 +210,3 @@ signing_key:
 specification_version: 4
 summary: Diplomat is a simple wrapper for Consul
 test_files: []
-has_rdoc: