intercom-rails 0.2.35 → 0.2.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d3cce2749664582e9707ca49d84e2f9492b196a
-  data.tar.gz: 715ba3b7c602bc9ea3ded903d2d54f03b2a1fe20
+  metadata.gz: 442ecf7487fbe99a3fb44e6f14b33ddb002bd70f
+  data.tar.gz: cb7e27a634b175c80e62d07f6689da1c02029400
 SHA512:
-  metadata.gz: 193a3d165c11b8e8d0be23f1f31d9ef9861514ac8b7bcfb9d1ce6cd39e68ce098be7ddc889de22ffa7843722c7a21c59da0459d4c5e121991252aaaf6eb86504
-  data.tar.gz: b43c7346104a0aca028ff6e3c819b8639d46a7c97d4adefc19d523535cb17678f4fd9de8b39b7be6329c918c74ace4e8c30a78b95f2f53af02a960845971956a
+  metadata.gz: cd671fd16f7457d5ae016def0745c4658457fd181527249214a58925e42240bf665a1cbca7e728620c2cd074200e8c2758b289e475e4b278c6761cd84768670b
+  data.tar.gz: b452e1c389e83593c6f76b9b9d5ec2960dcb90e0f45352ca0ba2d66d695cfb285fdc2abf00e0a13f894e04796d0888635d955339e0166d6597b8cbce6cea7c89

data/lib/intercom-rails.rb

@@ -9,7 +9,6 @@ require 'intercom-rails/custom_data_helper'
 require 'intercom-rails/shutdown_helper'
 require 'intercom-rails/auto_include_filter'
 require 'intercom-rails/config'
-require 'intercom-rails/import'
 require 'intercom-rails/railtie' if defined? Rails::Railtie
 
 module IntercomRails

data/lib/intercom-rails/config.rb

@@ -94,7 +94,6 @@ module IntercomRails
     config_accessor :app_id
     config_accessor :session_duration
     config_accessor :api_secret
-    config_accessor :api_key
     config_accessor :library_url
     config_accessor :enabled_environments, &ARRAY_VALIDATOR
     config_accessor :include_for_logged_out_users

data/lib/intercom-rails/exceptions.rb

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

data/lib/intercom-rails/version.rb

@@ -1,3 +1,3 @@
 module IntercomRails
-  VERSION = "0.2.35"
+  VERSION = "0.2.36"
 end

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

@@ -8,14 +8,12 @@ module Intercom
 
       argument :app_id, :desc => "Your Intercom app-id, which can be found here: https://app.intercom.io/apps/api_keys"
       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
       argument :session_duration, :desc => "user session duration, this should match your app", :optional => true
 
       FALSEY_RESPONSES = ['n', 'no']
       def create_config_file
         @app_id = app_id
         @api_secret = api_secret
-        @api_key = api_key
         @session_duration = session_duration
         @include_for_logged_out_users = false
 

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

@@ -20,16 +20,6 @@ IntercomRails.config do |config|
   # config.api_secret = "..."
   <%- end -%>
 
-  # == Intercom API Key
-  # This is required for some Intercom rake tasks like importing your users;
-  # you can generate one at https://app.intercom.io/apps/api_keys.
-  #
-  <%- if @api_key -%>
-  config.api_key = "<%= @api_key %>"
-  <%- else -%>
-  # config.api_key = "..."
-  <%- end -%>
-
   # == Enabled Environments
   # Which environments is auto inclusion of the Javascript enabled for
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: intercom-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.35
+  version: 0.2.36
 platform: ruby
 authors:
 - Ben McRedmond
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-09 00:00:00.000000000 Z
+date: 2016-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -172,8 +172,6 @@ files:
 - lib/intercom-rails/custom_data_helper.rb
 - lib/intercom-rails/date_helper.rb
 - lib/intercom-rails/exceptions.rb
-- lib/intercom-rails/import.rb
-- lib/intercom-rails/intercom.rake
 - lib/intercom-rails/proxy.rb
 - lib/intercom-rails/proxy/company.rb
 - lib/intercom-rails/proxy/user.rb
@@ -204,8 +202,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: intercom-rails
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rails helper for emitting javascript script tags for Intercom
 test_files: []
+has_rdoc: 

data/lib/intercom-rails/import.rb

