entity_events 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ab68e2fdb9ac9abfeed8157a96a1fae6ee1e7e2
-  data.tar.gz: 938f71e55da57b79d33f00e32d00bcd85d944758
+  metadata.gz: a2a340022aabd628b4c9ae1de103603eee4bebef
+  data.tar.gz: 317c5585fa1926ae107fd22852ed329bbe23cbed
 SHA512:
-  metadata.gz: 7a7c51ba9d3c5853a2636da1205f5f707129ba20dc2bece42e4738efc5da5df40c0baef4f2d728f962e8fb2406e241475d95accf7f3d853bd96d0e4ff2a4ed53
-  data.tar.gz: 5cee9489c373b368bcadfe17c70cdae62d8f998eaf63bde5af8c49a8a59a6f447f5611c07fe216820bf6f86bbad4ae84e53a165730f4533cd8665fd9795ad904
+  metadata.gz: c8b07b484af82dd5fdba3745eb34734793f8433b168a1f919cbcd7c94606a881f6d496d66bc26d77de5e37bf0c26ec777825259e5081561fa525d8bcf8381bb5
+  data.tar.gz: 225bf84013440fc6b34e16e430cce34b9f679f47dbe0efb7bd257cee992674b28bc2ca767c75b7d4c1cb63d02c7a711e7a3079c0c4f96138d1e16a3957841ab4

data/README.rdoc

@@ -41,7 +41,7 @@ gem 'entity_events'
         t.string :action
         t.string :controller
         t.string :flag
-        t.text   :parameters
+        t.string :request_ip
         t.references :actor, polymorphic: true
         t.references :target, polymorphic: true
         t.timestamps
@@ -55,7 +55,7 @@ gem 'entity_events'
 
   def entity_events
       auto_log = true
-      EntityEvents.record(params, current_user, auto_log)
+      EntityEvents.record(request, current_user, auto_log)
   end
 ===
 
@@ -69,7 +69,7 @@ Maybe you don't want to record every single request, and you only want to record
 
   def entity_events
       auto_log = false
-      EntityEvents.record(params, current_user, auto_log)
+      EntityEvents.record(request, current_user, auto_log)
   end
 ===
 

data/lib/entity_events/interaction.rb

@@ -1,7 +1,7 @@
 module EntityEvents
 
   class Interaction < ActiveRecord::Base
-    attr_accessible :controller, :action, :parameters, :flag, :actor, :target, :actor_id, :target_id
+    attr_accessible :controller, :action, :parameters, :flag, :actor, :target, :actor_id, :target_id, :request_ip
 
     belongs_to :actor, polymorphic: true
     belongs_to :target, polymorphic: true
@@ -10,8 +10,5 @@ module EntityEvents
       Interaction.create(interaction)
     end
 
-    def params
-      YAML::load(parameters)
-    end
   end
 end

data/lib/entity_events/version.rb

@@ -1,3 +1,3 @@
 module EntityEvents
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/lib/entity_events.rb

@@ -13,21 +13,20 @@ module EntityEvents
   end
 
   class << self
-    def record(params, current_user, auto_log = true)
-      event_finder = EventFinder.find(params[:controller])
-      entity_event = event_finder.new params, current_user
+    def record(request, current_user, auto_log = true)
+      event_finder = EventFinder.find(request.filtered_parameters[:controller])
+      entity_event = event_finder.new request, current_user
       entity_event.record if auto_log || entity_event.should_record?
     end
   end
 
   class EntityEvent
-    attr_reader :actor, :action ,:target, :params, :current_user, :target_is_user_defined, :actor_is_user_defined
+    attr_reader :actor, :action ,:target, :current_user, :target_is_user_defined, :actor_is_user_defined, :request
 
-    def initialize(params,current_user)
-      @params = params
+    def initialize(request, current_user)
+      @request = request
       @action = action
       @current_user = current_user
-      
       actor_method = (@action.to_s+'_actor').to_sym
       @actor = if respond_to?(actor_method)
         @actor_is_user_defined = true
@@ -47,14 +46,13 @@ module EntityEvents
     end
 
     def record
-      Interaction.log({
-        actor:       actor,
-        target:      target,
-        action:      action,
-        controller:  controller,
-        parameters:  YAML::dump(params),
-        flag:        flag
-      })
+      Interaction.log({  actor:       actor,
+                         target:      target,
+                         action:      action,
+                         controller:  controller,
+                         flag:        flag,
+                         request_ip:  request.remote_ip
+                      })
     end
 
     def event_class
@@ -75,15 +73,15 @@ module EntityEvents
 
     #You can override methods after this line, however it is not nessisary.
     def controller
-      params[:controller]
+      request.filtered_parameters[:controller]
     end
 
     def action
-      params[:action]
+      request.filtered_parameters[:action]
     end
 
     def flag
-      params[:flag]
+      request.filtered_parameters[:flag]
     end
 
     def default_actor
@@ -91,10 +89,11 @@ module EntityEvents
     end
 
     def default_target
-      id = params["#{params[:controller].to_s.singularize}_id"] || params[:id]
-      params[:controller].classify.split(':').last.constantize.find id if id
+      id = request.filtered_parameters["#{request.filtered_parameters[:controller].to_s.singularize}_id"] || request.filtered_parameters[:id]
+      request.filtered_parameters[:controller].classify.split(':').last.constantize.find id if id
     end
 
+
   end
 
 end

data/test/dummy/log/test.log

@@ -0,0 +1,3 @@
+Connecting to database specified by database.yml
+   (0.4ms)  begin transaction
+   (0.0ms)  rollback transaction

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entity_events
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Josh Dean
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -81,7 +81,9 @@ files:
 - test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20141124235638_create_interaction.rb
 - test/dummy/db/schema.rb
+- test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -138,7 +140,9 @@ test_files:
 - test/dummy/db/development.sqlite3
 - test/dummy/db/migrate/20141124235638_create_interaction.rb
 - test/dummy/db/schema.rb
+- test/dummy/db/test.sqlite3
 - test/dummy/log/development.log
+- test/dummy/log/test.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html