action_tracker_client 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b49e126178e1c41aeac5bca208cf545dfd9d221cee9ff843506b889ec56620cc
-  data.tar.gz: a572ecb730e7fafc315d31905b0ad8a5fbfb1c1d178f1ebe924050cce8657104
+  metadata.gz: 96e3a4be249df05d4ee1422b65d7812b559657b0a4d0f8faa8b64b3b31cf68b4
+  data.tar.gz: abb42792b81c98b9c56553f564dd1f3f08a3787763b4a9a2eb456601891430cb
 SHA512:
-  metadata.gz: baf06c442cf8bc2a726af177be71084618d364173282869fdebf20e8dbd0a0679f9aa163639f038f43bc1e10f595ce367765a05b2629643ac68f644035dd438c
-  data.tar.gz: 6b94ce8fa2ce2904841d8429eb273f78e901ad7cb33871d7f1b0885c6e392aed5ca0f407daa135b6f2b49e1caa48390ee03b78e35ea3040bee5e06cac0cf5b11
+  metadata.gz: e8fe4c30e5c17ede01292ce6e206089cb4f5005284f0b8d34e99bfd04f0d0271669c94666716d522131d62b1985f37f0bf8693129201904e53b22c1433f4f265
+  data.tar.gz: d9e1369bbeaca0b385bf275bd963a4924fc91517ec845d38136394fec67dc064fdd143686fdffb11e39f68c1860af07900d40076d7944f3f06857de8e5e2dd6f

data/.rubocop.yml

@@ -45,11 +45,3 @@ Metrics/BlockLength:
   Max: 50
   Exclude:
     - "**/*_spec.rb"
-
-##################### Rails ##################################
-
-Rails:
-  Enabled: true
-
-Rails/SkipsModelValidations:
-  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    action_tracker_client (0.1.1)
+    action_tracker_client (0.1.3)
       activemodel (>= 4.0)
       activesupport (>= 4.0)
       api_signature (~> 0.1.5)
@@ -12,13 +12,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activesupport (5.2.3)
+    activemodel (6.0.1)
+      activesupport (= 6.0.1)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     api_signature (0.1.5)
@@ -56,10 +57,10 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (0.3.9)
-    httparty (0.17.0)
+    httparty (0.17.1)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     listen (3.1.5)
@@ -68,10 +69,10 @@ GEM
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
     method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
-    minitest (5.11.3)
+    mime-types-data (3.2019.1009)
+    minitest (5.13.0)
     model_auditor (0.0.2)
     multi_xml (0.6.0)
     nenv (0.3.0)
@@ -119,6 +120,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    zeitwerk (2.2.1)
 
 PLATFORMS
   ruby
@@ -133,4 +135,4 @@ DEPENDENCIES
   webmock (~> 3.5, >= 3.5.1)
 
 BUNDLED WITH
-   1.16.2
+   1.17.3

data/lib/action_tracker.rb

@@ -8,18 +8,19 @@ require 'active_support/core_ext/object'
 
 module ActionTracker
   autoload :Config, 'action_tracker/config'
+  autoload :Recorder, 'action_tracker/recorder'
 
   autoload :CollectionProxy, 'action_tracker/utils/collection_proxy'
   autoload :Connection, 'action_tracker/utils/connection'
   autoload :Pagination, 'action_tracker/utils/pagination'
   autoload :RecordsCollection, 'action_tracker/utils/records_collection'
   autoload :SignedRequest, 'action_tracker/utils/signed_request'
-
-  autoload :Recorder, 'action_tracker/recorder'
+  autoload :HttpGateway, 'action_tracker/utils/http_gateway'
 
   module Models
     autoload :ApplicationRecord, 'action_tracker/models/application_record'
     autoload :TransitionRecord, 'action_tracker/models/transition_record'
+    autoload :StatisticRecord, 'action_tracker/models/statistic_record'
     autoload :Payload, 'action_tracker/models/payload'
     autoload :User, 'action_tracker/models/user'
   end

