restruct 0.0.3 → 0.1.0

data/spec/minitest_helper.rb

@@ -1,6 +1,7 @@
 require 'coverage_helper'
 require 'restruct'
 require 'minitest/autorun'
+require 'minitest/great_expectations'
 require 'turn'
 require 'pry-nav'
 
@@ -11,11 +12,11 @@ Turn.config do |c|
 end
 
 class Minitest::Spec
-  def redis
-    Restruct.redis
+  def connection
+    Restruct.connection
   end
 
   after do
-    redis.call('KEYS', Restruct::Id.new(:restruct)['*']).each { |k| redis.call 'DEL', k }
+    connection.call('KEYS', Restruct::Id.new(:restruct)['*']).each { |k| connection.call 'DEL', k }
   end
 end

data/spec/nested_hash_spec.rb

@@ -2,12 +2,12 @@ require 'minitest_helper'
 
 class Counter < Restruct::Structure
   def current
-    (redis.call('GET', id) || 0).to_i
+    (connection.call('GET', id) || 0).to_i
   end
   alias_method :to_primitive, :current
 
   def incr
-    redis.call 'SET', id, current + 1
+    connection.call 'SET', id, current + 1
     self
   end
 end

data/spec/queue_spec.rb

@@ -0,0 +1,41 @@
+require 'minitest_helper'
+
+[Restruct::Queue, Restruct::MarshalQueue].each do |klass|
+
+  describe klass do
+
+    let(:queue) { klass.new }
+
+    it 'Push and pop' do
+      queue.must_be :empty?
+
+      queue.push 'test_1'
+      queue.push 'test_2'
+
+      queue.wont_be :empty?
+      queue.size.must_equal 2
+      queue.to_a.must_equal ['test_1', 'test_2']
+
+      queue.pop.must_equal 'test_1'
+      queue.wont_be :empty?
+      queue.size.must_equal 1
+      queue.to_a.must_equal ['test_2']
+
+      queue.pop.must_equal 'test_2'
+      queue.must_be :empty?
+    end
+
+    it 'Batch' do
+      %w(a b c).each {|e| queue.push e}
+
+      queue.connection.batch do
+        queue.push 'd'
+        queue.pop
+        queue.to_a.must_equal %w(a b c)
+      end
+
+      queue.to_a.must_equal %w(b c d)
+    end
+
+  end
+end

data/spec/set_spec.rb

@@ -7,7 +7,7 @@ require 'minitest_helper'
     let(:set) { klass.new }
 
     def fill(elements)
-      redis.call 'SADD', set.id, *(elements.map { |e| set.send(:serialize, e) })
+      connection.call 'SADD', set.id, *(elements.map { |e| set.send(:serialize, e) })
     end
 
     describe 'Setters' do
@@ -252,6 +252,23 @@ require 'minitest_helper'
       other.to_primitive.must_equal set.to_primitive
     end
 
+    it 'Batch' do
+      fill %w(a b c)
+
+      set.connection.batch do
+        set.add 'd'                       #a b c d
+        set.add? 'x'                      #a b c d x
+        set.delete 'b'                    #a c d x
+        set.subtract %w(c d)              #a x
+        set.merge %w(x y z)               #a x y z
+        set.delete? 'a'                   #x y z
+        
+        set.to_a.must_equal_contents %w(a b c)
+      end
+
+      set.to_a.must_equal_contents %w(x y z)
+    end
+
   end
 
 end

metadata

@@ -1,125 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: restruct
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Gabriel Naiman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: class_config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.7'
+- !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: turn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: simplecov
   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: pry-nav
   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'
 description: Redis structures
@@ -129,36 +143,44 @@ 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/batch.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_hash.rb
+- lib/restruct/marshal_queue.rb
 - lib/restruct/marshal_set.rb
 - lib/restruct/marshalizable.rb
 - lib/restruct/nested_hash.rb
+- lib/restruct/queue.rb
 - lib/restruct/set.rb
 - lib/restruct/structure.rb
 - lib/restruct/version.rb
+- lua/register.lua
+- lua/unregister.lua
 - restruct.gemspec
 - spec/array_spec.rb
-- spec/batch_spec.rb
+- spec/connection_spec.rb
 - spec/coverage_helper.rb
 - spec/hash_spec.rb
 - spec/id_spec.rb
+- spec/locker_spec.rb
 - spec/minitest_helper.rb
 - spec/nested_hash_spec.rb
+- spec/queue_spec.rb
 - spec/set_spec.rb
 homepage: https://github.com/gabynaiman/restruct
 licenses:
@@ -170,26 +192,28 @@ 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.2.2
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Redis structures
 test_files:
 - spec/array_spec.rb
-- spec/batch_spec.rb
+- spec/connection_spec.rb
 - spec/coverage_helper.rb
 - spec/hash_spec.rb
 - spec/id_spec.rb
+- spec/locker_spec.rb
 - spec/minitest_helper.rb
 - spec/nested_hash_spec.rb
+- spec/queue_spec.rb
 - spec/set_spec.rb

data/lib/restruct/batch.rb

@@ -1,39 +0,0 @@
-module Restruct
-  class Batch
-    class << self
-
-      def execute(redis=nil)
-        redis ||= Restruct.redis
-        multi redis
-        result = yield
-        exec redis
-        result
-      rescue => ex
-        discard redis
-        raise ex
-      end
-
-      private
-
-      def nesting
-        @nesting ||= ::Hash.new { |h,k| h[k] = 0 }
-      end
-
-      def multi(redis)
-        redis.call 'MULTI' if nesting[redis] == 0
-        nesting[redis] += 1
-      end
-
-      def exec(redis)
-        nesting[redis] -= 1
-        redis.call 'EXEC' if nesting[redis] == 0
-      end
-
-      def discard(redis)
-        nesting[redis] -= 1
-        redis.call 'DISCARD' if nesting[redis] == 0
-      end
-
-    end
-  end
-end

data/spec/batch_spec.rb

@@ -1,53 +0,0 @@
-require 'minitest_helper'
-
-describe Restruct::Batch do
-
-  let(:connection) { Redic.new }
-  
-  it 'Execute' do
-    hash = Restruct::Hash.new redis: connection
-    
-    Restruct::Batch.execute do
-      h = Restruct::Hash.new id: hash.id
-      h.merge! a: 'x', b: 'y', c: 'z'
-      
-      hash.must_be_empty
-    end
-
-    hash.to_h.must_equal 'a' => 'x', 'b' => 'y', 'c' => 'z'
-  end
-
-  it 'Discard' do
-    hash = Restruct::Hash.new redis: connection
-    
-    proc do
-      Restruct::Batch.execute do
-        h = Restruct::Hash.new id: hash.id
-        h.merge! a: 'x', b: 'y', c: 'z'
-
-        raise 'Test error'
-      end
-    end.must_raise RuntimeError
-
-    hash.must_be_empty
-  end
-
-  it 'Nested' do
-    hash = Restruct::Hash.new redis: connection
-    
-    Restruct::Batch.execute do
-      h = Restruct::Hash.new id: hash.id
-      h.merge! a: 'x', b: 'y'
-      
-      Restruct::Batch.execute do
-        h[:c] = 'z'
-        hash.must_be_empty
-      end
-
-      hash.must_be_empty
-    end
-
-    hash.to_h.must_equal 'a' => 'x', 'b' => 'y', 'c' => 'z'
-  end
-
-end