civicrm 1.3.2 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0d1e22467572fa4a10aab4c6b6b8157e96852360
-  data.tar.gz: 7f0b3c4dd46f8efb262986cd6e776a54e395b26d
+SHA256:
+  metadata.gz: 8368cd231e0941132210ff8bf11724816e59242958ac47d458eddb512b93aad4
+  data.tar.gz: 8df3d8a938b2b722c8329f2464bcb42b0e153464e1914fc21bc14721c340b707
 SHA512:
-  metadata.gz: 3fcd6eb9f260b376e4320b4422e1b62844c5f7517f404bcca4741c64375e6e2bf084dec5ce6a1382e38aed36254b782231c646c73c64f7c32fcbeebf3eb25cbc
-  data.tar.gz: db4d6103cd428f6161c390a1ccc6069016de346733f1f93ac9db8795d9b4fe351a574ea479144a7c55b9f14b63c0646b709e65bbb3ad6115c7877cfd5040eabe
+  metadata.gz: af3a1b5c342f2d22c3da940c958c2e0e926a1097b93b5bf32da901eba25881a066ab65732fab32c77a916eae6b7ec27d49f608f01c9f102f56451a4115a8707d
+  data.tar.gz: 71a5213a6e9fcc38c01310b2b9a06987284bb902512c2426113df859e24947d3a038ccdfb598e976b876a7218a40e0697829b177747d7b787ed0697dc4ebb786

data/Gemfile.lock

@@ -1,41 +1,44 @@
 PATH
   remote: .
   specs:
-    civicrm (1.3.2)
+    civicrm (1.3.5)
       activemodel
       activesupport
