intercom-rails 0.1.1 → 0.2.0

data/lib/intercom-rails.rb

@@ -1,5 +1,7 @@
 require 'intercom-rails/exceptions'
-require 'intercom-rails/user_proxy'
+require 'intercom-rails/proxy'
+require 'intercom-rails/proxy/user'
+require 'intercom-rails/proxy/company'
 require 'intercom-rails/script_tag'
 require 'intercom-rails/script_tag_helper'
 require 'intercom-rails/custom_data_helper'

data/lib/intercom-rails/auto_include_filter.rb

@@ -46,7 +46,7 @@ module IntercomRails
     end
 
     def intercom_script_tag
-      @script_tag ||= ScriptTag.new(:find_current_user_details => true, :controller => controller)
+      @script_tag ||= ScriptTag.new(:find_current_user_details => true, :find_current_company_details => true, :controller => controller)
     end
 
   end

data/lib/intercom-rails/config.rb

@@ -1,99 +1,91 @@
-module IntercomRails
-
-  module Config
-
-    def self.reset!
-      [self, InboxConfig].each do |configer|
-        configer.instance_variables.each do |var|
-          configer.send(:remove_instance_variable, var)
-        end
-      end
-    end
-
-    # Your Intercom app_id
-    def self.app_id=(value)
-      @app_id = value
-    end
+class Module
 
-    def self.app_id
-      @app_id
-    end
+  def config_accessor(*args, &block)
+    config_reader(*args)
+    config_writer(*args, &block)
+  end
 
-    # Intercom api secret, for secure mode
-    def self.api_secret=(value)
-      @api_secret = value
+  def config_reader(name)
+    self.send(:define_singleton_method, name) do
+      instance_variable_get("@#{name}")
     end
+  end
 
-    def self.api_secret
-      @api_secret
+  def config_writer(name, &block)
+    self.send(:define_singleton_method, "#{name}=") do |value|
+      block.call(value) if block
+      instance_variable_set("@#{name}", value)
     end
+  end
 
-    # Intercom API key, for some rake tasks
-    def self.api_key=(value)
-      @api_key = value
-    end
+  def config_group(name, &block)
+    camelized_name = name.to_s.split('_').map { |s| s[0].upcase + s[1..-1] }.join('')
+    group = self.const_set(camelized_name, Module.new)
 
-    def self.api_key
-      @api_key
+    self.send(:define_singleton_method, name) do
+      group
     end
 
-    # How is the current logged in user accessed in your controllers?
-    def self.current_user=(value)
-      raise ArgumentError, "current_user should be a Proc" unless value.kind_of?(Proc)
-      @current_user = value
-    end
+    group.instance_eval(&block)
+  end
 
-    def self.current_user
-      @current_user
-    end
+end
 
-    # What class defines your user model?
-    def self.user_model=(value)
-      raise ArgumentError, "user_model should be a Proc" unless value.kind_of?(Proc)
-      @user_model = value
-    end
+module IntercomRails
 
-    def self.user_model
-      @user_model
-    end
+  module Config
 
-    # Widget options
-    def self.inbox
-      InboxConfig
-    end
+    def self.reset!
+      to_reset = self.constants.map {|c| const_get c}
+      to_reset << self
 
-    def self.custom_data=(value)
-      raise ArgumentError, "custom_data should be a hash" unless value.kind_of?(Hash)
-      unless value.reject { |_,v| v.kind_of?(Proc) || v.kind_of?(Symbol) }.count.zero?
-        raise ArgumentError, "all custom_data attributes should be either a Proc or a symbol"
+      to_reset.each do |configer|
+        configer.instance_variables.each do |var|
+          configer.send(:remove_instance_variable, var)
+        end
       end
-
-      @custom_data = value
-    end
-
-    def self.custom_data
-      @custom_data
     end
+ 
+    config_accessor :app_id
+    config_accessor :api_secret
+    config_accessor :api_key
 
-  end
+    config_group :user do
+      config_accessor :current do |value|
+        raise ArgumentError, "user.current should be a Proc" unless value.kind_of?(Proc)
+      end
 
-  module InboxConfig
+      config_accessor :model do |value|
+        raise ArgumentError, "user.model should be a Proc" unless value.kind_of?(Proc)
+      end
 
