collectr 0.0.7 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 500e76055e3f231839011dd446328953c11982a5
-  data.tar.gz: 03c0c4f0d1a7fae7589db60babb079dac94e2e19
+  metadata.gz: cd10b772686cd8a80b70a85a0d5c523c9fdcb4b6
+  data.tar.gz: da8f0bdf753af2d4abd1afc207a22b19e3bd9f79
 SHA512:
-  metadata.gz: a67daafbd63e7034553e4a836be561ccfb22fd7ec180b36af9b9bf9af83bdc1f3b9a26f5e56b0ea10bc8833331adc0c0b1fe81b944f464d0469d17019a55801b
-  data.tar.gz: b1bffa70a650b4d5f22668d6d7d442870e92b256bacb490b6e1929739b47827e4d9ac41797c125a1ab425293d9a45794237f92ae876c31f33453e4c499951cba
+  metadata.gz: 4c21545dce0ae951df5e1e83df1d7f99d1b5e172f2e02223145efe1d398cfda6234555f387df1356535b1a0b4347bf5334aca7b5f071d21b8c7f5d31ca6e3e14
+  data.tar.gz: 5de5acf3777e51f00de689fa38ad2e896519a23e1f3ad75ed81bd8401b3faae81ca37f839bd1f288f162158c74b83d49e851ddfb47e50399c0b478577323827a

data/.travis.yml

@@ -7,6 +7,9 @@ rvm:
   - 2.1.5
   - 2.2.0
 
+services:
+  - redis-server
+
 script: 'bundle exec rake'
 
 notifications:

data/README.md

