userlist-rails 0.3.0 → 0.5.3

data/lib/userlist/rails/config.rb

@@ -1,12 +1,21 @@
 require 'userlist/config'
 
+require 'userlist/rails/transforms/user'
+require 'userlist/rails/transforms/company'
+require 'userlist/rails/transforms/relationship'
+
 module Userlist
   module Rails
     module Config
       DEFAULT_CONFIGURATION = {
         user_model: nil,
         company_model: nil,
-        auto_discover: true
+        relationship_model: nil,
+        auto_discover: true,
+        script_url: 'https://js.userlist.com/v1',
+        user_transform: Userlist::Rails::Transforms::User,
+        company_transform: Userlist::Rails::Transforms::Company,
+        relationship_transform: Userlist::Rails::Transforms::Relationship
       }.freeze
 
       def default_config
@@ -18,13 +27,15 @@ module Userlist
       end
 
       def user_model
-        model = super
-        model && model.to_s.constantize
+        (model = super) && model.is_a?(Class) ? model : model&.to_s&.constantize
       end
 
       def company_model
-        model = super
-        model && model.to_s.constantize
+        (model = super) && model.is_a?(Class) ? model : model&.to_s&.constantize
+      end
+
+      def relationship_model
+        (model = super) && model.is_a?(Class) ? model : model&.to_s&.constantize
       end
 
       Userlist::Config.send(:prepend, self)

data/lib/userlist/rails/extensions/company.rb

@@ -0,0 +1,30 @@
+module Userlist
+  module Rails
+    module Extensions
+      module Company
+        module ClassMethods
+          def from_payload(payload, config = Userlist.config)
+            company_model = config.company_model
+            company_transform = config.company_transform
+
+            payload = company_transform.new(payload, config) if company_model && payload.is_a?(company_model)
+
+            super
+          end
+        end
+
+        def self.included(base)
+          base.extend(ClassMethods)
+        end
+
+        def push?
+          super && (!payload.respond_to?(:push?) || payload.push?)
+        end
+
+        def delete?
+          super && (!payload.respond_to?(:delete?) || payload.delete?)
+        end
+      end
+    end
+  end
+end

data/lib/userlist/rails/extensions/event.rb

@@ -2,10 +2,17 @@ module Userlist
   module Rails
     module Extensions
       module Event
-        def initialize(payload)
-          payload[:user] ||= Userlist::Rails.current_user
+        module ClassMethods
+          def new(payload, config = Userlist.config)
+            payload[:user] = Userlist::Rails.current_user unless payload.key?(:user)
+            payload[:company] = Userlist::Rails.current_company unless payload.key?(:company)
 
-          super
+            super
+          end
+        end
+
+        def self.included(base)
+          base.extend(ClassMethods)
         end
       end
     end

data/lib/userlist/rails/extensions/relationship.rb

@@ -0,0 +1,30 @@
+module Userlist
+  module Rails
+    module Extensions
+      module Relationship
+        module ClassMethods
+          def from_payload(payload, config = Userlist.config)
+            relationship_model = config.relationship_model
+            relationship_transform = config.relationship_transform
+
+            payload = relationship_transform.new(payload, config) if relationship_model && payload.is_a?(relationship_model)
+
+            super
+          end
+        end
+
+        def self.included(base)
+          base.extend(ClassMethods)
+        end
+
+        def push?
+          super && (!payload.respond_to?(:push?) || payload.push?)
+        end
+
+        def delete?
+          super && (!payload.respond_to?(:delete?) || payload.delete?)
+        end
+      end
+    end
+  end
+end

data/lib/userlist/rails/extensions/user.rb

@@ -0,0 +1,30 @@
+module Userlist
+  module Rails
+    module Extensions
+      module User
+        module ClassMethods
+          def from_payload(payload, config = Userlist.config)
+            user_model = config.user_model
+            user_transform = config.user_transform
+
+            payload = user_transform.new(payload, config) if user_model && payload.is_a?(user_model)
+
+            super
+          end
+        end
+
+        def self.included(base)
+          base.extend(ClassMethods)
+        end
+
+        def push?
+          super && (!payload.respond_to?(:push?) || payload.push?)
+        end
+
+        def delete?
+          super && (!payload.respond_to?(:delete?) || payload.delete?)
+        end
+      end
+    end
+  end
+end

data/lib/userlist/rails/helpers.rb

