restruct 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 220d7c61ca9fe2daff93071982a18b7934967c71
-  data.tar.gz: bc038fb7d2126b6d30d770ab1d28687b031111a0
+  metadata.gz: b08da180cd16bfdb19e965f58ed2f6bdc0590558
+  data.tar.gz: 5eb60adcfa2585711ae48a8b26718d062c0fad8d
 SHA512:
-  metadata.gz: 3357b7800bb6da26bdb54675d097300cd9f33b652f63ad7c5e9d1a0a71f4038459f20e8bade86f12d2b6562f57e08af5ed74400139307cbaea20d35fa5b2273f
-  data.tar.gz: 5740e1bc9699cef63a9c5632c2c6198a48164b99aaf78e3b60bef61983352b5fcc6d48ce3a8b8524af50b673a905caa65c1655e97c3bc4500ee9e0e21fc5b4f5
+  metadata.gz: 15795162d1328da9f16764494398379e87004db5e9491672d60ebe94d99d17ba5ac8f7eaf83648f3a62b31aa34caa2c70350abbb730790131bb1ff54e1832b0e
+  data.tar.gz: 1bf098b79cdc7b020abf55849fe5a9fe399e0c6a43c9e0bc9efd65523df97ecf3d923610e756925632e8cf6a416588faf1d816669fbce95f8977592bcf7256a1

data/.travis.yml

@@ -4,6 +4,9 @@ rvm:
   - 2.0
   - 2.1
   - 2.2
+  - 2.3.0
   - jruby
+before_install:
+  - gem install bundler
 services:
-  - redis-server
+  - redis-server

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in restruct.gemspec
 gemspec
-
-gem 'coveralls', require: false

data/README.md

@@ -1,10 +1,10 @@
 # Restruct
 
-[![Gem Version](https://badge.fury.io/rb/restruct.png)](https://rubygems.org/gems/restruct)
-[![Build Status](https://travis-ci.org/gabynaiman/restruct.png?branch=master)](https://travis-ci.org/gabynaiman/restruct)
-[![Coverage Status](https://coveralls.io/repos/gabynaiman/restruct/badge.png?branch=master)](https://coveralls.io/r/gabynaiman/restruct?branch=master)
-[![Code Climate](https://codeclimate.com/github/gabynaiman/restruct.png)](https://codeclimate.com/github/gabynaiman/restruct)
-[![Dependency Status](https://gemnasium.com/gabynaiman/restruct.png)](https://gemnasium.com/gabynaiman/restruct)
+[![Gem Version](https://badge.fury.io/rb/restruct.svg)](https://rubygems.org/gems/restruct)
+[![Build Status](https://travis-ci.org/gabynaiman/restruct.svg?branch=master)](https://travis-ci.org/gabynaiman/restruct)
+[![Coverage Status](https://coveralls.io/repos/gabynaiman/restruct/badge.svg?branch=master)](https://coveralls.io/r/gabynaiman/restruct?branch=master)
+[![Code Climate](https://codeclimate.com/github/gabynaiman/restruct.svg)](https://codeclimate.com/github/gabynaiman/restruct)
+[![Dependency Status](https://gemnasium.com/gabynaiman/restruct.svg)](https://gemnasium.com/gabynaiman/restruct)
 
 Redis structures
 
@@ -12,6 +12,9 @@ Redis structures
 - Set
 - Hash
 - NestedHash
+- Queue
+- Locker
+- Channel
 
 ## Installation
 

data/Rakefile

@@ -5,6 +5,12 @@ Rake::TestTask.new(:spec) do |t|
   t.libs << 'spec'
   t.pattern = 'spec/**/*_spec.rb'
   t.verbose = false
+  t.warning = false
+  t.loader = nil if ENV['TEST']
+  ENV['TEST'], ENV['LINE'] = ENV['TEST'].split(':') if ENV['TEST'] && !ENV['LINE']
+  t.options = ''
+  t.options << "--name=/#{ENV['NAME']}/ " if ENV['NAME']
+  t.options << "-l #{ENV['LINE']} " if ENV['LINE'] && ENV['TEST']
 end
 
 task :console do

data/lib/restruct.rb

@@ -11,12 +11,14 @@ require_relative 'restruct/array'
 require_relative 'restruct/set'
 require_relative 'restruct/hash'
 require_relative 'restruct/queue'
+require_relative 'restruct/channel'
 require_relative 'restruct/nested_hash'
 require_relative 'restruct/marshalizable'
 require_relative 'restruct/marshal_array'
 require_relative 'restruct/marshal_set'
 require_relative 'restruct/marshal_hash'
 require_relative 'restruct/marshal_queue'
+require_relative 'restruct/marshal_channel'
 require_relative 'restruct/locker'
 require_relative 'restruct/connection'
 

data/lib/restruct/channel.rb

@@ -0,0 +1,31 @@
+module Restruct
+  class Channel < Structure
+
+    def publish(message)
+      connection.call 'PUBLISH', id, serialize(message)
+    end
+
+    def subscribe
+      subscriber = connection.clone
+      subscriber.call 'SUBSCRIBE', id
+      loop do
+        yield deserialize(subscriber.read.last)
+      end
+    rescue => ex
+      raise ex
+    ensure
+      subscriber.call 'UNSUBSCRIBE', id
+    end
+
+    private
+
+    def serialize(string)
+      string
+    end
+
+    def deserialize(string)
+      string
+    end
+
+  end
+end

data/lib/restruct/connection.rb

@@ -2,6 +2,7 @@ module Restruct
   class Connection
 
     def initialize(*args)
+      @args = args
       @redis = Redic.new *args
       @scripts = {}
       @nesting = ::Hash.new { |h,k| h[k] = 0 }
@@ -44,6 +45,14 @@ module Restruct
       raise ex
     end
 
+    def read
+      redis.client.read
+    end
+
+    def clone
+      Connection.new *@args
+    end
+
     private 
 
     attr_reader :redis, :scripts

data/lib/restruct/id.rb

@@ -3,6 +3,10 @@ module Restruct
     
     attr_reader :separator
 
+    def self.[](id)
+      new id
+    end
+
     def initialize(id, separator=nil)
       @separator = separator || Restruct.id_separator
       super id.to_s

data/lib/restruct/marshal_channel.rb

@@ -0,0 +1,5 @@
+module Restruct
+  class MarshalChannel < Channel
+    include Marshalizable
+  end
+end

data/lib/restruct/version.rb

@@ -1,3 +1,3 @@
 module Restruct
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/restruct.gemspec

@@ -21,11 +21,19 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'redic',        '~> 1.5.0'
   spec.add_dependency 'class_config', '~> 0.0.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'minitest', '~> 4.7'
+  spec.add_development_dependency 'bundler', '~> 1.12'
+  spec.add_development_dependency 'rake', '~> 11.0'
+  spec.add_development_dependency 'minitest', '~> 5.0'
   spec.add_development_dependency "minitest-great_expectations"
-  spec.add_development_dependency 'turn',     '~> 0.9'
-  spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'pry-nav'
+  spec.add_development_dependency 'minitest-colorin', '~> 0.1'
+  spec.add_development_dependency 'minitest-line', '~> 0.6'
+  spec.add_development_dependency 'simplecov', '~> 0.12'
+  spec.add_development_dependency 'coveralls', '~> 0.8'
+  spec.add_development_dependency 'pry-nav', '~> 0.2'
+
+  if RUBY_VERSION < '2'
+    spec.add_development_dependency 'term-ansicolor', '~> 1.3.0'
+    spec.add_development_dependency 'tins', '~> 1.6.0'
+    spec.add_development_dependency 'json', '~> 1.8'
+  end
 end

data/spec/channel_spec.rb

@@ -0,0 +1,33 @@
+require 'minitest_helper'
+
+[Restruct::Channel, Restruct::MarshalChannel].each do |klass|
+
+  describe klass do
+
+    let(:channel) { klass.new }
+
+    it 'Subscribe and publish' do
+      messages = []
+
+      Thread.new do
+        channel.subscribe do |message|
+          messages << message
+        end
+      end
+      sleep 0.01 # Wait for establish connection
+
+      3.times do |i|
+        channel.publish "Message #{i}"
+      end
+
+      Timeout.timeout(3) do
+        while messages.count < 3; 
+          sleep 0.0001 # Wait for subscriptions
+        end
+      end
+
+      messages.must_equal 3.times.map { |i| "Message #{i}" }
+    end
+
+  end
+end

data/spec/connection_spec.rb

@@ -3,6 +3,7 @@ require 'minitest_helper'
 describe Restruct::Connection do
 
   describe 'Success' do
+    
     it 'call' do
       connection.call('HSET', 'test_id', 'key', 'test_key')
       connection.call('HGET', 'test_id', 'key').must_equal 'test_key'

data/spec/coverage_helper.rb

@@ -1,8 +1,5 @@
 require 'simplecov'
 require 'coveralls'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new [SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter]
 SimpleCov.start

data/spec/hash_spec.rb

@@ -4,11 +4,11 @@ require 'minitest_helper'
 
   describe klass do
 
-    let(:hash) { klass.new }
+    let(:sample_hash) { klass.new }
 
     def fill(data)
-      data.each { |k,v| data[k] = hash.send(:serialize, v) }
-      connection.call 'HMSET', hash.id, *data.flatten
+      data.each { |k,v| data[k] = sample_hash.send(:serialize, v) }
+      connection.call 'HMSET', sample_hash.id, *data.flatten
     end
 
     describe 'Getters' do
@@ -16,44 +16,44 @@ require 'minitest_helper'
       it '[]' do
         fill a: 'x', b: 'y'
 
-        hash[:a].must_equal 'x'
-        hash[:b].must_equal 'y'
-        hash[:c].must_be_nil
+        sample_hash[:a].must_equal 'x'
+        sample_hash[:b].must_equal 'y'
+        sample_hash[:c].must_be_nil
       end
 
       it 'fetch' do
         fill a: 'x', b: 'y'
 
-        hash.fetch(:a).must_equal 'x'
-        hash.fetch(:b).must_equal 'y'
-        hash.fetch(:c, 'z').must_equal 'z'
-        hash.fetch(:c) { |k| k.to_s }.must_equal 'c'
+        sample_hash.fetch(:a).must_equal 'x'
+        sample_hash.fetch(:b).must_equal 'y'
+        sample_hash.fetch(:c, 'z').must_equal 'z'
+        sample_hash.fetch(:c) { |k| k.to_s }.must_equal 'c'
         
-        error = proc { hash.fetch(:c) }.must_raise KeyError
+        error = proc { sample_hash.fetch(:c) }.must_raise KeyError
         error.message.must_equal 'key not found: c'
       end
 
       it 'key' do
         fill a: 'x', b: 'y', c: 'y'
 
-        hash.key('x').must_equal 'a'
-        hash.key('y').must_equal 'b'
-        hash.key('z').must_be_nil
+        sample_hash.key('x').must_equal 'a'
+        sample_hash.key('y').must_equal 'b'
+        sample_hash.key('z').must_be_nil
       end
 
       it 'keys' do
         fill a: 'x', b: 'y', c: 'z'
-        hash.keys.must_equal %w(a b c)
+        sample_hash.keys.must_equal %w(a b c)
       end
 
       it 'values' do
         fill a: 'x', b: 'y', c: 'z'
-        hash.values.must_equal %w(x y z)
+        sample_hash.values.must_equal %w(x y z)
       end
 
       it 'values_at' do
         fill a: 'x', b: 'y', c: 'z'
-        hash.values_at(:a, :f, :b, :g, :c).must_equal ['x', nil, 'y', nil, 'z']
+        sample_hash.values_at(:a, :f, :b, :g, :c).must_equal ['x', nil, 'y', nil, 'z']
       end
 
     end
@@ -64,11 +64,11 @@ require 'minitest_helper'
         it method do
           fill a: 'x', b: 'y'
 
-          hash.send(method, :a, 'a').must_equal 'a'
-          hash.to_h.must_equal 'a' => 'a', 'b' => 'y'
+          sample_hash.send(method, :a, 'a').must_equal 'a'
+          sample_hash.to_h.must_equal 'a' => 'a', 'b' => 'y'
 
-          hash.send(method, :c, 'z').must_equal 'z'
-          hash.to_h.must_equal 'a' => 'a', 'b' => 'y', 'c' => 'z'
+          sample_hash.send(method, :c, 'z').must_equal 'z'
+          sample_hash.to_h.must_equal 'a' => 'a', 'b' => 'y', 'c' => 'z'
         end
       end
 
@@ -76,42 +76,42 @@ require 'minitest_helper'
         it method do
           fill a: 'x', b: 'y'
 
-          hash.send(method, a: 'a', c: 'z').must_equal hash
-          hash.to_h.must_equal 'a' => 'a', 'b' => 'y', 'c' => 'z'
+          sample_hash.send(method, a: 'a', c: 'z').must_equal sample_hash
+          sample_hash.to_h.must_equal 'a' => 'a', 'b' => 'y', 'c' => 'z'
         end
       end
       
       it 'delete' do
         fill a: 'x', b: 'y'
 
-        hash.delete(:b).must_equal 'y'
-        hash.to_h.must_equal 'a' => 'x'
+        sample_hash.delete(:b).must_equal 'y'
+        sample_hash.to_h.must_equal 'a' => 'x'
         
-        hash.delete(:c).must_be_nil
-        hash.to_h.must_equal 'a' => 'x'
+        sample_hash.delete(:c).must_be_nil
+        sample_hash.to_h.must_equal 'a' => 'x'
       end
       
       it 'delete_if' do
         fill a: 'x', b: 'y'
 
-        hash.delete_if { |k,v| v == 'x' }.must_equal hash
-        hash.to_h.must_equal 'b' => 'y'
+        sample_hash.delete_if { |k,v| v == 'x' }.must_equal sample_hash
+        sample_hash.to_h.must_equal 'b' => 'y'
       end
 
       %w(keep_if select!).each do |method|
         it method do
           fill a: 'x', b: 'y'
 
-          hash.send(method) { |k,v| v == 'x' }.must_equal hash
-          hash.to_h.must_equal 'a' => 'x'
+          sample_hash.send(method) { |k,v| v == 'x' }.must_equal sample_hash
+          sample_hash.to_h.must_equal 'a' => 'x'
         end
       end
       
       it 'clear' do
         fill a: 'x', b: 'y'
 
-        hash.clear.must_equal hash
-        hash.must_be_empty
+        sample_hash.clear.must_equal sample_hash
+        sample_hash.must_be_empty
       end
 
     end
@@ -121,22 +121,22 @@ require 'minitest_helper'
       %w(size count length).each do |method|
         it method do
           fill a: 'x', b: 'y'
-          hash.send(method).must_equal 2
+          sample_hash.send(method).must_equal 2
         end
       end
       
       it 'empty?' do
-        hash.must_be :empty?
+        sample_hash.must_be :empty?
         fill a: 'x', b: 'y'
-        hash.wont_be :empty?
+        sample_hash.wont_be :empty?
       end
 
       %w(key? has_key?).each do |method|
         it method do
           fill a: 'x', b: 'y'
 
-          assert hash.send(method, :a)
-          refute hash.send(method, :c)
+          assert sample_hash.send(method, :a)
+          refute sample_hash.send(method, :c)
         end
       end
       
@@ -144,8 +144,8 @@ require 'minitest_helper'
         it method do
           fill a: 'x', b: 'y'
 
-          assert hash.send(method, 'x')
-          refute hash.send(method, 'z')
+          assert sample_hash.send(method, 'x')
+          refute sample_hash.send(method, 'z')
         end
       end
 
@@ -156,23 +156,23 @@ require 'minitest_helper'
       %w(to_h to_primitive).each do |method|
         it method do
           fill a: 'x', b: 'y'
-          hash.send(method).must_equal 'a' => 'x', 'b' => 'y'
+          sample_hash.send(method).must_equal 'a' => 'x', 'b' => 'y'
         end
       end
 
       it 'merge' do
         fill a: 'x', b: 'y'
-        hash.merge('c' => 'z', 'a' => 'a').must_equal 'a' => 'a', 'b' => 'y', 'c' => 'z'
+        sample_hash.merge('c' => 'z', 'a' => 'a').must_equal 'a' => 'a', 'b' => 'y', 'c' => 'z'
       end
       
       it 'flatten' do
         fill a: 'x', b: 'y'
-        hash.flatten.must_equal %w(a x b y)
+        sample_hash.flatten.must_equal %w(a x b y)
       end
 
       it 'invert' do
         fill a: 'x', b: 'y'
-        hash.invert.must_equal 'x' => 'a', 'y' => 'b'
+        sample_hash.invert.must_equal 'x' => 'a', 'y' => 'b'
       end
 
     end
@@ -189,13 +189,13 @@ require 'minitest_helper'
 
           keys = []
           values = []
-          hash.send(method) do |k,v|
+          sample_hash.send(method) do |k,v|
             keys << k
             values << v
           end
 
-          keys.must_equal hash.keys
-          values.must_equal hash.values
+          keys.must_equal sample_hash.keys
+          values.must_equal sample_hash.values
         end
       end
       
@@ -203,52 +203,52 @@ require 'minitest_helper'
         fill a: 'x', b: 'y'
 
         keys = []
-        hash.each_key { |k| keys << k }
+        sample_hash.each_key { |k| keys << k }
 
-        keys.must_equal hash.keys
+        keys.must_equal sample_hash.keys
       end
       
       it 'each_value' do
         fill a: 'x', b: 'y'
 
         values = []
-        hash.each_value { |v| values << v }
+        sample_hash.each_value { |v| values << v }
 
-        values.must_equal hash.values
+        values.must_equal sample_hash.values
       end
 
     end
 
     it 'Equality' do
-      copy = klass.new id: hash.id
-      assert hash == copy
-      assert hash.eql? copy
-      refute hash.equal? copy
+      copy = klass.new id: sample_hash.id
+      assert sample_hash == copy
+      assert sample_hash.eql? copy
+      refute sample_hash.equal? copy
     end
 
     it 'Dump/Restore' do
       fill a: 'x', b: 'y'
       
-      dump = hash.dump
+      dump = sample_hash.dump
       other = klass.new
       other.restore dump
 
-      other.id.wont_equal hash.id
-      other.to_primitive.must_equal hash.to_primitive
+      other.id.wont_equal sample_hash.id
+      other.to_primitive.must_equal sample_hash.to_primitive
     end
 
     it 'Batch' do
       fill a: 'x', b: 'y', c: 'z'
 
-      hash.connection.batch do
-        hash[:d] = 'w'
-        hash.delete :a
-        hash.merge! b: 'x', e: 'v'
+      sample_hash.connection.batch do
+        sample_hash[:d] = 'w'
+        sample_hash.delete :a
+        sample_hash.merge! b: 'x', e: 'v'
         
-        hash.to_h.must_equal 'a' => 'x', 'b' => 'y', 'c' => 'z'    
+        sample_hash.to_h.must_equal 'a' => 'x', 'b' => 'y', 'c' => 'z'    
       end
 
-      hash.to_h.must_equal 'b' => 'x', 'c' => 'z', 'd' => 'w', 'e' => 'v'
+      sample_hash.to_h.must_equal 'b' => 'x', 'c' => 'z', 'd' => 'w', 'e' => 'v'
     end
 
   end

data/spec/id_spec.rb

@@ -21,8 +21,7 @@ describe Restruct::Id do
   end
 
   it 'Be chainable' do
-    id = Id.new 'foo'
-    id['bar']['baz'].must_equal 'foo:bar:baz'
+    Id['foo']['bar']['baz'].must_equal 'foo:bar:baz'
   end
 
   it 'Accept symbols' do

data/spec/minitest_helper.rb

@@ -1,17 +1,12 @@
 require 'coverage_helper'
 require 'restruct'
 require 'minitest/autorun'
+require 'minitest/colorin'
 require 'minitest/great_expectations'
-require 'turn'
 require 'pry-nav'
 
-Turn.config do |c|
-  c.format = :pretty
-  c.natural = true
-  c.ansi = true
-end
-
 class Minitest::Spec
+  
   def connection
     Restruct.connection
   end
@@ -19,4 +14,5 @@ class Minitest::Spec
   after do
     connection.call('KEYS', Restruct::Id.new(:restruct)['*']).each { |k| connection.call 'DEL', k }
   end
+
 end

data/spec/nested_hash_spec.rb

@@ -17,42 +17,42 @@ CounterHash = Restruct::NestedHash.new(Counter)
 
 describe Restruct::NestedHash do
   
-  let(:hash) { CounterHash.new }
+  let(:counter_hash) { CounterHash.new }
 
   describe 'Getters' do
     
     it '[]' do
-      hash[:a].current.must_equal 0
+      counter_hash[:a].current.must_equal 0
     end
 
     it 'fetch' do
-      hash[:a].incr
+      counter_hash[:a].incr
 
-      hash.fetch(:a).current.must_equal 1
+      counter_hash.fetch(:a).current.must_equal 1
 
-      error = proc { hash.fetch(:c) }.must_raise KeyError
+      error = proc { counter_hash.fetch(:c) }.must_raise KeyError
       error.message.must_equal 'key not found: c'
     end
     
     it 'keys' do
-      hash[:a].incr
-      hash[:b].incr
+      counter_hash[:a].incr
+      counter_hash[:b].incr
       
-      hash.keys.must_equal %w(a b)
+      counter_hash.keys.must_equal %w(a b)
     end
 
     it 'values' do
-      hash[:a].incr.incr
-      hash[:b].incr
+      counter_hash[:a].incr.incr
+      counter_hash[:b].incr
 
-      hash.values.map(&:current).must_equal [2, 1]
+      counter_hash.values.map(&:current).must_equal [2, 1]
     end
 
     it 'values_at' do
-      hash[:a].incr.incr
-      hash[:b].incr
+      counter_hash[:a].incr.incr
+      counter_hash[:b].incr
 
-      hash.values_at(:a, :f, :b, :g).map(&:current).must_equal [2, 0, 1, 0]
+      counter_hash.values_at(:a, :f, :b, :g).map(&:current).must_equal [2, 0, 1, 0]
     end
 
   end
@@ -60,38 +60,38 @@ describe Restruct::NestedHash do
   describe 'Setters' do
     
     it 'delete' do
-      hash[:a].incr.incr
-      hash[:b].incr
+      counter_hash[:a].incr.incr
+      counter_hash[:b].incr
 
-      hash.delete(:a)
+      counter_hash.delete(:a)
 
-      hash.keys.must_equal %w(b)
+      counter_hash.keys.must_equal %w(b)
     end
     
     it 'delete_if' do
-      hash[:a].incr.incr
-      hash[:b].incr
+      counter_hash[:a].incr.incr
+      counter_hash[:b].incr
 
-      hash.delete_if { |k,v| v.current > 1 }.must_equal hash
-      hash.keys.must_equal %w(b)
+      counter_hash.delete_if { |k,v| v.current > 1 }.must_equal counter_hash
+      counter_hash.keys.must_equal %w(b)
     end
 
     %w(keep_if select!).each do |method|
       it method do
-        hash[:a].incr.incr
-        hash[:b].incr
+        counter_hash[:a].incr.incr
+        counter_hash[:b].incr
 
-        hash.send(method) { |k,v| v.current > 1 }.must_equal hash
-        hash.keys.must_equal %w(a)
+        counter_hash.send(method) { |k,v| v.current > 1 }.must_equal counter_hash
+        counter_hash.keys.must_equal %w(a)
       end
     end
     
     it 'clear' do
-      hash[:a].incr.incr
-      hash[:b].incr
+      counter_hash[:a].incr.incr
+      counter_hash[:b].incr
 
-      hash.clear.must_equal hash
-      hash.must_be_empty
+      counter_hash.clear.must_equal counter_hash
+      counter_hash.must_be_empty
     end
 
   end
@@ -100,26 +100,26 @@ describe Restruct::NestedHash do
 
     %w(size count length).each do |method|
       it method do
-        hash[:a].incr.incr
-        hash[:b].incr
+        counter_hash[:a].incr.incr
+        counter_hash[:b].incr
 
-        hash.send(method).must_equal 2
+        counter_hash.send(method).must_equal 2
       end
     end
     
     it 'empty?' do
-      hash.must_be :empty?
-      hash[:a].incr
-      hash.wont_be :empty?
+      counter_hash.must_be :empty?
+      counter_hash[:a].incr
+      counter_hash.wont_be :empty?
     end
 
     %w(key? has_key?).each do |method|
       it method do
-        hash[:a].incr.incr
-        hash[:b].incr
+        counter_hash[:a].incr.incr
+        counter_hash[:b].incr
 
-        assert hash.send(method, :a)
-        refute hash.send(method, :c)
+        assert counter_hash.send(method, :a)
+        refute counter_hash.send(method, :c)
       end
     end
 
@@ -129,10 +129,10 @@ describe Restruct::NestedHash do
 
     %w(to_h to_primitive).each do |method|
       it method do
-        hash[:a].incr.incr
-        hash[:b].incr
+        counter_hash[:a].incr.incr
+        counter_hash[:b].incr
 
-        hash.send(method).must_equal 'a' => 2, 'b' => 1
+        counter_hash.send(method).must_equal 'a' => 2, 'b' => 1
       end
     end
 
@@ -146,60 +146,60 @@ describe Restruct::NestedHash do
 
     %w(each each_pair).each do |method|
       it method do
-        hash[:a].incr.incr
-        hash[:b].incr
+        counter_hash[:a].incr.incr
+        counter_hash[:b].incr
 
         keys = []
         values = []
-        hash.send(method) do |k,v|
+        counter_hash.send(method) do |k,v|
           keys << k
           values << v
         end
 
-        keys.must_equal hash.keys
-        values.must_equal hash.values
+        keys.must_equal counter_hash.keys
+        values.must_equal counter_hash.values
       end
     end
     
     it 'each_key' do
-      hash[:a].incr.incr
-      hash[:b].incr
+      counter_hash[:a].incr.incr
+      counter_hash[:b].incr
 
       keys = []
-      hash.each_key { |k| keys << k }
+      counter_hash.each_key { |k| keys << k }
 
-      keys.must_equal hash.keys
+      keys.must_equal counter_hash.keys
     end
     
     it 'each_value' do
-      hash[:a].incr.incr
-      hash[:b].incr
+      counter_hash[:a].incr.incr
+      counter_hash[:b].incr
 
       values = []
-      hash.each_value { |v| values << v }
+      counter_hash.each_value { |v| values << v }
 
-      values.must_equal hash.values
+      values.must_equal counter_hash.values
     end
 
   end
 
   it 'Equality' do
-    copy = CounterHash.new id: hash.id
-    assert hash == copy
-    assert hash.eql? copy
-    refute hash.equal? copy
+    copy = CounterHash.new id: counter_hash.id
+    assert counter_hash == copy
+    assert counter_hash.eql? copy
+    refute counter_hash.equal? copy
   end
 
   it 'Dump/Restore' do
-    hash[:a].incr.incr
-    hash[:b].incr
+    counter_hash[:a].incr.incr
+    counter_hash[:b].incr
     
-    dump = hash.dump
+    dump = counter_hash.dump
     other = CounterHash.new
     other.restore dump
 
-    other.id.wont_equal hash.id
-    other.to_primitive.must_equal hash.to_primitive
+    other.id.wont_equal counter_hash.id
+    other.to_primitive.must_equal counter_hash.to_primitive
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restruct
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2016-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: minitest-great_expectations
   requirement: !ruby/object:Gem::Requirement
@@ -95,47 +95,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: turn
+  name: minitest-colorin
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: minitest-line
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 description: Redis structures
 email:
 - gabynaiman@gmail.com
@@ -154,12 +182,14 @@ files:
 - Rakefile
 - lib/restruct.rb
 - lib/restruct/array.rb
+- lib/restruct/channel.rb
 - lib/restruct/connection.rb
 - lib/restruct/errors.rb
 - lib/restruct/hash.rb
 - lib/restruct/id.rb
 - lib/restruct/locker.rb
 - lib/restruct/marshal_array.rb
+- lib/restruct/marshal_channel.rb
 - lib/restruct/marshal_hash.rb
 - lib/restruct/marshal_queue.rb
 - lib/restruct/marshal_set.rb
@@ -173,6 +203,7 @@ files:
 - lua/unregister.lua
 - restruct.gemspec
 - spec/array_spec.rb
+- spec/channel_spec.rb
 - spec/connection_spec.rb
 - spec/coverage_helper.rb
 - spec/hash_spec.rb
@@ -202,12 +233,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Redis structures
 test_files:
 - spec/array_spec.rb
+- spec/channel_spec.rb
 - spec/connection_spec.rb
 - spec/coverage_helper.rb
 - spec/hash_spec.rb