intercom-rails 0.2.2 → 0.2.3

data/lib/intercom-rails/config.rb

@@ -59,6 +59,10 @@ module IntercomRails
         raise ArgumentError, "user.model should be a Proc" unless value.kind_of?(Proc)
       end
 
+      config_accessor :company_association do |value|
+        raise ArgumentError, "company_association should be a Proc" unless value.kind_of?(Proc)
+      end
+
       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?

data/lib/intercom-rails/import.rb

@@ -70,7 +70,13 @@ module IntercomRails
       user_klass.find_in_batches(:batch_size => MAX_BATCH_SIZE) do |users|
         users_for_wire = users.map do |u| 
           user_proxy = Proxy::User.new(u)
-          user_proxy.valid? ? user_proxy.to_hash : nil
+          next unless user_proxy.valid?
+          
+          for_wire = user_proxy.to_hash
+          companies = Proxy::Company.companies_for_user(user_proxy)
+          for_wire.merge!(:companies => companies.map(&:to_hash)) if companies.present?
+
+          for_wire
         end.compact
 
         yield(prepare_batch(users_for_wire), users_for_wire.count) unless users_for_wire.count.zero?

data/lib/intercom-rails/proxy.rb

@@ -43,12 +43,12 @@ module IntercomRails
         self.class.type
       end
 
-      def self.config
-        IntercomRails.config.send(type)
+      def self.config(type_override = nil)
+        IntercomRails.config.send(type_override || type)
       end
 
-      def config
-        self.class.config
+      def config(type_override = nil)
+        self.class.config(type_override)
       end
 
       private

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

@@ -4,6 +4,14 @@ module IntercomRails
 
     class Company < Proxy
 
+      def self.companies_for_user(user)
+        return unless config(:user).company_association.present?
+        companies = config(:user).company_association.call(user.user)
+        return unless companies.kind_of?(Array)
+
+        companies.map { |company| new(company) }.select { |company_proxy| company_proxy.valid? }
+      end
+
       def self.current_in_context(search_object)
         begin
           if config.current.present?

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

@@ -4,14 +4,21 @@ module IntercomRails
 
     class User < Proxy
 
-      POTENTIAL_USER_OBJECTS = [
-        Proc.new { instance_eval &IntercomRails.config.user.current if IntercomRails.config.user.current.present? },
+      PREDEFINED_POTENTIAL_USER_OBJECTS = [
         Proc.new { current_user },
         Proc.new { @user }
       ]
 
+      def self.potential_user_objects
+        if config.current.present?
+          [Proc.new { instance_eval &IntercomRails.config.user.current }]
+        else
+          PREDEFINED_POTENTIAL_USER_OBJECTS
+        end
+      end
+
       def self.current_in_context(search_object)
-        POTENTIAL_USER_OBJECTS.each do |potential_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?

data/lib/intercom-rails/version.rb

@@ -1,3 +1,3 @@
 module IntercomRails
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

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

@@ -45,6 +45,13 @@ IntercomRails.config do |config|
   # }
 
   <%- if @app_id == 'tx2p130c' -%>
+  # == User -> Company association
+  # A Proc that given a user returns an array of companies
+  # that the user belongs to.
+  # 
+  # config.user.company_association = Proc.new { |user| user.companies.to_a }
+  # config.user.company_association = Proc.new { |user| [user.company] }
+
   # == 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 

data/test/intercom-rails/import_unit_test.rb

@@ -70,4 +70,28 @@ output
     $stdout = @old_stdout
   end
 
+  def test_prepares_companies
+    @import = IntercomRails::Import.new
+
+    u = dummy_user
+    u.instance_eval do
+      def apps
+        [dummy_company]
+      end
+    end
+
+    User.stub(:find_in_batches).and_yield([u])
+
+    IntercomRails.config.user.company_association = Proc.new { |user| user.apps }
+
+    prepare_for_batch_users = nil
+    @import.stub(:prepare_batch) { |users| prepare_for_batch_users = users }
+    @import.stub(:send_users).and_return('failed' => [])
+
+    @import.run
+
+    assert_equal 1, prepare_for_batch_users[0][:companies].length
+    User.rspec_reset
+  end
+
 end

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

@@ -29,4 +29,18 @@ class CompanyTest < MiniTest::Unit::TestCase
     assert_equal false, Company.new(search_object).valid?
   end
 
+  def test_companies_for_user
+    IntercomRails.config.user.company_association = Proc.new { |user| user.apps }
+    test_user = dummy_user
+    test_user.instance_eval do
+      def apps
+        [DUMMY_COMPANY, dummy_company(:name => "Prey", :id => "800")]
+      end
+    end
+
+    companies = Company.companies_for_user(IntercomRails::Proxy::User.new(test_user))
+    assert_equal 2, companies.length
+    assert_equal ["Intercom", "Prey"], companies.map(&:company).map(&:name)
+  end
+
 end

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

@@ -50,6 +50,18 @@ class UserTest < MiniTest::Unit::TestCase
     assert_user_found 
   end
 
+  def test_finds_config_user_does_not_fallback_to_auto_find_users
+    IntercomRails.config.user.current = Proc.new { something_esoteric }
+    object_with_instance_variable = Object.new
+    object_with_instance_variable.instance_eval do
+      @user = DUMMY_USER 
+    end
+
+    assert_raises(IntercomRails::NoUserFoundError) {
+      User.current_in_context(object_with_instance_variable)
+    }
+  end
+
   def assert_user_found
     assert_equal DUMMY_USER, @user_proxy.user
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-30 00:00:00.000000000 Z
+date: 2012-12-03 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: 3543058584260120985
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3543058584260120985
 requirements: []
 rubyforge_project: intercom-rails
 rubygems_version: 1.8.23