cirro-ruby-client 1.2.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae8201867c4e81773872690ee39df951dfb161d68cdf4ab10807a497a8e2744b
-  data.tar.gz: 59b06b8045b93026ddae29649542f54398ecc5c8fd5eb727608709153bcd57ea
+  metadata.gz: b40b51067875bc8f05dbf8d6d3ef70713369437b84f7f02d34ad9ebc12e6f1f5
+  data.tar.gz: 95d7598c00eb3ad3fcd7d2c357252620792dde5653ef3ca6a002753c2a9a5c91
 SHA512:
-  metadata.gz: 6e664faa51a535dec4b7544c5bd43870e31dfa014d3f5e8665df7c20f4a6fa075529b226ae9835276105e229a86ab020cdfc005662bc5f972d587a43cba40515
-  data.tar.gz: f3263a656d9d2cc6500233dafdd40d47dee4727a3d1d1b4e9f464a4ecdc4e2c399b8a728360061b498f32dc77c30dfed40515560ce8b33ad01bdd6031b002861
+  metadata.gz: aa7585fece3356f8511010df5f8b7635946da195b66350dd10cd7d0c964b18616ad53291ee12f287d37819666f73098569b550b8c6e9a6568a9d8b37edd230fc
+  data.tar.gz: 4c4bb7c02b948a2a8786be6e622aaf5dac1ef9cc1fe046cee66dd15cafaa3f2d27595e1749e014d186ae72987108c79a277e08eeced5bdfa5e42756053b4e012

data/Gemfile.lock

@@ -1,22 +1,23 @@
 PATH
   remote: .
   specs:
-    cirro-ruby-client (1.2.1)
+    cirro-ruby-client (1.5.0)
+      faraday (< 1.2.0)
       faraday_middleware