data/lib/action_tracker/models/statistic_record.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal :true
+
+module ActionTracker
+  module Models
+    class StatisticRecord < ActionTracker::Models::ApplicationRecord
+      include ActionTracker::HttpGateway
+
+      attribute :user_id, Integer
+      attribute :report_date, String
+      attribute :total_count, Integer
+      attribute :targets, Hash
+
+      def count(params = {})
+        request processed_path(collection_path, params)
+      end
+
+      def daily(params = {})
+        path = processed_path("#{collection_path}/daily", params)
+        parse_response request(path)
+      end
+
+      def collection_path
+        'statistics'
+      end
+    end
+  end
+end

data/lib/action_tracker/models/transition_record.rb

@@ -3,6 +3,8 @@
 module ActionTracker
   module Models
     class TransitionRecord < ActionTracker::Models::ApplicationRecord
+      include ActionTracker::HttpGateway
+
       mimic 'transition'
 
       attribute :target_id, Integer
@@ -31,29 +33,19 @@ module ActionTracker
       end
 
       def index(params = {})
-        @path = processed_path(collection_path, params)
-
-        parse_response
+        parse_response request(processed_path(collection_path, params))
       end
 
       def filtered_by_users(params = {})
-        @path = processed_path(users(params[:user_id]), params.except(:user_id))
+        path = processed_path(users(params[:user_id]), params.except(:user_id))
 
-        parse_response
+        parse_response request(path)
       end
 
       def filtered_by_users_count(params = {})
-        @path = processed_path(users(params[:user_id]) + '/count', params.except(:user_id))
-
-        response
-      end
-
-      def collection_path
-        'transitions'
-      end
+        path = processed_path(users(params[:user_id]) + '/count', params.except(:user_id))
 
-      def users(user_id)
-        "users/#{user_id}"
+        request(path)
       end
 
       def payload
@@ -68,25 +60,21 @@ module ActionTracker
         [event, content].reject(&:blank?).compact.join(': ')
       end
 
-      private
-
-      def parse_response
-        ActionTracker::CollectionProxy.new response, self.class.model_name
+      def collection_path
+        'transitions'
       end
 
-      def response
-        @response ||= Connection.new.get(@path)
+      def users(user_id)
+        "users/#{user_id}"
       end
 
+      private
+
       def check_payload
         return if payload.valid?
 
         errors.add(:payload, :invalid)
       end
-
-      def processed_path(collection_name, params)
-        [collection_name, params.to_query].reject(&:blank?).compact.join('?')
-      end
     end
   end
 end

data/lib/action_tracker/utils/collection_proxy.rb

@@ -23,7 +23,7 @@ module ActionTracker
     end
 
     def raw_data
-      @response.dig(model_name.plural)
+      @response.dig(model_name.plural) || @response.dig('data')
     end
 
     def entry_name(options = {})

data/lib/action_tracker/utils/http_gateway.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module ActionTracker
+  module HttpGateway
+    protected
+
+    def request(path)
+      Connection.new.get(path)
+    end
+
+    def response
+      @response ||= Connection.new.get(@path)
+    end
+
+    def processed_path(collection_name, params)
+      [collection_name, params.to_query].reject(&:blank?).compact.join('?')
+    end
+
+    def parse_response(response)
+      ActionTracker::CollectionProxy.new response, self.class.model_name
+    end
+  end
+end

data/lib/action_tracker/version.rb

@@ -1,3 +1,3 @@
 module ActionTracker
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_tracker_client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Igor Malinovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -221,6 +221,7 @@ files:
 - lib/action_tracker/config.rb
 - lib/action_tracker/models/application_record.rb
 - lib/action_tracker/models/payload.rb
+- lib/action_tracker/models/statistic_record.rb
 - lib/action_tracker/models/transition_record.rb
 - lib/action_tracker/models/user.rb
 - lib/action_tracker/recorder.rb
@@ -230,6 +231,7 @@ files:
 - lib/action_tracker/templates/update.rb
 - lib/action_tracker/utils/collection_proxy.rb
 - lib/action_tracker/utils/connection.rb
+- lib/action_tracker/utils/http_gateway.rb
 - lib/action_tracker/utils/pagination.rb
 - lib/action_tracker/utils/records_collection.rb
 - lib/action_tracker/utils/signed_request.rb