-    def self.style=(value)
-      raise ArgumentError, "inbox.style must be one of :default or :custom" unless [:default, :custom].include?(value)
-      @style = value
+      config_accessor :custom_data do |value|
+        raise ArgumentError, "user.custom_data should be a hash" unless value.kind_of?(Hash)
+        unless value.reject { |_,v| v.kind_of?(Proc) || v.kind_of?(Symbol) }.count.zero?
+          raise ArgumentError, "all custom_data attributes should be either a Proc or a symbol"
+        end
+      end
     end
+    
+    config_group :company do
+      config_accessor :current do |value|
+        raise ArgumentError, "company.current should be a Proc" unless value.kind_of?(Proc)
+      end
 
-    def self.style
-      @style 
+      config_accessor :custom_data do |value|
+        raise ArgumentError, "company.custom_data should be a hash" unless value.kind_of?(Hash)
+        unless value.reject { |_,v| v.kind_of?(Proc) || v.kind_of?(Symbol) }.count.zero?
+          raise ArgumentError, "all custom_data attributes should be either a Proc or a symbol"
+        end
+      end
     end
 
-    def self.counter=(value)
-      @counter = value
-    end
+    config_group :inbox do
+      config_accessor :counter
 
-    def self.counter
-      @counter
+      config_accessor :style do |value|
+        raise ArgumentError, "inbox.style must be one of :default or :custom" unless [:default, :custom].include?(value)
+      end
     end
 
   end

data/lib/intercom-rails/custom_data_helper.rb

@@ -6,11 +6,16 @@ module IntercomRails
     # for the current request from within the controller. e.g.
     #
     # def destroy
-    #   intercom_custom_data['canceled_at'] = Time.now
+    #   intercom_custom_data.user['canceled_at'] = Time.now
     #   ...
     # end
     def intercom_custom_data
-      @_request_specific_intercom_custom_data ||= {}
+      @_request_specific_intercom_custom_data ||= begin
+        s = Struct.new(:user, :company).new
+        s.user = {}
+        s.company = {}
+        s
+      end
     end
 
   end

data/lib/intercom-rails/exceptions.rb

@@ -1,9 +1,9 @@
 module IntercomRails
 
   class Error < StandardError; end
-  
-  class NoUserFoundError < Error; end
   class ImportError < Error; end
   class IntercomAPIError < Error; end
+  class NoUserFoundError < Error; end
+  class NoCompanyFoundError < Error; end
 
 end

data/lib/intercom-rails/import.rb

@@ -69,7 +69,7 @@ module IntercomRails
     def batches
       user_klass.find_in_batches(:batch_size => MAX_BATCH_SIZE) do |users|
         users_for_wire = users.map do |u| 
-          user_proxy = UserProxy.new(u)
+          user_proxy = Proxy::User.new(u)
           user_proxy.valid? ? user_proxy.to_hash : nil
         end.compact
 
@@ -82,8 +82,8 @@ module IntercomRails
     end
 
     def user_klass
-      if IntercomRails.config.user_model.present?
-        IntercomRails.config.user_model.call
+      if IntercomRails.config.user.model.present?
+        IntercomRails.config.user.model.call
       else
         User
       end

data/lib/intercom-rails/proxy.rb

