userlist-rails 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4ac0764bfdecbc381ea029d3fa9e8e2b04aa7f668eff35f7f54d14b7e20d1e9
-  data.tar.gz: 31e4be6a0b8fe3b5a7cf172b9a07af9e6e5dac7a9edd38751b39416ddee8ad9e
+  metadata.gz: 68ee452ebc6c542be2b06dcf5ab4e7126f1cfdd0088ddc7708dcf1f219bc32fc
+  data.tar.gz: 3f24039dbd0f67ca37b1149aac2f6503a1e58e191b91302a36e3e4cda2087701
 SHA512:
-  metadata.gz: 3053ce85e9cc0d218dec274d0a11b5e0fb9caac714b999a2e3a0995946b17ae5f0180159fd978ecc91c890230cf8c744d3e9ddcfe67f1b035eb19c610ce49bbd
-  data.tar.gz: 0a426f64b71938dfea7112c62d96b97e568a47db3a8f1780571ad3612d0f7f39e8cc8c6f2511a5344b95785ad4efe18e8a5f9e912c886a9f2587601716bf2b46
+  metadata.gz: a2cf9f06f634611f304ba6c42ef840178f1add57063c0148b7bc1b791167ce18b60b6f69e6df759262c50a16864761873db52e41fee15ee7e37a1111d4ba0121
+  data.tar.gz: b1723c2aa4205c30ddeca3080addb0c5330bf428ee9f3990867da01531bf05d215bfa65f4538c91ea7307c85e6e9bfc0832826df57cc762e4c725f34f4c8966f

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.2
+  TargetRubyVersion: 2.3
   Exclude:
     - 'bin/*'
     - 'Guardfile'
@@ -32,13 +32,10 @@ Layout/ElseAlignment:
 Lint/AssignmentInCondition:
   Enabled: false
 
-Lint/EndAlignment:
-  EnforcedStyleAlignWith: start_of_line
-
 Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
 
 Style/FrozenStringLiteralComment:

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
-  - 2.2
   - 2.3
   - 2.4
   - 2.5
   - 2.6
+  - 2.7

data/lib/userlist/rails/config.rb

@@ -6,7 +6,8 @@ module Userlist
       DEFAULT_CONFIGURATION = {
         user_model: nil,
         company_model: nil,
-        auto_discover: true
+        auto_discover: true,
+        script_url: 'https://js.userlist.com/v1'
       }.freeze
 
       def default_config
@@ -18,13 +19,11 @@ module Userlist
       end
 
       def user_model
-        model = super
-        model && model.to_s.constantize
+        super&.to_s&.constantize
       end
 
       def company_model
-        model = super
-        model && model.to_s.constantize
+        super&.to_s&.constantize
       end
 
       Userlist::Config.send(:prepend, self)

data/lib/userlist/rails/helpers.rb

@@ -0,0 +1,33 @@
+module Userlist
+  module Rails
+    module Helpers
+      def userlist_script_tag(*args)
+        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
+          identifier = user.userlist_identifier
+
+          options[:data] ||= {}
+          options[:data][:userlist] = Userlist::Token.generate(identifier)
+        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

@@ -9,6 +9,8 @@ require 'userlist/rails/company'
 require 'userlist/rails/extensions/resource'
 require 'userlist/rails/extensions/event'
 
+require 'userlist/rails/helpers'
+
 module Userlist
   module Rails
     class Railtie < ::Rails::Railtie
@@ -26,9 +28,15 @@ module 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::Push::Resource.prepend(Userlist::Rails::Extensions::Resource)
+        Userlist::Push::Event.prepend(Userlist::Rails::Extensions::Event)
       end
 
       initializer 'userlist.models' do

data/lib/userlist/rails/version.rb

@@ -1,5 +1,5 @@
 module Userlist
   module Rails
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

data/lib/userlist/rails.rb

@@ -4,6 +4,8 @@ require 'userlist/rails/railtie'
 require 'userlist/rails/extensions/resource'
 require 'userlist/rails/extensions/event'
 
+require 'userlist/rails/helpers'
+
 module Userlist
   module Rails
     def self.with_current_user(user)

data/userlist-rails.gemspec

@@ -19,12 +19,16 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport', '>= 3.0'
-  spec.add_dependency 'railties', '>= 3.0'
-  spec.add_dependency 'userlist', '~> 0.3'
+  spec.required_ruby_version = '>= 2.3'
 
+  spec.add_dependency 'activesupport', '>= 5.0'
+  spec.add_dependency 'railties', '>= 5.0'
+  spec.add_dependency 'userlist', '~> 0.4'
+
+  spec.add_development_dependency 'actionpack', '>= 5.0'
   spec.add_development_dependency 'bundler', '>= 1.15'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.3', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rspec-rails', '~> 3.0'
   spec.add_development_dependency 'webmock', '~> 1.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: userlist-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Benedikt Deicke
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,42 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: userlist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +168,7 @@ files:
 - lib/userlist/rails/config.rb
 - lib/userlist/rails/extensions/event.rb
 - lib/userlist/rails/extensions/resource.rb
+- lib/userlist/rails/helpers.rb
 - lib/userlist/rails/importer.rb
 - lib/userlist/rails/logger.rb
 - lib/userlist/rails/railtie.rb
@@ -152,14 +187,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: Rails integration for Userlist.io