-      nokogiri
+      nokogiri (>= 1.10.8)
       rest-client (~> 2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activesupport (5.2.3)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     byebug (10.0.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    mime-types (3.2.2)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2019.1009)
     mini_portile2 (2.4.0)
-    minitest (5.12.2)
+    minitest (5.14.0)
     netrc (0.11.0)
-    nokogiri (1.10.4)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
     rake (10.0.3)
-    rest-client (2.0.2)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
@@ -53,11 +56,12 @@ GEM
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -13,6 +13,9 @@ $ gem install civicrm
 CiviCrm.api_base = "https://www.example.org/path/to/civi/codebase/"
 CiviCrm.site_key = "YOUR_SITE_KEY"
 CiviCrm.api_key = "..."
+
+# Optional config
+CiviCrm.timeout = 60 # Change request timeout in seconds (nil to disable)
 ```
 
 ## CiviCrm Objects
@@ -34,6 +37,27 @@ CiviCrm::Contact.find(1).delete
 $ bundle exec rspec spec
 ```
 
+## Debugging
+
+Set these `ENV` options to a truthy value to print CiviCRM REST API data.
+
+```DEBUG_CIVICRM_REQUEST```
+
+Example: 
+
+```
+[CiviCRM] [REQ] [FinancialType] [get] {"method":"post","timeout":null,"headers":{"user_agent":"CiviCrm RubyClient/1.3.6","request_id":"8168cbfc-36d1-4967-bf94-8fd72fd48455"},"payload":{"json":"{\"id\":12}"},"url":"..."}
+```
+
+```DEBUG_CIVICRM_RESPONSE```
+
+Example:
+
+```
+[CiviCRM] [RES] [FinancialType] [get] {"is_error":0,"version":3,"count":1,"id":12,"values":{"12":{"id":"12","name":"Matching Gift","is_deductible":"0","is_active":"1"}}}
+```
+
+
 ## Useful links
 
 * https://docs.civicrm.org/dev/en/latest/api/interfaces/#rest-interface

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.3.7

data/civicrm.gemspec

@@ -12,11 +12,12 @@ spec = Gem::Specification.new do |s|
   s.homepage = 'http://civicrm.org'
   s.executables = 'civicrm'
   s.require_paths = %w{lib}
+  s.required_ruby_version = '>= 2.0'
 
   s.add_dependency('rest-client', '~> 2.0')
   s.add_dependency('activesupport')
   s.add_dependency('activemodel')
-  s.add_dependency('nokogiri')
+  s.add_dependency('nokogiri', '>= 1.10.8')
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec', '~> 3.8')

data/lib/civicrm.rb

@@ -35,8 +35,9 @@ module CiviCrm
   @@site_key = nil
   @@api_base = 'https://www.example.org/path/to/civi/codebase'
   @@api_version = 'v3'
+  @@timeout = 80
 
-  mattr_accessor :api_key, :api_base, :api_version, :site_key
+  mattr_accessor :api_key, :api_base, :api_version, :site_key, :timeout
 
   def self.api_url(path = '')
     base = "#{api_base}/civicrm/extern/rest.php?#{path}"

data/lib/civicrm/actions/create.rb

@@ -6,11 +6,13 @@ module CiviCrm
           params = {'entity' => entity_class_name, 'action' => 'create'}
           response = CiviCrm::Client.request(:post, params.merge(attrs))
 
-          if response.first.nil?
+          if response == 1
+            Resource.build_from(attrs, params)
+          elsif response.first.nil?
             raise Error, "Couldn't create #{entity_class_name}"
+          else
+            Resource.build_from(response.first, params)
           end
-
-          Resource.build_from(response.first, params)
         end
       end
 

data/lib/civicrm/client.rb

@@ -10,12 +10,13 @@ module CiviCrm
         end
 
         headers = {
-          :user_agent => "CiviCrm RubyClient/#{CiviCrm::VERSION}"
+          :user_agent => "CiviCrm RubyClient/#{CiviCrm::VERSION}",
+          :request_id => SecureRandom.uuid
         }
 
         opts = {
           :method => :post,
-          :timeout => 80,
+          :timeout => CiviCrm.timeout,
           :headers => headers
         }
 
@@ -34,12 +35,13 @@ module CiviCrm
 
         response = nil
 
+        puts("[CiviCRM] [REQ] [#{entity}] [#{action}] #{JSON.dump(opts)}") if ENV["DEBUG_CIVICRM_REQUEST"]
+
         CiviCrm.time(params['entity'], params['action']) do
           response = execute(opts)
         end
 
-        puts(JSON.dump(opts)) if ENV["DEBUG_CIVICRM_REQUEST"]
-        puts(response) if ENV["DEBUG_CIVICRM_RESPONSE"]
+        puts("[CiviCRM] [RES] [#{entity}] [#{action}] #{response}") if ENV["DEBUG_CIVICRM_RESPONSE"]
 
         body, code = response.body, response.code
 

data/lib/civicrm/errors.rb

@@ -1,9 +1,9 @@
 module CiviCrm
   module Errors
-    class Unauthorized < Exception; end;
-    class InternalError < Exception; end;
-    class Forbidden < Exception; end;
-    class BadRequest < Exception; end;
-    class NotFound < Exception; end;
+    class Unauthorized < RuntimeError; end
+    class InternalError < RuntimeError; end
+    class Forbidden < RuntimeError; end
+    class BadRequest < RuntimeError; end
+    class NotFound < RuntimeError; end
   end
 end

data/lib/civicrm/resources/base.rb

@@ -140,6 +140,9 @@ module CiviCrm
   class Relationship < BaseResource
     entity :relationship
   end
+  class RelationshipType < BaseResource
+    entity :relationship_type
+  end
   class Setting < BaseResource
     entity :setting
   end

data/lib/civicrm/resources/custom_field.rb

@@ -5,7 +5,7 @@ module CiviCrm
     @@_custom_field_cache = {}
 
     def self.[](entity, field, cache: true)
-      cache_key = name
+      cache_key = [entity.underscore, field].join("/")
 
       if cache && @@_custom_field_cache.key?(cache_key)
         return @@_custom_field_cache[cache_key]
@@ -24,7 +24,7 @@ module CiviCrm
       end
 
       raise Errors::NotFound.new(
-        "CustomField of #{entity} with name=#{name}"
+        "CustomField of #{entity} with name=#{field}"
       )
     end
 

data/lib/civicrm/version.rb

@@ -1,3 +1,3 @@
 module CiviCrm
-  VERSION = '1.3.2'
+  VERSION = "1.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: civicrm
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.7
 platform: ruby
 authors:
 - Iskander Haziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-06 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.8
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -168,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.11
 signing_key: 
 specification_version: 4
 summary: Ruby bindings for the CiviCRM API