@@ -0,0 +1,81 @@
+module IntercomRails
+
+  module Proxy
+
+    class Proxy
+
+      def self.class_string
+        self.to_s.split('::').last
+      end
+
+      def self.inherited(subclass)
+        subclass.class_eval do
+          attr_reader class_string.downcase.to_s 
+        end
+      end
+
+      attr_reader :search_object, :proxied_object
+
+      def initialize(object_to_proxy, search_object = nil)
+        @search_object = search_object
+        @proxied_object = instance_variable_set(:"@#{type}", object_to_proxy)
+      end
+
+      def to_hash
+        standard_data.merge custom_data
+      end
+
+      def custom_data
+        custom_data_from_config.merge custom_data_from_request
+      end
+
+      protected
+
+      def attribute_present?(attribute)
+        proxied_object.respond_to?(attribute) && proxied_object.send(attribute).present?
+      end
+
+      def self.type
+        self.class_string.downcase.to_sym
+      end
+
+      def type
+        self.class.type
+      end
+
+      def self.config
+        IntercomRails.config.send(type)
+      end
+
+      def config
+        self.class.config
+      end
+
+      private
+
+      def custom_data_from_request 
+        search_object.intercom_custom_data.send(type)
+      rescue NoMethodError
+        {}
+      end
+
+      def custom_data_from_config 
+        return {} if config.custom_data.blank?
+        config.custom_data.reduce({}) do |custom_data, (k,v)|
+          custom_data.merge(k => custom_data_value_from_proc_or_symbol(v))
+        end
+      end
+
+      def custom_data_value_from_proc_or_symbol(proc_or_symbol)
+        if proc_or_symbol.kind_of?(Symbol)
+          proxied_object.send(proc_or_symbol)
+        elsif proc_or_symbol.kind_of?(Proc)
+          proc_or_symbol.call(proxied_object)
+        end
+      end
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,35 @@
+module IntercomRails
+
+  module Proxy
+
+    class Company < Proxy
+
+      def self.current_in_context(search_object)
+        begin
+          if config.current.present?
+            company_proxy = new(search_object.instance_eval(&config.current), search_object) 
+            return company_proxy if company_proxy.valid?
+          end
+        rescue NameError
+        end
+
+        raise NoCompanyFoundError 
+      end
+
+      def valid?
+        company.respond_to?(:id) && company.id.present?
+      end
+
+      def standard_data
+        hsh = {}
+        hsh[:id] = company.id
+        hsh[:name] = company.name if attribute_present?(:name) 
+        hsh[:created_at] = company.created_at if attribute_present?(:created_at) 
+        hsh
+      end
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,48 @@
+module IntercomRails
+
+  module Proxy
+
+    class User < Proxy
+
+      POTENTIAL_USER_OBJECTS = [
+        Proc.new { instance_eval &IntercomRails.config.user.current if IntercomRails.config.user.current.present? },
+        Proc.new { current_user },
+        Proc.new { @user }
+      ]
+
+      def self.current_in_context(search_object)
+        POTENTIAL_USER_OBJECTS.each do |potential_object|
+          begin
+            user_proxy = new(search_object.instance_eval(&potential_object), search_object)
+            return user_proxy if user_proxy.valid?
+          rescue NameError
+            next
+          end
+        end
+
+        raise NoUserFoundError
+      end
+
+      def standard_data
+        hsh = {}
+
+        hsh[:user_id] = user.id if attribute_present?(:id) 
+        [:email, :name, :created_at].each do |attribute|
+          hsh[attribute] = user.send(attribute) if attribute_present?(attribute)
+        end
+
+        hsh
+      end
+
+      def valid?
+        return false if user.blank?
+        return true if user.respond_to?(:id) && user.id.present?
+        return true if user.respond_to?(:email) && user.email.present?
+        false
+      end
+
+    end
+
+  end
+
+end

data/lib/intercom-rails/script_tag.rb

@@ -9,7 +9,7 @@ module IntercomRails
       new(*args).output
     end
 
-    attr_reader :user_details
+    attr_reader :user_details, :company_details
     attr_accessor :secret, :widget_options, :controller
 
     def initialize(options = {})
@@ -17,6 +17,11 @@ module IntercomRails
       self.widget_options = widget_options_from_config.merge(options[:widget] || {})
       self.controller = options[:controller]
       self.user_details = options[:find_current_user_details] ? find_current_user_details : options[:user_details] 
+      self.company_details = if options[:find_current_company_details] 
+        find_current_company_details
+      elsif options[:user_details]
+        options[:user_details].delete(:company) if options[:user_details]
+      end
     end
 
     def valid?
@@ -24,10 +29,10 @@ module IntercomRails
     end
 
     def intercom_settings
-      options = {}
-      options[:widget] = widget_options if widget_options.present?
-
-      user_details.merge(options)
+      hsh = user_details
+      hsh[:widget] = widget_options if widget_options.present?
+      hsh[:company] = company_details if company_details.present?
+      hsh
     end
 
     def output 
@@ -69,11 +74,25 @@ module IntercomRails
 
     def find_current_user_details
       return {} unless controller.present?
-      UserProxy.from_current_user_in_object(controller).to_hash
+      Proxy::User.current_in_context(controller).to_hash
     rescue NoUserFoundError 
       {}
     end
 
+    def company_details=(company_details)
+      @company_details = convert_dates_to_unix_timestamps(company_details || {})
+      @company_details = @company_details.with_indifferent_access.tap do |c|
+        [:id, :name].each { |k| c.delete(k) if c[k].nil? }
+      end
+    end
+
+    def find_current_company_details
+      return {} unless controller.present?
+      Proxy::Company.current_in_context(controller).to_hash
+    rescue NoCompanyFoundError
+      {}
+    end
+
     def user_hash
       components = [secret, (user_details[:user_id] || user_details[:email])]
       Digest::SHA1.hexdigest(components.join)

