civicrm 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08213b07d9c509cce9fde6eb2cd6d172beae1e29
-  data.tar.gz: b950d8fa3aadcf8228d4eef6e62f577e7ff9834e
+  metadata.gz: 0d1e22467572fa4a10aab4c6b6b8157e96852360
+  data.tar.gz: 7f0b3c4dd46f8efb262986cd6e776a54e395b26d
 SHA512:
-  metadata.gz: 0aa4ebfeba87a0981584b219e73f7edf2459d5974ff342d3b8b8f842e0b5064933b9f2c1c74537ad69437cfef5dbd903605b03f31462a0abda4ee41d30fac124
-  data.tar.gz: 6acbe76caea2a07a6294bdd7cccf402eac2868d04de16693a6640e22e6f4356a7dc779c3d1c2f1fc60bfa712c2e0895b26b522f22f4425ff62f399af7415e255
+  metadata.gz: 3fcd6eb9f260b376e4320b4422e1b62844c5f7517f404bcca4741c64375e6e2bf084dec5ce6a1382e38aed36254b782231c646c73c64f7c32fcbeebf3eb25cbc
+  data.tar.gz: db4d6103cd428f6161c390a1ccc6069016de346733f1f93ac9db8795d9b4fe351a574ea479144a7c55b9f14b63c0646b709e65bbb3ad6115c7877cfd5040eabe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    civicrm (1.1.1)
+    civicrm (1.3.2)
       activemodel
       activesupport
       nokogiri
@@ -10,29 +10,29 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.1)
-      activesupport (= 5.2.1)
-    activesupport (5.2.1)
+    activemodel (5.2.3)
+      activesupport (= 5.2.3)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     byebug (10.0.2)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.1.1)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
+    mime-types-data (3.2019.0331)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.12.2)
     netrc (0.11.0)
-    nokogiri (1.10.1)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     rake (10.0.3)
     rest-client (2.0.2)
@@ -57,7 +57,7 @@ GEM
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
 
 PLATFORMS
   ruby
@@ -69,4 +69,4 @@ DEPENDENCIES
   rspec (~> 3.8)
 
 BUNDLED WITH
-   1.12.5
+   2.0.1

data/lib/civicrm/resources/base.rb

@@ -50,9 +50,6 @@ module CiviCrm
   class Country < BaseResource
     entity :country
   end
-  class CustomField < BaseResource
-    entity :custom_field
-  end
   class CustomGroup < BaseResource
     entity :custom_group
   end
@@ -157,5 +154,6 @@ module CiviCrm
   end
 end
 
+require "civicrm/resources/custom_field"
 require "civicrm/resources/financial_type"
 require "civicrm/resources/option_value"

data/lib/civicrm/resources/custom_field.rb

@@ -0,0 +1,35 @@
+module CiviCrm
+  class CustomField < BaseResource
+    entity :custom_field
+
+    @@_custom_field_cache = {}
+
+    def self.[](entity, field, cache: true)
+      cache_key = name
+
+      if cache && @@_custom_field_cache.key?(cache_key)
+        return @@_custom_field_cache[cache_key]
+      end
+
+      field = find_by(
+        "custom_group_id.extends" => entity,
+        "custom_group_id.name" => entity,
+        "name" => field,
+        "options" => { "or" => [["custom_group_id.extends", "custom_group_id.name"]] }
+      )
+
+      if field
+        @@_custom_field_cache[cache_key] = field if cache
+        return field
+      end
+
+      raise Errors::NotFound.new(
+        "CustomField of #{entity} with name=#{name}"
+      )
+    end
+
+    def key
+      "custom_#{id}"
+    end
+  end
+end

data/lib/civicrm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: civicrm
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Iskander Haziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -139,6 +139,7 @@ files:
 - lib/civicrm/profiling.rb
 - lib/civicrm/resource.rb
 - lib/civicrm/resources/base.rb
+- lib/civicrm/resources/custom_field.rb
 - lib/civicrm/resources/financial_type.rb
 - lib/civicrm/resources/option_value.rb
 - lib/civicrm/version.rb