trueandco_analytics 0.3.0 → 0.4.0

data/{app/controllers/trueandco_analytics → lib/trueandco_analytics/site/controllers}/application_controller.rb

@@ -1,5 +1,5 @@
-module TrueandcoAnalytics
+module TrueandcoAnalytics::Site
   class ApplicationController < ActionController::Base
     protect_from_forgery with: :exception
   end
-end
+end

data/{app/controllers/trueandco_analytics → lib/trueandco_analytics/site/controllers}/reciver_controller.rb

@@ -1,16 +1,14 @@
-require_dependency "trueandco_analytics/application_controller"
-
-module TrueandcoAnalytics
+module TrueandcoAnalytics::Site
   class ReceiverController < ApplicationController
-    
+
     def pull_user_statistic
       data = JSON.parse(params[:user_metric])
       userInfo = request.user_agent
       page_path = request.url.match(/(?:\/\/.+?\/)(.+?)(?=\?|$)/)[1]
-      data = data.merge({ page_path: page_path }).to_json
+      data = data.merge({page_path: page_path}).to_json
       request_info = {
-        'remote_ip'  => request.remote_ip,
-        'user_agent' => request.user_agent
+          'remote_ip' => request.remote_ip,
+          'user_agent' => request.user_agent
       }
       SessionC::PutData.new(data, request_info, userInfo).execute
       render nothing: true, status: 201, content_type: 'text/plain'

data/lib/trueandco_analytics/site/helpers/trueandco_analytics_helper.rb

@@ -0,0 +1,18 @@
+module TrueandcoAnalytics::Site::TrueandcoAnalyticsHelper
+  def track_user_behavior
+    pull_user_statistic_path = ::TrueandcoAnalytics::Engine.routes.url_helpers.receiver_pull_user_statistic_path
+    return unless @user_behavior.nil?
+    @user_behavior = 1
+    js_string = <<-USER_BEHAVIOR_TRACK
+      
+        var statistics_url = "#{root_url.chomp('/')}#{pull_user_statistic_path}",
+            app_token = "#{form_authenticity_token}",
+            selector = "#{::TrueandcoAnalytics::Config::Params.buy_selector}",
+            time_survey = "#{::TrueandcoAnalytics::Config::Params.time_survey}";
+
+        analitics_in_point(statistics_url, app_token, selector, time_survey);
+     
+    USER_BEHAVIOR_TRACK
+    javascript_tag js_string, defer: 'defer'
+  end
+end

data/lib/trueandco_analytics/site/workers/user_session_metric_worker.rb

@@ -0,0 +1,20 @@
+module TrueandcoAnalytics::Site
+    class UserSessionMetricWorker
+      include Sidekiq::Worker
+      sidekiq_options queue: :user_metric
+
+      def perform(*args)
+        info_pages, info_request = args[0], args[1]
+        @redis = ::TrueandcoAnalytics::RedisConnect.get
+        user_session_data_json = @redis.lrange(info_pages, 0, -1)
+        return if user_session_data_json.nil?
+        user_session_data = ArrJsonsToArrHash.new(user_session_data_json).execute
+        return unless user_session_data.any?
+        first_point = user_session_data[0]
+        last_point = user_session_data[-1]
+        metric_user = UserC::CreateOrUpdateUserIfExist.new(info_request['user_agent'], last_point['time']['timestamp']).execute
+        session = SessionC::Create.new(metric_user, first_point, last_point['time']['timestamp'], info_request).execute
+        MetricC::AddList.new(metric_user, session, user_session_data).execute
+      end
+    end
+end

data/lib/trueandco_analytics/version.rb

@@ -1,3 +1,3 @@
 module TrueandcoAnalytics
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trueandco_analytics
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Moroz Ivan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -175,45 +175,47 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/assets/javascripts/analitics_in_point.js
+- app/assets/javascripts/analitics_script.js
 - app/assets/javascripts/trueandco_analytics.js