data/lib/intercom-rails/script_tag_helper.rb

@@ -31,6 +31,7 @@ module IntercomRails
       controller.instance_variable_set(IntercomRails::SCRIPT_TAG_HELPER_CALLED_INSTANCE_VARIABLE, true) if defined?(controller)
       options[:user_details] = user_details if user_details.present?
       options[:find_current_user_details] = !options[:user_details]
+      options[:find_current_company_details] = !(options[:user_details] && options[:user_details][:company])
       options[:controller] = controller if defined?(controller)
 
       ScriptTag.generate(options)

data/lib/intercom-rails/version.rb

@@ -1,3 +1,3 @@
 module IntercomRails
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

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

@@ -10,7 +10,7 @@ IntercomRails.config do |config|
   <%- if @api_secret -%>
   config.api_secret = "<%= @api_secret %>"
   <%- else -%>
-  # config.api_secret = '...'
+  # config.api_secret = "..."
   <%- end -%>
 
   # == Intercom API Key
@@ -27,23 +27,41 @@ 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
   #
-  # config.current_user = Proc.new { current_user }
+  # config.user.current = Proc.new { current_user }
   
   # == User model class
   # The class which defines your user model
   #
-  # config.user_model = Proc.new { User }
+  # config.user.model = Proc.new { User }
 
-  # == Custom Data
+  # == User Custom Data
   # A hash of additional data you wish to send about your users.
   # You can provide either a method name which will be sent to the current
   # user object, or a Proc which will be passed the current user.
   #
-  # config.custom_data = {
-  #   'plan' => Proc.new { |current_user| current_user.plan.name },
-  #   'favorite_color' => :favorite_color
+  # config.user.custom_data = {
+  #   :plan => Proc.new { |current_user| current_user.plan.name },
+  #   :favorite_color => :favorite_color
   # }
-  
+
+  <%- if @app_id == 'tx2p130c' -%>
+  # == Current company name
+  # The method/variable that contains the current company for the current user,
+  # in your controllers. 'Companies' are generic groupings of users, so this 
+  # could be a company, app or group.
+  #
+  # config.company.current = Proc.new { @app }
+
+  # == Company Custom Data
+  # A hash of additional data you wish to send about a company.
+  # This works the same as User custom data above.
+  #
+  # config.company.custom_data = {
+  #   :number_of_messages => Proc.new { |app| app.messages.count },
+  #   :is_interesting => :is_interesting?
+  # }
+  <%- end -%>
+ 
   # == Inbox Style
   # This enables the Intercom inbox which allows your users to read their
   # past conversations with your app, as well as start new ones. It is 

data/test/intercom-rails/auto_include_filter_test.rb

@@ -10,10 +10,16 @@ class TestController < ActionController::Base
     @user = dummy_user
     render :text => params[:body], :content_type => 'text/html'
   end
+
+  def with_user_and_app_instance_variables
+    @user = dummy_user
+    @app = dummy_company
+    render :text => params[:body], :content_type => 'text/html'
+  end
   
   def with_user_instance_variable_and_custom_data
     @user = dummy_user
-    intercom_custom_data['testing_stuff'] = true 
+    intercom_custom_data.user['testing_stuff'] = true 
     render :text => params[:body], :content_type => 'text/html'
   end
 
@@ -80,7 +86,6 @@ class AutoIncludeFilterTest < ActionController::TestCase
   def test_user_instance_variable_present_with_body_tag_and_custom_data
     get :with_user_instance_variable_and_custom_data, :body => "<body>Hello world</body>"
     assert_includes @response.body, "<script>"
-    assert_includes @response.body, "custom_data"
     assert_includes @response.body, "testing_stuff"
   end
 
@@ -93,8 +98,7 @@ class AutoIncludeFilterTest < ActionController::TestCase
   end
 
   def test_setting_current_user_with_intercom_config
-    IntercomRails.config.current_user = Proc.new { @admin }
-
+    IntercomRails.config.user.current = Proc.new { @admin }
     get :with_admin_instance_variable, :body => "<body>Hello world</body>"
 
     assert_includes @response.body, "<script>"
