wrapi 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d7d0d197548b78702536dcb3ffd582f1a637ba7c4563b678b682702a55f1f92
-  data.tar.gz: 944dd3cb645f422900a45ff8728a08f47472abb98c64e7c3c34a3a8e696ad0d0
+  metadata.gz: d7a1a27203e141d7bbc0f20e3e65f18dafc255c33a051d3e03786cdb88fefa6f
+  data.tar.gz: b9cb8227c911fcb9ef133c8816c41e5dee626f3c0ea9ee4f1d5538f7c48f61cd
 SHA512:
-  metadata.gz: 51854938895ac5cfdcb616fd9a6a6de72ed0e4a7544bea9eca525b64b8c370b2dbc9b0ca2b596fcbd1838f7b4eaec0a4fa476666e1bca79436f448c647d358cb
-  data.tar.gz: fe27c57580cf3d50d49830d0b1449d177f0de21cb077eb12a3cc953351c1f3d9dc898de8cf4391130dea6f5e549cf9b6530928094cf5866482fefb5e1d795cca
+  metadata.gz: 65296ac28b6371f30ef67d7c6c4736d7a1a75820f5c33488acd9eaa370eecb63e5407dad016484e13e05b184faf99b853cac0c4c2f0e6ccd1e527cadb5a9212e
+  data.tar.gz: 18ab1a6603f10c89191c3fdf5345b7dbf22a2862bf251e1477b8d0da092679bdc8a1698f87b65e8e9cae68e69f8ff111e758822cb1ddb2560da594d4472cf56b

data/CHANGELOG.md

@@ -18,3 +18,13 @@
 ## [0.2.0] - 2024-02-13
 - implement option to manipulate request
 
+## [0.4.0] - 2024-02-13
+- testing/code quality
+  authentication tests (mocked)
+  test string/{}/[] entities returned with mock
+  request tests with mock including delete/put/post
+- Entity fix issues returning json arrays
+  Request option to return raw response
+
+## [0.4.1] - 2024-02-28
+- fix issue with post body only supported as json

data/Gemfile

@@ -2,8 +2,7 @@
 
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in cloudally.gemspec
+# Specify your gem's dependencies in wrapi.gemspec
 gemspec
 
 gem 'rake', '~> 13.0'
-gem 'rubocop', '~> 1.7'

data/README.md

@@ -1,6 +1,9 @@
 # Wrapper API 
