reso_web_api 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67631df91f672fae2f93f55775fe0428cd9499c2
-  data.tar.gz: ff3124a85d13350d727091124f6b1a26505192ff
+  metadata.gz: 4501a96c3557146c1a1154fdaaacc285dc5997a6
+  data.tar.gz: 27192bff4c4fab933e245e73fdf5bbe6d0d345f3
 SHA512:
-  metadata.gz: 0ec818165bb57a2aaa96f7648d8926d4d2970f9b44fc7e0f4fb08104507cd42946291e968eb1503c4d06bf9d86ddc46561dba9d37b38cf372c99ae92e53e055c
-  data.tar.gz: 42b196b79c5e818acea12e690a664fc35e51d922c4447d6264b083ddd53f18d9ec20821664cef9476b4c8e13ea94a1eaf4f0b1e91114290087f3a03cd59d99a6
+  metadata.gz: 64323dbece9426f3690e354c60362a6487c5c55116c251efaf80a0bd630f9beeb907a0c98a4a20e8d1b300812b540aff58197dce2fd67da0b9c231e75d9afdd0
+  data.tar.gz: 432e8d6e25e1873e6c38a297a9b8dfcb2ab041f4f36a570ec2583d5b6e26f91e29189d861d8817eff0b161f0f606dc99e73adb03a2cd3115907f776300d375a1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.2.2
+
+* Switching to frodata gem
+* Make headers configurable, remove default accept header
+* Don't modify passed-in options hash
+
 ## 0.2.1
 
 * Added `SimpleTokenAuth` strategy for using basic non-expiring, non-refreshable tokens

data/README.md

@@ -69,6 +69,7 @@ However, if you need more control, there are several additional settings that ca
 
 - `:user_agent`: Sets the `User-Agent` header sent to the service (defaults to `Reso Web API Ruby Gem $VERSION`)
 - `:adapter`: Sets the Faraday adapter used for the connection (defaults to `Net::HTTP`)
+- `:header`: Allows custom headers to be set on the connection. 
 - `:logger`: You may pass your own logger to a client instance. By default, each instance will use the global logger defined on the `ResoWebApi` module, which logs to STDOUT. You can also change the logger on the module itself, which will then be used for all new client instances you create.
 - `:odata`: If you need to pass any special options to the OData service, you may do so here.
 

data/lib/reso_web_api.rb

@@ -1,6 +1,6 @@
 require 'json'
 require 'logger'
-require 'odata4'
+require 'frodata'
 
 require 'reso_web_api/version'
 require 'reso_web_api/errors'

data/lib/reso_web_api/base_client.rb

@@ -7,9 +7,10 @@ module ResoWebApi
     extend Dry::Initializer
 
     option :endpoint
-    option :user_agent, default: proc { USER_AGENT }
     option :adapter, default: proc { Faraday::default_adapter }
+    option :headers, default: proc { {} }
     option :logger, default: proc { ResoWebApi.logger }
+    option :user_agent, default: proc { USER_AGENT }
 
     USER_AGENT = "Reso Web API Ruby Gem v#{VERSION}"
 
@@ -30,7 +31,7 @@ module ResoWebApi
     def headers
       {
         :user_agent => user_agent
-      }
+      }.merge(@headers)
     end
   end
 end

data/lib/reso_web_api/client.rb

@@ -17,12 +17,6 @@ module ResoWebApi
       ensure_valid_auth_strategy!
     end
 
-    # Headers to be send along with requests
-    # @return [Hash] The request headers
-    def headers
-      super.merge({ accept: 'application/json' })
-    end
-
     # Return the {Faraday::Connection} object for this client.
     # Yields the connection object being constructed (for customzing middleware).
     # @return [Faraday::Connection] The connection object
@@ -33,12 +27,12 @@ module ResoWebApi
       end
     end
 
-    # Returns a proxied {OData4::Service} that attempts to ensure a  properly
+    # Returns a proxied {FrOData::Service} that attempts to ensure a  properly
     # authenticated and authorized connection
-    # @return [OData4::Service] The service instance.
+    # @return [FrOData::Service] The service instance.
     def service
       # puts odata, service_options
-      @service ||= OData4::Service.new(connection, service_options)
+      @service ||= FrOData::Service.new(connection, service_options)
     end
 
     # Returns the default options used by the by the OData service
@@ -51,7 +45,7 @@ module ResoWebApi
 
     def ensure_valid_auth_strategy!
       if auth.is_a?(Hash)
-        strategy = auth.delete(:strategy) || Authentication::TokenAuth
+        strategy = auth[:strategy] || Authentication::TokenAuth
         if strategy.is_a?(Class) && strategy <= Authentication::AuthStrategy
           @auth = strategy.new(auth)
         else

data/lib/reso_web_api/version.rb

@@ -1,3 +1,3 @@
 module ResoWebApi
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/reso_web_api.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'faraday', '~> 0.15.0'
-  spec.add_dependency 'odata4', '~> 0.9.1'
+  spec.add_dependency 'frodata', '~> 0.9.2'
   spec.add_dependency 'dry-initializer', '~> 1.4.1'
 
   spec.add_development_dependency "bundler", "~> 1.16"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reso_web_api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Christoph Wagner
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.15.0
 - !ruby/object:Gem::Dependency
-  name: odata4
+  name: frodata
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: dry-initializer
   requirement: !ruby/object:Gem::Requirement