@@ -105,6 +109,7 @@ class AutoIncludeFilterTest < ActionController::TestCase
   def test_auto_insert_with_api_secret_set
     IntercomRails.config.api_secret = 'abcd'
     get :with_current_user_method, :body => "<body>Hello world</body>"
+
     assert_includes @response.body, "<script>"
     assert_includes @response.body, "user_hash"
     assert_includes @response.body, Digest::SHA1.hexdigest('abcd' + @controller.current_user.email)
@@ -126,4 +131,13 @@ class AutoIncludeFilterTest < ActionController::TestCase
     assert_equal @response.body,  "<body>Hello world</body>"
   end
 
+  def test_includes_company
+    IntercomRails.config.company.current = Proc.new { @app }
+    get :with_user_and_app_instance_variables, :body => "<body>Hello world</body>"
+
+    assert_includes @response.body, "<script>"
+    assert_includes @response.body, "company"
+    assert_includes @response.body, "6"
+  end
+
 end

data/test/intercom-rails/config_test.rb

@@ -11,13 +11,13 @@ class ConfigTest < MiniTest::Unit::TestCase
 
   def test_setting_current_user
     current_user = Proc.new { @blah }
-    IntercomRails.config.current_user = current_user
-    assert_equal IntercomRails.config.current_user, current_user
+    IntercomRails.config.user.current = current_user
+    assert_equal IntercomRails.config.user.current, current_user
   end
 
   def test_setting_current_user_not_to_a_proc
     assert_raises ArgumentError do
-      IntercomRails.config.current_user = 1
+      IntercomRails.config.user.current = 1
     end
   end
 
@@ -31,7 +31,7 @@ class ConfigTest < MiniTest::Unit::TestCase
 
   def test_custom_data_rejects_non_proc_or_symbol_attributes
     exception = assert_raises ArgumentError do 
-      IntercomRails.config.custom_data = {
+      IntercomRails.config.user.custom_data = {
         'foo' => Proc.new {},
         'bar' => 'heyheyhey!'
       }
@@ -46,14 +46,19 @@ class ConfigTest < MiniTest::Unit::TestCase
       'bar' => :method_name
     }
 
-    IntercomRails.config.custom_data = custom_data_config
-    assert_equal custom_data_config, IntercomRails.config.custom_data
+    IntercomRails.config.user.custom_data = custom_data_config
+    assert_equal custom_data_config, IntercomRails.config.user.custom_data
+  end
+
+  def test_setting_inbox_style
+    IntercomRails.config.inbox.style = :custom
+    assert_equal :custom, IntercomRails.config.inbox.style
   end
 
   def test_reset_clears_existing_config
-    IntercomRails.config.custom_data = {'muffin' => :muffin}
+    IntercomRails.config.user.custom_data = {'muffin' => :muffin}
     IntercomRails.config.reset!
-    assert_equal nil, IntercomRails.config.custom_data
+    assert_equal nil, IntercomRails.config.user.custom_data
   end
 
   def test_reset_clears_inbox_config_too

data/test/intercom-rails/proxy/company_test.rb

@@ -0,0 +1,21 @@
+require 'test_setup'
+
+class CompanyTest < MiniTest::Unit::TestCase
+
+  include InterTest
+
+  Company = IntercomRails::Proxy::Company
+  DUMMY_COMPANY = dummy_company
+
+  def test_finds_current_company
+    IntercomRails.config.company.current = Proc.new { @app }
+    object_with_app_instance_var = Object.new 
+    object_with_app_instance_var.instance_variable_set(:@app, DUMMY_COMPANY)
+
+    c = Company.current_in_context(object_with_app_instance_var)
+    assert_equal true, c.valid?
+    expected_hash = {:id => '6', :name => 'Intercom'}
+    assert_equal expected_hash, c.to_hash
+  end
+
+end

data/test/intercom-rails/{user_proxy_test.rb → proxy/user_test.rb}

@@ -1,6 +1,8 @@
 require 'test_setup'
 
-class UserProxyTest < MiniTest::Unit::TestCase
+class UserTest < MiniTest::Unit::TestCase
+
+  User = IntercomRails::Proxy::User
 
   include InterTest
   include IntercomRails
@@ -9,7 +11,7 @@ class UserProxyTest < MiniTest::Unit::TestCase
 
   def test_raises_error_when_no_user_found
     assert_raises(IntercomRails::NoUserFoundError) {
-      UserProxy.from_current_user_in_object(Object.new)
+      User.current_in_context(Object.new)
     }
   end
 