@@ -0,0 +1,31 @@
+module Userlist
+  module Rails
+    module Helpers
+      def userlist_script_tag(*args) # rubocop:disable Metrics/CyclomaticComplexity
+        config = Userlist.config
+        logger = Userlist.logger
+
+        options = args.extract_options!
+
+        user = args.first
+        user ||= current_user if respond_to?(:current_user)
+        user ||= Userlist::Rails.current_user
+
+        options[:async] = true
+
+        if user
+          options[:data] ||= {}
+          options[:data][:userlist] = Userlist::Token.generate(user, config)
+        end
+
+        script_tag = javascript_tag('window.userlist=window.userlist||function(){(userlist.q=userlist.q||[]).push(arguments)};')
+        include_tag = javascript_include_tag(config.script_url, options)
+
+        script_tag + include_tag
+      rescue Userlist::Error => e
+        logger.error(e.message)
+        raw("<!-- #{e.class}: #{e.message} -->") unless ::Rails.env.production?
+      end
+    end
+  end
+end

data/lib/userlist/rails/railtie.rb

@@ -3,32 +3,46 @@ require 'rails/railtie'
 require 'userlist'
 require 'userlist/config'
 require 'userlist/rails/logger'
-require 'userlist/rails/user'
-require 'userlist/rails/company'
 
-require 'userlist/rails/extensions/resource'
+require 'userlist/rails/extensions/user'
+require 'userlist/rails/extensions/company'
+require 'userlist/rails/extensions/relationship'
 require 'userlist/rails/extensions/event'
 
+require 'userlist/rails/helpers'
+
 module Userlist
   module Rails
     class Railtie < ::Rails::Railtie
       rake_tasks do
-        load 'tasks/userlist.rake'
+        load 'userlist/rails/tasks/userlist.rake'
       end
 
       initializer 'userlist.config' do
         config.userlist = Userlist.config
       end
 
+      initializer 'userlist.strategy' do
+        config.after_initialize do
+          strategy = config.userlist.push_strategy
+          Userlist::Push::Strategies.require_strategy(strategy)
+        end
+      end
+
       initializer 'userlist.logger' do
         config.after_initialize do
           Userlist.logger = Userlist::Rails::Logger.new(::Rails.logger, config.userlist)
         end
       end
 
+      initializer 'userlist.helpers' do
+        ActiveSupport.on_load :action_view do
+          include Userlist::Rails::Helpers
+        end
+      end
+
       initializer 'userlist.extensions' do
-        Userlist::Push::Resource.send(:prepend, Userlist::Rails::Extensions::Resource)
-        Userlist::Push::Event.send(:prepend, Userlist::Rails::Extensions::Event)
+        Userlist::Rails.setup_extensions
       end
 
       initializer 'userlist.models' do
@@ -38,18 +52,26 @@ module Userlist
           if userlist.auto_discover
             Userlist.logger.info('Automatically discovering models')
 
-            userlist.user_model ||= Userlist::Rails.detect_model('User')
-            userlist.company_model ||= Userlist::Rails.detect_model('Account', 'Company')
+            userlist.user_model = Userlist::Rails.detect_model('User')
+            userlist.company_model = Userlist::Rails.detect_model('Account', 'Company', 'Team', 'Organization')
+            userlist.relationship_model = Userlist::Rails.detect_relationship(userlist.user_model, userlist.company_model)
           end
 
           if user_model = userlist.user_model
             Userlist.logger.info("Preparing user model #{user_model}")
-            user_model.send(:include, Userlist::Rails::User)
+            Userlist::Rails.check_deprecations(user_model)
+            Userlist::Rails.setup_callbacks(user_model, :users)
           end
 
           if company_model = userlist.company_model
             Userlist.logger.info("Preparing company model #{company_model}")
-            company_model.send(:include, Userlist::Rails::Company)
+            Userlist::Rails.check_deprecations(company_model)
+            Userlist::Rails.setup_callbacks(company_model, :companies)
+          end
+
+          if relationship_model = userlist.relationship_model
+            Userlist.logger.info("Preparing relationship model #{relationship_model}")
+            Userlist::Rails.setup_callbacks(relationship_model, :relationships)
           end
         end
       end

data/lib/{tasks → userlist/rails/tasks}/userlist.rake

@@ -4,24 +4,24 @@ require 'userlist/rails/importer'
 
 namespace :userlist do
   namespace :import do
-    desc 'Import users into Userlist.io'
+    desc 'Import users into Userlist'
     task users: :environment do
       if user_model = Rails.application.config.userlist.user_model
         importer = Userlist::Rails::Importer.new
         importer.import(user_model) do |user|
