redis-set 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85fb6b90aa4d2878c749b147389a183557967f5a
-  data.tar.gz: e6d89f6f66dd79108298f7d97cab63ca8e3a1e22
+  metadata.gz: 38c7747969cffe4f84c06b7c4c249e1db96b60b2
+  data.tar.gz: cc72aef22abc64c4a4ed886eef069865451131a3
 SHA512:
-  metadata.gz: 703d725c82cc116107ded6d3174dc2646ab419cbc0c11665523a0386e6688f104854a7c45c8feaaf18e61fdbcaf5a6e8c862ba3605461bb4b86962f0832275c5
-  data.tar.gz: a1ac7949c4cbf73eb0c9bd4f5d1c930e355860d1064a7a8dfd5c2c19d9b4d0cff4f189bc3b0f1b23705a6398fd4899e206c444195db9951d9282c225fbddf56a
+  metadata.gz: 4b38c5833ea9b105ae3a516154319389708db9b3f6e2103d7215736673f686bbba823ed25fd8064be7bf4062e295f158c07a34b436d5febf59469801c61d94e6
+  data.tar.gz: 53c98de243c00205a442a6e7ca987e15219260eda9bc9c8820e7ad22fedfc408a9159bee0f82a0c638b63a50b82be10722612a31e9c34c9ecc7ef25c4117ba18

data/README.md

@@ -2,8 +2,6 @@
 
 A unique set of unordered items. Lightweight wrapper over redis sets with some additional enumeration and atomic operations.
 
-TODO: Delete this and the text above, and describe your gem
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -23,19 +21,19 @@ Or install it yourself as:
 ## Getting started
 
 ```ruby
-s = Redis::Set.new 'completed_customer_ids'
+s = RedisSet.new 'completed_customer_ids'
 ```
 
 Or you can pass in your own instance of the Redis class.
 
 ```ruby
-s = Redis::Set.new 'completed_customer_ids', Redis.new(:host => "10.0.1.1", :port => 6380, :db => 15)
+s = RedisSet.new 'completed_customer_ids', Redis.new(:host => "10.0.1.1", :port => 6380, :db => 15)
 ```
 
 A third option is to instead pass your Redis configurations.
 
 ```ruby
-s = Redis::Set.new 'completed_customer_ids', :host => "10.0.1.1", :port => 6380, :db => 15
+s = RedisSet.new 'completed_customer_ids', :host => "10.0.1.1", :port => 6380, :db => 15
 ```
 
 ## Using the set
@@ -48,11 +46,11 @@ s.add "world"
 s.add "hello" # the item 'hello' will only exist once in the set since it is unique
 ```
 
-You can insert multiple items set using the add_multi or push_multi methods
+You can add multiple items
 
 ```ruby
-s.add_multi ["one","two","three"]
-s.add_multi "four","five","six"
+s.add ["one","two","three"]
+s.add "four","five","six"
 # set should have items "one","two","three","four","five","six" now
 ```
 
@@ -68,7 +66,7 @@ result = s.pop
 
 You can pop multiple random items from the set
 ```ruby
-result = s.pop_multi 5 # pop 5 random items from set and return them
+result = s.pop 5 # pop 5 random items from set and return them
 ```
 
 You can remove a specific item from the set
@@ -79,7 +77,7 @@ s.remove 5  #remove the item 5 from the set if it exists
 You can atomically remove multiple items from the set.
 
 ```ruby
-s.remove_multi 3,4,5  #removes items 3,4, and 5 from the set if they exist
+s.remove 3,4,5  #removes items 3,4, and 5 from the set if they exist
 ```
 
 You can get the size of the set.
@@ -105,6 +103,22 @@ The set can be cleared of all items
 s.clear
 ```
 
