intercom-rails 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff14436633adc07b04ea0fff8507abf54e6fd34e4c4ab943c3a26aa691d69801
-  data.tar.gz: 7fe20bd0ce9cff4efe03a935886b43ac8bed8f56366e75f1733a5948f7145299
+  metadata.gz: 2e7d544e693716ec8e6927a28aa46d01d2c360544bfb0c9816193013e1d9686c
+  data.tar.gz: 732324518526f63c2202be3521a890f77d90d26953e103d0fc47ebdafd27f945
 SHA512:
-  metadata.gz: 744323aa7316eebe9923ef4a15897e6cf0ee24fda86e42f19ee865f1050e09840a4921be0b8f706a4fd610d66d584f4155a83a7483686949ec46e858ca2a9623
-  data.tar.gz: a93f75e039d873083243e3c847b8ccc4e2f35e812c4e05d5423fca83c36419aa908348003770133384044629584e63d4f55feafa6ff6b9f68e9d4b172274e2e0
+  metadata.gz: 4b3b36ca475257f4c2ebdd89f93a517124e686ffc5b51f8c081dc96cabc4e47cf19b23ab0f34eb28f002dd116f186704701e0fd6fcf514bc09a207aa2d35f943
+  data.tar.gz: fdaafd9ba64ea6cdf9c9a7b681834b1cb1cd5b7cba4d1402b4a9c8d944ff4b792595482957bd7c106986e4add9cd1ec7fba670643de0518e85b2b290fae0bf2e

data/README.md

@@ -47,7 +47,7 @@ If things are not working make sure that:
 
 * You've generated a config file with your `app_id` as detailed above.
 * Your user object responds to an `id` or `email` method.
-* Your current user is accessible in your controllers as `current_user` or `@user`, if not in `config/initializers/intercom.rb`:
+* Your current user is accessible in your controllers as `current_user`. If it is not, set it in `config/initializers/intercom.rb`:
 ```ruby
   config.user.current = Proc.new { current_user_object }
 ```

data/lib/intercom-rails/proxy/company.rb

@@ -24,7 +24,7 @@ module IntercomRails
       end
 
       def valid?
-        return false if company.blank? || company.respond_to?(:new_record?) && company.new_record?
+        return false if company.blank? || unsaved?
         return false if config.company.exclude_if.present? && config.company.exclude_if.call(company)
         company.present? && identity_present?
       end

data/lib/intercom-rails/proxy/user.rb

@@ -9,10 +9,7 @@ module IntercomRails
       proxy_delegator :name
       proxy_delegator :created_at
 
-      PREDEFINED_POTENTIAL_USER_OBJECTS = [
-        Proc.new { current_user },
-        Proc.new { @user }
-      ]
+      PREDEFINED_POTENTIAL_USER_OBJECTS = [Proc.new { current_user }]
 
       def self.potential_user_objects
         if config.current.present?
@@ -46,7 +43,7 @@ module IntercomRails
       end
 
       def valid?
-        return false if user.blank? || user.respond_to?(:new_record?) && user.new_record?
+        return false if user.blank? || unsaved?
         return false if excluded?
         identity_present?
       end

data/lib/intercom-rails/proxy.rb

@@ -71,6 +71,13 @@ module IntercomRails
         config.send(variable_name).present?
       end
 
+      def unsaved?
+        return proxied_object.new_record? if proxied_object.respond_to?(:new_record?)
+        return !proxied_object.persisted? if proxied_object.respond_to?(:persisted?)
+        return proxied_object.new? if proxied_object.respond_to?(:new?)
+        false
+      end
+
       def identity_present?
         self.class.identity_attributes.any? { |attribute_name| (proxied_object.is_a?(Hash) && proxied_object[attribute_name].present?) || (proxied_object.respond_to?(attribute_name) && proxied_object.send(attribute_name).present?) }
       end

data/lib/intercom-rails/version.rb

@@ -1,3 +1,3 @@
 module IntercomRails
-  VERSION = "1.1.1"
+  VERSION = "2.0.0"
 end

data/lib/rails/generators/intercom/config/config_generator.rb

@@ -20,9 +20,9 @@ module Intercom
         introduction = <<-desc
 Intercom will automatically insert its javascript before the closing '</body>'
 tag on every page where it can find a logged-in user. Intercom by default
-looks for logged-in users, in the controller, via 'current_user' and '@user'.
+looks for logged-in users, in the controller, via 'current_user'.
 
-Is the logged-in user accessible via either 'current_user' or '@user'? [Yn]
+Is the logged-in user accessible via 'current_user'? [Yn]
         desc
 
         print "#{introduction.strip} "

data/lib/rails/generators/intercom/config/intercom.rb.erb

@@ -27,7 +27,7 @@ IntercomRails.config do |config|
 
   # == Current user method/variable
   # The method/variable that contains the logged in user in your controllers.
-  # If it is `current_user` or `@user`, then you can ignore this
+  # If it is `current_user`, then you can ignore this
   #
   <%- if @current_user -%>
   config.user.current = Proc.new { <%= @current_user %> }

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: intercom-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Ben McRedmond
 - Ciaran Lee
 - Darragh Curran
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-04-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -187,7 +186,6 @@ homepage: http://www.intercom.io
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -202,8 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 4.0.11
 specification_version: 4
 summary: Rails helper for emitting javascript script tags for Intercom
 test_files: []