dimelo_ccp_api 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c588092b15bab07ee5e68f7ca25026c5f5b56b7f00fe2e2e0b5cad05036c572e
-  data.tar.gz: 5182c9c44a21730c094df50b1bb47a02cc17469bce74d5ec55f15ca19785e156
+  metadata.gz: edff5421244502ef947c083c5316c8064757acde55ca3a206a7ff2ef97118983
+  data.tar.gz: 301e0b0dac362cdb642e7b32f43515ddb8aa8989e341ea6586a152e1b800a07b
 SHA512:
-  metadata.gz: 1b574327b0b7243262714902db490063b4fd86ca9f71710e0384ec1b0fef56ae2a94ac458337137252942cf7a7d7c52f86ab15e02bc47982d7d4d533cdd5d2f3
-  data.tar.gz: 9c530c919e6b04171edefc8d8747d7bc233a339e00f50d8482c25ad4c0d0aa58eee0859f77b543d9c30862b901b43469bdf364a01c40b0bf6a36ca901001d538
+  metadata.gz: a598fa477ab3141a3652be66a5f5b4cbe4ca7163b6b01ad4612a5733da38ab76af9718b9377cd599149522a57ca7f1d726a7ba041934ac0c7b0f80089644c059
+  data.tar.gz: b0d4486af28b8a38d75c944d14afa542de4bb73ec73f091db5bf971c6479ee11a225395ed51539f2a0165769edfbd8f1af605b4636b7f7355caef15ad5e4ca2d

data/.github/workflows/ruby.yml

