wavecrest 0.0.21 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea8bb3dc2ae121b3c4bcf813ad7c4ae538c90102
-  data.tar.gz: d1e6a137b617dc96fd62288b3e9e35fbcf943ab7
+  metadata.gz: 7dce306297db11071d9baadbfb267f9811b4c2cf
+  data.tar.gz: e028b194e1842263c83a13ea6732ff6ed631f5e6
 SHA512:
-  metadata.gz: 60a0fa2ba168f14fe692f5566c85b9ec349876f95a2dd8511eece7e24ccd3bae33b848f508b2f046a7d4f71ebd036033becd860e3ee6dea2a68427b7edcb95ac
-  data.tar.gz: 11d4d1a788d0475b5166568d1e20292415523c9c64e03d15bdcf56cc10e24800411de4ab5d779f530569d09fcb5fb8f003e4bc98ebf5e61f4c964a8c1c91c492
+  metadata.gz: c94bca47c04446de00af5ad8cd29c12c2219b58288206e29e7331d41e8ce1757204bff88bce856e263c684bf0b67fc4a1c100db46e70c98ff01242dbc7a25916
+  data.tar.gz: d35276bed272521a673665f2daa1108ddcd411a1dea58eea94f1ddd1d3823551be3797bfbc3a33c49f65e48cd21a73db57b59885539c9d8b8b2bd789e1e342c9

data/lib/wavecrest.rb

@@ -80,47 +80,76 @@ module Wavecrest
   end
 
   def self.auth
-    url = configuration.endpoint + "/v3/services/authenticator"
-
-    headers = {
-        "DeveloperId" => configuration.user,
-        "DeveloperPassword" => configuration.password,
-        "X-Method-Override" => 'login',
-        accept: :json,
-        content_type: :json
-    }
+    url = URI("#{configuration.endpoint}/v3/services/authenticator")
+
+    if configuration.proxy
+      proxy_uri = URI.parse(configuration.proxy)
+      http = Net::HTTP.new(url.host, url.port, proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
+    else
+      http = Net::HTTP.new(url.host, url.port)
+    end
+
+    if url.scheme == 'https'
+      http.use_ssl = true
+    end
 
-    RestClient.proxy = configuration.proxy if configuration.proxy
-    request = RestClient::Request.new(method: :post, url: url, headers: headers)
-    response = request.execute.body
-    RestClient.proxy = nil
-    data = JSON.parse response
+    request = Net::HTTP::Post.new(url.request_uri)
+    request.add_field('Content-Type', 'application/json')
+    request.add_field('Accept', 'application/json')
+    request.add_field('DeveloperId', configuration.user)
+    request.add_field('DeveloperPassword', configuration.password)
+    request.add_field('X-Method-Override', 'login')
+
+    response = http.request(request)
+    data = JSON.parse response.body
     ENV['_WAVECREST_AUTH_TOKEN'] = data["token"]
     ENV['_WAVECREST_AUTH_TOKEN_ISSUED'] = Time.now.to_i.to_s
-    # puts "WC Authenticated: #{data["token"]}"
   end
 
 
   def self.send_request method, path, params={}
     auth if auth_need?
 
-    url = configuration.endpoint + "/v3/services" + path
-    payload = params.to_json
-    headers = {
-        "DeveloperId" => configuration.user,
-        "DeveloperPassword" => configuration.password,
-        "AuthenticationToken" => auth_token,
-        accept: :json,
-        content_type: :json
-    }
+    # path must begin with slash
+    url = URI(configuration.endpoint + "/v3/services" + path)
+
+    # Build the connection
+    if configuration.proxy
+      proxy_uri = URI.parse(configuration.proxy)
+      http = Net::HTTP.new(url.host, url.port, proxy_uri.host, proxy_uri.port, proxy_uri.user, proxy_uri.password)
+    else
+      http = Net::HTTP.new(url.host, url.port)
+    end
+
+    if url.scheme == 'https'
+      http.use_ssl = true
+    end
+
+    if method == :get
+      request = Net::HTTP::Get.new(url.request_uri)
+    elsif method == :post
+      request = Net::HTTP::Post.new(url.request_uri)
+    elsif method == :delete
+      request = Net::HTTP::Delete.new(url.request_uri)
+    elsif method == :put
+      request = Net::HTTP::Put.new(url.request_uri)
+    else
+      raise 'Unsupported request method'
+    end
+
+    unless method == :get
+      request.body = params.to_json
+    end
+
+    request.add_field('Content-Type', 'application/json')
+    request.add_field('Accept', 'application/json')
+    request.add_field('DeveloperId', configuration.user)
+    request.add_field('DeveloperPassword', configuration.password)
+    request.add_field('AuthenticationToken', auth_token)
 
     begin
-      RestClient.proxy = configuration.proxy if configuration.proxy
-      # puts "WC request: #{method} #{url}"
-      request = RestClient::Request.new(method: method, url: url, payload: payload, headers: headers)
-      response = request.execute.body
-      RestClient.proxy = nil
-      JSON.parse response
+      response = http.request(request)
+      JSON.parse response.body
     rescue => e
       # puts e.message, e.response
       return JSON.parse e.response
@@ -128,6 +157,7 @@ module Wavecrest
   end
 
 
+
   def self.request_card(params)
     default_params = {
         "cardProgramId" => "0",

data/lib/wavecrest/version.rb

@@ -1,3 +1,3 @@
 module Wavecrest
-  VERSION = "0.0.21"
+  VERSION = "0.0.22"
 end

data/wavecrest.gemspec

@@ -19,6 +19,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
 
-  spec.add_runtime_dependency 'rest-client'
   spec.add_runtime_dependency 'json'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavecrest
 version: !ruby/object:Gem::Version
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors:
 - Vadim Marchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement