seiso-connector 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 2207917a82352c542779238c44ccc6198af2f8b1
-  data.tar.gz: f856185df1fa582f846df8e7e5223cee1c9c7d33
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OTM0N2JjZDM5Zjk4MGRkZjIzMjI5MWI5ZjM4YWFlZDA3ZDhmN2RiOA==
+  data.tar.gz: !binary |-
+    MjU4YzBlYzkyYjYxYjc4YWJhNmU1MDZlNDA1MDE4ODgwZmMyNzExYw==
 SHA512:
-  metadata.gz: b5c6801df649b5eace7f24997c9b5c8353c799d3583de34071200e1e7ab3cb473ed9ab060fd0228720c4b23e54af268213f6593b0ab0a21f3c1ac126b103839d
-  data.tar.gz: a907382f7eb7c9e08105c17d0e016417424f38af719e5f1879bc8c156d8048d33b27e11c4d05c60610ae39f1b60abe6d092253bf8aa79994ae4dcc571447dbde
+  metadata.gz: !binary |-
+    MzA0ZWFjMDM0ZTM1NzQ5M2MyZmVmYzFmZjA1OTA2NWY1MmMwNTFhNjJjYWJl
+    YzY1MWUzYjFiZTBiOTU3YWYzMTRmNzFjZDllYTc3MTQ1YWJjMGFhOTRlYjBi
+    YTMzYjdiNWNlYmQxY2E1M2FjNWQ1Y2FiMjk4ZjYyYzdiNzdjMjE=
+  data.tar.gz: !binary |-
+    ZTUzYWQ0Mjg0ODI2NmYxZDhhMTg0N2Y3MzRlYTM0MGJlOGNkMDYzMDczNjA3
+    MWRkMzgzOGMzNTJiZjJjNDdjNDY2MGRjYzc0OTk3OGVmOTlkNzBkMWQwMTAw
+    Y2ZmYjgxNmQzOTdjZjdlMzA3NTlmZmZiNTdkYzQwY2ZmNzhiNzc=

data/README.md

@@ -6,6 +6,8 @@
 
 Seiso connector for Ruby clients.
 
+Note that this gem is a bit of a mess right now. We're moving toward using a more generic REST connector (standard verbs, identify resources with URIs, etc.) instead of having method like `getServices()`, `getServiceInstance(key)`, etc. So please pay attention to deprecation notices.
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -33,3 +35,9 @@ TODO: Write usage instructions here
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+
+## Development
+
+To build and install the gem locally:
+
+    $ rake install

data/lib/seiso/connector/connector_v1.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'net/http'
 require_relative 'request_failed_error'
 
+# DEPRECATED
 module Seiso
   class Connector
     class ConnectorV1

data/lib/seiso/connector/connector_v2.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require_relative 'request_failed_error'
 
+# DEPRECATED
 module Seiso
   class Connector
     class ConnectorV2

data/lib/seiso/connector/rest_connector.rb

@@ -0,0 +1,100 @@
+require "json"
+require "net/http"
+require "openssl"
+
+module Seiso
+  class Connector
+
+    # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
+    # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
+    # License:: Apache 2.0
+    class RestConnector
+      HN_ACCEPT = "Accept"
+      HN_CONTENT_TYPE = "Content-Type"
+
+      def initialize(host, port, use_ssl, ignore_cert, username, password, media_type)
+        @host = host
+        @port = port
+        @use_ssl = use_ssl
+        @ignore_cert = ignore_cert
+        @username = username
+        @password = password
+        @media_type = media_type
+
+        # FIXME Not secure
+        @verify_mode = OpenSSL::SSL::VERIFY_NONE if @use_ssl
+      end
+
+      def get(uri)
+        request = Net::HTTP::Get.new uri.request_uri
+        request[HN_ACCEPT] = @media_type
+        request.basic_auth(@username, @password)
+        do_request(http, request)
+      end
+
+      def post(uri, resource)
+        request = Net::HTTP::Post.new uri.request_uri
+        request[HN_CONTENT_TYPE] = @media_type
+        request.basic_auth(@username, @password)
+        request.body = resource.to_json
+        do_request(http, request)
+      end
+
+      # Puts all resources using a keepalive connection
+      def put_all(uri_resource_pairs)
+        Net::HTTP.start(
+            @host,
+            @port,
+            :use_ssl => @use_ssl,
+            :verify_mode => @verify_mode) do |http|
+
+          uri_resource_pairs.each do |pair|
+            pair_uri = pair['uri']
+            pair_resource = pair['resource']
+            request = Net::HTTP::Put.new pair_uri.request_uri
+            request[HN_CONTENT_TYPE] = @media_type
+            request.basic_auth(@username, @password)
+            request.body = pair_resource.to_json
+            do_request(http, request)
+          end
+        end
+      end
+
+      def put(uri, resource)
+        request = Net::HTTP::Put.new uri.request_uri
+        request[HN_CONTENT_TYPE] = @media_type
+        request.basic_auth(@username, @password)
+        request.body = resource.to_json
+        do_request(http, request)
+      end
+
+      def delete(uri)
+        puts "DELETE #{uri}"
+        request = Net::HTTP::Delete.new uri.request_uri
+        request.basic_auth(@username, @password)
+        do_request(http, request)
+      end
+
+      private
+
+      def http
+        # Not sure if I can reuse this, so for now I'm just creating a new one every time.
+        http = Net::HTTP.new(@host, @port)
+        http.use_ssl = @use_ssl
+        http.verify_mode = @verify_mode
+        http
+      end
+
+      def do_request(http, request)
+        response = http.request request
+
+        if response.code.start_with?("4") || response.code.start_with?("5")
+          details = "(#{JSON.parse response.body})"
+        end
+        puts "#{request.method} #{request.path} => #{response.code} #{response.message} #{details}"
+        response
+      end
+
+    end # class RestConnector
+  end # class Connector
+end # module Seiso

data/lib/seiso/connector/uri_factory_v1.rb

@@ -0,0 +1,60 @@
+require "uri"
+
+module Seiso
+  class Connector
+
+    # Seiso API v1 URI factory.
+    # 
+    # URI templating (embodied here) is a temporary strategy for obtaining URIs. The plan is
+    # to adopt something like a Traverson-style strategy.
+    # 
+    # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
+    # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
+    # License:: Apache 2.0
+    class UriFactoryV1
+
+      def initialize(base_uri)
+        @base_uri = base_uri
+      end
+
+      def nodes_uri(batch)
+        if batch
+          uri "/nodes?mode=batch"
+        else
+          uri "/nodes"
+        end
+      end
+
+      def node_uri(name)
+        uri "/nodes/#{name}"
+      end
+      
+      def node_ip_address_uri(node_name, ip_address)
+        uri "/nodes/#{node_name}/ip-addresses/#{ip_address}"
+      end
+
+      def services_uri(batch)
+        if batch
+          uri "/services?mode=batch"
+        else
+          uri "/services"
+        end
+      end
+
+      def service_instances_uri(batch)
+        if batch
+          uri "/service-instances?mode=batch"
+        else
+          uri "/service-instances"
+        end
+      end
+
+      private
+
+      def uri(path)
+        URI.parse "#{@base_uri}#{path}"
+      end
+      
+    end # class UriFactoryV1
+  end # class Connector
+end # module Seiso

data/lib/seiso/connector/uri_factory_v2.rb

@@ -0,0 +1,36 @@
+require "uri"
+
+module Seiso
+  class Connector
+
+    # Seiso API v2 URI factory.
+    # 
+    # URI templating (embodied here) is a temporary strategy for obtaining URIs. The plan is
+    # to adopt something like a Traverson-style strategy.
+    # 
+    # Author:: Willie Wheeler (mailto:wwheeler@expedia.com)
+    # Copyright:: Copyright (c) 2014-2015 Expedia, Inc.
+    # License:: Apache 2.0
+    class UriFactoryV2
+
+      def initialize(base_uri)
+        @base_uri = base_uri
+      end
+
+      def doc_links_uri(service_key)
+        uri "/services/#{service_key}/doc-links"
+      end
+
+      def find_seyren_check_uri(seyren_base_url, seyren_id)
+        uri "/seyren-checks/search/find-by-base-url-and-id?url=#{seyren_base_url}&id=#{seyren_id}"
+      end
+
+      private
+
+      def uri(path)
+        URI.parse "#{@base_uri}#{path}"
+      end
+      
+    end # class UriFactoryV2
+  end # class Connector
+end # module Seiso

data/lib/seiso/connector.rb

@@ -3,7 +3,11 @@ require "openssl"
 require "uri"
 require_relative "connector/connector_v1"
 require_relative "connector/connector_v2"
+require_relative "connector/rest_connector"
+require_relative "connector/uri_factory_v1"
+require_relative "connector/uri_factory_v2"
 
+# DEPRECATED
 # Seiso namespace module
 module Seiso
   
@@ -24,8 +28,8 @@ module Seiso
     def initialize(settings)
       host = settings['host']
       port = settings['port']
-      use_ssl = settings['use_ssl'] | false
-      ignore_cert = settings['ignore_cert'] | false
+      use_ssl = settings['use_ssl'] || false
+      ignore_cert = settings['ignore_cert'] || false
       username = settings['username']
       password = settings['password']
       

data/seiso-connector.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "seiso-connector"
-  spec.version       = "0.1.2"
+  spec.version       = "0.1.3"
   spec.authors       = ["Willie Wheeler"]
   spec.email         = ["wwheeler@expedia.com"]
   spec.summary       = "Connector to make it easier for Ruby clients to talk to the Seiso REST API."

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: seiso-connector
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Willie Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 description: Very basic at this point. Plan to support pagination, sorting, searching
@@ -60,8 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -71,6 +71,9 @@ files:
 - lib/seiso/connector/connector_v1.rb
 - lib/seiso/connector/connector_v2.rb
 - lib/seiso/connector/request_failed_error.rb
+- lib/seiso/connector/rest_connector.rb
+- lib/seiso/connector/uri_factory_v1.rb
+- lib/seiso/connector/uri_factory_v2.rb
 - seiso-connector.gemspec
 - test/test_connector.rb
 - test/test_connector_v1.rb
@@ -85,17 +88,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Connector to make it easier for Ruby clients to talk to the Seiso REST API.