-- app/commands/trueandco_analytics/arr_jsons_to_arr_hash.rb
-- app/commands/trueandco_analytics/metric_c/add_list.rb
-- app/commands/trueandco_analytics/report_c/generate.rb
-- app/commands/trueandco_analytics/session_c/create.rb
-- app/commands/trueandco_analytics/session_c/put_data.rb
-- app/commands/trueandco_analytics/user_c/create_or_update_user_if_exist.rb
-- app/controllers/trueandco_analytics/application_controller.rb
-- app/controllers/trueandco_analytics/reciver_controller.rb
-- app/models/trueandco_analytics/application_record.rb
-- app/models/trueandco_analytics/metric_user.rb
-- app/models/trueandco_analytics/metric_user_session.rb
-- app/models/trueandco_analytics/metric_user_visit.rb
-- app/views/trueandco_analytics/receiver/pull_user_statistic.erb
-- app/workers/trueandco_analytics/user_session_metric_worker.rb
+- app/views/trueandco_analytics/site/receiver/pull_user_statistic.erb
 - config/routes.rb
 - config/secrets.yml
 - db/migrate/20170802133950_create_metric_users.rb
 - db/migrate/20170802134044_create_metric_user_visits.rb
 - db/migrate/20170802134059_create_metric_user_sessions.rb
 - exe/trueandco_analytics
-- lib/extension_string.rb
 - lib/generators/trueandco_analytics/install_generator.rb
 - lib/generators/trueandco_analytics/templates/trueandco_analytics.rb
 - lib/trueandco_analytics.rb
-- lib/trueandco_analytics/cli/common.rb
-- lib/trueandco_analytics/cli/report.rb
+- lib/trueandco_analytics/common/locales/en.yml
+- lib/trueandco_analytics/common/models/application_record.rb
+- lib/trueandco_analytics/common/models/metric_user.rb
+- lib/trueandco_analytics/common/models/metric_user_session.rb
+- lib/trueandco_analytics/common/models/metric_user_visit.rb
+- lib/trueandco_analytics/common/modules/info.rb
+- lib/trueandco_analytics/common/reports/application_report.rb
+- lib/trueandco_analytics/common/reports/details_report.rb
+- lib/trueandco_analytics/common/reports/page_buy_in_date_range_report.rb
+- lib/trueandco_analytics/common/services/logger.rb
+- lib/trueandco_analytics/common/services/redis_connect.rb
+- lib/trueandco_analytics/common/services/reports.rb
+- lib/trueandco_analytics/common/services/workers.rb
 - lib/trueandco_analytics/config/params.rb
+- lib/trueandco_analytics/console/cli/common.rb
+- lib/trueandco_analytics/console/cli/report.rb
+- lib/trueandco_analytics/console/commands/report_c/generate.rb
+- lib/trueandco_analytics/console/extension_string.rb
 - lib/trueandco_analytics/engine.rb
-- lib/trueandco_analytics/helpers/trueandco_analytics_helper.rb
-- lib/trueandco_analytics/locales/en.yml
-- lib/trueandco_analytics/modules/info.rb
-- lib/trueandco_analytics/reports/application_report.rb
-- lib/trueandco_analytics/reports/details_report.rb
-- lib/trueandco_analytics/reports/page_buy_in_date_range_report.rb
-- lib/trueandco_analytics/services/logger.rb
-- lib/trueandco_analytics/services/redis_connect.rb
-- lib/trueandco_analytics/services/reports.rb
-- lib/trueandco_analytics/services/workers.rb
+- lib/trueandco_analytics/site/commands/arr_jsons_to_arr_hash.rb
+- lib/trueandco_analytics/site/commands/metric_c/add_list.rb
+- lib/trueandco_analytics/site/commands/session_c/create.rb
+- lib/trueandco_analytics/site/commands/session_c/put_data.rb
+- lib/trueandco_analytics/site/commands/user_c/create_or_update_user_if_exist.rb
+- lib/trueandco_analytics/site/controllers/application_controller.rb
+- lib/trueandco_analytics/site/controllers/reciver_controller.rb
+- lib/trueandco_analytics/site/helpers/trueandco_analytics_helper.rb
+- lib/trueandco_analytics/site/workers/user_session_metric_worker.rb
 - lib/trueandco_analytics/version.rb
 homepage: ''
 licenses:

data/app/commands/trueandco_analytics/metric_c/add_list.rb

