intercom-rails 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae61e5efdf193cc74b1176e5689e18ec2ceca704
-  data.tar.gz: e5dfb686a1b287f254d6f4fa16f6a6c794f885d4
+  metadata.gz: 90db5a172849d4e46208b7e4945becc12bda59a0
+  data.tar.gz: 5f6a61ef04bb2a4a55c21aee3959f79453b5b1ab
 SHA512:
-  metadata.gz: d8296981fcc1ce3cbbc916f8ba0d99ccf2689c19bc92e9d3b2496908f79de5202aceb8a3c14bf7e79bd367864295cb7a7737f853b70ea226c0c5094cd18b9e95
-  data.tar.gz: 1b0b1c01a2de42adf788f684616d33ef7de2e147a8f3fe1392105f2619051c067fa337dcfe7cfc2f20fd5a7bb694810961d151405470c2f0de7f33942acd70fc
+  metadata.gz: 29c9e1b05d138b9d666948e9209fe049758abe7244147605c31d6d644c615d5b96c74b6ea6a5d6fd7d2efc9484dce4dae481251470b8d5af28437b2e0fdc6328
+  data.tar.gz: b7ecd91c086b837ebdf2c3bbd3264f7fdfd4de5a8ecb59af7c3010bfe2a0f55c185b7b788eae1e9c19aadcd9e9d5cb559fac6f43990ebc175d7a2095efbbfda0

data/{README.mdown → README.md}

@@ -26,9 +26,8 @@ rails generate intercom:config YOUR-APP-ID
 To make installing Intercom easy, where possible a `<script>` tag **will be automatically inserted before the closing `</body>` tag**. For most Rails apps, **you won't need to do any extra config**. Having trouble? Check out troubleshooting below.
 
 
-### Live Chat / Acquire
-With our [Acquire package](https://www.intercom.io/live-chat), Intercom Messenger now works with logged out users and visitors to your web site. Include the Intercom snippet on every page by setting:
-
+### Live Chat 
+With the Intercom Messenger you can [chat](https://www.intercom.com/live-chat) with users and visitors to your web site. Include the Intercom Messenger on every page by setting:
 ```ruby
   config.include_for_logged_out_users = true
 ```
@@ -54,7 +53,7 @@ If your users can be defined in different ways in your app you can also pass an
 ```ruby
   config.user.current = [Proc.new { current_user_object }, Proc.new { @user_object }]
 ```
-* If you want the Intercom Messenger to be available when there is no current user,  set `config.include_for_logged_out_users = true` in your config and sign up for the [Acquire](https://www.intercom.io/live-chat) package.
+* If you want the Intercom Messenger to be available when there is no current user,  set `config.include_for_logged_out_users = true` in your config and sign up for the [Respond](https://www.intercom.io/live-chat) package.
 
 Feel free to mail us: team@intercom.io, if you're still having trouble.
 
@@ -69,7 +68,7 @@ If you want to use secure mode, ensure you set your API secret in `config/initia
 **Note: This example is just for the sake of simplicity, you should never include your api secret in source control. Instead, you should use the Rails [secret config](http://guides.rubyonrails.org/4_1_release_notes.html#config-secrets-yml) feature.**
 ### Shutdown
 
-If you use Intercom Acquire combined with another product like Support, Learn or Engage, any user that uses a shared computer and browser with someone else will be able to see the most recently logged in user’s conversation history until the cookie expires.
+If you use Intercom Respond combined with another product like Engage, any user that uses a shared computer and browser with someone else will be able to see the most recently logged in user’s conversation history until the cookie expires.
 Because of this, it’s very important to properly shutdown Intercom when a user’s session on your app ends (via manually or automatically logging out).
 
 #### Using Devise

data/lib/intercom-rails/exceptions.rb

@@ -2,6 +2,7 @@ module IntercomRails
 
   class Error < StandardError; end
   class NoUserFoundError < Error; end
+  class ExcludedUserFoundError < Error; end
   class NoCompanyFoundError < Error; end
 
 end

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

@@ -31,11 +31,11 @@ module IntercomRails
           begin
             user_proxy = new(search_object.instance_eval(&potential_object), search_object)
             return user_proxy if user_proxy.valid?
+            raise ExcludedUserFoundError if user_proxy.excluded?
           rescue NameError
             next
           end
         end
-
         raise NoUserFoundError
       end
 
@@ -47,10 +47,14 @@ module IntercomRails
 
       def valid?
         return false if user.blank? || user.respond_to?(:new_record?) && user.new_record?
-        return false if config.user.exclude_if.present? && config.user.exclude_if.call(user)
+        return false if excluded?
         identity_present?
       end
 
+      def excluded?
+        config.user.exclude_if.present? && config.user.exclude_if.call(user)
+      end
+
     end
 
   end

data/lib/intercom-rails/script_tag.rb

@@ -32,6 +32,7 @@ module IntercomRails
     end
 
     def valid?
+      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?
@@ -117,6 +118,10 @@ module IntercomRails
       Proxy::User.current_in_context(controller).to_hash
     rescue NoUserFoundError
       {}
+    rescue ExcludedUserFoundError
+      {
+        excluded_user: true
+      }
     end
 
     def company_details=(company_details)

data/lib/intercom-rails/version.rb

@@ -1,3 +1,3 @@
 module IntercomRails
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Ben McRedmond
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -163,7 +163,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- README.mdown
+- README.md
 - Rakefile
 - lib/data/cacert.pem
 - lib/intercom-rails.rb