action_tracker_client 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4c190be868e1b5eed6ba65b5f5d60e91fc7dccbbdc0d29012d5713c3b68bdf3
-  data.tar.gz: cd4f693844d1dc312d03b96c6f5b25632cd6307f2bd29055026fbd7b7baaa5cf
+  metadata.gz: a547b2c68123c0c7d4c04d5b1c3fadc52efaf31b0f00a71e8ee4e96ca0fb93af
+  data.tar.gz: 1f2773baf527349b2abcd46c8b082c595aa09cad576e7a2edbd224bd75e3c3a4
 SHA512:
-  metadata.gz: 6a76b40225df9342df4b35c0b20e4e3f98b13a250856f5e1359e600cf28272f729629739766829daa3b6db4dc427938fe8d117ba1e843b51422e4c60a7e0997e
-  data.tar.gz: ab5cae31834a5032b81a675acfa45abe3fe9da5f1fae84e2f08d8b356e4c687f5a81952de0e528c25b436015f88c87d6f4c3487a71578466bee8a93df352bfa9
+  metadata.gz: 1ab6f4aa47df79c3a9309f3780477968877d788ab8e5abe4f3bb4834a28e1d85fd54d62ca70d197cfaec22c359f119e0a9df69933048f3b58ffc0f01904a3d00
+  data.tar.gz: df14c93b8abba9c5a350033d21beef3582dc6aea66f00813bed754fc20f53a313822898ac9b93c322a8f4969838e6d0f80bad7840a5801e722003e185ec009c6

data/.gitignore

@@ -9,3 +9,6 @@
 
 # rspec failure tracking
 .rspec_status
+
+# IDE
+.idea/

data/.rubocop.yml

@@ -1,6 +1,6 @@
 AllCops:
   TargetRubyVersion: 2.5.5
-
+  NewCops: disable
   Exclude:
     - "Guardfile"
     - "Rakefile"
@@ -30,7 +30,7 @@ Lint/AmbiguousBlockAssociation:
 
 ##################### Metrics ##################################
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 110
 
 Metrics/ClassLength:
@@ -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.6)
       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.3.1)
+      activesupport (= 6.0.3.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     api_signature (0.1.5)
@@ -32,7 +33,7 @@ GEM
     coderay (1.1.2)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     descendants_tracker (0.0.4)
@@ -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.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.6.0)
+    i18n (1.8.2)
       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.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
-    minitest (5.11.3)
+    mime-types-data (3.2019.1009)
+    minitest (5.14.1)
     model_auditor (0.0.2)
     multi_xml (0.6.0)
     nenv (0.3.0)
@@ -85,8 +86,8 @@ GEM
       byebug (~> 11.0)
       pry (~> 0.10)
     public_suffix (3.1.0)
-    rack (2.0.7)
-    rake (10.5.0)
+    rack (2.2.2)
+    rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
@@ -108,7 +109,7 @@ GEM
     shellany (0.0.1)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     virtus (1.0.5)
       axiom-types (~> 0.1)
@@ -119,6 +120,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -128,9 +130,9 @@ DEPENDENCIES
   bundler (~> 1.16)
   guard-rspec (~> 4.7, >= 4.7.3)
   pry-byebug
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   webmock (~> 3.5, >= 3.5.1)
 
 BUNDLED WITH
-   1.16.2
+   1.17.3

data/README.md

@@ -62,6 +62,25 @@ end
 #<ActionTracker::Models::TransitionRecord:0x00007f9584d3dfd0 @id="810b900d-d24b-4206-85e3-b7a53e55a060"...
 ```
 
+### Records filtered by user
+```ruby
+api = ActionTracker::Models::TransitionRecord.new
+data = api.filtered_by_users(user_id: user.id, target_id: order.id, target_type: 'Order', per_page: 25, cursor: 'Y3VycmVudF9wYWdl')
+
+#<ActionTracker::CollectionProxy:0x00007f958b6970a8
+# ...
+
+data.each do |record|
+  puts record.inspect
+end
+
+#<ActionTracker::Models::TransitionRecord:0x00007f9584d44470 @id="a51b2fe2-fa92-4e91-bdcd-5beee9081903"...
+#<ActionTracker::Models::TransitionRecord:0x00007f9584d3dfd0 @id="810b900d-d24b-4206-85e3-b7a53e55a060"...
+
+# data = api.filtered_by_users_count(user_id: user.id, target_id: order.id, target_type: 'Order')
+# this will return count of actions 
+```
+
 ### Writing records
 
 Call ActionTracker::Recorder after creating or updating your model:

data/action_tracker.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'guard-rspec', '~> 4.7', '>= 4.7.3'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'webmock', '~> 3.5', '>= 3.5.1'
 

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,13 +3,15 @@
 module ActionTracker
   module Models
     class TransitionRecord < ActionTracker::Models::ApplicationRecord
+      include ActionTracker::HttpGateway
+
       mimic 'transition'
 
-      attribute :target_id, Integer
+      attribute :target_id, String
       attribute :target_type, String
       attribute :created_at, DateTime
       attribute :payload, ActionTracker::Models::Payload
-      attribute :reference_id, Integer
+      attribute :reference_id, String
       attribute :reference_type, String
 
       delegate :event, :content, :user, to: :payload
@@ -31,14 +33,25 @@ module ActionTracker
       end
 
       def index(params = {})
-        path = [collection_path, params.to_query].reject(&:blank?).compact.join('?')
-        @response ||= Connection.new.get(path)
+        parse_response request(processed_path(collection_path, params))
+      end
 
-        ActionTracker::CollectionProxy.new @response, self.class.model_name
+      def filtered_by_users(params = {})
+        path = processed_path(users(params[:user_id]), params.except(:user_id))
+
+        parse_response request(path)
       end
 
-      def collection_path
-        'transitions'
+      def filtered_by_users_count(params = {})
+        path = processed_path(users(params[:user_id]) + '/count', params.except(:user_id))
+
+        request(path)
+      end
+
+      def filtered_by_users_simple_count(params = {})
+        path = processed_path(users(params[:user_id]) + '/without_lambda_count', params.except(:user_id))
+
+        request(path)
       end
 
       def payload
@@ -53,6 +66,14 @@ module ActionTracker
         [event, content].reject(&:blank?).compact.join(': ')
       end
 
+      def collection_path
+        'transitions'
+      end
+
+      def users(user_id)
+        "users/#{user_id}"
+      end
+
       private
 
       def check_payload

data/lib/action_tracker/templates/base_template.rb

@@ -13,7 +13,8 @@ module ActionTracker
       def form
         @form ||= ActionTracker::Models::TransitionRecord.new(
           payload: payload,
-          reference: reference
+          reference: reference,
+          created_at: created_at
         ).with_target(target)
       end
 
@@ -58,6 +59,10 @@ module ActionTracker
         options[:title_append]
       end
 
+      def created_at
+        options[:created_at] || Time.zone&.now
+      end
+
       def reference
         options[:reference]
       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/utils/pagination.rb

@@ -2,14 +2,22 @@
 
 module ActionTracker
   module Pagination
-    delegate :cursor, to: :meta
+    delegate :next_cursor, :current_cursor, to: :meta
 
     def size
       raw_data.try(:size)
     end
 
+    def per_page
+      meta.per_page.to_i
+    end
+
     def last_page?
-      cursor.blank?
+      next_cursor.blank?
+    end
+
+    def first_page?
+      current_cursor.blank?
     end
   end
 end

data/lib/action_tracker/version.rb

@@ -1,3 +1,3 @@
 module ActionTracker
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_tracker_client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Igor Malinovskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -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