ifd_tools 0.1.7 → 0.1.8

data/app/models/ifd_tools/tracking/event.rb

@@ -1,51 +1,53 @@
 module IfdTools
-  class Tracking::Event < ActiveRecord::Base
+  module Tracking
+    class Event < ActiveRecord::Base
     
-    self.table_name = "ifd_tools_tracking_events"
+      self.table_name = "ifd_tools_tracking_events"
     
-    belongs_to :customer
-    belongs_to :trackable, polymorphic: true
+      belongs_to :customer
+      belongs_to :trackable, polymorphic: true
     
-    attr_accessible :ip_address, :platform, :timestamp, :type, :customer_id
+      attr_accessible :ip_address, :platform, :timestamp, :type, :customer_id
     
-    validates :customer, presence: true
+      validates :customer, presence: true
     
-    default_scope order(:timestamp)
+      default_scope order(:timestamp)
     
-    def assign_trackable_item_by_id(id)
-      # self.trackable = AssociatedClass.find(id)
-      raise "Must implement 'assign_trackable_item_by_id' in each IfdTools::Tracking::Event subclass to set association"
-    end
+      def assign_trackable_item_by_id(id)
+        # self.trackable = AssociatedClass.find(id)
+        raise "Must implement 'assign_trackable_item_by_id' in each IfdTools::Tracking::Event subclass to set association"
+      end
     
-    after_initialize do
-      self.timestamp ||= Time.now if new_record?
-    end
+      after_initialize do
+        self.timestamp ||= Time.now if new_record?
+      end
     
-    # Class Methods
-    class << self
+      # Class Methods
+      class << self
       
-      def event_types
-        Dir["#{Rails.root}/app/models/ifd_tools/tracking/*.rb"].each { |f| require f }
-        Dir[File.expand_path(File.join(File.dirname(__FILE__), "/*.rb"))].delete_if { |f| f.end_with? "/event.rb" }.each { |f| require f }
-        subclasses
-      end
+        def event_types
+          Dir[File.expand_path(File.join(File.dirname(__FILE__), "/*.rb"))].delete_if { |f| f.end_with? "/event.rb" }.each { |f| require f }
+          Dir["#{Rails.root}/app/models/ifd_tools/tracking/*.rb"].each { |f| require f }
+          subclasses
+        end
     
-      def platform_for_request(request)
-        if request.headers["HTTP_USER_AGENT"] =~ /Macintosh|iPad|iPhone/
-          "mac"
-        else
-          "pc"
+        def platform_for_request(request)
+          if request.headers["HTTP_USER_AGENT"] =~ /Macintosh|iPad|iPhone/
+            "mac"
+          else
+            "pc"
+          end
         end
-      end
 
-      def top_content
-        content = self.where("type != ?", "IfdTools::Tracking::ApplicationEvent").group(:trackable_id).order("count(trackable_id) desc").limit(25).collect do |e|
-          e.trackable_type.constantize.find(e.trackable_id) rescue nil
+        def top_content
+          content = self.where("type != ?", "IfdTools::Tracking::ApplicationEvent").group(:trackable_id).order("count(trackable_id) desc").limit(25).collect do |e|
+            e.trackable_type.constantize.find(e.trackable_id) rescue nil
+          end
+          content.compact.sort { |a,b| b.trackable_activity <=> a.trackable_activity }
         end
-        content.compact.sort { |a,b| b.trackable_activity <=> a.trackable_activity }
-      end
       
-    end
+      end
     
+    end
   end
-end
+end

data/lib/ifd_tools/tracking/trackable.rb

@@ -1,28 +1,30 @@
 module IfdTools
-  module Trackable
+  module Tracking
+    module Trackable
 
-    def self.included(base)
-      base.class_eval do
-        has_many :tracking_events, :class_name => 'IfdTools::Tracking::Event', foreign_key: :trackable_id, dependent: :destroy
+      def self.included(base)
+        base.class_eval do
+          has_many :tracking_events, :class_name => 'IfdTools::Tracking::Event', foreign_key: :trackable_id, dependent: :destroy
+        end
       end
-    end
 
-    def trackable_title
-      name rescue title
-    end
+      def trackable_title
+        name rescue title
+      end
 
-    def trackable_type
-      self.class.name.titleize
-    end
+      def trackable_type
+        self.class.name.titleize
+      end
 
-    # Override if you might want to link to something else
-    def trackable_resource
-      self
-    end
+      # Override if you might want to link to something else
+      def trackable_resource
+        self
+      end
 
-    def trackable_activity
-      tracking_events.count
-    end
+      def trackable_activity
+        tracking_events.count
+      end
 
+    end
   end
 end

data/lib/ifd_tools/version.rb

@@ -1,3 +1,3 @@
 module IfdTools
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ifd_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -298,7 +298,6 @@ files:
 - app/models/ifd_tools/software_update.rb
 - app/models/ifd_tools/tracking/application_event.rb
 - app/models/ifd_tools/tracking/event.rb
-- app/models/ifd_tools/tracking.rb
 - app/uploaders/software_uploader.rb
 - app/views/admin/contact_requests/_form.html.haml
 - app/views/admin/customers/_trend.html.haml

data/app/models/ifd_tools/tracking.rb

@@ -1,7 +0,0 @@
-module IfdTools
-  module Tracking
-    def self.table_name_prefix
-      'tracking_'
-    end
-  end
-end