stbaldricks 2.1.0.alpha.2 → 3.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79edbc4f9b64f19660b1e21de5684ec4aa13650b
-  data.tar.gz: 7ba5ab1319f27e0a25edffa186f5c99abdf89e56
+  metadata.gz: c0aeba2b13acc4b3e32228139d2d0cb75605022c
+  data.tar.gz: 573fa7b8b7ecf6ef819ec97fa73830796993ee4f
 SHA512:
-  metadata.gz: 1217846d9cf01217d7a0b0b696d86f1de553228f49f864d199c28d11b27e1c66b2bd69b5e15fd117656fb8a5389132da1b36e87f0d765a109e9d4ddab36f486d
-  data.tar.gz: 3e4bd4a61f1882356cd15afa060f3ca73795ea4177ff1d424cacf08decb5675348b8ba6129583f5b5e7aceaeeeefae8cc361ee8409f93163dedbd7f5aec36a83
+  metadata.gz: 198912e64a8c1372de7c488388e93bd0e33f43f5b4b9c7d3382519dcfb3d35c4c859ba5336fbbb5d2a83e77cf754a802160a87c791005f5fbc26dabc89b8d889
+  data.tar.gz: c21fd67d3ca1c3c45ee2caefa35a716fcecb94920eb9ed474569b68360c8b359bee3a59803949b2b3ba19a91c8cd6d44b39af90b7f80190b6d99b693849ca674

data/lib/stbaldricks/endpoints/config.rb

@@ -5,7 +5,7 @@ module SBF
   module Client
     class ConfigEndpoint < SBF::Client::EntityEndpoint
       def reload(entity)
-        response = SBF::Client::Api::Request.public_get_request("#{base_uri}/get")
+        response = SBF::Client::Api::Request.get_request("#{base_uri}/get")
         parsed_response_body = JSON.parse(response.body).symbolize!
 
         raise SBF::Client::StandardError, 'Unable to retrieve settings from the api' unless ok?(response)

data/lib/stbaldricks/endpoints/event_application.rb

@@ -13,7 +13,7 @@ module SBF
 
         entity.errors.clear
 
-        response = SBF::Client::Api::Request.public_post_request("#{base_uri}/create", create_data)
+        response = SBF::Client::Api::Request.post_request("#{base_uri}/create", create_data)
         parsed_response_body = JSON.parse(response.body).symbolize!
 
         if ok?(response)

data/lib/stbaldricks/endpoints/newsletter_recipient.rb

@@ -14,7 +14,7 @@ module SBF
 
         data = entity.to_hash
 
-        response = SBF::Client::Api::Request.public_post_request("#{base_uri}/subscribe", data)
+        response = SBF::Client::Api::Request.post_request("#{base_uri}/subscribe", data)
         error = SBF::Client::ErrorEntity.new(JSON.parse(response.body).symbolize!) unless ok?(response)
 
         SBF::Client::Api::Response.new(http_code: response.code, data: nil, error: error)
@@ -31,7 +31,7 @@ module SBF
 
         data = entity.to_hash
 
-        response = SBF::Client::Api::Request.public_post_request("#{base_uri}/unsubscribe", data)
+        response = SBF::Client::Api::Request.post_request("#{base_uri}/unsubscribe", data)
         error = SBF::Client::ErrorEntity.new(JSON.parse(response.body).symbolize!) unless ok?(response)
 
         SBF::Client::Api::Response.new(http_code: response.code, data: nil, error: error)

data/lib/stbaldricks/endpoints/user.rb

@@ -11,7 +11,7 @@ module SBF
       # @param password [string]
       # @return [string]
       def login!(username, password)
-        response = SBF::Client::Api::Request.public_post_request(
+        response = SBF::Client::Api::Request.post_request(
           "/#{SBF::Client::Api::VERSION}/security/login",
           username: username,
           password: password

data/lib/stbaldricks/request.rb

@@ -37,11 +37,8 @@ module SBF
         def self.get_request(path, params = {})
           raise SBF::Client::InvalidURIError, "Invalid URI: #{path}" unless valid_uri?(path)
 
-          # Use a public request if the user has not logged in
-          return public_get_request(path, params) if user_token.nil?
-
           request_log('GET', path, params) do
-            get(path, options(query: params, auth: user_token))
+            get(path, options(query: params, auth: user_token || general_token))
           end
         end
 
@@ -55,10 +52,9 @@ module SBF
         # @raise [Error]
         def self.post_request(path, params = {})
           raise SBF::Client::InvalidURIError, "Invalid URI: #{path}" unless valid_uri?(path)
-          raise SBF::Client::Error, 'Not yet authenticated' if user_token.nil?
 
           request_log('POST', path, params) do
-            post(path, options(body: params.to_json, type: :post, auth: user_token))
+            post(path, options(body: params.to_json, type: :post, auth: user_token || general_token))
           end
         end
 
@@ -72,28 +68,6 @@ module SBF
           end
         end
 
-        # Makes a HTTP GET request to the specified path with specified params
-        # This is used for login which is the only request which should use the public key.
-        #
-        def self.public_get_request(path, params = {})
-          raise SBF::Client::InvalidURIError, "Invalid URI: #{path}" unless valid_uri?(path)
-
-          request_log('GET', path, params) do
-            get(path, options(query: params, auth: general_token))
-          end
-        end
-
-        # Makes a HTTP POST request to the specified path with specified params
-        # This is used for login which is the only request which should use the public key.
-        #
-        def self.public_post_request(path, params = {})
-          raise SBF::Client::InvalidURIError, "Invalid URI: #{path}" unless valid_uri?(path)
-
-          request_log('POST', path, params) do
-            post(path, options(body: params.to_json, type: :post, auth: general_token))
-          end
-        end
-
         def self.options(auth: nil, type: :get, query: nil, body: nil)
           {}.tap do |options|
             options.merge!(base_uri: SBF::Client::Configuration.base_uri,

data/lib/stbaldricks/version.rb

@@ -1,5 +1,5 @@
 module SBF
   module Client
-    VERSION = '2.1.0.alpha.2'
+    VERSION = '3.0.0.alpha.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stbaldricks
 version: !ruby/object:Gem::Version
-  version: 2.1.0.alpha.2
+  version: 3.0.0.alpha.1
 platform: ruby
 authors:
 - Firespring
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -216,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: St. Baldrick's Foundation Ruby Client Library