@@ -1,65 +0,0 @@
-module TrueandcoAnalytics
-  module MetricC
-    class AddList
-
-      def initialize(metric_user, session, user_session_data)
-        if metric_user.nil? || session.nil? || user_session_data.nil?
-          raise ArgumentError.new("#{self.to_s} metric_user=#{metric_user}
-            session=#{session} user_session_data=#{user_session_data}")
-        end
-        @metric_user    = metric_user
-        @session        = session
-        @user_session_data = user_session_data
-      end
-
-      def execute
-        uniq_pages = info_uniq_page
-        return if uniq_pages.nil?
-        uniq_pages.each do |page|
-          data = {
-            metric_user: metric_user,
-            metric_user_session: session,
-            page_path:  page['page_path'],
-            user_action: page['clicks']['clickDetails'].to_json,
-            time_s: page['time']['timeOnPage'],
-            is_buy: page['clicks']['clickDetails'].length > 0
-          }
-          MetricUserVisit.create(data)
-        end
-      end
-
-      private
-
-      attr_reader :metric_user, :session, :user_session_data
-
-      def info_uniq_page
-        length = user_session_data.length
-        return user_session_data if length < 2
-        results = []
-        page = user_session_data[0]['page_path']
-        clickDetails = []
-        index = 0
-        while index < length - 1
-          unless user_session_data[index]['clicks']['clickDetails'].empty?
-            clickDetails = user_session_data[index]['clicks']['clickDetails']
-          end
-          index += 1
-          unless page  == user_session_data[index]['page_path']
-            data = user_session_data[index - 1]
-            data['clicks']['clickDetails'] = clickDetails
-            results << data
-            page = user_session_data[index]['page_path']
-            clickDetails = []
-          end
-        end
-        data = user_session_data[index]
-        unless data['clicks']['clickDetails'].empty?
-          clickDetails = data['clicks']['clickDetails']
-        end
-        data['clicks']['clickDetails'] = clickDetails
-        results << data
-        results
-      end
-    end
-  end
-end

data/app/commands/trueandco_analytics/report_c/generate.rb

@@ -1,31 +0,0 @@
-module TrueandcoAnalytics
-  module ReportC
-    class Generate
-      include TrueandcoAnalytics::Modules::Info
-
-      def initialize(name: nil, format: nil, datetime_start: nil, datetime_end: nil, path: nil)
-        @name = name
-        @format = format
-        @datetime_start = datetime_start
-        @datetime_end = datetime_end
-        @path = path || CURRENT_PATH
-      end
-
-      def execute
-        report = ::TrueandcoAnalytics::Reports.get_report_obj(name, format, datetime_start, datetime_end)
-        return if report.nil? || report.data.empty?
-        @path += report.report_name if File.directory?(path)
-        dirname = File.dirname(path)
-        unless File.directory?(dirname)
-          FileUtils.mkdir_p(dirname)
-        end
-        File.open(path, 'w+') { |f| f.write(report.data) }
-        result(I18n.t('trueandco_analytics.result.done', path: path))
-      end
-
-      private
-
-      attr_reader :name, :format, :datetime_start, :datetime_end, :path
-    end
-  end
-end

data/app/commands/trueandco_analytics/session_c/create.rb

@@ -1,65 +0,0 @@
-module TrueandcoAnalytics
-  module SessionC
-    class Create
-
-      def initialize(metric_user, first_point, timestamp_end, request_info)
-
-        if metric_user.nil? || first_point.nil? || timestamp_end.nil? ||request_info.nil?
-          raise ArgumentError.new("#{self.to_s} metric_user=#{metric_user}
-            first_point=#{first_point} timestamp_end=#{timestamp_end} request_info=#{request_info}")
-        end
-
-        @metric_user    = metric_user
-        @ip             = request_info['remote_ip']
-        @user_agent     = request_info['user_agent']
-        @session_start  = first_point['time']['timestamp']
-        @referer        = first_point['userReferrer']
-        @live_time_s    = timestamp_end - @session_start
-      end
-
-      def execute
-        Browser::Base.include(Browser::Aliases)
-        browser = Browser.new(user_agent, accept_language: "en-us")
-        data = {
-          metric_user: metric_user,
-          user_agent: user_agent,
-          referer: referer,
-          session_start: datetime_session_start,
-          live_time_s: 60,
-          ip_4: ip_v4(ip),
-          ip_6: ip_v6(ip),
-          browser: browser.name,
-          is_mobile: browser.mobile? || false
-        }
-        MetricUserSession.create(data)
-      end
-
-      private
-
-      attr_reader :metric_user, :ip, :user_agent, :session_start, :live_time_s, :referer
-
-      def  datetime_session_start
-        DateTime.strptime(session_start.to_s,'%s')
-      end
-
-      def ip_v4(ip)
-        ip_o   = get_ip_object(ip)
-        result = 0
-        result = ip_o.to_i if ip_o.ipv4?
-        result
-      end
-
-
-      def ip_v6(ip)
-        ip_o   = get_ip_object(ip)
-        result = 0
-        result = ip_o.data if ip_o.ipv6?
-        result
-      end
-
-      def get_ip_object(ip)
-        @ip_o ||= IPAddress.parse ip
-      end
-    end
-  end
-end

data/app/commands/trueandco_analytics/session_c/put_data.rb

@@ -1,46 +0,0 @@
-module TrueandcoAnalytics
-  module SessionC
-    class PutData
-
-      def initialize(json_data, request_info, userInfo)
-        @json_data = json_data
-        @userInfo = userInfo
-        @request_info = request_info
-        @redis = RedisConnect.get
-        @time_survey = Config::Params.time_survey
-        @time_dead_session = Config::Params.time_dead_session
-      end
-
-      def execute
-        1.times do
-          break if userInfo.nil? || userInfo.empty?
-          user_key = ::FNV.new.fnv1_32 userInfo.to_s
-          mange_job(user_key)
-          redis.rpush(user_key, json_data)
-          redis.expire(user_key, time_dead_session + 3)
-        end
-      end
-
-      private
-
-      attr_reader :json_data, :userInfo, :request_info, :redis, :time_dead_session, :time_survey
-
-      def mange_job(user_key)
-        user_job_key = "#{user_key}:job_key"
-        unless redis.exists user_job_key
-          create_job(user_key, user_job_key)
-        end
-        if redis.ttl(user_job_key) < time_survey * 3
-          job_id = redis.get(user_job_key)
-          Sidekiq::ScheduledSet.new.find_job(job_id)&.delete
-          create_job(user_key, user_job_key)
-        end
-      end
-
-      def create_job(user_key, user_job_key)
-        job_id = UserSessionMetricWorker.perform_at(time_dead_session.seconds.from_now, user_key, request_info)
-        redis.setex(user_job_key, time_dead_session, job_id)
-      end
-    end
-  end
-end

data/app/commands/trueandco_analytics/user_c/create_or_update_user_if_exist.rb

@@ -1,41 +0,0 @@
-module TrueandcoAnalytics
-  module UserC
-    class CreateOrUpdateUserIfExist
-
-      def initialize(user_agent, timestamp_end)
-        if user_agent.nil? ||  timestamp_end.nil?
-          raise ArgumentError.new("#{self.to_s} user_agent=#{user_agent} timestamp_end=#{timestamp_end}")
-        end
-        @user_agent = user_agent
-        @timestamp_end = timestamp_end
-        @user_id = Config::Params.user_method&.id
-      end
-
-      def execute
-        user = nil
-        user = TrueandcoAnalytics::MetricUser.find_by(user_id: user_id) if user_id
-        user = TrueandcoAnalytics::MetricUser.find_by(hash_id: hash_id) if user.nil?
-        user = if user.nil?
-                 TrueandcoAnalytics::MetricUser.create(user_id: user_id || 0, datetime_create: datetime_end,
-                   last_active_datetime: datetime_end, hash_id: hash_id)
-               else
-                 user.update_attribute(:last_active_datetime, datetime_end)
-                 user
-               end
-        user
-      end
-
-      private
-
-      attr_reader :user_agent, :timestamp_end, :user_id
-
-      def  datetime_end
-        DateTime.strptime(timestamp_end.to_s,'%s')
-      end
-
-      def hash_id
-        @hash_id ||= FNV.new.fnv1_32(user_agent)
-      end
-    end
-  end
-end

data/app/models/trueandco_analytics/metric_user_visit.rb

@@ -1,8 +0,0 @@
-module TrueandcoAnalytics
-  class MetricUserVisit < ApplicationRecord
-    self.table_name = 'metric_user_visits'
-
-    belongs_to :metric_user_session
-    belongs_to :metric_user
-  end
-end

data/app/workers/trueandco_analytics/user_session_metric_worker.rb

@@ -1,21 +0,0 @@
-module TrueandcoAnalytics
-
-  class UserSessionMetricWorker
-    include Sidekiq::Worker
-    sidekiq_options queue: :user_metric
-
-    def perform(*args)
-      info_pages,info_request = args[0],args[1]
-      @redis = RedisConnect.get
-      user_session_data_json = @redis.lrange(info_pages, 0, -1)
-      return if user_session_data_json.nil?
-      user_session_data = ArrJsonsToArrHash.new(user_session_data_json).execute
-      return unless user_session_data.any?
-      first_point = user_session_data[0]
-      last_point =  user_session_data[-1]
-      metric_user = UserC::CreateOrUpdateUserIfExist.new(info_request['user_agent'], last_point['time']['timestamp']).execute
-      session = SessionC::Create.new(metric_user, first_point, last_point['time']['timestamp'], info_request).execute
-      MetricC::AddList.new(metric_user, session, user_session_data).execute
-    end
-  end
-end