-      json_api_client
+      json_api_client (>= 1.10.0)
       jwt
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.3.4)
-      activesupport (= 6.0.3.4)
-    activesupport (6.0.3.4)
+    activemodel (6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activesupport (6.1.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     ast (2.4.1)
@@ -34,16 +35,16 @@ GEM
     hashdiff (1.0.1)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    json_api_client (1.17.1)
+    json_api_client (1.18.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       addressable (~> 2.2)
       faraday (>= 0.15.2, < 1.2.0)
       faraday_middleware (>= 0.9.0, < 1.2.0)
       rack (>= 0.2)
-    jwt (2.2.2)
+    jwt (2.2.3)
     method_source (1.0.0)
-    minitest (5.14.2)
+    minitest (5.14.4)
     multipart-post (2.1.1)
     parallel (1.19.2)
     parser (2.7.2.0)
@@ -84,10 +85,9 @@ GEM
     rubocop-rspec (1.43.2)
       rubocop (~> 0.87)
     ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
+    ruby2_keywords (0.0.4)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
     webmock (3.9.1)
       addressable (>= 2.3.6)

data/README.md

@@ -43,3 +43,15 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Usage
+
+#### Bulk create gig invitations
+
+```ruby
+gig = CirroIO::Client::Gig.load(id: 1)
+filter = CirroIO::Client::WorkerFilter.new(filter_query: '{ "app_worker_id": { "$in": [1,2,3] } }')
+invitation = CirroIO::Client::GigInvitation.new(gig: gig)
+
+invitation.bulk_create_with(filter, auto_accept: true) # by default auto_accept is false
+```

data/cirro-ruby-client.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'jwt'
+  spec.add_runtime_dependency 'faraday', '< 1.2.0'
   spec.add_runtime_dependency 'faraday_middleware'
-  spec.add_runtime_dependency 'json_api_client'
+  spec.add_runtime_dependency 'json_api_client', '>= 1.10.0'
 end

data/lib/cirro_io/client.rb

@@ -1,23 +1,20 @@
 require 'json_api_client'
 
-# temporary monkey patch code to fix gem bug
-require 'cirro_io/has_one'
-require 'cirro_io/base_association'
-# temporary monkey patch code to fix gem bug
-
 require 'cirro_io/client/version'
 require 'cirro_io/client/configuration'
 require 'cirro_io/client/response_debugging_middleware'
 require 'cirro_io/client/jwt_authentication'
 require 'cirro_io/client/base'
+require 'cirro_io/client/bulk_action_helper'
 require 'cirro_io/client/gig_invitation'
 require 'cirro_io/client/app_user'
 require 'cirro_io/client/app_worker'
-require 'cirro_io/client/worker_invitation_filter'
+require 'cirro_io/client/worker_filter'
 require 'cirro_io/client/gig_task'
 require 'cirro_io/client/gig_result'
 require 'cirro_io/client/gig_time_activity'
 require 'cirro_io/client/gig'
+require 'cirro_io/client/payout'
 
 module CirroIO
   module Client

data/lib/cirro_io/client/app_worker.rb

@@ -3,6 +3,7 @@ module CirroIO
     class AppWorker < Base
       has_one :app_user
       has_many :gig_invitations
+      has_many :payouts
     end
   end
 end

data/lib/cirro_io/client/base.rb

@@ -4,10 +4,16 @@ module CirroIO
       self.route_format = :dasherized_route
       self.json_key_format = :dasherized_key
 
-      # https://github.com/JsonApiClient/json_api_client/issues/215
+      # HACK: https://github.com/JsonApiClient/json_api_client/issues/215
+      # Used for initialization as well
       def self.site=(url)
-        super(url)
-        connection.faraday.url_prefix = url
+        super.tap do
+          connection true do |connection|
+            connection.use JwtAuthentication
+            connection.use Faraday::Response::Logger
+            # connection.use ResponseDebuggingMiddleware # for debugging or while adding new specs
+          end
+        end
       end
 
       def self.custom_post(endpoint, payload)
@@ -25,9 +31,3 @@ module CirroIO
     end
   end
 end
-
-CirroIO::Client::Base.connection do |connection|
-  connection.use CirroIO::Client::JwtAuthentication
-  connection.use Faraday::Response::Logger
-  # connection.use CirroIO::Client::ResponseDebuggingMiddleware # This middleware can be injected during debugging or while adding new specs
-end

data/lib/cirro_io/client/bulk_action_helper.rb

@@ -0,0 +1,9 @@
+module CirroIO
+  module Client
+    module BulkActionHelper
+      def format_to_dashed_keys(params)
+        params.deep_transform_keys { |key| key.to_s.gsub('_', '-') }
+      end
+    end
+  end
+end

data/lib/cirro_io/client/gig.rb

@@ -1,16 +1,18 @@
 module CirroIO
   module Client
     class Gig < Base
-      has_one :worker_invitation_filter
+      include CirroIO::Client::BulkActionHelper
+
+      has_one :worker_filter
       has_many :gig_tasks
       has_many :gig_results
       has_many :gig_time_activities
 
       # rubocop:disable Metrics/AbcSize
-      def bulk_create_with(worker_invitation_filter, gig_tasks)
+      def bulk_create_with(worker_filter, gig_tasks)
         payload = { data: { attributes: attributes, relationships: {} } }
         payload[:data][:relationships][:gig_tasks] = gig_tasks.map(&:attributes)
-        payload[:data][:relationships][:worker_invitation_filter] = worker_invitation_filter.attributes
+        payload[:data][:relationships][:worker_filter] = worker_filter.attributes
 
         response = self.class.custom_post('bulk/gigs', format_to_dashed_keys(payload))
 
@@ -34,12 +36,6 @@ module CirroIO
         self.class.parser.parse(self.class, response).first
       end
       # rubocop:enable Metrics/AbcSize
-
-      private
-
-      def format_to_dashed_keys(params)
-        params.deep_transform_keys { |key| key.to_s.gsub('_', '-') }
-      end
     end
   end
 end

data/lib/cirro_io/client/gig_invitation.rb

@@ -1,6 +1,17 @@
 module CirroIO
   module Client
     class GigInvitation < Base
+      include CirroIO::Client::BulkActionHelper
+
+      has_one :gig
+
+      def bulk_create_with(worker_filter, auto_accept: false)
+        payload = { data: { attributes: attributes.merge(worker_filter: worker_filter.attributes, auto_accept: auto_accept) } }
+
+        response = self.class.custom_post("bulk/gigs/#{gig.id}/gig_invitations", format_to_dashed_keys(payload))
+
+        self.class.parser.parse(self.class, response)
+      end
     end
   end
 end

data/lib/cirro_io/client/payout.rb

@@ -0,0 +1,7 @@
+module CirroIO
+  module Client
+    class Payout < Base
+      has_one :app_worker
+    end
+  end
+end

data/lib/cirro_io/client/version.rb

@@ -1,7 +1,7 @@
 # rubocop:disable Style/MutableConstant
 module CirroIO
   module Client
-    VERSION = '1.2.1'
+    VERSION = '1.5.0'
   end
 end
 # rubocop:enable Style/MutableConstant

data/lib/cirro_io/client/{worker_invitation_filter.rb → worker_filter.rb}

@@ -1,6 +1,6 @@
 module CirroIO
   module Client
-    class WorkerInvitationFilter < Base
+    class WorkerFilter < Base
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cirro-ruby-client
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Cirro Dev Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-02 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.0
 description: Simple wrapper for Cirro API
 email:
 - OrgtestIODevelopers@epam.com
@@ -74,11 +88,11 @@ files:
 - bin/console
 - bin/setup
 - cirro-ruby-client.gemspec
-- lib/cirro_io/base_association.rb
 - lib/cirro_io/client.rb
 - lib/cirro_io/client/app_user.rb
 - lib/cirro_io/client/app_worker.rb
 - lib/cirro_io/client/base.rb
+- lib/cirro_io/client/bulk_action_helper.rb
 - lib/cirro_io/client/configuration.rb
 - lib/cirro_io/client/gig.rb
 - lib/cirro_io/client/gig_invitation.rb
@@ -86,10 +100,10 @@ files:
 - lib/cirro_io/client/gig_task.rb
 - lib/cirro_io/client/gig_time_activity.rb
 - lib/cirro_io/client/jwt_authentication.rb
+- lib/cirro_io/client/payout.rb
 - lib/cirro_io/client/response_debugging_middleware.rb
 - lib/cirro_io/client/version.rb
-- lib/cirro_io/client/worker_invitation_filter.rb
-- lib/cirro_io/has_one.rb
+- lib/cirro_io/client/worker_filter.rb
 homepage: https://cirro.io/api-docs/v1#cirro-api-documentation
 licenses:
 - MIT

data/lib/cirro_io/base_association.rb

@@ -1,33 +0,0 @@
-module JsonApiClient
-  module Associations
-    class BaseAssociation
-      attr_reader :attr_name, :klass, :options
-      def initialize(attr_name, klass, options = {})
-        @attr_name = attr_name
-        @klass = klass
-        @options = options
-      end
-
-      def association_class
-        @association_class ||= Utils.compute_type(klass, options.fetch(:class_name) do
-          attr_name.to_s.classify
-        end)
-      end
-
-      def data(url)
-        from_result_set(association_class.requestor.linked(url))
-      end
-
-      def from_result_set(result_set)
-        result_set.to_a
-      end
-
-      def load_records(data)
-        data.map do |d|
-          record_class = Utils.compute_type(klass, klass.key_formatter.unformat(d['type']).classify)
-          record_class.load id: d['id']
-        end
-      end
-    end
-  end
-end

data/lib/cirro_io/has_one.rb

@@ -1,16 +0,0 @@
-module JsonApiClient
-  module Associations
-    module HasOne
-      class Association < BaseAssociation
-        def from_result_set(result_set)
-          result_set.first
-        end
-
-        def load_records(data)
-          record_class = Utils.compute_type(klass, klass.key_formatter.unformat(data['type']).classify)
-          record_class.load id: data['id']
-        end
-      end
-    end
-  end
-end