+You can get the intersection between the set and another set
+```ruby
+a = RedisSet.new 'a'
+a.push 'a', 'b', 'c', 'd'
+
+b = RedisSet.new 'b'
+b.push 'c', 'd', 'e', 'f'
+
+c = RedisSet.new 'c'
+c.push 'c', 'd', 'f'
+
+# should return ['c', 'd']
+a.intersection b, c
+
+```
+
 The set can also be set to expire (in seconds).
 ```ruby
 # expire in five minutes

data/lib/redis_set.rb

@@ -0,0 +1,150 @@
+require "redis"
+
+class RedisSet
+	attr_reader :name
+
+	VERSION = "0.0.3"
+
+	class InvalidNameException < StandardError; end;
+	class InvalidRedisConfigException < StandardError; end;
+
+	def initialize(name, redis_or_options = {})
+		name = name.to_s if name.kind_of? Symbol
+
+		raise InvalidNameException.new unless name.kind_of?(String) && name.size > 0
+		@name = name
+		@redis = if redis_or_options.kind_of?(Redis)
+			         redis_or_options
+			       elsif redis_or_options.kind_of? Hash
+				       ::Redis.new redis_or_options
+			       elsif defined?(ActiveSupport::Cache::RedisStore) && redis_or_options.kind_of?(ActiveSupport::Cache::RedisStore)
+				       @pooled = redis_or_options.data.kind_of?(ConnectionPool)
+				       redis_or_options.data
+			       elsif defined?(ConnectionPool) && redis_or_options.kind_of?(ConnectionPool)
+				       @pooled = true
+				       redis_or_options
+			       else
+				       raise InvalidRedisConfigException.new
+		         end
+	end
+
+	def add *values
+		values = [values].flatten
+		with{|redis| redis.sadd name, values} if values.size > 0
+	end
+
+	alias push add
+
+	def add_with_count value
+		block_on_atomic_attempt { attempt_atomic_add_read_count value }
+	end
+
+	alias push_with_count add_with_count
+
+	def remove *values
+		values = [values].flatten
+		with{|redis|redis.srem name, values} if values.size > 0
+	end
+
+	def pop(amount = 1)
+		with{|redis| redis.spop name, amount}
+	end
+
+	def include? value
+		with{|redis| redis.sismember(name, value)}
+	end
+
+	def size
+		with{|redis| redis.scard name}
+	end
+
+	alias count size
+
+	def all
+		with{|redis| redis.smembers name}
+	end
+
+	def intersection *sets
+		sets = [sets].flatten
+		sets = sets.map do |s|
+			if s.kind_of?(self.class)
+				s.name
+			else
+				s
+			end
+		end
+
+		with{|redis| redis.sinter *sets }
+	end
+
+	def scan cursor = 0, amount = 10, match = "*"
+		with{|redis| redis.sscan name, cursor, :count => amount, :match => match}
+	end
+
+	def enumerator(slice_size = 10)
+		cursor = 0
+		Enumerator.new do |yielder|
+			loop do
+				cursor, items = scan cursor, slice_size
+				items.each do |item|
+					yielder << item
+				end
+				raise StopIteration if cursor.to_i.zero?
+			end
+		end
+	end
+
+	def clear
+		with{|redis| redis.del name}
+		[]
+	end
+
+	alias flush clear
+
+	def expire seconds
+		with{|redis| redis.expire name, seconds}
+	end
+
+	private
+
+	def attempt_atomic_add_read_count value
+		attempt_atomic_write_read lambda { add value }, lambda { |multi, read_result| multi.scard name }
+	end
+
+	def block_on_atomic_attempt
+		begin
+			success, result = yield
+			#puts "success is #{success} and result is #{result}"
+		end while !success && result
+		result.value
+	end
+
+	def attempt_atomic_write_read write_op, read_op
+		success, write_result, read_result = false, nil, nil
+
+		with do |redis|
+			success = redis.watch(name) do
+				write_result = write_op.call
+				#if write_result
+				redis.multi do |multi|
+					read_result = read_op.call multi, write_result
+				end
+				#end
+			end
+		end
+
+		[success, read_result]
+	end
+
+	def with(&block)
+		if pooled?
+			@redis.with(&block)
+		else
+			block.call(@redis)
+		end
+	end
+
+	def pooled?
+		!!@pooled
+	end
+end

data/redis-set.gemspec

@@ -1,11 +1,11 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'redis/set'
+require 'redis_set'
 
 Gem::Specification.new do |spec|
   spec.name          = "redis-set"
-  spec.version       = Redis::Set::VERSION
+  spec.version       = RedisSet::VERSION
   spec.authors       = ["Misha Conway"]
   spec.email         = ["mishaAconway@gmail.com"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-set
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Misha Conway
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,7 +65,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/redis/set.rb
+- lib/redis_set.rb
 - redis-set.gemspec
 homepage: https://github.com/MishaConway/ruby-redis-set
 licenses:
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Lightweight wrapper over redis sets.

data/lib/redis/set.rb

@@ -1,139 +0,0 @@
-require "redis"
-
-class Redis
-  class Set
-    attr_reader :name
-
-    VERSION = "0.0.2"
-
-    class InvalidNameException < StandardError; end;
-    class InvalidRedisConfigException < StandardError; end;
-
-    def initialize(name, redis_or_options = {})
-      name = name.to_s if name.kind_of? Symbol
-      
-      raise InvalidNameException.new unless name.kind_of?(String) && name.size > 0
-      @name  = name
-      @redis = if redis_or_options.kind_of? Redis
-                 redis_or_options
-               elsif redis_or_options.kind_of? Hash
-                 Redis.new redis_or_options
-               else
-                 raise InvalidRedisConfigException.new
-               end
-    end
-
-    def add value
-      @redis.sadd name, value
-    end
-
-    alias push add
-
-    def add_multi *values
-      if values.size > 0
-        values = values.first if 1 == values.size && values.first.kind_of?(Array)
-        @redis.sadd name, values
-      end
-    end
-
-    alias push_multi add_multi
-
-    def add_with_count value
-      block_on_atomic_attempt{ attempt_atomic_add_read_count value }
-    end
-
-    alias push_with_count add_with_count
-
-    def remove value
-      @redis.srem name, value
-    end
-
-    def remove_multi *values
-      if values.size > 0
-        values = values.first if 1 == values.size && values.first.kind_of?(Array)
-        @redis.srem name, values
-      end
-    end
-
-    def pop
-      @redis.pop name, 1
-    end
-
-    def pop_multi amount
-      @redis.pop name, amount
-    end
-
-    def include? value
-      @redis.sismember(name, value)
-    end
-
-    def size
-      @redis.scard name
-    end
-
-    alias count size
-
-    def all
-      @redis.smembers name
-    end
-
-    def scan cursor = 0, amount=10, match = "*"
-      @redis.sscan name, cursor, :count => amount, :match => match
-    end
-
-    def enumerator(slice_size = 10)
-      cursor = 0
-      Enumerator.new do |yielder|
-        loop do
-          cursor, items = scan cursor, slice_size
-          items.each do |item|
-            yielder << item
-          end
-          raise StopIteration if cursor.to_i.zero?
-        end
-      end
-    end
-
-    def clear
-      @redis.del name
-      []
-    end
-
-    alias flush clear
-
-    def expire seconds
-      @redis.expire name, seconds
-    end
-
-private
-
-    def attempt_atomic_add_read_count value
-      attempt_atomic_write_read lambda{ add value }, lambda{ |multi, read_result| multi.scard name}
-    end
-
-    def block_on_atomic_attempt
-      begin
-        success, result = yield
-        #puts "success is #{success} and result is #{result}"
-      end while !success && result
-      result.value
-    end
-
-    def attempt_atomic_write_read write_op, read_op
-
-      write_result, read_result  = nil, nil
-      success = @redis.watch(name) do
-        write_result = write_op.call
-        #if write_result
-          @redis.multi do |multi|
-            read_result = read_op.call multi, write_result
-          end
-        #end
-      end
-
-      [success, read_result]
-    end
-
-
-  end
-end