browsing_history 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5579aa68af285099783e050c1f060c193d4e5761
-  data.tar.gz: 55d5a56f2ddcc0e2294febb4aa2ff1175ca85d42
+  metadata.gz: 44240900447de64eee1d917a42c10dc18b72fe26
+  data.tar.gz: 3c110cb5e9e00d6e7904bcf8083296297bf0dd2a
 SHA512:
-  metadata.gz: 665329c030a0ec2e17f6120516c315d864a5540169f720e0f50b75ad15f30e541f7cbeff4bbd237b03dddb9d2ef78a5015c460de51036841983965e4935c54fb
-  data.tar.gz: 1d56e955901f795dd373eedde90853c2aa0234bcde80f70a593685338f09a9a5ebc7dc926421c7c27543a15c73394fafaa8a139401ccb789c1c472f3b5ee60e2
+  metadata.gz: 2bf2adee9b2b6a105b181e70786952ce483696491b654aad786b594dc8cb453d45b2c16e75ac60b8e30fd6458efb227b8a63dc978b8d176527dec7c3d9f68c9a
+  data.tar.gz: 890e06144a100e76889787f04834942fcedcc1f231da633e95121aadd8ed52d052c792e3ece8c4ace9bbc21be266108ce794d951c36b6b6de22e4ab3f839e248

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    browsing_history (0.0.2)
+    browsing_history (0.0.3)
       redis (>= 3.0.2)
       redis-namespace
       redis-objects

data/lib/browsing_history/storages/redis.rb

@@ -59,9 +59,9 @@ class BrowsingHistory::Storages::Redis < BrowsingHistory::Storages::Base
   end
 
   def fetch_between(opts)
-    start_date, end_date = parse_between(opts.delete(:between))
+    from, to = parse_between(opts.delete(:between))
 
-    history.revrangebyscore(start_date, end_date, **opts)
+    history.revrangebyscore(to, from, **opts)
   end
 
   def clear_expiration(opts)
@@ -75,17 +75,20 @@ class BrowsingHistory::Storages::Redis < BrowsingHistory::Storages::Base
   end
 
   def count_between(opts)
-    end_date, start_date = parse_between(opts.delete(:between))
+    from, to = parse_between(opts.delete(:between))
 
-    history.range_size(start_date, end_date)
+    history.range_size(from, to)
   end
 
   def score(time = nil)
-    time ? time.to_f : Time.now.to_f
+    time ? time.to_f : Time.zone.now.to_f
   end
 
   def parse_between(range)
-    [range.first.to_f, range.last.to_f]
+    from = [range.first.to_f, range.last.to_f].min
+    to   = [range.first.to_f, range.last.to_f].max
+
+    [from, to]
   end
 
   class << self

data/lib/browsing_history/version.rb

@@ -1,3 +1,3 @@
 module BrowsingHistory
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

data/spec/browsing_history/browser_spec.rb

@@ -3,12 +3,10 @@ require 'fixtures/user'
 require 'fixtures/article'
 
 describe BrowsingHistory::Browser do
-  articles_size = 50
-
   let(:user)    { User.new }
-  let(:article) { Article.new }
+  let(:article) { Article.new(100) }
   let(:articles) do
-    articles_size.times.map.with_index(1) { |i| Article.new(i) }
+    Array.new(5) { |i| Article.new(i) }
   end
   let(:histories) { user.browsing_histories }
 
@@ -76,27 +74,34 @@ describe BrowsingHistory::Browser do
     describe '#previous' do
       context 'default' do
         it 'should default empty' do
-          expect(histories.previous(article, Time.now..1.day.ago)).to be_empty
+          expect(histories.previous(article, Time.zone.now..1.day.ago)).to be_empty
         end
       end
 
       context 'when histories exist' do
-        before do
-          articles.each { |article| histories << article }
+        before(:each) do
+          Timecop.travel(1.day.ago) do
+            articles.each { |article| histories << article }
+          end
+
+          histories << article
         end
 
-        let(:recent_article) { Article.new(100) }
+        let(:recent_article) do
+          histories.previous(article, Time.zone.now..23.hours.ago)
+        end
         let(:previous_article) do
-          histories.previous(article, Time.now..5.seconds.ago)
+          histories.previous(article, 23.hours.ago..25.hours.ago)
         end
 
-        it 'should return 1 historizable' do
-          sleep(6)
-          histories << recent_article
+        it 'should return recent historizable' do
+          expect(recent_article.size).to eq(1)
+          expect(recent_article.first.id).to eq(article.id)
+          expect(recent_article.first.title).to eq(article.title)
+        end
 
-          expect(previous_article.size).to eq(1)
-          expect(previous_article.first.id).to eq(recent_article.id)
-          expect(previous_article.first.title).to eq(recent_article.title)
+        it 'should return previous historizables' do
+          expect(previous_article.size).to eq(articles.size)
         end
       end
     end

data/spec/browsing_history/history_spec.rb

@@ -5,7 +5,7 @@ require 'fixtures/article'
 describe BrowsingHistory::History do
   let(:user)    { User.new }
   let(:article) { Article.new }
-  let(:articles) { Array.new(50) { |i| Article.new(i) } }
+  let(:articles) { Array.new(5) { |i| Article.new(i) } }
   let(:history) { described_class.new(browser: user, historizable: article) }
   let(:invalid_object) { Struct.new(:_).new }
 
@@ -208,9 +208,9 @@ describe BrowsingHistory::History do
     end
 
     context 'with limit option' do
-      before do
-        5.times do |i|
-          described_class.create(browser: user, historizable: Article.new(i))
+      before(:each) do
+        articles.each do |article|
+          described_class.create(browser: user, historizable: article)
         end
       end
 
@@ -234,24 +234,23 @@ describe BrowsingHistory::History do
       it { expect(historizables.size).to eq(3) }
 
       it { expect(historizables_excess_limit).to be_a(Array) }
-      it { expect(historizables_excess_limit.size).to eq(5) }
+      it { expect(historizables_excess_limit.size).to eq(articles.size) }
     end
 
     context 'with between option' do
-      before do
-        5.times.map.with_index(1) do |i|
-          described_class.create(browser: user, historizable: Article.new(i))
+      before(:each) do
+        Timecop.travel(1.day.ago) do
+          articles.each do |article|
+            described_class.create(browser: user, historizable: article)
+          end
         end
-
-        sleep(6)
-        described_class.create(browser: user, historizable: Article.new(100))
       end
 
       let(:historizables) do
         described_class.where(
           browser: user,
           historizable: article,
-          between: Time.now..5.seconds.ago
+          between: 23.hours.ago..25.hours.ago
         )
       end
 
@@ -259,12 +258,12 @@ describe BrowsingHistory::History do
         described_class.where(
           browser: user,
           historizable: article,
-          between: 1.day.ago..2.days.ago
+          between: Time.zone.now..23.hours.ago
         )
       end
 
       it { expect(historizables).to be_a(Array) }
-      it { expect(historizables.size).to eq(1) }
+      it { expect(historizables.size).to eq(articles.size) }
 
       it { expect(historizables_unhit).to be_a(Array) }
       it { expect(historizables_unhit.size).to eq(0) }

data/spec/browsing_history/storages/redis_spec.rb

@@ -3,11 +3,9 @@ require 'fixtures/user'
 require 'fixtures/article'
 
 describe BrowsingHistory::Storages::Redis do
-  articles_size = 5
-
-  let(:user)    { User.new }
+  let(:user) { User.new }
   let(:articles) do
-    articles_size.times.map.with_index(1) { |i| Article.new(i) }
+    Array.new(5) { |i| Article.new(i) }
   end
   let(:article) { articles.first }
 
@@ -17,6 +15,7 @@ describe BrowsingHistory::Storages::Redis do
       attach_storage :redis
     end.current_storage
   end
+  let(:redis) { storage.redis }
 
   describe 'method_defined?' do
     describe 'public_instance_methods' do
@@ -59,11 +58,11 @@ describe BrowsingHistory::Storages::Redis do
       end
     end
 
-    context "when add #{articles_size} object" do
+    context 'when add articles' do
       it 'should return articles' do
         expect do
           articles.each { |article| storage.add(user, article) }
-        end.to change { storage.fetch(user, article).size }.by(articles_size)
+        end.to change { storage.fetch(user, article).size }.by(articles.size)
       end
     end
   end
@@ -87,47 +86,73 @@ describe BrowsingHistory::Storages::Redis do
   end
 
   describe '#clear' do
-    before(:each) { articles.each { |article| storage.add(user, article) } }
+    context 'default' do
+      before(:each) { articles.each { |article| storage.add(user, article) } }
 
-    it 'should clear 1 historizable' do
-      expect { storage.clear(user, article, article) }
-        .to change { storage.fetch(user, article).size }.by(-1)
-    end
+      it 'should clear 1 historizable' do
+        expect { storage.clear(user, article, article) }
+          .to change { storage.fetch(user, article).size }.by(-1)
+      end
 
-    it 'should celar all historizables' do
-      expect { storage.clear(user, article, all: true) }
-        .to change { storage.fetch(user, article).size }.to(0)
+      it 'should celar all historizables' do
+        expect { storage.clear(user, article, all: true) }
+          .to change { storage.fetch(user, article).size }.to(0)
+      end
     end
 
-    context 'and add 1 historizable after 6 seconds' do
-      before do
-        sleep(6)
-        storage.add(user, Article.new(100))
+    context 'added some histoirizable 1 day ago and add one now' do
+      before(:each) do
+        Timecop.travel(1.day.ago) do
+          articles.each { |article| storage.add(user, article) }
+        end
+
+        storage.add(user, Article.new(101))
       end
 
-      it 'should celar 5 historizables' do
-        expect { storage.clear(user, article, expiration: 5.seconds.ago) }
-          .to change { storage.fetch(user, article).size }.to(1)
+      it 'should clear 1 historizable from now to 23 hours ago' do
+        expect { storage.clear(user, article, expiration: 23.hours.ago) }
+          .to change { storage.count(user, article) }
+          .from(articles.size + 1).to(1)
+      end
+
+      it 'should clear all historizables from now' do
+        expect { storage.clear(user, article, expiration: Time.zone.now) }
+          .to change { storage.count(user, article) }
+          .from(articles.size + 1).to(0)
       end
     end
   end
 
   describe '#count' do
-    before(:each) { articles.each { |article| storage.add(user, article) } }
+    context 'default' do
+      before { articles.each { |article| storage.add(user, article) } }
 
-    context "when exist #{articles_size} historizable" do
-      subject { storage.count(user, article) }
-      it { is_expected.to be(articles_size) }
+      context 'when exist historizables' do
+        subject { storage.count(user, article) }
+        it { is_expected.to be(articles.size) }
+      end
     end
 
-    context 'and add 1 historizable after 6 seconds' do
+    context 'and add some historizables 1 day ago and add one now' do
       before do
-        sleep(6)
+        Timecop.travel(1.day.ago) do
+          articles.each { |article| storage.add(user, article) }
+        end
+
         storage.add(user, Article.new(100))
       end
 
-      subject { storage.count(user, article, between: Time.now..5.seconds.ago) }
-      it { is_expected.to be(1) }
+      it do
+        expect(
+          storage.count(user, article, between: Time.zone.now..23.hours.ago)
+        ).to be(1)
+      end
+
+      it do
+        expect(
+          storage.count(user, article, between: Time.zone.now..25.hours.ago)
+        ).to be(articles.size + 1)
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require 'pry'
 require 'rails/all'
 require 'rspec/rails'
 require 'database_cleaner'
+require 'timecop'
 
 require 'browsing_history'
 
@@ -30,7 +31,6 @@ RSpec.configure do |config|
   end
 
   config.after(:each) do
-    DatabaseCleaner.clean
     redis.redis.quit
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsing_history
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - tkclimb