intercom-rails 0.2.4 → 0.2.5

data/README.mdown

@@ -39,7 +39,7 @@ If it's not working make sure:
 * Your current user is accessible in your controllers as `current_user` or `@user`, if not in `config/initializers/intercom.rb`:
 
 ```ruby
-  config.current_user = Proc.new { current_user_object }
+  config.user.current = Proc.new { current_user_object }
 ```
 
 Feel free to mail us: team@intercom.io, if you're still having trouble.
@@ -64,7 +64,7 @@ You can give either a:
 to generate the values of the custom data:
 
 ```ruby
-  config.custom_data = {
+  config.user.custom_data = {
     :plan => Proc.new { |user| user.plan.name },
     :is_paid => Proc.new { |user| user.plan.present? },
     :email_verified => :email_verified?
@@ -76,12 +76,12 @@ In some situations you'll want to set some custom data specific to a request. Yo
 ```ruby
 class AppsController < ActionController::Base
   def activate
-    intercom_custom_data[:app_activated_at] = Time.now
+    intercom_custom_data.user[:app_activated_at] = Time.now
     ...
   end
 
   def destroy
-    intercom_custom_data[:app_deleted_at] = Time.now
+    intercom_custom_data.user[:app_deleted_at] = Time.now
     ...
   end
 end
@@ -123,11 +123,11 @@ This will behave exactly the same as the default auto-install. If for whatever r
 ```erb
 <% if logged_in? %>
   <%= intercom_script_tag({
-    :app_id => 'your-app-id'
-    :user_id => current_user.id
-    :email => current_user.email
-    :name => current_user.name
-    :created_at => current_user.created_at
+    :app_id => 'your-app-id',
+    :user_id => current_user.id,
+    :email => current_user.email,
+    :name => current_user.name,
+    :created_at => current_user.created_at,
     :custom_data => {
       'plan' => current_user.plan.name
     }
@@ -140,13 +140,13 @@ You can also override `IntercomRails::Config` options such as your `api_secret`,
 ```erb
 <% if logged_in? %>
   <%= intercom_script_tag({
-    :app_id => 'your-app-id'
-    :user_id => current_user.id
-    :email => current_user.email
-    :name => current_user.name
+    :app_id => 'your-app-id',
+    :user_id => current_user.id,
+    :email => current_user.email,
+    :name => current_user.name,
     :created_at => current_user.created_at
   }, {
-    :secret => 'your-apps-secret',
+    :secret => 'your-apps-api-secret',
     :widget => {:activator => '#Intercom'}
   }) %>
 <% end %>

data/lib/intercom-rails/import.rb

@@ -28,7 +28,7 @@ module IntercomRails
 
       if uri.scheme == 'https'
         http.use_ssl = true 
-        http.ca_file = File.join(File.dirname(__FILE__), '../data/ca_cert.pem')
+        http.ca_file = File.join(File.dirname(__FILE__), '../data/cacert.pem')
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       end
     end

data/lib/intercom-rails/script_tag.rb

@@ -99,7 +99,6 @@ module IntercomRails
     end
 
     def app_id
-      return ENV['INTERCOM_APP_ID'] if ENV['INTERCOM_APP_ID'].present?
       return IntercomRails.config.app_id if IntercomRails.config.app_id.present?
       return 'abcd1234' if defined?(Rails) && Rails.env.development?
 

data/lib/intercom-rails/version.rb

@@ -1,3 +1,3 @@
 module IntercomRails
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

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

@@ -7,8 +7,8 @@ module Intercom
       end
 
       argument :app_id, :desc => "Your Intercom app-id, which can be found here: https://www.intercom.io/apps/api_keys"
-      argument :api_secret, :desc => "Your Intercom api-secret, used for secure mode"
-      argument :api_key, :desc => "An Intercom API key, for various rake tasks"
+      argument :api_secret, :desc => "Your Intercom api-secret, used for secure mode", :optional => true
+      argument :api_key, :desc => "An Intercom API key, for various rake tasks", :optional => true
 
       def create_config_file
         @app_id = app_id

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

@@ -1,7 +1,7 @@
 IntercomRails.config do |config|
   # == Intercom app_id
   # 
-  config.app_id = "<%= @app_id %>"
+  config.app_id = ENV["INTERCOM_APP_ID"] || "<%= @app_id %>"
 
   # == Intercom secret key 
   # This is reuqired to enable secure mode, you can find it on your Intercom 

data/test/intercom-rails/auto_include_filter_test.rb

@@ -52,11 +52,11 @@ class AutoIncludeFilterTest < ActionController::TestCase
 
   def setup
     super
-    ENV['INTERCOM_APP_ID'] = 'my_app_id'
+    IntercomRails.config.app_id = 'my_app_id'
   end
 
   def teardown
-    ENV.delete('INTERCOM_APP_ID')
+    IntercomRails.config.app_id = nil
   end
   
   def test_no_user_present
@@ -78,7 +78,7 @@ class AutoIncludeFilterTest < ActionController::TestCase
     get :with_user_instance_variable, :body => "<body>Hello world</body>"
 
     assert_includes @response.body, "<script>"
-    assert_includes @response.body, ENV['INTERCOM_APP_ID']
+    assert_includes @response.body, IntercomRails.config.app_id 
     assert_includes @response.body, "ben@intercom.io"
     assert_includes @response.body, "Ben McRedmond"
   end
@@ -129,7 +129,7 @@ class AutoIncludeFilterTest < ActionController::TestCase
   end
 
   def test_no_app_id_present
-    ENV.delete('INTERCOM_APP_ID')
+    IntercomRails.config.app_id = nil
     get :with_current_user_method, :body => "<body>Hello world</body>"
 
     assert_equal @response.body, "<body>Hello world</body>"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -179,12 +179,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2417479611235149347
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2417479611235149347
 requirements: []
 rubyforge_project: intercom-rails
 rubygems_version: 1.8.23