+[![Version](https://img.shields.io/gem/v/wrapi.svg)](https://rubygems.org/gems/wrapi)
+[![Maintainability](https://api.codeclimate.com/v1/badges/d84930f1f1d8fae05c5c/maintainability)](https://codeclimate.com/github/jancotanis/wrapi/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/d84930f1f1d8fae05c5c/test_coverage)](https://codeclimate.com/github/jancotanis/wrapi/test_coverage)
 
-Some generic cody extracted from  by a number of api wrapper gems. Internal used only.
+Some generic code extracted from  by a number of api wrapper gems. Internal used only.
 
 ## Installation
 

data/Rakefile

@@ -1,12 +1,20 @@
 # frozen_string_literal: true
 
 require 'bundler/gem_tasks'
+require 'dotenv'
 require 'rake/testtask'
 
+Dotenv.load
+
+system './bin/cc-test-reporter before-build'
+
 Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.libs << 'lib'
   t.test_files = FileList['test/**/*_test.rb']
+  at_exit do
+    system './bin/cc-test-reporter after-build'
+  end
 end
 
 require 'rubocop/rake_task'

data/lib/wrapi/configuration.rb

@@ -2,10 +2,15 @@
 #require_relative './version'
 
 module WrAPI
+
   # Defines constants and methods related to configuration
+  # If configuration is overridden, please add following methods
+  # @see [self.extended(base)] to initialize the Configuration
+  # If additional options are added, please overide
+  # @see [reset] to initialize variables
+  # @see [options] to return the correct set of options
   module Configuration
-    # An array of valid keys in the options hash when configuring a {Integra365::API}
-
+    # An array of valid keys in the options hash when configuring a {WrAPI::API}
     VALID_OPTIONS_KEYS = [
       :access_token,
       :token_type,

data/lib/wrapi/connection.rb

@@ -33,12 +33,12 @@ module WrAPI
           'User-Agent': user_agent
         },
         url: endpoint
-      }.merge(connection_options)
+      }.merge(connection_options || {})
     end
 
     # callback method to setup api authorization
     def setup_authorization(connection)
-      connection.authorization :Bearer, access_token if access_token
+      connection.headers['Authorization'] = "Bearer #{access_token}" if access_token
     end
 
     # callback method to setup api headers

data/lib/wrapi/entity.rb

@@ -6,40 +6,37 @@ module WrAPI
     class Entity
       attr_reader :attributes
 
+      # factory method to create entity or array of entities
+      def self.create(attributes)
+
+        if attributes.is_a? Array
+          Entity.entify(attributes)
+        else
+          Entity.new(attributes) if attributes
+        end
+      end
+
       def initialize(attributes)
         @_raw = attributes
 
         case attributes
         when Hash
           @attributes = attributes.clone.transform_keys(&:to_s)
-        when Array
-          # make deep copy
-          @attributes = entify(attributes)
         else
           @attributes = attributes.clone
         end
       end
 
       def method_missing(method_sym, *arguments, &block)
-        len = arguments.length
         # assignment
         if (method = method_sym[/.*(?==\z)/m])
-          raise! ArgumentError, "wrong number of arguments (given #{len}, expected 1)", caller(1) unless len == 1
+          raise! ArgumentError, "wrong number of arguments (given #{arguments.length}, expected 1)", caller(1) unless arguments.length == 1
 
           @attributes[method] = arguments[0]
         elsif @attributes.include? method_sym.to_s
-          r = @attributes[method_sym.to_s]
-          case r
-          when Hash
-            @attributes[method_sym.to_s] = self.class.new(r)
-          when Array
-            # make deep copy
-            @attributes[method_sym.to_s] = r = entify(r)
-            r
-          else
-            r
-          end
+          accessor(method_sym.to_s)
         else
+          # delegate to hash
           @attributes.send(method_sym, *arguments, &block)
         end
       end
@@ -55,10 +52,23 @@ module WrAPI
       def to_json(options = {})
         @_raw.to_json
       end
-      
-      def entify(a)
+
+      def accessor(method)
+          case @attributes[method]
+          when Hash
+            @attributes[method] = self.class.new(@attributes[method])
+          when Array
+            # make deep copy
+            @attributes[method] = Entity.entify(@attributes[method])
+          else
+            @attributes[method]
+          end
+      end
+
+      def self.entify(a)
         a.map do |item|
-          item.is_a?(Hash) ? self.class.new(item) : item
+          #item.is_a?(Hash) ? self.class.new(item) : item
+          Entity.create(item)
         end
       end
     end

data/lib/wrapi/request.rb

@@ -7,19 +7,19 @@ module WrAPI
   module Request
 
     # Perform an HTTP GET request and return entity incase format is :json
-    #  @return if format is :json an [Entity] is returned, otherwhise the response body
-    def get(path, options = {})
+    #  @return if format is :json and !raw an [Entity] is returned, otherwhise the response body
+    def get(path, options = {}, raw=false)
       response = request(:get, path, options) do |request|
         yield(request) if block_given?
       end
-      :json.eql?(format) ? Entity.new(pagination_class.data(response.body)) : response.body
+      entity_response(response, raw)
     end
 
     # Perform an HTTP GET request for paged date sets response
     #  @return nil if block given, otherwise complete concatenated json result set
     def get_paged(path, options = {}, request_labda = nil)
       raise ArgumentError,
-            "Pages requests should be json formatted (given format '#{format}')" unless :json.eql? format
+            "Pages requests should be json formatted (given format '#{format}')" unless is_json?
 
       result = []
       pager = create_pager
@@ -27,19 +27,16 @@ module WrAPI
         response = request(:get, path, options.merge(pager.page_options)) do |req|
           request_labda.call(req) if request_labda
         end
-        d = pager.class.data(response.body)
-        if d.is_a? Array
-          d = pager.class.data(response.body).map { |e| Entity.new(e) }
-        else
-          d = Entity.new(d)
-        end
-        if block_given?
-          yield(d)
-        else
-          if d.is_a? Array
-            result += d
+        if d = pager.class.data(response.body)
+          d = Entity.create(d)
+          if block_given?
+            yield(d)
           else
-            result << d
+            if d.is_a? Array
+              result += d
+            else
+              result << d
+            end
           end
         end
         pager.next_page!(response.body)
@@ -49,26 +46,33 @@ module WrAPI
 
     # Perform an HTTP POST request
     # @return response is returned in json if format is :json
-    def post(path, options = {})
+    def post(path, options = {}, raw=true)
       response = request(:post, path, options) do |request|
         yield(request) if block_given?
       end
+      entity_response(response, raw)
     end
 
     # Perform an HTTP PUT request
     # @return response is returned in json if format is :json
-    def put(path, options = {})
+    def put(path, options = {}, raw=true)
       response = request(:put, path, options) do |request|
         yield(request) if block_given?
       end
+      entity_response(response, raw)
     end
 
     # Perform an HTTP DELETE request
     # @return response is returened
-    def delete(path, options = {})
+    def delete(path, options = {}, raw=false)
       response = request(:delete, path, options) do |request|
         yield(request) if block_given?
       end
+      entity_response(response, raw)
+    end
+    
+    def is_json?
+      format && 'json'.eql?(format.to_s)
     end
 
     private
@@ -88,10 +92,22 @@ module WrAPI
         when :post, :put
           request.headers['Content-Type'] = "application/#{format}"
           request.path = uri.escape(path)
-          request.body = options.to_json unless options.empty?
+          if is_json? && !options.empty?
+            request.body = options.to_json
+          else
+            request.body = URI.encode_www_form(options) unless options.empty?
+          end
         end
       end
       response
     end
+
+    def entity_response(response, raw=false)
+      if is_json? && !raw
+        Entity.create(pagination_class.data(response.body))
+      else
+        response
+      end
+    end
   end
 end

data/lib/wrapi/respond_to.rb

@@ -2,13 +2,13 @@
 module WrAPI
   module RespondTo
 
-    # Delegate to Integra365::Client
+    # Delegate to Client
     def self.method_missing(method, *args, &block)
       return super unless client.respond_to?(method)
       client.send(method, *args, &block)
     end
 
-    # Delegate to Integra365::Client
+    # Delegate to Client
     def self.respond_to?(method, include_all = false)
       client.respond_to?(method, include_all) || super
     end

data/lib/wrapi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WrAPI
-  VERSION = '0.3.0'
+  VERSION = '0.4.1'
 end

data/wrapi.gemspec

@@ -31,4 +31,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'faraday'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'webmock'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wrapi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Janco Tanis
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email: gems@jancology.com
 executables: []
@@ -63,6 +91,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- bin/cc-test-reporter.exe
 - lib/wrapi.rb
 - lib/wrapi/api.rb
 - lib/wrapi/authentication.rb