notches 0.3.1 → 0.5.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGJhY2U0YmUzMTc4ZTQ3Nzg2MTk2NzY5MDhmNGU5ZGExOTg5NTAyMw==
+  data.tar.gz: !binary |-
+    YWQ1ZTVlM2I4MWQ5ZTI0MzI0YmQ4ZDMzMTk5MWZhMDczNjIzYjUyYw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YmNiZmFmZGZlOGQ4ODQ5Yjg4ZjBmMzY0OTAwODQ1M2RmODBmNDVjNTdkZDJh
+    YjY0ZTM0MTkwNWNkOTQ2OGY0ZjU3NjNmMTA2ODI2ZDI0YjhiYmExMTIwOGFl
+    ZTI4OWJlMzc4NWQ5MTRhM2Y5MjU1MzhmNTJmNjllNzJlYjc1NDQ=
+  data.tar.gz: !binary |-
+    ZDcwZWQ2MjQ1YWVmMDk2MjRlZmY0ZDMxNDg0MjkwNTQwNmE5N2QwYTc1Yzg5
+    MzA2MjkzZjE4NWViMzhiYTFkMDU0MjVjMTkxOGZmOWZiMGZmZWU3ZjJmMzgy
+    YmFlMTI5ZjA0N2RmZmVlYTJkZGFhNWIzMTVlZjZiOTE5Njk4MWU=

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/app/controllers/notches/hits_controller.rb

@@ -1,11 +1,13 @@
 class Notches::HitsController < ActionController::Base
   def new
     session[:notched] = true
+
     Notches::Hit.log(
-      :url => params[:url],
+      :url        => params[:url],
       :user_agent => request.env["HTTP_USER_AGENT"],
+      :user_id    => params[:user_id],
       :session_id => request.session_options[:id],
-      :ip => request.remote_ip
+      :ip         => request.remote_ip
     )
 
     # Don't cache the image.

data/app/models/notches/hit.rb

@@ -14,18 +14,30 @@ class Notches::Hit < ActiveRecord::Base
   belongs_to :date,       :foreign_key => :notches_date_id
   belongs_to :time,       :foreign_key => :notches_time_id
 
-  scope :unique, group("notches_url_id, notches_session_id, notches_ip_id")
+  scope :unique, -> { group("notches_url_id, notches_session_id, notches_ip_id") }
 
   def self.log(attributes)
+    attributes[:user_agent] ||= ''
     hit = self.new
     hit.transaction do
       Rails.logger.info("[Notches] Tracking #{attributes.inspect} at #{Date.today} #{Time.now}")
-      hit.url = Notches::URL.find_or_create_by_url(attributes[:url])
-      hit.user_agent = Notches::UserAgent.find_or_create_by_user_agent(attributes[:user_agent])
-      hit.session = Notches::Session.find_or_create_by_session_id(attributes[:session_id])
-      hit.ip = Notches::IP.find_or_create_by_ip(attributes[:ip])
-      hit.date = Notches::Date.find_or_create_by_date(Date.today)
-      hit.time = Notches::Time.find_or_create_by_time(Time.now)
+      hit.url = Notches::URL.find_or_create_by(url: attributes[:url])
+      hit.user_agent = Notches::UserAgent.find_or_create_by(
+        user_agent_md5: Digest::MD5.hexdigest(attributes[:user_agent]),
+        :user_agent => attributes[:user_agent]
+      )
+      hit.session = Notches::Session.find_or_create_by(session_id: attributes[:session_id])
+      hit.ip      = Notches::IP.find_or_create_by(ip: attributes[:ip])
+      hit.date    = Notches::Date.find_or_create_by(date: Date.today)
+      hit.time    = Notches::Time.find_or_create_by(time: Time.now)
+
+      if attributes[:user_id].present?
+        Notches::UserSession.find_or_create_by(
+          user_id: attributes[:user_id],
+          notches_session_id: hit.session.id
+        )
+      end
+
       begin
         hit.save!
       rescue #ActiveRecord::RecordNotUnique

data/app/models/notches/user_session.rb

@@ -0,0 +1,8 @@
+class Notches::UserSession < ActiveRecord::Base
+  self.table_name = "notches_user_sessions"
+
+  validates :user_id, :presence => true
+  validates :session, :presence => true
+
+  belongs_to :session, :foreign_key => :notches_session_id
+end

data/db/migrate/20120910093652_add_index_to_user_agents.rb

@@ -0,0 +1,35 @@
+class AddIndexToUserAgents < ActiveRecord::Migration
+  def up
+    add_column :notches_user_agents, :user_agent_md5, :string
+    add_index :notches_user_agents, :user_agent_md5
+    change_table :notches_hits do |t|
+      t.remove_index :name => :notches_index
+    end
+    add_index :notches_hits, [
+      :notches_time_id,
+      :notches_date_id,
+      :notches_ip_id,
+      :notches_session_id,
+      :notches_url_id,
+      :notches_user_agent_id
+    ], :name => :notches_index, :unique => true
+    Notches::UserAgent.find_each do |user_agent|
+      user_agent.update_attribute(:user_agent_md5, Digest::MD5.hexdigest(user_agent.user_agent))
+    end
+  end
+
+  def down
+    remove_index :notches_user_agents, :user_agent_md5
+    remove_column :notches_user_agents, :user_agent_md5
+    change_table :notches_hits do |t|
+      t.remove_index :name => :notches_index
+    end
+    add_index :notches_hits, [
+      :notches_time_id,
+      :notches_date_id,
+      :notches_ip_id,
+      :notches_session_id,
+      :notches_url_id
+    ], :name => :notches_index, :unique => true
+  end
+end

data/db/migrate/20130918115023_create_notches_user_sessions.rb

@@ -0,0 +1,14 @@
+class CreateNotchesUserSessions < ActiveRecord::Migration
+  def up
+    create_table :notches_user_sessions do |t|
+      t.integer :user_id, :null => false
+      t.integer :notches_session_id, :null => false
+    end
+    add_index :notches_user_sessions, :user_id, :unique => true
+  end
+
+  def down
+    remove_index :notches_user_sessions, :user_id
+    drop_table :notches_user_sessions
+  end
+end

data/lib/notches/version.rb

@@ -1,3 +1,3 @@
 module Notches
-  VERSION = '0.3.1'
+  VERSION = '0.5.0'
 end

data/notches.gemspec

@@ -20,9 +20,9 @@ Gem::Specification.new do |s|
   }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency     'rails',           '~> 3.1'
+  s.add_runtime_dependency     'rails',       '~> 4.0'
 
-  s.add_development_dependency 'combustion', '~> 0.3.2'
-  s.add_development_dependency 'rspec-rails', '~> 2.11'
+  s.add_development_dependency 'combustion',  '~> 0.5.1'
+  s.add_development_dependency 'rspec-rails', '~> 2.14'
   s.add_development_dependency 'sqlite3',     '~> 1.3.4'
 end

data/spec/controllers/notches/hits_controller_spec.rb

@@ -13,7 +13,7 @@ describe Notches::HitsController do
       @request.stub(:remote_ip => '234.101.82.14')
       @request.stub(:session_options => { :id => 'abcd' })
 
-      get :new, :url => '/posts', :format => 'gif'
+      get :new, :url => '/posts', :user_id => 7, :format => 'gif'
 
       Notches::Hit.count.should == 1
       hit = Notches::Hit.first
@@ -21,6 +21,7 @@ describe Notches::HitsController do
       hit.user_agent.user_agent.should == 'FeedBurner/1.0'
       hit.ip.ip.should == '234.101.82.14'
       hit.session.session_id.should == 'abcd'
+      Notches::UserSession.exists?(notches_session_id: hit.session.id, user_id: 7).should be_true
     end
   end
 end

data/spec/models/notches/hit_spec.rb

@@ -70,10 +70,11 @@ describe Notches::Hit do
         hit.date.date.should == today
         hit.time.time.strftime('%H:%M:%S').should == now.strftime('%H:%M:%S')
         hit.user_agent.user_agent.should == 'FeedBurner/1.0'
+        hit.user_agent.user_agent_md5.should == Digest::MD5.hexdigest('FeedBurner/1.0')
       end
     end
 
-    let(:existing_hit) { 
+    let(:existing_hit) {
       Notches::Hit.log(
         :url => "/posts/1",
         :user_agent => 'FeedBurner/1.0',
@@ -152,5 +153,18 @@ describe Notches::Hit do
         }.to_not change { Notches::Hit.count }
       end
     end
+
+    context "when given a user id" do
+      it "attaches the user id to the session" do
+        hit = Notches::Hit.log({
+          :url => '/posts',
+          :user_agent => 'FeedBurner/1.0',
+          :user_id    => 7,
+          :session_id => '1',
+          :ip => '0.0.0.1'
+        })
+        Notches::UserSession.exists?(notches_session_id: hit.session.id, user_id: 7).should be_true
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,12 +1,12 @@
 require 'rubygems'
-require 'bundler'
+require 'bundler/setup'
 
-Bundler.require :default, :development
+require 'combustion'
 
-Combustion.initialize!
+Combustion.initialize! :active_record, :action_controller, :action_view
 
 require 'rspec/rails'
 
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
-end
+end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notches
 version: !ruby/object:Gem::Version
-  version: 0.3.1
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - Cillian O'Ruanaidh
@@ -10,72 +9,64 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-01 00:00:00.000000000 Z
+date: 2013-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '4.0'
   type: :runtime
+- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.1'
-- !ruby/object:Gem::Dependency
+        version: 0.5.1
   name: combustion
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.5.1
   type: :development
+- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
-- !ruby/object:Gem::Dependency
+        version: '2.14'
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '2.14'
   type: :development
+- !ruby/object:Gem::Dependency
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
-- !ruby/object:Gem::Dependency
+        version: 1.3.4
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.4
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.4
 description: A Rails Engine for tracking your web traffic.
 email:
 - contact@cilliano.com
@@ -98,10 +89,13 @@ files:
 - app/models/notches/time.rb
 - app/models/notches/url.rb
 - app/models/notches/user_agent.rb
+- app/models/notches/user_session.rb
 - config.ru
 - config/routes.rb
 - db/migrate/20120323111734_create_notches.rb
 - db/migrate/20120713142636_create_notches_user_agents.rb
+- db/migrate/20120910093652_add_index_to_user_agents.rb
+- db/migrate/20130918115023_create_notches_user_sessions.rb
 - lib/notches.rb
 - lib/notches/engine.rb
 - lib/notches/version.rb
@@ -116,33 +110,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/hypertiny/notches
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1687754116731628172
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1687754116731628172
 requirements: []
 rubyforge_project: notches
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple Rails web traffic counter
 test_files:
 - spec/controllers/notches/hits_controller_spec.rb