impressionist 1.4.11 → 1.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bc58f25a7575987707c4e3c1db283b667c92def
-  data.tar.gz: 1366d3c96dc8d9f450df03b08e9dd4baca0352d3
+  metadata.gz: e626e8beffd6313e99798eddb2c2bf382935acfd
+  data.tar.gz: c7a2adbc3fac02f565a257deffc30af5c6e13386
 SHA512:
-  metadata.gz: b443bea4b273f98ec4a62cc06e57ad8db6743c25789087d78058c1a9b22332daadcdcf88b64ff8fd5f74b477814afa8146a07b9219e29febc0dea4248a4e67eb
-  data.tar.gz: 6c56d18c5464fcbf7241e5a33a815c254db3194673535524c29eaa2733d0e99d09ed6cc63cde068de75fb8f5ca6cdf41bdbf1955c8e71193eb0e9725e0864b34
+  metadata.gz: 30c6e2cbfc40499cdf435a9cd243f1e80d4ed0b0bd2a58c805b56c3db817f334c88d8f2cf72c3140a78e400edd21d1bf25c416c34c49097dd423c942915a4fdb
+  data.tar.gz: e29a4745d1c1f2e1049f741cce550c55e58d47bfd47f7feaab0a353cb1b0723f381fd12d54f3e05e6aa16c7a50c82a6f93c311e501606927691d982359584bd2

data/README.md

@@ -1,6 +1,7 @@
 ![Impressionist Logo](https://github.com/charlotte-ruby/impressionist/raw/master/logo.png)
 
 [![Build Status](https://secure.travis-ci.org/charlotte-ruby/impressionist.png?branch=master)](http://travis-ci.org/charlotte-ruby/impressionist)
+[![Code Climate](https://codeclimate.com/github/charlotte-ruby/impressionist.png)](https://codeclimate.com/github/charlotte-ruby/impressionist)
 
 impressionist
 =============
@@ -224,9 +225,10 @@ Want to run the tests? Ok mummy
 
 Contributors
 ------------
-* [johnmcaliley](https://github.com/johnmcaliley)
+* [johnmcaliley - creator](https://github.com/johnmcaliley)
+* [Antonio C Nalesso - maintainer](https://github.com/nbit001)
 * [coryschires](https://github.com/coryschires)
 * [georgmittendorfer](https://github.com/georgmittendorfer)
-* [Antonio C Nalesso](https://github.com/nbit001)
+
 
 Copyright (c) 2011 John McAliley. See LICENSE.txt for further details.

data/impressionist.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'httpclient', '~> 2.2'
 
-  s.add_dependency 'nokogiri', '~> 1.6.0'
+  s.add_dependency 'nokogiri', '~> 1.5.0'
 
   s.add_development_dependency 'capybara', '>= 2.0.3'
   s.add_development_dependency 'rake', '>= 0.9'

data/lib/impressionist/models/mongoid/impressionist/impressionable.rb

@@ -4,28 +4,21 @@ module Impressionist
   # extends AS::Concern
   include Impressionist::IsImpressionable
 
-    ## TODO: Make it readable
-
-    # Overides impressionist_count in order to provied
-    # mongoid compability
+    # Overides impressionist_count in order to provide mongoid compability
     def impressionist_count(options={})
-      options.
-      reverse_merge!(
-        :filter=>:request_hash,
-        :start_date=>nil,
-        :end_date=>Time.now)
-
-      imps = options[:start_date].blank? ?
-        impressions :
-        impressions.
-          between(created_at: options[:start_date]..options[:end_date])
-
-      filter = options[:filter]
-
-      filter == :all ?
-        imps.count :
-        imps.where(filter.ne => nil).
-          distinct(filter).count
+
+      # Uses these options as defaults unless overridden in options hash
+      options.reverse_merge!(:filter => :request_hash, :start_date => nil, :end_date => Time.now)
+
+      # 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.between(created_at: options[:start_date]..options[:end_date])
+
+
+      # Count all distinct impressions unless the :all filter is provided
+      distinct = options[:filter] != :all
+      distinct ? imps.where(options[:filter].ne => nil).distinct(options[:filter]).count : imps.count
     end
 
   end

data/lib/impressionist/version.rb

@@ -1,3 +1,3 @@
 module Impressionist
-  VERSION = "1.4.11"
+  VERSION = "1.4.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: impressionist
 version: !ruby/object:Gem::Version
-  version: 1.4.11
+  version: 1.4.12
 platform: ruby
 authors:
 - johnmcaliley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement