Skip to content

Commit

Permalink
removed sqlite3 dependency as it causes heroku to fail [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
acnalesso committed Sep 6, 2013
1 parent 34df3e8 commit 3d23031
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
1 change: 0 additions & 1 deletion impressionist.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ Gem::Specification.new do |s|
s.add_development_dependency 'rdoc', '>= 2.4.2'
s.add_development_dependency 'rspec-rails'
s.add_development_dependency 'simplecov'
s.add_development_dependency 'sqlite3'
s.add_development_dependency 'systemu'
s.add_development_dependency 'minitest'
s.add_development_dependency 'minitest-rails'
Expand Down
19 changes: 16 additions & 3 deletions lib/impressionist/models/mongoid/impressionist/impressionable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,23 @@ module Impressionable
# Overides impressionist_count in order to provied
# 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])
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

filter == :all ?
imps.count :
imps.where(filter.ne => nil).
distinct(filter).count
end

end
Expand Down

0 comments on commit 3d23031

Please sign in to comment.