@@ -0,0 +1,31 @@
+name: Ruby CI
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['2.6', '2.7', '3.0', 'ruby-head']
+        gemfile: ['activesupport-4.2.x', 'activesupport-5.2.x', 'activesupport-6.0.x', 'activesupport-6.1.x', 'activesupport-head']
+        exclude:
+          - ruby: 2.6
+            gemfile: activesupport-head
+          - ruby: 2.7
+            gemfile: activesupport-4.2.x
+          - ruby: 3.0
+            gemfile: activesupport-4.2.x
+          - ruby: ruby-head
+            gemfile: activesupport-4.2.x
+    env:
+      BUNDLE_GEMFILE: gemfiles/Gemfile.${{ matrix.gemfile }}
+    name: Ruby ${{ matrix.ruby }} with ${{ matrix.gemfile }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run tests
+      run: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.5.0
+
+Added compatibility with Active Model 6.1
+
 # 0.4.4
 
 Now uses HTTP Authorization Header instead of passing access_token via params.

data/README.md

@@ -1,17 +1,19 @@
-# RingCentral Engage Communities ruby API Client
+# RingCentral Engage Communities Ruby API Client
 
-Ruby client for the Engage Communities
+[![Build Status](https://github.com/ringcentral/engage-digital-communities-ruby/workflows/Ruby%20CI/badge.svg)](https://github.com/ringcentral/engage-digital-communities-ruby/actions)
+
+RubyClient for the Engage Communities.
 
 This client support most of Engage Communities resources, can read and write them, paginates with cursor like interface, supports attachments and supports proper validation and error format.
 
-This is heavily used internaly at Engage Communities.
+This is heavily used internally at Engage Communities.
 
 # Compatibility
 
 Compatible and tested with:
 
-- Ruby MRI 2.4, 2.5, 2.6, Head and Jruby-head
-- ActiveSupport 3+, 4+, 5+, Head
+- Ruby MRI 2.6, 2.7, 3.0 and HEAD
+- ActiveSupport 4+, 5+, 6+, Head
 
 
 ## Installation
@@ -47,7 +49,6 @@ end
 feedbacks = Dimelo::CCP::Feedback.find({ :order => 'updated_at.desc' }, feedbacks_client)
 puts "feedbacks count: #{feedbacks.count}"
 puts "feedbacks not by anonymous and superadmin: #{feedbacks.select{|f| f.user_id.present?}.count}"
-
 ```
 
 ## Contributing

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.5.0

data/dimelo_ccp_api.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.add_dependency('activesupport', '>= 3.0.0')
-  s.add_dependency('activemodel', '>= 3.0.0')
-  s.add_dependency('faraday')
+  s.add_dependency('activesupport', '>= 4.2')
+  s.add_dependency('activemodel', '>= 4.2')
+  s.add_dependency('faraday', '< 2')
   s.add_development_dependency('rake')
-  s.add_development_dependency('rspec', '~> 3.0')
+  s.add_development_dependency('rspec', '~> 3.0', '< 3.10')
 end

data/gemfiles/{Gemfile.activesupport-3.2.x → Gemfile.activesupport-4.2.x}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec :path => '..'
 
-gem 'activesupport', '~> 3.2'
+gem 'activesupport', '~> 4.2'

data/gemfiles/{Gemfile.activesupport-4.0.x → Gemfile.activesupport-5.2.x}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec :path => '..'
 
-gem 'activesupport', '~> 4.0'
+gem 'activesupport', '~> 5.2'

data/gemfiles/{Gemfile.activesupport-4.1.x → Gemfile.activesupport-6.0.x}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec :path => '..'
 
-gem 'activesupport', '~> 4.1'
+gem 'activesupport', '~> 6.0.0'

data/gemfiles/Gemfile.activesupport-6.1.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '..'
+
+gem 'activesupport', '~> 6.1.0'

data/lib/dimelo/ccp/api/model.rb

@@ -204,6 +204,17 @@ module Dimelo::CCP
         defined?(Rails) ? Rails.logger.warn(message) : STDERR.puts(message)
       end
 
+      def read_attribute_for_validation(attr)
+        attributes[attr] ||  attributes["#{attr}_id"]
+      end
+
+      def self.human_attribute_name(attr, options = {})
+        attr
+      end
+
+      def self.lookup_ancestors
+        [self]
+      end
     end
   end
 end

data/spec/lib/dimelo/ccp/api/client_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Dimelo::CCP::API::Client do
 
   subject do
-    Dimelo::CCP::API::Client.new('https://domain-test.api.users.dimelo.info:4433/1.0', 'access_token' => ENV['DIMELO_API_KEY'], :http_options => {:timeout => 80})
+    Dimelo::CCP::API::Client.new('https://domain-test.api.users.dimelo.com/1.0', 'access_token' => ENV['DIMELO_API_KEY'], :http_options => {:timeout => 80})
   end
 
   def response_error(status, error, message='')
@@ -58,7 +58,7 @@ describe Dimelo::CCP::API::Client do
     end
 
     it 'raise DomainNotFoundError if request on invalid domain' do
-      client = Dimelo::CCP::API::Client.new('https://no-domain.api.users.dimelo.info:4433/1.0', :http_options => {:timeout => 80})
+      client = Dimelo::CCP::API::Client.new('https://no-domain.api.users.dimelo.com/1.0', :http_options => {:timeout => 80})
       expect{
         client.transport(:get, 'check', {'access_token' => 'my-token'})
       }.to raise_error(Dimelo::CCP::API::DomainNotFoundError)

data/spec/lib/dimelo/ccp/api/model/attachment_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Dimelo::CCP::Attachment do
-  let(:client) { Dimelo::CCP::API::Client.new('https://domain-test.api.answers.dimelo.info/1.0', 'access_token' => 'foo') }
+  let(:client) { Dimelo::CCP::API::Client.new('https://domain-test.api.answers.dimelo.com/1.0', 'access_token' => 'foo') }
 
   describe Dimelo::CCP::QuestionAttachment do
 

data/spec/lib/dimelo/ccp/api/model_spec.rb

@@ -4,7 +4,7 @@ describe Dimelo::CCP::API::Model do
 
   class User < Dimelo::CCP::API::Model
     path 'groups/%{group_id}/users/%{id}'
-    attributes :id, :firstname, :lastname
+    attributes :id, :firstname, :lastname, :from_user_id
   end
 
   class BaseUser < Dimelo::CCP::API::Model
@@ -159,4 +159,32 @@ describe Dimelo::CCP::API::Model do
 
   end
 
+
+  describe '.errors' do
+    it 'works with simple attributes' do
+      user = User.parse(%[
+          {
+            "error": "validation_error",
+            "errors" : [ {"attribute": "firstname", "type": "invalid", "message": "Firstname is invalid"} ],
+            "message": "User can't be saved",
+            "status": 422
+          }
+        ])
+
+      expect(user.errors.full_messages.to_sentence).to eq("firstname invalid")
+    end
+
+    it 'works with associations' do
+      user = User.parse(%[
+          {
+            "error": "validation_error",
+            "errors" : [ {"attribute": "from_user", "type": "invalid", "message": "From User is invalid"} ],
+            "message": "User can't be saved",
+            "status": 422
+          }
+        ])
+
+      expect(user.errors.full_messages.to_sentence).to eq("from_user invalid")
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dimelo_ccp_api
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Jean Boussier
 - Renaud Morvan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2022-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +74,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -81,6 +84,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.10'
 description: Rest API client for Dimelo CCP v2 plateform
 email:
 - jean.boussier@dimelo.com
@@ -89,8 +95,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -99,9 +105,10 @@ files:
 - VERSION
 - dimelo_ccp_api.gemspec
 - examples/dimelo_api_test
-- gemfiles/Gemfile.activesupport-3.2.x
-- gemfiles/Gemfile.activesupport-4.0.x
-- gemfiles/Gemfile.activesupport-4.1.x
+- gemfiles/Gemfile.activesupport-4.2.x
+- gemfiles/Gemfile.activesupport-5.2.x
+- gemfiles/Gemfile.activesupport-6.0.x
+- gemfiles/Gemfile.activesupport-6.1.x
 - gemfiles/Gemfile.activesupport-head
 - lib/dimelo/ccp/api.rb
 - lib/dimelo/ccp/api/basic_object.rb
@@ -141,7 +148,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -156,8 +163,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Dimelo CCP v2 API client
 test_files: []

data/.travis.yml

@@ -1,16 +0,0 @@
-language: ruby
-rvm:
-  - ruby-head
-  - 2.6
-  - 2.5
-  - 2.4
-  - jruby-head
-gemfile:
-  - gemfiles/Gemfile.activesupport-3.2.x
-  - gemfiles/Gemfile.activesupport-4.2.x
-  - gemfiles/Gemfile.activesupport-5.2.x
-  - gemfiles/Gemfile.activesupport-edge
-matrix:
-  allow_failures:
-    - gemfile: gemfiles/Gemfile.activesupport-edge
-    - rvm: jruby-head