-          push.user(user.send(:userlist_payload))
+          push.users.create(user)
         end
       else
         puts 'No user model defined. Skipping import.'
       end
     end
 
-    desc 'Import companies into Userlist.io'
+    desc 'Import companies into Userlist'
     task companies: :environment do
       if company_model = Rails.application.config.userlist.company_model
         importer = Userlist::Rails::Importer.new
         importer.import(company_model) do |company|
-          push.company(company.send(:userlist_payload))
+          push.companies.create(company)
         end
       else
         puts 'No company model defined. Skipping import.'
@@ -29,7 +29,7 @@ namespace :userlist do
     end
   end
 
-  desc 'Import users and companies into Userlist.io'
+  desc 'Import users and companies into Userlist'
   task import: ['userlist:import:users', 'userlist:import:companies']
 end
 

data/lib/userlist/rails/transform.rb

@@ -0,0 +1,42 @@
+module Userlist
+  module Rails
+    class Transform
+      def self.attributes
+        @attributes = []
+      end
+
+      def initialize(model, config = Userlist.config)
+        @model = model
+        @config = config
+      end
+
+      def [](name)
+        public_send(name) if key?(name)
+      end
+
+      def key?(name)
+        keys.include?(name.to_sym)
+      end
+
+      def keys
+        self.class.attributes
+      end
+
+      def hash
+        model.hash
+      end
+
+      def push?
+        (!model.respond_to?(:userlist_push?) || model.userlist_push?)
+      end
+
+      def delete?
+        (!model.respond_to?(:userlist_delete?) || model.userlist_delete?)
+      end
+
+    private
+
+      attr_reader :model, :config
+    end
+  end
+end

data/lib/userlist/rails/transforms/company.rb

@@ -0,0 +1,41 @@
+require 'userlist/rails/transform'
+
+module Userlist
+  module Rails
+    module Transforms
+      class Company < Userlist::Rails::Transform
+        def self.attributes
+          @attributes ||= [
+            :identifier,
+            :properties,
+            :relationships,
+            :name,
+            :signed_up_at
+          ]
+        end
+
+        def identifier
+          model.try(:userlist_identifier) || "#{model.class.name}-#{model.id}".parameterize
+        end
+
+        def properties
+          model.try(:userlist_properties) || {}
+        end
+
+        def relationships
+          relationships_method = Userlist::Rails.find_reflection(config.company_model, config.relationship_model)&.name
+
+          model.try(:userlist_relationships) || (relationships_method && model.try(relationships_method))
+        end
+
+        def name
+          model.try(:userlist_name) || model.try(:name)
+        end
+
+        def signed_up_at
+          model.try(:created_at)
+        end
+      end
+    end
+  end
+end

data/lib/userlist/rails/transforms/relationship.rb

@@ -0,0 +1,33 @@
+require 'userlist/rails/transform'
+
+module Userlist
+  module Rails
+    module Transforms
+      class Relationship < Userlist::Rails::Transform
+        def self.attributes
+          @attributes ||= [
+            :user,
+            :company,
+            :properties
+          ]
+        end
+
+        def properties
+          model.try(:userlist_properties) || {}
+        end
+
+        def user
+          user_method = Userlist::Rails.find_reflection(config.relationship_model, config.user_model)&.name
+
+          model.try(:userlist_user) || (user_method && model.try(user_method))
+        end
+
+        def company
+          company_method = Userlist::Rails.find_reflection(config.relationship_model, config.company_model)&.name
+
+          model.try(:userlist_company) || (company_method && model.try(company_method))
+        end
+      end
+    end
+  end
+end

data/lib/userlist/rails/transforms/user.rb

@@ -0,0 +1,41 @@
+require 'userlist/rails/transform'
+
+module Userlist
+  module Rails
+    module Transforms
+      class User < Userlist::Rails::Transform
+        def self.attributes
+          @attributes ||= [
+            :identifier,
+            :properties,
+            :relationships,
+            :email,
+            :signed_up_at
+          ]
+        end
+
+        def identifier
+          model.try(:userlist_identifier) || "#{model.class.name}-#{model.id}".parameterize
+        end
+
+        def properties
+          model.try(:userlist_properties) || {}
+        end
+
+        def relationships
+          relationships_method = Userlist::Rails.find_reflection(config.user_model, config.relationship_model)&.name
+
+          model.try(:userlist_relationships) || (relationships_method && model.try(relationships_method))
+        end
+
+        def email
+          model.try(:userlist_email) || model.try(:email)
+        end
+
+        def signed_up_at
+          model.try(:created_at)
+        end
+      end
+    end
+  end
+end