@@ -1,11 +1,9 @@
-[![Build Status](https://api.travis-ci.org/brianmd/collectr.png?branch=master)](https://travis-ci.org/brianmd/collectr)  [![Gem Version](https://badge.fury.io/rb/collectr.png)](http://badge.fury.io/rb/collectr)  [![Coverage Status](https://coveralls.io/repos/brianmd/collectr/badge.png?branch=master&service=github)](https://coveralls.io/github/brianmd/collectr?branch=master)
+[![Build Status](https://api.travis-ci.org/brianmd/collectr.png?branch=master)](https://travis-ci.org/brianmd/collectr)  [![Gem Version](https://badge.fury.io/rb/collectr.png)](http://badge.fury.io/rb/collectr)  [![Coverage Status](https://coveralls.io/repos/brianmd/collectr/badge.svg?branch=master&service=github)](https://coveralls.io/github/brianmd/collectr?branch=master)
 
 # Collectr
 
 Abstraction for thread-safe collections (array, hash, set, bag).
 
-Once it is fleshed out, will include complete abstractions for redis and memory.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -16,7 +14,7 @@ gem 'collectr'
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 
@@ -24,7 +22,48 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+```ruby
+require 'collectr/redis/redis_hash'
+x = Collectr::RedisHash.new('example')
+x[3] = 7
+x[3]
+  => 7
+x.fetch(3) { 88 }
+  => 7
+x.fetch(:not_found) { 88 }
+  => 88
+```
+
+```ruby
+require 'collectr/redis/redis_hash_expiry'
+x = Collectr::RedisHashExpiry.new('example', expires_in: 60)
+x['purple'] = :blue
+x['purple']
+  => "blue"
+sleep 61
+x['purple']
+  => nil
+x.write('nine', 9, expires_in: 2)
+x['nine']
+```
+
+```ruby
+require 'collectr/memory/memory_hash'
+x = Collectr::MemoryHash.new('example')
+x[:a] = 'abc'
+x[:a]
+  => "abc"
+```
+
+```ruby
+require 'collectr/redis/redis_array'
+array = Collectr::RedisArray.new('arr', max_size: 3)
+array.clear
+array << 'a'
+array << 'b'
+array.to_a
+  => ["a", "b"]
+```
 
 ## Contributing
 

data/lib/collectr/memory/memory_hash.rb

@@ -51,6 +51,10 @@ module Collectr
       @store.keys
     end
 
+    def values
+      @store.values
+    end
+
     def to_hash
       @store  #.copy
     end

data/lib/collectr/null/null_hash.rb

@@ -38,6 +38,10 @@ module Collectr
       []
     end
 
+    def values
+      Set.new
+    end
+
     def to_hash
       {}
     end

data/lib/collectr/redis/redis_array.rb

@@ -1,4 +1,3 @@
-require 'redis'
 require 'json'
 
 require_relative 'redis_base'

data/lib/collectr/redis/redis_base.rb

@@ -1,3 +1,5 @@
+require 'redis'
+
 module Collectr
   class RedisBase
     def serialize(val)

data/lib/collectr/redis/redis_hash.rb

@@ -1,25 +1,7 @@
-require 'redis'
 require 'json'
 
 require_relative 'redis_base'
 
-# __FILE__.has_spec 'common/spec/classes/collection/hash_spec'
-
-
-# class Redis
-#   def fetch(key, options={})
-#     val = self[key]
-#     if val.nil?
-#       begin
-#         val = yield key
-#         self[key] = val
-#       end
-#     end
-#     val
-#   end
-# end
-
-
 module Collectr
   class RedisHash < RedisBase
     attr_reader :store
@@ -91,6 +73,10 @@ module Collectr
       @store.hkeys(@title).collect{ |key| deserialize key }
     end
 
+    def values
+      keys.collect{ |key| self[key] }
+    end
+
     def to_hash
       hash = {}
       @store.hgetall(@title).each do |key, val|

data/lib/collectr/redis/redis_hash_expiry.rb

@@ -1,4 +1,3 @@
-require 'redis'
 require 'json'
 
 require_relative 'redis_base'
@@ -46,7 +45,6 @@ module Collectr
     end
 
     def fetch(key, options={})
-      expiration = options.fetch(:expires_in) { @default_expires_in }
       result = self[key]
       if result.nil?
         return nil if has_key?(key)
@@ -94,6 +92,10 @@ module Collectr
       @store.keys(key_prefix).collect{ |key| dekey key }
     end
 
+    def values
+      keys.collect{ |key| self[key] }
+    end
+
     def to_hash
       hash = {}
       keys.each do |key|

data/lib/collectr/version.rb

@@ -1,3 +1,3 @@
 module Collectr
-  VERSION = "0.0.7"
+  VERSION = "1.0.0"
 end

data/spec/hash_spec_helper.rb

@@ -1,6 +1,10 @@
 require 'json'
 require 'spec_helper'
 
+if redis_exists?
+  warn Redis.current.flushall
+end
+
 shared_examples 'a hash' do
   context 'when keys and/or values may be other than strings' do
     subject(:collection) { described_class.new 'example' }
@@ -25,6 +29,7 @@ shared_examples 'a hash' do
 
       its(:size) { should eq(3) }
       it { expect(collection.keys.to_set).to eq([1, 'b2', [1,2]].to_set) }
+      it { expect(collection.values.to_set).to eq(["aa1", nil, 3].to_set) }
       its(:to_hash) { should eq({1=>'aa1', 'b2'=>nil, [1,2]=>3}) }
       it { expect(collection.fetch(1)).to eq('aa1') }
       it { expect(collection.fetch('b2')).to eq(nil) }
@@ -55,21 +60,5 @@ shared_examples 'a hash' do
     # it 'string key is distinct from symbol key' do expect(collection.fetch('x')).to eq(7) end
     it 'new value is retained' do collection['x'] = 9 ; expect(collection.fetch('x')).to eq(9) end
   end
-
-  # context 'when expires' do
-  #   it 'expires on time'
-  # end
 end
 
-if redis_exists? and false
-  describe Collectr::RedisHash do
-    it_behaves_like 'a hash'
-  end
-
-  describe Collectr::RedisHashExpiry do
-    it_behaves_like 'a hash'
-  end
-end
-
-# warn Redis.current.flushall
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: collectr
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Brian Murphy-Dye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis