etre-client 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a9a7c0360d700dabbe48fc8572a362ec8f2eae8
-  data.tar.gz: 73f22ebd75fd9621c33e72fa4fe10be856b368a5
+  metadata.gz: 44d824a5e5b29f32d0523730882e2a021688e0f6
+  data.tar.gz: 673709db37ec3eb8d1c3f80a5381a3d488be2230
 SHA512:
-  metadata.gz: f66a61bb2b27da32951328b2bbe2da2f29d7579fee33d780223f7af2a4dfc3ba0de7d38c6bbf7411625086ac4c684e60c72371652f4c8567d59a4da2857b464e
-  data.tar.gz: 7f9e30e3707341914aaad1a1adcaac4290c5a9f7b5572db162831f239ea1d3880dedfd727797481ea048167ed5eb1e0f10589b30567c672d505265397a06c853
+  metadata.gz: bc1b87620cbd76905693db58a98575a8eafd8deba25f0821adea0a21b2aa491dff2a42c9815544c6cde91caf21f4c0ff94c4ad6bc1ac435e2d90fd1f6f822591
+  data.tar.gz: ee959e545e5ca61da91215a41af8b00e1c8ab8df0a94ed29ce8660cf524fae70ca43984af84c2918ec459e890ef4279d6938cce2b27ce7904439fdf83a8991df

data/README.md

@@ -21,7 +21,18 @@ require 'etre-client'
 
 Create a new client
 ```
-e = Etre::Client.new(entity_type: "node", url: "http://127.0.0.1:8080", ssl_cert: nil, ssl_key: nil, ssl_ca: nil, insecure: true)
+# Create a standard client.
+e = Etre::Client.new(entity_type: "node", url: "http://127.0.0.1:8080")
+
+# Create a client with advanced HTTP options. Can put whatever you want in here.
+options = {
+  :ssl_client_cert => OpenSSL::X509::Certificate.new(File.read("path_to_ssl_cert")),
+  :ssl_client_key  => OpenSSL::PKey::RSA.new(File.read("path_to_ssl_key")),
+  :ssl_ca_file     => "path_to_ssl_ca",
+  :verify_ssl      => OpenSSL::SSL::VERIFY_PEER,
+  :cookies         => {:foo => "bar"},
+}
+e = Etre::Client.new(entity_type: "node", url: "http://127.0.0.1:8080", options: options)
 ```
 
 Insert entities

data/lib/etre-client/client.rb

@@ -10,14 +10,10 @@ module Etre
     META_LABEL_ID = "_id"
     META_LABEL_TYPE = "_type"
 
-    def initialize(entity_type:, url:, ssl_cert: nil, ssl_key: nil, ssl_ca: nil, insecure: true)
+    def initialize(entity_type:, url:, options: {})
       @entity_type = entity_type
       @url = url
-
-      @ssl_cert = ssl_cert
-      @ssl_key = ssl_key
-      @ssl_ca = ssl_ca
-      @insecure = insecure
+      @options = options
     end
 
     # query returns an array of entities that satisfy a query.
@@ -282,23 +278,12 @@ module Etre
     end
 
     def resource_for_route(route)
-      opts = {}
-      opts.merge!(ssl_options) unless @insecure
       RestClient::Resource.new(
         @url + API_ROOT + route,
-        opts
+        @options
       )
     end
 
-    def ssl_options
-      {
-        :ssl_client_cert => OpenSSL::X509::Certificate.new(File.read(@ssl_cert)),
-        :ssl_client_key  => OpenSSL::PKey::RSA.new(File.read(@ssl_key)),
-        :ssl_ca_file     => @ssl_ca,
-        :verify_ssl      => OpenSSL::SSL::VERIFY_PEER,
-      }
-    end
-
     def parse_response(response)
       JSON.parse(response)
     end

data/lib/etre-client/version.rb

@@ -1,5 +1,5 @@
 module Etre
   class Client
-    VERSION = "0.8.1"
+    VERSION = "0.8.2"
   end
 end

data/spec/client_spec.rb

@@ -2,7 +2,7 @@ require 'etre-client'
 require 'ostruct'
 
 describe Etre::Client do
-  let(:etre_client) { Etre::Client.new(entity_type: "node", url: "http://localhost:3000", insecure: true) }
+  let(:etre_client) { Etre::Client.new(entity_type: "node", url: "http://localhost:3000") }
   let(:get_headers) { {:accept => "application/json"} }
   let(:post_headers) { get_headers.merge({:content_type => "application/json"}) }
   let(:put_headers) { post_headers }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etre-client
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Michael Finch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-03 00:00:00.000000000 Z
+date: 2018-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json