@@ -21,7 +23,7 @@ class UserProxyTest < MiniTest::Unit::TestCase
       end
     end
 
-    @user_proxy = UserProxy.from_current_user_in_object(object_with_current_user_method)
+    @user_proxy = User.current_in_context(object_with_current_user_method)
     assert_user_found 
   end
 
@@ -31,7 +33,7 @@ class UserProxyTest < MiniTest::Unit::TestCase
       @user = DUMMY_USER 
     end
 
-    @user_proxy = UserProxy.from_current_user_in_object(object_with_instance_variable)
+    @user_proxy = User.current_in_context(object_with_instance_variable)
     assert_user_found 
   end
 
@@ -43,8 +45,8 @@ class UserProxyTest < MiniTest::Unit::TestCase
       end
     end
 
-    IntercomRails.config.current_user = Proc.new { something_esoteric }
-    @user_proxy = UserProxy.from_current_user_in_object(object_from_config)
+    IntercomRails.config.user.current = Proc.new { something_esoteric }
+    @user_proxy = User.current_in_context(object_from_config)
     assert_user_found 
   end
 
@@ -60,36 +62,41 @@ class UserProxyTest < MiniTest::Unit::TestCase
       end
     end
 
-    IntercomRails.config.custom_data = {
+    IntercomRails.config.user.custom_data = {
       'plan' => :plan
     }
 
-    @user_proxy = UserProxy.new(plan_dummy_user)
-    expected_custom_data = {'plan' => 'pro'}
-    assert_equal expected_custom_data, @user_proxy.to_hash[:custom_data]
+    @user_proxy = User.new(plan_dummy_user)
+    assert_equal 'pro', @user_proxy.to_hash['plan']
   end
 
   def test_valid_returns_true_if_user_id_or_email
-    assert_equal true, UserProxy.new(DUMMY_USER).valid?
+    assert_equal true, User.new(DUMMY_USER).valid?
   end
 
   def test_includes_custom_data_from_intercom_custom_data
     object_with_intercom_custom_data = Object.new
     object_with_intercom_custom_data.instance_eval do
       def intercom_custom_data
-        {:ponies => :rainbows}
+        o = Object.new 
+        o.instance_eval do 
+          def user
+            {:ponies => :rainbows}
+          end
+        end 
+
+        o
       end
     end
 
-    @user_proxy = UserProxy.new(DUMMY_USER, object_with_intercom_custom_data) 
-    expected_custom_data = {:ponies => :rainbows}
-    assert_equal expected_custom_data, @user_proxy.to_hash[:custom_data]
+    @user_proxy = User.new(DUMMY_USER, object_with_intercom_custom_data) 
+    assert_equal :rainbows, @user_proxy.to_hash[:ponies]
   end
 
   def test_valid_returns_false_for_nil
     search_object = false 
     search_object.stub(:id) { raise NameError }
-    assert_equal false, UserProxy.new(search_object).valid?
+    assert_equal false, User.new(search_object).valid?
   end
 
 end

data/test/intercom-rails/script_tag_test.rb

@@ -87,5 +87,17 @@ class ScriptTagTest < MiniTest::Unit::TestCase
     assert_equal expected_widget_settings, script_tag.intercom_settings['widget']
   end
 
+  def test_company_discovery_and_inclusion
+    IntercomRails.config.company.current = Proc.new { @app }
+    object_with_app_instance_variable = Object.new
+    object_with_app_instance_variable.instance_eval do
+      @app = dummy_company 
+    end
+
+    script_tag = ScriptTag.new(:controller => object_with_app_instance_variable,
+                               :find_current_company_details => true)
+    expected_company = {'id' => '6', 'name' => 'Intercom'}
+    assert_equal expected_company, script_tag.intercom_settings[:company]
+  end
 
 end

data/test/test_setup.rb

@@ -10,6 +10,13 @@ def dummy_user(options = {})
   user
 end
 
+def dummy_company(options = {})
+  company = Struct.new(:id, :name).new
+  company.id = options[:id] || '6'
+  company.name = options[:name] || 'Intercom'
+  company
+end
+
 def fake_action_view_class
   klass = Class.new(ActionView::Base)
   klass.class_eval do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -143,10 +143,12 @@ files:
 - lib/intercom-rails/exceptions.rb
 - lib/intercom-rails/import.rb
 - lib/intercom-rails/intercom.rake
+- lib/intercom-rails/proxy/company.rb
+- lib/intercom-rails/proxy/user.rb
+- lib/intercom-rails/proxy.rb
 - lib/intercom-rails/railtie.rb
 - lib/intercom-rails/script_tag.rb
 - lib/intercom-rails/script_tag_helper.rb
-- lib/intercom-rails/user_proxy.rb
 - lib/intercom-rails/version.rb
 - lib/intercom-rails.rb
 - lib/rails/generators/intercom/config/config_generator.rb
@@ -160,9 +162,10 @@ files:
 - test/intercom-rails/config_test.rb
 - test/intercom-rails/import_network_test.rb
 - test/intercom-rails/import_unit_test.rb
+- test/intercom-rails/proxy/company_test.rb
+- test/intercom-rails/proxy/user_test.rb
 - test/intercom-rails/script_tag_helper_test.rb
 - test/intercom-rails/script_tag_test.rb
-- test/intercom-rails/user_proxy_test.rb
 - test/test_setup.rb
 homepage: http://www.intercom.io
 licenses: []
@@ -178,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2121047111901162592
+      hash: -893769769593597927
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -187,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2121047111901162592
+      hash: -893769769593597927
 requirements: []
 rubyforge_project: intercom-rails
 rubygems_version: 1.8.23
@@ -201,7 +204,8 @@ test_files:
 - test/intercom-rails/config_test.rb
 - test/intercom-rails/import_network_test.rb
 - test/intercom-rails/import_unit_test.rb
+- test/intercom-rails/proxy/company_test.rb
+- test/intercom-rails/proxy/user_test.rb
 - test/intercom-rails/script_tag_helper_test.rb
 - test/intercom-rails/script_tag_test.rb
-- test/intercom-rails/user_proxy_test.rb
 - test/test_setup.rb

data/lib/intercom-rails/user_proxy.rb

@@ -1,84 +0,0 @@
-module IntercomRails
-
-  class UserProxy 
-
-    POTENTIAL_USER_OBJECTS = [
-      Proc.new { instance_eval &IntercomRails.config.current_user if IntercomRails.config.current_user.present? },
-      Proc.new { current_user },
-      Proc.new { @user }
-    ]
-
-    def self.from_current_user_in_object(search_object)
-      POTENTIAL_USER_OBJECTS.each do |potential_user|
-        begin
-          user_proxy = new(search_object.instance_eval(&potential_user), search_object)
-          return user_proxy if user_proxy.valid?
-        rescue NameError
-          next
-        end
-      end
-
-      raise NoUserFoundError 
-    end
-
-    attr_reader :search_object, :user
-
-    def initialize(user, search_object = nil)
-      @user = user
-      @search_object = search_object
-    end
-
-    def to_hash
-      hsh = {}
-
-      hsh[:user_id] = user.id if attribute_present?(:id) 
-      [:email, :name, :created_at].each do |attribute|
-        hsh[attribute] = user.send(attribute) if attribute_present?(attribute)
-      end
-
-      hsh[:custom_data] = custom_data
-      hsh.delete(:custom_data) unless hsh[:custom_data].present?
-
-      hsh
-    end
-
-    def custom_data
-      custom_data_from_config.merge custom_data_from_request
-    end
-
-    def valid?
-      return false if user.blank?
-      return true if user.respond_to?(:id) && user.id.present?
-      return true if user.respond_to?(:email) && user.email.present?
-      false
-    end
-
-    private
-    def attribute_present?(attribute)
-      user.respond_to?(attribute) && user.send(attribute).present?
-    end
-
-    def custom_data_value_from_proc_or_symbol(proc_or_symbol)
-      if proc_or_symbol.kind_of?(Symbol)
-        user.send(proc_or_symbol)
-      elsif proc_or_symbol.kind_of?(Proc)
-        proc_or_symbol.call(user)
-      end
-    end
-
-    def custom_data_from_request 
-      search_object.intercom_custom_data
-    rescue NoMethodError
-      {}
-    end
-
-    def custom_data_from_config 
-      return {} if Config.custom_data.blank?
-      Config.custom_data.reduce({}) do |custom_data, (k,v)|
-        custom_data.merge(k => custom_data_value_from_proc_or_symbol(v))
-      end
-    end
-
-  end
-
-end