@@ -1,180 +0,0 @@
-require 'net/http'
-require 'json'
-require 'uri'
-
-module IntercomRails
-
-  class Import
-
-    def self.bulk_create_api_endpoint
-      host = (ENV['INTERCOM_RAILS_DEV'] ? "http://api.intercom.dev" : "https://api.intercom.io")
-      URI.parse(host + "/v1/users/bulk_create")
-    end
-
-    def self.run(*args)
-      new(*args).run
-    end
-
-    attr_reader :uri, :http, :max_batch_size
-    attr_accessor :failed, :total_sent
-
-    def initialize(options = {})
-      @uri = Import.bulk_create_api_endpoint
-      @http = Net::HTTP.new(@uri.host, @uri.port)
-      @failed = []
-      @total_sent = 0
-      @max_batch_size = [(options[:max_batch_size] || 100), 100].min
-
-      @status_enabled = !!options[:status_enabled]
-
-      if uri.scheme == 'https'
-        http.use_ssl = true
-        http.ca_file = File.join(File.dirname(__FILE__), '../data/cacert.pem')
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      end
-    end
-
-    # Check for ActiveRecord OR Mongoid
-    def active_record?(user_klass)
-      (defined?(ActiveRecord::Base) && (user_klass < ActiveRecord::Base))
-    end
-
-    def mongoid?(user_klass)
-      (defined?(Mongoid::Document) && (user_klass < Mongoid::Document))
-    end
-
-    def supported_orm?(user_klass)
-      active_record?(user_klass) || mongoid?(user_klass)
-    end
-
-    def assert_runnable
-      raise ImportError, "You can only import your users from your production environment" unless (Rails.env.production? || Rails.env.staging?)
-      raise ImportError, "We couldn't find your user class, please set one in config/initializers/intercom_rails.rb" unless user_klass.present?
-      info "Found user class: #{user_klass}"
-      raise ImportError, "Only ActiveRecord and Mongoid models are supported" unless supported_orm?(user_klass)
-      raise ImportError, "Please add an Intercom API Key to config/initializers/intercom.rb" unless IntercomRails.config.api_key.present?
-      info "Intercom API key found"
-    end
-
-    def run
-      assert_runnable
-
-      info "Sending users in batches of #{max_batch_size}:"
-      batches do |batch, number_in_batch|
-        failures = send_users(batch)['failed']
-        self.failed += failures
-        self.total_sent += number_in_batch
-
-        progress '.' * (number_in_batch - failures.count)
-        progress 'F' * failures.count
-      end
-      info "Successfully created #{self.total_sent - self.failed.count} users", :new_line => true
-      info "Failed to create #{self.failed.count} #{(self.failed.count == 1) ? 'user' : 'users'}, this is likely due to bad data" unless failed.count.zero?
-
-      self
-    end
-
-    def total_failed
-      self.failed.count
-    end
-
-    private
-
-    def batches
-      if active_record?(user_klass)
-        user_klass.find_in_batches(:batch_size => max_batch_size) do |users|
-          users_for_wire = map_to_users_for_wire(users)
-
-          yield(prepare_batch(users_for_wire), users_for_wire.count) unless users_for_wire.count.zero?
-        end
-      elsif mongoid?(user_klass)
-        0.step(user_klass.all.count, max_batch_size) do |offset|
-          users_for_wire = map_to_users_for_wire(user_klass.limit(max_batch_size).skip(offset))
-          yield(prepare_batch(users_for_wire), users_for_wire.count) unless users_for_wire.count.zero?
-        end
-      end
-    end
-
-    def map_to_users_for_wire(users)
-      users.map do |u|
-        user_proxy = Proxy::User.new(u)
-        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)) unless companies.nil?
-
-        for_wire
-      end.compact
-    end
-
-    def prepare_batch(batch)
-      {:users => batch}.to_json
-    end
-
-    def user_klass
-      if IntercomRails.config.user.model.present?
-        IntercomRails.config.user.model.call
-      else
-        user_klass_name if user_klass_name.class != Module
-      end
-    rescue NameError
-      # Rails lazy loads constants, so this is how we check
-      nil
-    end
-
-    def user_klass_name
-      User
-    end
-
-    def send_users(users)
-      request = Net::HTTP::Post.new(uri.request_uri)
-      request.basic_auth(IntercomRails.config.app_id, IntercomRails.config.api_key)
-      request["Content-Type"] = "application/json"
-      request.body = users
-
-      response = perform_request(request)
-      JSON.parse(response.body)
-    end
-
-    MAX_REQUEST_ATTEMPTS = 3
-    def perform_request(request, attempts = 0, error = {})
-      if (attempts > 0) && (attempts < MAX_REQUEST_ATTEMPTS)
-        sleep(0.5)
-      elsif error.present?
-        raise error[:exception] if error[:exception]
-        raise exception_for_failed_response(error[:failed_response])
-      end
-
-      response = http.request(request)
-
-      return response if successful_response?(response)
-      perform_request(request, attempts + 1, :failed_response => response)
-    rescue Timeout::Error, Errno::ECONNREFUSED, EOFError => e
-      perform_request(request, attempts + 1, :exception => e)
-    end
-
-    def successful_response?(response)
-      raise ImportError, "App ID or API Key are incorrect, please check them in config/initializers/intercom.rb" if response.code == '403'
-      ['200', '201'].include?(response.code)
-    end
-
-    def exception_for_failed_response(response)
-      code = response.code
-      IntercomAPIError.new("The Intercom API request failed with the code: #{code}, after #{MAX_REQUEST_ATTEMPTS} attempts.")
-    end
-
-    def status_enabled?
-      @status_enabled
-    end
-
-    def progress(str)
-      print(str) if status_enabled?
-    end
-
-    def info(str, options = {})
-      puts "#{"\n" if options[:new_line]}* #{str}" if status_enabled?
-    end
-
-  end
-end

data/lib/intercom-rails/intercom.rake

@@ -1,12 +0,0 @@
-namespace :intercom do
-
-  desc "Import your users into intercom"
-  task :import => :environment do
-    begin
-      IntercomRails::Import.run(:status_enabled => true)
-    rescue IntercomRails::ImportError => e
-      puts e.message
-    end
-  end
-
-end