intercom-rails 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 274c2855076beb153ba6dcf5ecdc639bcac1a2515bfe74a7042b84df61eab363
-  data.tar.gz: 59e0d09f3dca2b46db7e6e3829d39a89f75eef845c1608f690e87bad41505f0f
+  metadata.gz: 2e7d544e693716ec8e6927a28aa46d01d2c360544bfb0c9816193013e1d9686c
+  data.tar.gz: 732324518526f63c2202be3521a890f77d90d26953e103d0fc47ebdafd27f945
 SHA512:
-  metadata.gz: eebe74df506580a99a1fbe68857ab6c86c140e1db905c4cc96307aa0baa984b2d5efcf852eff43baaf7e6edb4b0937c2340a26b56f602339014478bf92e5c4bd
-  data.tar.gz: f3d98e2f4fa9083ba632faa4852028656e20c4b4c14c931dc3caa6dea429957efd9f0402b84be390dd2a97ee9bf0d002622206f455835277844d13f69e5b8aff
+  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/script_tag.rb

@@ -54,7 +54,7 @@ module IntercomRails
       return false if user_details[:excluded_user] == true
       valid = user_details[:app_id].present?
       unless @show_everywhere
-        valid = valid && (user_details[:user_id] || user_details[:email]).present?
+        valid = valid && @has_identity
       end
       if nonce
         valid = valid && valid_nonce?
@@ -146,6 +146,8 @@ module IntercomRails
       @user_details = @user_details.with_indifferent_access.tap do |u|
         [:email, :name, :user_id].each { |k| u.delete(k) if u[k].nil? }
 
+        @has_identity = (u[:user_id] || u[:email]).present?
+
         if secret.present?
           if jwt_enabled && u[:user_id].present?
             u[:intercom_user_jwt] ||= generate_jwt

data/lib/intercom-rails/version.rb

@@ -1,3 +1,3 @@
 module IntercomRails
-  VERSION = "1.1.0"
+  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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Ben McRedmond
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.11
 specification_version: 4
 summary: Rails helper for emitting javascript script tags for Intercom
 test_files: []