intercom 4.2.2 → 4.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea6de8ff389a01f714c1a0f5f42ffadf46b22f3636743fd58f76a9ad5c1ec458
-  data.tar.gz: 7e5da0a304fe4b90614fda3944d0f40089ab61db0e5aac0444235fde34186e49
+  metadata.gz: 97caaa1c044ea1370944d335cfc0d6e004966d8f84ba547a83ca78daa2be3d11
+  data.tar.gz: dfd96074bef226daa006f2b4c18aa2b6b6ee5a582301ea18e783962a5a4bcab9
 SHA512:
-  metadata.gz: d1ab02970d6363d0b07424a2d9a09019ae69a29770d671045fb677332f4ce1621ee907d2e2ec0c6d29398374bc826c0ed197e6ff857813371f4d77d1c4b8692f
-  data.tar.gz: e821557df3b3eda19a519d0d51523b77434724a433e2e7ec651ebdb979b0e0847cab0576da9055e6e696b13987c3a66470edb21d4fca91d275b92b6ba0ac6337
+  metadata.gz: dfec5a80b9442a047087608f564db3d9380ae106e4cffae99f11d9e1c33915e5a984957712ea7f09d213abd4cd968cee6d642d241d2a9ef7020a30a1ce953497
+  data.tar.gz: a7370a062eff270da20077fba81930af2cdfa92f9845583bdf498ee95bc18867672577d916bf57843bbf07ed16da5524e971e85e97827ee578efa53a753303a5

data/.circleci/config.yml

@@ -1,35 +1,91 @@
-version: 2
+version: 2.1
 jobs:
-  "Test against Ruby 2.4":
+  test-ruby-2-4:
     docker:
       - image: circleci/ruby:2.4.9
     working_directory: ~/intercom-ruby
     steps:
       - checkout
+      - run:
+          name: Route Bundler through the Socket Firewall registry
+          command: |
+            set -euo pipefail
+            if [ -z "${SOCKET_GEM_URL:-}" ]; then
+              # CircleCI does not share context credentials with forked PRs, so a
+              # fork cannot be routed. Say so rather than failing the contributor.
+              if [ -n "${CIRCLE_PR_REPONAME:-}" ]; then
+                echo "Forked PR: no Socket Firewall credentials available, gems will come from rubygems.org."
+                exit 0
+              fi
+              echo "FATAL: SOCKET_GEM_URL is required (provided by the socket-firewall context)"
+              exit 1
+            fi
+            # Legacy two-argument form: these images ship Bundler 1.x, where
+            # `bundle config set --global` does not exist and silently no-ops.
+            bundle config mirror.https://rubygems.org "$SOCKET_GEM_URL"
+            bundle config mirror.https://rubygems.org | grep -q socket-firewall-registry \
+              || { echo "FAIL: bundler mirror not pointing at Socket Firewall"; exit 1; }
       - run: bundle install
       - run: bundle exec rake
-  "Test against Ruby 2.5":
+  test-ruby-2-5:
     docker:
       - image: circleci/ruby:2.5.7
     working_directory: ~/intercom-ruby
     steps:
       - checkout
+      - run:
+          name: Route Bundler through the Socket Firewall registry
+          command: |
+            set -euo pipefail
+            if [ -z "${SOCKET_GEM_URL:-}" ]; then
+              if [ -n "${CIRCLE_PR_REPONAME:-}" ]; then
+                echo "Forked PR: no Socket Firewall credentials available, gems will come from rubygems.org."
+                exit 0
+              fi
+              echo "FATAL: SOCKET_GEM_URL is required (provided by the socket-firewall context)"
+              exit 1
+            fi
+            bundle config mirror.https://rubygems.org "$SOCKET_GEM_URL"
+            bundle config mirror.https://rubygems.org | grep -q socket-firewall-registry \
+              || { echo "FAIL: bundler mirror not pointing at Socket Firewall"; exit 1; }
       - run: bundle install
       - run: bundle exec rake
