punchline 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cf29f420c42097206b7df8314facad3f2f777c6
-  data.tar.gz: 73c9c8d9036f745b3055551ab0de2e40204ae954
+  metadata.gz: 9aea1e279156757a3782956b9684c86b9945e43c
+  data.tar.gz: a7a3e6921c2bcd932514d7dac7f4177ec77c323b
 SHA512:
-  metadata.gz: aea0964fe5cf076e7c7cc645997877f1cb056437c18f2f3a332c5932f80c8106ce628197e8fe6bef2f70d417e7a21e162adeee2e1eccfd2149185d0ad077e4fa
-  data.tar.gz: 504d8ffd5b9c953d50e3e60629e5a0edab8da91a56629dd583c61965b67ffd8c4240122a0053ff81b029ec66ebd1b923abc470707bcdd5353d835b5535d24240
+  metadata.gz: b8eccc58cded5aee6dba4b48ec543d7f60cbe470e28112ce6cd6f4b13fc190d2728b680774e13a1c338d3bf592efa493a8e44703a167f656e9789aad363085a6
+  data.tar.gz: d6b6b59dbe054eb1fbd7f36dedb641792c707aa91a10b570e8343dcbaf03ea92e893f7db73412bc4e9428b00704b4aca16f1c65da64662f8cf5a6602933da9d8

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/catkins/punchline.svg)](https://travis-ci.org/catkins/punchline) [![Dependency Status](https://gemnasium.com/catkins/punchline.svg)](https://gemnasium.com/catkins/punchline) [![Coverage Status](https://img.shields.io/coveralls/catkins/punchline.svg)](https://coveralls.io/r/catkins/punchline) [![Code Climate](https://codeclimate.com/github/catkins/punchline/badges/gpa.svg)](https://codeclimate.com/github/catkins/punchline)
+[![Build Status](https://travis-ci.org/catkins/punchline.svg)](https://travis-ci.org/catkins/punchline) [![Dependency Status](https://gemnasium.com/catkins/punchline.svg)](https://gemnasium.com/catkins/punchline) [![Coverage Status](https://img.shields.io/coveralls/catkins/punchline.svg)](https://coveralls.io/r/catkins/punchline) [![Code Climate](https://codeclimate.com/github/catkins/punchline/badges/gpa.svg)](https://codeclimate.com/github/catkins/punchline) [![Gem Version](https://badge.fury.io/rb/punchline.svg)](http://badge.fury.io/rb/punchline)
 
 # Punchline
 
@@ -34,18 +34,22 @@ $ bundle
 require 'punchline'
 
 # optionally override Punchline with your own Redis client, otherwise defaults to Redis.new
-Punchline.config.redis = Redis.new host: "10.0.1.1", port: 6830
+Punchline.configure do |config|
+  config.redis = Redis.new host: "10.0.1.1", port: 6830
+end
 
 # create a queue
 queue = Punchline::MinQueue.new
 queue.length # => 0
 
 # add a key
-queue.enqueue priority: Time.now.to_i, value: 'hello!' # => true
+queue.enqueue 'hello!' # => true
+
 queue.length # => 1
 
 # shortly after... higher priority score is rejected
-queue.enqueue priority: Time.now.to_i, value: 'hello!' # => false
+queue.enqueue 'hello!' # => false
+
 queue.length # => 1
 
 # original key is retrieved
@@ -54,6 +58,19 @@ queue.dequeue # => { :priority => 1411405014, :value => "hello!" }
 # queue is now empty
 queue.length # => 0
 
+# optionally set your own priority value
+queue.enqueue 'hello!', priority: 155 # => true
+
+# fetch all without dequeuing
+queue.enqueue 'hello!'
+queue.enqueue 'adding values!'
+queue.all # [{:value=>"hello", :priority=>1411445996}, {:value=>"adding values!", :priority=>1411446073}]
+
+# clear out queue
+queue.clear!
+queue.all # => []
+queue.length # => 0
+
 ```
 
 ## TODO

data/lib/punchline.rb

@@ -4,6 +4,10 @@ require 'punchline/min_queue'
 
 module Punchline
   class << self
+    def configure(&block)
+      yield config if block_given?
+    end
+
     def config
       @config ||= Configuration.new
     end

data/lib/punchline/min_queue.rb

@@ -24,9 +24,8 @@ module Punchline
       end
     end
 
-    def enqueue(options = {})
-      priority = options.fetch :priority
-      value    = options.fetch :value
+    def enqueue(value, options = {})
+      priority = options[:priority] || Time.now.to_i
       @enqueue.call([key], [priority, value]) == 1
     end
 

data/lib/punchline/version.rb

@@ -1,5 +1,5 @@
 # Encoding: utf-8
 
 module Punchline
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/punchline.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.1.0'
+  spec.add_development_dependency 'timecop', '~> 0.7.1'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'coveralls'
 end

data/spec/mindy/min_queue_spec.rb

@@ -9,7 +9,10 @@ module Punchline
     end
 
     before(:all) { clear_queue! }
-    after(:each) { clear_queue! }
+    after(:each) do
+      subject.reset_scripts!
+      clear_queue!
+    end
 
     let(:some_key) { TEST_KEY }
     subject(:min_queue) { MinQueue.new some_key }
@@ -42,7 +45,7 @@ module Punchline
     describe '#length' do
       it { should respond_to :length }
 
-      let(:mock_redis) { double 'redis', zcard: 5, del: true }
+      let(:mock_redis) { double 'redis', zcard: 5, del: true, script: true }
 
       it 'is initially zero' do
         expect(subject.length).to eq 0
@@ -74,7 +77,7 @@ module Punchline
       end
 
       it 'returns elements as hashes' do
-        subject.enqueue priority: 123, value: 'hello'
+        subject.enqueue 'hello', priority: 123
 
         hash = subject.all.first
         expect(hash).not_to be_nil
@@ -84,15 +87,11 @@ module Punchline
     end
 
     describe '#enqueue' do
-      after(:each) do
-        subject.reset_scripts!
-      end
-
       it { should respond_to :enqueue }
 
       it 'increases the length by 1' do
         expect {
-          subject.enqueue priority: 123, value: 'hello'
+          subject.enqueue 'hello'
         }.to change {
           subject.length
         }.by 1
@@ -104,50 +103,63 @@ module Punchline
       end
 
       it 'returns false when key is not written' do
-        result = subject.enqueue priority: 123, value: 'hello'
-        result = subject.enqueue priority: 456, value: 'hello'
+        result = subject.enqueue 'hello', priority: 123
+        result = subject.enqueue 'hello', priority: 456
         expect(result).to eq false
       end
 
       describe 'duplicates' do
         it 'ignores duplicate values' do
-          subject.enqueue priority: 123, value: 'hello'
+          subject.enqueue 'hello', priority: 123
 
           expect {
-            subject.enqueue priority: 567, value: 'hello'
+            subject.enqueue 'hello', priority: 567
           }.to change {
             subject.length
           }.by(0)
         end
 
         it 'retains only the lowest priority score' do
-          subject.enqueue priority: 123, value: 'hello'
-          subject.enqueue priority: 567, value: 'hello'
-          subject.enqueue priority: 789, value: 'hello'
+          subject.enqueue 'hello', priority: 123
+          subject.enqueue 'hello', priority: 567
+          subject.enqueue 'hello', priority: 25
 
           pair = subject.dequeue
-          expect(pair[:priority]).to eq 123
+          expect(pair[:priority]).to eq 25
         end
       end
-    end
 
-    describe '#dequeue' do
-      after(:each) do
-        subject.reset_scripts!
-        subject.clear!
+      describe 'sequential inserts' do
+        before(:each) { Timecop.freeze }
+
+        it 'keeps the oldest value for a given key' do
+          original_time = Time.now.to_i
+          subject.enqueue 'hello'
+
+          Timecop.travel Time.now + 1000
+          subject.enqueue 'hello'
+
+          Timecop.travel Time.now + 1000
+          subject.enqueue 'hello'
+
+          result = subject.dequeue
+          expect(result[:priority]).to eq original_time
+        end
       end
+    end
 
+    describe '#dequeue' do
       it { should respond_to :dequeue }
 
       it 'decreases the length by 1' do
-        subject.enqueue priority: 123, value: 'hello'
+        subject.enqueue 'hello', priority: 123
 
         expect{ subject.dequeue }.to change { subject.length }.by -1
       end
 
       it 'returns the pair with the lowest score' do
-        subject.enqueue priority: 123, value: 'hello'
-        subject.enqueue priority: 567, value: 'world'
+        subject.enqueue 'hello', priority: 123
+        subject.enqueue 'world', priority: 567
         expect(subject.dequeue).to eq({ value: 'hello', priority: 123 })
       end
     end
@@ -161,7 +173,7 @@ module Punchline
       end
 
       it 'resets the length' do
-        subject.enqueue priority: 123, value: 'hello'
+        subject.enqueue 'hello', priority: 123
         expect { subject.clear! }.to change { subject.length }.by -1
       end
     end

data/spec/spec_helper.rb

@@ -3,3 +3,13 @@ Coveralls.wear!
 
 require 'pry'
 require 'punchline'
+require 'timecop'
+
+RSpec.configure do |config|
+  config.after(:each) do
+
+    # always unfreeze timecop after specs
+    Timecop.return
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: punchline
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Chris Atkins
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement