restruct 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b08da180cd16bfdb19e965f58ed2f6bdc0590558
-  data.tar.gz: 5eb60adcfa2585711ae48a8b26718d062c0fad8d
+  metadata.gz: 2bd75f82dde2f17f7b562be3a8fe5b264028eaba
+  data.tar.gz: ed15597cbf0b1487d4ab9697649dd3575ff01e75
 SHA512:
-  metadata.gz: 15795162d1328da9f16764494398379e87004db5e9491672d60ebe94d99d17ba5ac8f7eaf83648f3a62b31aa34caa2c70350abbb730790131bb1ff54e1832b0e
-  data.tar.gz: 1bf098b79cdc7b020abf55849fe5a9fe399e0c6a43c9e0bc9efd65523df97ecf3d923610e756925632e8cf6a416588faf1d816669fbce95f8977592bcf7256a1
+  metadata.gz: f5febc64be1599503c84a16a66a1e3fd0d447c99db365f620d67043117a3f49a92f6aeb37b75e11e3df1b8ccd75059d076f2aebfd61c4052eaa0b429a8c34b53
+  data.tar.gz: 22c7f357f209ee553c05699a1f3e252b65da9378596c1002da42a161ab2b29504215bbf6818d25547160fe0dc38794bba2e48bf0f3d9bac0b5e3a60ce3323cfe

data/.ruby-version

@@ -1 +1 @@
-ruby 2.0
+ruby-2.3.0

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - 2.1
   - 2.2
   - 2.3.0
+  - 2.4.0
   - jruby
 before_install:
   - gem install bundler

data/README.md

@@ -14,7 +14,6 @@ Redis structures
 - NestedHash
 - Queue
 - Locker
-- Channel
 
 ## Installation
 

data/lib/restruct.rb

@@ -1,4 +1,5 @@
 require 'redic'
+require 'redic-sentinels'
 require 'class_config'
 require 'forwardable'
 require 'securerandom'
@@ -11,14 +12,12 @@ 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'
 
@@ -27,7 +26,7 @@ module Restruct
 
   extend ClassConfig
 
-  attr_config :connection, Connection.new
+  attr_config :connection, Connection.simple
   attr_config :id_separator, ':'
   attr_config :id_generator, ->() { Id.new(:restruct)[SecureRandom.uuid] }
 

data/lib/restruct/connection.rb

@@ -1,9 +1,23 @@
 module Restruct
+
   class Connection
 
-    def initialize(*args)
-      @args = args
-      @redis = Redic.new *args
+    class << self
+
+      def simple(*args)
+        new Redic.new(*args)
+      end
+
+      def with_sentinels(*args)
+        new Redic::Sentinels.new(*args)
+      end
+
+      private :new
+
+    end
+
+    def initialize(redis=nil)
+      @redis = redis || Redic.new
       @scripts = {}
       @nesting = ::Hash.new { |h,k| h[k] = 0 }
     end
@@ -45,14 +59,6 @@ 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/locker.rb

@@ -29,7 +29,7 @@ module Restruct
     private
 
     def _lock(key, exclusive)
-      connection.script REGISTER_LUA,   0, id, key, exclusive
+      connection.script REGISTER_LUA, 0, id, key, exclusive
       begin
         yield
       ensure  

data/lib/restruct/version.rb

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

data/restruct.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'redic',        '~> 1.5.0'
-  spec.add_dependency 'class_config', '~> 0.0.1'
+  spec.add_dependency 'redic', '~> 1.5'
+  spec.add_dependency 'redic-sentinels', '~> 0.1'
+  spec.add_dependency 'class_config', '~> 0.0'
 
   spec.add_development_dependency 'bundler', '~> 1.12'
   spec.add_development_dependency 'rake', '~> 11.0'

data/spec/locker_spec.rb

@@ -85,7 +85,7 @@ describe Restruct::Locker do
 
       pids = 10.times.map do |thread_number|
         Process.fork do
-          connection = Restruct::Connection.new
+          connection = Restruct::Connection.simple
           locker = Restruct::Locker.new id: locker_id, connection: connection
           10.times do |iteration|
             locker.lock :process_1 do

metadata

@@ -1,167 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: restruct
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: redic-sentinels
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: class_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: minitest-great_expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   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.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         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.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
 description: Redis structures
@@ -171,25 +185,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - 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
@@ -203,7 +215,6 @@ 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
@@ -223,23 +234,22 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 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

data/lib/restruct/channel.rb

@@ -1,31 +0,0 @@
-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/marshal_channel.rb

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

data/spec/channel_spec.rb

@@ -1,33 +0,0 @@
-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