action_tracker 0.1.0.3 → 0.1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfb149079d10597d07994207f8a82c235004c638
-  data.tar.gz: f3983a018a57ed372ba89f083d4b9c2b767155db
+  metadata.gz: ca216a7f089af0698cc33011d093feb69490860c
+  data.tar.gz: da50b64e31e0ebcfd3c8664070e09c161e7e4c78
 SHA512:
-  metadata.gz: 56bf58bae35cad88d44b2908f5c35e80c59540d8c31ddee84c2956c3889f1acf4ea96c24e9fdce512bc1f0a233f3a5baac52e326c274e2a212d1c37a993a2ad5
-  data.tar.gz: 3efbe77d676c092a0393aa11daae5f20b3efa5b3a125d859b5e786cdee212ae4f2ecd67f28f3995124ccd570cb2d0b2e3d3eaea0f89a84f60b9c803891c2f0dc
+  metadata.gz: 3bf5d2242306b8f9c89e6738fa2aec7ed4c935ff5243b03acae68a6cbe2712f558505e222398f1e12e3fd1e7d9d752ea7fc61161baa8a0bf65b0249ee83783b7
+  data.tar.gz: af2c98a243dfaaa4b15dfc01eedd6f506671c335bc5184a6101d097f648b08bb640f5bc7efb7c089d402c6789794011943c74226ff021da80f10012ac962476e

data/action_tracker.gemspec

@@ -4,25 +4,27 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'action_tracker/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "action_tracker"
+  spec.name          = 'action_tracker'
   spec.version       = ActionTracker::VERSION
-  spec.authors       = ["André Taiar", "João Fraga"]
-  spec.email         = ["andre.taiar@appprova.com.br", "joaogabriel@appprova.com.br"]
+  spec.authors       = ['André Taiar', 'João Fraga']
+  spec.email         = ['andre.taiar@appprova.com.br', 'joaogabriel@appprova.com.br']
 
   spec.summary       = %q{Easy way to track actions in your application.}
   spec.description   = %q{Easy way to track actions in your application without adding unnecessary code to your controllers.}
-  spec.homepage      = "http://coders.appprova.com.br/"
-  spec.license       = "MIT"
+  spec.homepage      = 'http://coders.appprova.com.br/'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
   spec.add_dependency 'rails3_before_render', '0.2.0'
   spec.add_dependency 'activesupport', '~> 3.2'
+  spec.add_dependency 'devise', '~> 3.4'
 
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-rails", "~> 3.0"
+  spec.add_development_dependency 'rails', '~> 3.2'
 end

data/lib/action_tracker/base.rb

@@ -1,6 +1,15 @@
 module ActionTracker
   # nodoc
   class Base
-    attr_accessor :params, :user
+    attr_reader :params, :resource
+
+    def initialize(resource, params)
+      @resource = resource
+      @params = params
+    end
+
+    def user
+      @resource
+    end
   end
 end

data/lib/action_tracker/concerns/tracker.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 require 'rails3_before_render'
 
 module ActionTracker
@@ -12,23 +13,42 @@ module ActionTracker
       end
 
       def track_event
-        tracker_user = current_user || current_teacher
-        tracker_class = "#{namespace}#{controller_name.camelize}Tracker"
-        @tracker_params = tracker_params(tracker_class, tracker_user)
+        session[:action_tracker] ||= []
+        output = tracker_params
+        session[:action_tracker] << output unless output.blank?
       end
 
       private
 
-      def tracker_params(tracker_class, tracker_user)
-        begin
-          tracker = Object.const_get(tracker_class, false).new
-          tracker.user = tracker_user
-          tracker.params = params
-          output = tracker.method(action_name).call if tracker.respond_to? action_name
-        rescue NameError
-          output = ''
-        end
-        output
+      def tracker_klass
+        @tracker_klass ||= "#{namespace}#{controller_name.camelize}Tracker"
+      end
+
+      def resource
+        @resource ||= method(find_resource).call if find_resource
+      end
+
+      def find_resource
+        @resource_method ||= Devise.mappings.keys.map { |resource| "current_#{resource}" }
+                                   .select { |method_name| !method(method_name).call.nil? }
+                                   .first
+      rescue NameError
+        nil
+      end
+
+      def tracker_instance
+        @tracker_instance ||= Object.const_get(tracker_klass, false).new(resource, params)
+      rescue NameError
+        nil
+      end
+
+      def tracker_params
+        return nil unless tracker_exists?
+        tracker_instance.method(action_name).call
+      end
+
+      def tracker_exists?
+        tracker_instance && tracker_instance.respond_to?(action_name)
       end
 
       def namespace

data/lib/action_tracker/helpers/render.rb

@@ -3,7 +3,9 @@ module ActionTracker
     # nodoc
     module Render
       def track_event
-        @tracker_params unless @tracker_params.nil?
+        output = session[:action_tracker].to_s
+        session[:action_tracker] = nil
+        output
       end
     end
   end

data/lib/action_tracker/version.rb

@@ -1,3 +1,3 @@
 module ActionTracker
-  VERSION = "0.1.0.3"
+  VERSION = "0.1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_tracker
 version: !ruby/object:Gem::Version
-  version: 0.1.0.3
+  version: 0.1.0.4
 platform: ruby
 authors:
 - André Taiar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails3_before_render
@@ -39,6 +39,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -81,6 +95,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
 description: Easy way to track actions in your application without adding unnecessary
   code to your controllers.
 email: