impressionist 1.4.13 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26b1ba3eb3dcb6e51c0b28a6f0f5362510098d11
-  data.tar.gz: 64b95b9bccb3aa0810fc5b06925dce5ef590988a
+  metadata.gz: cb9ffa85fa4e4bcd8eebad92acee8eb81c3f48de
+  data.tar.gz: 9073d41d76c1eec72dbc44b51fce2c6100269c34
 SHA512:
-  metadata.gz: 7e31c9470fb5c7261f7b156404e5a6a20eb1ebc5487bde84e7fe1fab75a731ca0fa2a0398fabff491dcbf3e32f1c46694adce428f0745726a7535d30a5e557ab
-  data.tar.gz: 263082fdc47df01e46b169d4183231405ab5a2918166d3194bad9e0679b247af1bd2e893adc85fbebaad3471305656990975a4cf9b05e2d4081a440ecb3afd82
+  metadata.gz: 02d800f34d2d75e3e1605e5abee38c554b874509a3b2d9cd7ea199bb2cfbbda1ccadd6b1e0661b3021ea86eb686e0a632736ef7cc1deef75490d89bc75a4ba88
+  data.tar.gz: 26147d35e22672d3624340d52c8b8b2649ab65641c7377f9cc5c14f4d01e9c24a2cc2cf42b21a516ee04989aaf15b22d573d856706e5f2a264a09d12166472d6

data/.travis.yml

@@ -1,21 +1,26 @@
 language: ruby
-before_script: 
+before_script:
   - cd tests/test_app
   - bundle exec rails g impressionist -f
   - bundle exec rake db:migrate
   - cd ..
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
-  - jruby-19mode
-  - rbx-19mode
+  - jruby-head
+  - rbx
+  - ruby-head
 gemfile:
   - gemfiles/rails32.gemfile
   - gemfiles/rails40.gemfile
 matrix:
-  exclude:
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails40.gemfile
   allow_failures:
-      - rvm: 1.9.2
+    - rvm: jruby-head
+    - rvm: rbx
+    - rvm: ruby-head
+  fast_finish: true
+notifications:
+  email:
+    - acnalesso@yahoo.co.uk
+    - john@couponshack.com
+    - mmcmahand@gmail.com

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 1.5.0 (2013-12-30)
+* Added message filtering.
+* (@overovermind)
+
 == 1.4.8 (2013-09-01)
 * Fixed #108
 * Clean up

data/Gemfile

@@ -1,5 +1,8 @@
 source 'https://rubygems.org'
 
+gem 'rake', '>= 0.9'
+gem 'rdoc', '>= 2.4.2'
+
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
   gem 'jdbc-sqlite3'
@@ -10,4 +13,14 @@ platforms :ruby, :mswin, :mingw do
   gem 'sqlite3'
 end
 
+group :test do
+  gem 'capybara', '>= 2.0.3'
+  gem 'minitest'
+  gem 'minitest-rails'
+  gem 'rails', '>= 3.2.15'
+  gem 'rspec-rails'
+  gem 'simplecov'
+  gem 'systemu'
+end
+
 gemspec

data/README.md

@@ -124,6 +124,10 @@ Usage
 
         @widget.impressionist_count(:filter=>:all)
 
+9. Get impression count by message.  This only counts impressions of the given message.
+
+        @widget.impressionist_count(:message=>"pageview", :filter=>:all)
+
 Logging impressions for authenticated users happens automatically.  If you have
 a current_user helper or use @current_user in your before_filter to set your
 authenticated user, current_user.id will be written to the user_id field in the

data/app/models/impressionist/impressionable.rb

@@ -5,7 +5,11 @@ module Impressionist
     module ClassMethods
       attr_accessor :impressionist_cache_options
 
-      DEFAULT_CACHE = { :counter_cache => false, :column_name => :impressions_count, :unique => false }
+      DEFAULT_CACHE ||= {
+        :counter_cache => false,
+        :column_name => :impressions_count,
+        :unique => false
+      }
 
       def impressionist_counter_cache_options
         @impressionist_cache_options ||= {}
@@ -31,6 +35,10 @@ module Impressionist
       # If a start_date is provided, finds impressions between then and the end_date. Otherwise returns all impressions
       imps = options[:start_date].blank? ? impressions : impressions.where("created_at >= ? and created_at <= ?", options[:start_date], options[:end_date])
 
+      if options[:message]
+        imps = imps.where("impressions.message = ?", options[:message])
+      end
+
       # Count all distinct impressions unless the :all filter is provided.
       distinct = options[:filter] != :all
       if Rails::VERSION::MAJOR == 4

data/gemfiles/rails32.gemfile

@@ -1,12 +1,26 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 3.2.12'
-gem 'jquery-rails'
-gem 'json'
+gem 'rake', '>= 0.9'
+gem 'rdoc', '>= 2.4.2'
 
-gem 'activerecord-jdbcsqlite3-adapter', :platforms => [:jruby]
-gem 'jdbc-sqlite3', :platforms => [:jruby]
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'jdbc-sqlite3'
+  gem 'jruby-openssl'
+end
 
-gem 'sqlite3', :platforms => [:ruby, :mswin, :mingw]
+platforms :ruby, :mswin, :mingw do
+  gem 'sqlite3'
+end
 
-gemspec :path => '../'
+group :test do
+  gem 'capybara', '>= 2.0.3'
+  gem 'minitest'
+  gem 'minitest-rails'
+  gem 'rails', '~> 3.2.15'
+  gem 'rspec-rails'
+  gem 'simplecov'
+  gem 'systemu'
+end
+
+gemspec :path => '../'

data/gemfiles/rails40.gemfile

@@ -1,11 +1,26 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.0.0'
-gem 'jquery-rails'
-gem 'json'
+gem 'rake', '>= 0.9'
+gem 'rdoc', '>= 2.4.2'
 
-gem 'activerecord-jdbcsqlite3-adapter', '1.3.0.rc1', :platforms => [:jruby]
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'jdbc-sqlite3'
+  gem 'jruby-openssl'
+end
 
-gem 'sqlite3', :platforms => [:ruby, :mswin, :mingw]
+platforms :ruby, :mswin, :mingw do
+  gem 'sqlite3'
+end
 
-gemspec :path => '../'
+group :test do
+  gem 'capybara', '>= 2.0.3'
+  gem 'minitest'
+  gem 'minitest-rails'
+  gem 'rails', '~> 4.0.1'
+  gem 'rspec-rails'
+  gem 'simplecov'
+  gem 'systemu'
+end
+
+gemspec :path => '../'

data/impressionist.gemspec

@@ -19,16 +19,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
 
   s.add_dependency 'httpclient', '~> 2.2'
+  s.add_dependency 'nokogiri', '~> 1.5'
 
-  s.add_dependency 'nokogiri', '>= 1.5.0'
-
-  s.add_development_dependency 'capybara', '>= 2.0.3'
-  s.add_development_dependency 'rake', '>= 0.9'
-  s.add_development_dependency 'rails', '>= 3.2.12', '< 4.1'
-  s.add_development_dependency 'rdoc', '>= 2.4.2'
-  s.add_development_dependency 'rspec-rails'
-  s.add_development_dependency 'simplecov'
-  s.add_development_dependency 'systemu'
-  s.add_development_dependency 'minitest'
-  s.add_development_dependency 'minitest-rails'
+  s.add_development_dependency 'bundler', '~> 1.0'
 end

data/lib/impressionist/version.rb

@@ -1,3 +1,3 @@
 module Impressionist
-  VERSION = "1.4.13"
+  VERSION = "1.5.1"
 end

data/tests/test_app/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.12'
+gem 'rails', '~> 3.2'
 
 gem 'impressionist', :path => '../../'
 
@@ -14,7 +14,7 @@ platforms :ruby, :mswin, :mingw do
   gem 'pg'
   gem 'sqlite3'
   gem 'mysql2'
-  gem "mongoid", "~> 3.1.4"
+  gem 'mongoid', '~> 3.1'
   gem 'bson_ext'
 end
 
@@ -23,8 +23,8 @@ gem 'json'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
+  gem 'sass-rails',   '~> 3.2'
+  gem 'coffee-rails', '~> 3.2'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   # gem 'therubyracer'
@@ -39,10 +39,9 @@ group :development, :test do
 end
 
 group :test do
+  gem 'capybara'
   gem 'simplecov'
   gem 'systemu'
-  gem 'capybara', '~> 2.0.0'
 end
 
 gem 'jquery-rails'
-

data/tests/test_app/app/assets/javascripts/application.js

@@ -10,5 +10,4 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require jquery_ujs
 //= require_tree .

data/tests/test_app/spec/models/model_spec.rb

@@ -17,6 +17,14 @@ describe Impression do
     @article.impressions.last.message.should eq "test message"
   end
 
+  it "should return the impression count for the message specified" do
+    @article.impressions.create(:message => "pageview")
+    @article.impressions.create(:message => "pageview")
+    @article.impressions.create(:message => "visit")
+
+    @article.impressionist_count(:message => "pageview", :filter => :all).should eq 2
+  end
+
   it "should return the impression count for all with no date range specified" do
     @article.impressionist_count(:filter=>:all).should eq 11
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: impressionist
 version: !ruby/object:Gem::Version
-  version: 1.4.13
+  version: 1.5.1
 platform: ruby
 authors:
 - johnmcaliley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -28,148 +28,30 @@ dependencies:
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.3
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.12
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.12
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.1'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.2
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: systemu
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: minitest-rails
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 description: Log impressions from controller actions or from a model
 email: john.mcaliley@gmail.com
 executables: []