-  "Test against Ruby 2.6":
+  test-ruby-2-6:
     docker:
       - image: circleci/ruby:2.6.5
     working_directory: ~/intercom-ruby
     steps:
       - checkout
+      - run:
+          name: Route Bundler through the Socket Firewall registry
+          command: |
+            set -euo pipefail
+            if [ -z "${SOCKET_GEM_URL:-}" ]; then
+              if [ -n "${CIRCLE_PR_REPONAME:-}" ]; then
+                echo "Forked PR: no Socket Firewall credentials available, gems will come from rubygems.org."
+                exit 0
+              fi
+              echo "FATAL: SOCKET_GEM_URL is required (provided by the socket-firewall context)"
+              exit 1
+            fi
+            bundle config mirror.https://rubygems.org "$SOCKET_GEM_URL"
+            bundle config mirror.https://rubygems.org | grep -q socket-firewall-registry \
+              || { echo "FAIL: bundler mirror not pointing at Socket Firewall"; exit 1; }
       - run: bundle install
       - run: bundle exec rake
 
 workflows:
-  version: 2
   build_and_test:
     jobs:
-      - "Test against Ruby 2.4"
-      - "Test against Ruby 2.5"
-      - "Test against Ruby 2.6"
-
+      - test-ruby-2-4:
+          name: "Test against Ruby 2.4"
+          context:
+            - socket-firewall
+      - test-ruby-2-5:
+          name: "Test against Ruby 2.5"
+          context:
+            - socket-firewall
+      - test-ruby-2-6:
+          name: "Test against Ruby 2.6"
+          context:
+            - socket-firewall

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem 'webmock'
 gemspec

data/changes.txt

@@ -1,3 +1,6 @@
+4.2.3
+- Fixed SyntaxError when reading articles with hyphenated locales
+
 4.2.2
 - Fixed FlatStore to skip hash values when building API request payloads
 - Removed hash validation on FlatStore reads to allow for custom objects

data/lib/intercom/lib/dynamic_accessors.rb

@@ -17,39 +17,46 @@ module Intercom
         private
 
         def define_flat_store_based_accessors(attribute, value, object)
-          object.instance_eval %Q"
-            def #{attribute}=(value)
-              mark_field_as_changed!(:#{attribute})
-              @#{attribute} = Intercom::Lib::FlatStore.new(value)
+          ivar = ivar_name(attribute, object)
+          object.singleton_class.class_eval do
+            define_method("#{attribute}=") do |val|
+              mark_field_as_changed!(attribute.to_sym)
+              instance_variable_set(ivar, Intercom::Lib::FlatStore.new(val))
             end
-            def #{attribute}
-              @#{attribute}
-            end
-          "
+            define_method(attribute) { instance_variable_get(ivar) }
+          end
         end
 
         def define_date_based_accessors(attribute, value, object)
-          object.instance_eval %Q"
-            def #{attribute}=(value)
-              mark_field_as_changed!(:#{attribute})
-              @#{attribute} = value.nil? ? nil : value.to_i
+          ivar = ivar_name(attribute, object)
+          object.singleton_class.class_eval do
+            define_method("#{attribute}=") do |val|
+              mark_field_as_changed!(attribute.to_sym)
+              instance_variable_set(ivar, val.nil? ? nil : val.to_i)
             end
-            def #{attribute}
-              @#{attribute}.nil? ? nil : Time.at(@#{attribute})
+            define_method(attribute) do
+              time = instance_variable_get(ivar)
+              time.nil? ? nil : Time.at(time)
             end
-          "
+          end
         end
 
         def define_standard_accessors(attribute, value, object)
-            object.instance_eval %Q"
-              def #{attribute}=(value)
-                mark_field_as_changed!(:#{attribute})
-                @#{attribute} = value
-              end
-              def #{attribute}
-                @#{attribute}
-              end
-            "
+          ivar = ivar_name(attribute, object)
+          object.singleton_class.class_eval do
+            define_method("#{attribute}=") do |val|
+              mark_field_as_changed!(attribute.to_sym)
+              instance_variable_set(ivar, val)
+            end
+            define_method(attribute) { instance_variable_get(ivar) }
+          end
+        end
+
+        # Keys such as "pt-BR" are not valid identifiers, so normalise them for the ivar name.
+        def ivar_name(attribute, object)
+          ivar = "@#{attribute.to_s.gsub(/\W/, '_')}"
+          object.register_attribute_key(ivar, attribute) if ivar != "@#{attribute}"
+          ivar
         end
 
       end

data/lib/intercom/traits/api_resource.rb

@@ -37,7 +37,7 @@ module Intercom
 
       def to_hash
         instance_variables_excluding_dirty_tracking_field.each_with_object({}) do |variable, hash|
-          hash[variable.to_s.delete('@')] = instance_variable_get(variable)
+          hash[attribute_key(variable)] = instance_variable_get(variable)
         end
       end
 
@@ -46,10 +46,18 @@ module Intercom
           next if variable == :@client
 
           value = instance_variable_get(variable)
-          hash[variable.to_s.delete('@')] = value.respond_to?(:to_json) ? value.to_json(*args) : value
+          hash[attribute_key(variable)] = value.respond_to?(:to_json) ? value.to_json(*args) : value
         end
       end
 
+      def register_attribute_key(ivar, attribute)
+        (@attribute_keys ||= {})[ivar.to_sym] = attribute.to_s
+      end
+
+      def attribute_key(variable)
+        (@attribute_keys || {}).fetch(variable, variable.to_s.delete('@'))
+      end
+
       def to_submittable_hash
         submittable_hash = {}
         to_hash.each do |attribute, value|

data/lib/intercom/traits/dirty_tracking.rb

@@ -22,7 +22,7 @@ module Intercom
 
       def field_changed?(field_name)
         @changed_fields ||= Set.new
-        field = instance_variable_get("@#{field_name}")
+        field = instance_variable_get("@#{field_name.to_s.gsub(/\W/, '_')}")
         if field.respond_to?(:field_changed?)
           field.to_hash.any? do |attribute, _|
             field.field_changed?(attribute)
@@ -33,7 +33,7 @@ module Intercom
       end
 
       def instance_variables_excluding_dirty_tracking_field
-        instance_variables.reject{|var| var == :@changed_fields}
+        instance_variables.reject{|var| var == :@changed_fields || var == :@attribute_keys}
       end
     end
   end

data/lib/intercom/version.rb

@@ -1,3 +1,3 @@
 module Intercom #:nodoc:
-  VERSION = "4.2.2"
+  VERSION = "4.2.3"
 end

data/spec/unit/intercom/article_spec.rb

@@ -37,4 +37,22 @@ describe "Intercom::Article" do
       client.articles.delete(article)
     end
   end
-end
+
+  describe "Parsing an Article" do
+    it "handles hyphenated locale keys in translated content" do
+      article = Intercom::Article.from_api(
+        "id" => "1",
+        "type" => "article",
+        "translated_content" => {
+          "type" => "article_translated_content",
+          "fr" => { "type" => "article_content", "title" => "Bonjour" },
+          "pt-BR" => { "type" => "article_content", "title" => "Ola" }
+        }
+      )
+      _(article.translated_content.fr.title).must_equal "Bonjour"
+      _(article.translated_content.public_send("pt-BR").title).must_equal "Ola"
+      article.translated_content.public_send("pt-BR").title = "Oi"
+      _(article.to_submittable_hash).must_equal("translated_content" => { "pt-BR" => { "title" => "Oi" } })
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.3
 platform: ruby
 authors:
 - Ben McRedmond
@@ -12,10 +12,10 @@ authors:
 - Declan McGrath
 - Jamie Osler
 - Bob Long
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-09-01 00:00:00.000000000 Z
+date: 2026-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -264,7 +264,7 @@ homepage: https://www.intercom.io
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3.1
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Ruby bindings for the Intercom API
 test_files: