intercom-rails 0.2.11 → 0.2.12

data/README.mdown

@@ -151,13 +151,6 @@ You can also override `IntercomRails::Config` options such as your `api_secret`,
   }) %>
 <% end %>
 ```
-
-The `intercom:install` rails generator will add the `intercom_script_tag` to your application layout:
-
-```
-rails g intercom:install YOUR-APP-ID
-```
-
 ## Importing your users
 To get started faster with Intercom, `IntercomRails` includes a Rake task that will do an initial import of your users:
 

data/lib/intercom-rails/version.rb

@@ -1,3 +1,3 @@
 module IntercomRails
-  VERSION = "0.2.11"
+  VERSION = "0.2.12"
 end

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

@@ -10,11 +10,34 @@ module Intercom
       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
 
+      FALSEY_RESPONSES = ['n', 'no']
       def create_config_file
         @app_id = app_id
         @api_secret = api_secret
         @api_key = api_key
 
+        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'.
+
+Is the logged-in user accessible via either 'current_user' or '@user'? [Yn]
+        desc
+
+        print "#{introduction.strip} "
+        default_ok = $stdin.gets.strip.downcase 
+
+        if FALSEY_RESPONSES.include?(default_ok) 
+          custom_current_user_question = <<-desc
+
+How do you access the logged-in user in your controllers? This can be
+any Ruby code, e.g. 'current_customer', '@admin', etc.:
+          desc
+
+          print "#{custom_current_user_question.rstrip} "
+          @current_user = $stdin.gets.strip
+        end
+
         template("intercom.rb.erb", "config/initializers/intercom.rb")
       end
 

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

@@ -27,7 +27,11 @@ IntercomRails.config do |config|
   # 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 @current_user -%>
+  config.user.current = Proc.new { <%= @current_user %> }
+  <%- else -%>
   # config.user.current = Proc.new { current_user }
+  <%- end -%>
   
   # == User model class
   # The class which defines your user model

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-10 00:00:00.000000000 Z
+date: 2013-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -153,7 +153,6 @@ files:
 - lib/intercom-rails.rb
 - lib/rails/generators/intercom/config/config_generator.rb
 - lib/rails/generators/intercom/config/intercom.rb.erb
-- lib/rails/generators/intercom/install/install_generator.rb
 - Rakefile
 - README.mdown
 - test/action_controller_test_setup.rb
@@ -181,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3854921548021819677
+      hash: -28937987010178608
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -190,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3854921548021819677
+      hash: -28937987010178608
 requirements: []
 rubyforge_project: intercom-rails
 rubygems_version: 1.8.23

data/lib/rails/generators/intercom/install/install_generator.rb

@@ -1,33 +0,0 @@
-module Intercom
-  module Generators
-    class InstallGenerator < ::Rails::Generators::Base
-      desc "Installs Intercom (https://www.intercom.io) into your Rails app"
-
-      argument :app_id, :desc => "Your Intercom app-id, which can be found here: https://www.intercom.io/apps/api_keys"
-
-      def update_layout
-        snippet = <<-HTML
-<!--
-TODO add any user/app/situational data to the custom Hash below
-e.g. :plan => 'Pro', :dashboard_page => 'http://dashboard.example.com/user-id'
-See http://docs.intercom.io/#CustomData for more details about custom data
--->
-<% if logged_in? %>
-  <%= intercom_script_tag({
-    :app_id => #{app_id.inspect},
-    :user_id => current_user.id,
-    :email => current_user.email,
-    :name => current_user.name,
-    :created_at => current_user.created_at,
-    :custom_data => {
-
-    }}) %>
-<% end %>
-</body>
-HTML
-
-        gsub_file('app/views/layouts/application.html.erb', %r{</body>}, snippet)
-      end
-    end
-  end
-end