strc 0.0.3 → 0.0.4

data/README.rdoc

@@ -56,6 +56,8 @@ Now you could start passing it commands, if they've been implemented.
     >> strc.llen "poo"
     => 2
 
+=== Hashes!
+
 == Command List
 Currently, the following commands are implemented:
 * get
@@ -98,8 +100,19 @@ Currently, the following commands are implemented:
   * lset
   * ltrim
   * rpoplpush
+* Hashes
+  * hset
+  * hsetnx
+  * hget
+  * hgetall
+  * hdel
+  * hexists
+  * hkeys
+  * hvals
+  * hlen
 
 == History
+* 0.0.4 - Some hash commands done.
 * 0.0.3 - Some list commands done.
 * 0.0.2 - Set commands done.  Most general commands done.
 * 0.0.1 - Initial release.  Does some basic things.

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/strc.rb

@@ -129,7 +129,7 @@ class STRC
 		if args.length < 1
 			raise STRC::Exception.new "Wrong number of arguments (1 for 2)"
 		end
-		set = sget(key)
+		set = get_s(key)
 		added = 0
 		args.each do |arg|
 			unless set.include?(arg)
@@ -155,7 +155,7 @@ class STRC
 	def sinter(*keys)
 		sets = []
 		keys.each do |key|
-			sets << sget(key)
+			sets << get_s(key)
 		end
 		inter = sets.shift
 		sets.each do |set|
@@ -175,7 +175,7 @@ class STRC
 	def sdiff(*keys)
 		sets = []
 		keys.each do |key|
-			sets << sget(key)
+			sets << get_s(key)
 		end
 		diff = sets.shift
 		sets.each do |set|
@@ -206,7 +206,7 @@ class STRC
 	def sunion(*keys)
 		sets = []
 		keys.each do |key|
-			sets << sget(key)
+			sets << get_s(key)
 		end
 		union = sets.shift
 		sets.each do |set|
@@ -223,7 +223,7 @@ class STRC
 
 	# Returns a random element from the set
 	def srandmember(key)
-		sget(key).to_a.sample
+		get_s(key).to_a.sample
 	end
 
 	# Randomly remove and return an item from the set
@@ -235,33 +235,31 @@ class STRC
 
 	# Determine if the given value is a member of the set at key
 	def sismember(key, member)
-		set = sget(key)
+		set = get_s(key)
 		return set.include?(member)
 	end
 
 	# Returns an array of members of the set
 	def smembers(key)
-		sget(key).to_a
+		get_s(key).to_a
 	end
 
 	# Gets the length of a set
 	def scard(key)
-		set = sget(key)
+		set = get_s(key)
 		return set.length
 	end
 
 	# Gets a set.  Private
-	def sget(key)
+	def get_s(key)
+		set = Set.new
 		if exists(key)
-			value = get(key)
-			if value.class == Set
-				return value
-			else
+			set = get(key)
+			unless set.class == Set
 				raise STRC::Exception.new "ERR Operation against a key holding the wrong kind of value"
 			end
-		else
-			return Set.new
 		end
+		return set
 	end
 
 	# End of set commands~
@@ -269,7 +267,7 @@ class STRC
 	# List commands!
 
 	# Gets a list.  Private
-	def lget(key)
+	def get_l(key)
 		list = []
 		if exists(key)
 			list = get(key)
@@ -282,18 +280,18 @@ class STRC
 
 	# Returns elements from key in the given range
 	def lrange(key, start, stop)
-		list = lget(key)[start..stop]
+		list = get_l(key)[start..stop]
 		return list.nil? ? [] : list
 	end
 
 	# Returns length of list
 	def llen(key)
-		lget(key).length
+		get_l(key).length
 	end
 
 	# Append values to a list
 	def rpush(key, *values)
-		list = lget(key)
+		list = get_l(key)
 		list += values
 		set(key, list)
 		return list.length
@@ -308,7 +306,7 @@ class STRC
 
 	# Remove and get the last element in a list
 	def rpop(key)
-		list = lget(key)
+		list = get_l(key)
 		element = list.pop
 		set(key, list)
 		return element
@@ -316,7 +314,7 @@ class STRC
 
 	# Prepend values to a list
 	def lpush(key, *values)
-		list = lget(key)
+		list = get_l(key)
 		list = values + list
 		set(key, list)
 		return list.length
@@ -331,7 +329,7 @@ class STRC
 
 	# Remove and get the first element in a list
 	def lpop(key)
-		list = lget(key)
+		list = get_l(key)
 		element = list.shift
 		set(key, list)
 		return element
@@ -339,12 +337,12 @@ class STRC
 
 	# Get an element from a list by its index
 	def lindex(key, index)
-		lget(key)[index]
+		get_l(key)[index]
 	end
 
 	# Set value for an element at index in a list
 	def lset(key, index, value)
-		list = lget(key)
+		list = get_l(key)
 		list[index] = value
 		set(key, list)
 	end
@@ -364,7 +362,78 @@ class STRC
 
 	# Hash commands!
 
+	# Gets the hash at key.  Private.
+	def get_h(key)
+		hash = {}
+		if exists(key)
+			hash = get(key)
+			unless hash.class == Hash
+				raise STRC::Exception.new "ERR Operation against a key holding the wrong kind of value"	
+			end
+		end
+		return hash
+	end
+
+	# Set file in hash stored at key to value.
+	def hset(key, field, value)
+		hash = get_h(key)
+		hash[field] = value
+		set(key, hash)
+	end
+
+	# Sets field in key only if it doesn't exist
+	def hsetnx(key, field, value)
+		unless hexists(key, field)
+			hset(key, field, value)
+			return true
+		end
+		return false
+	end
+
+	# Get value at field in hash at key
+	def hget(key, field)
+		get_h(key)[field]
+	end
+
+	# Deletes fields from hash
+	def hdel(key, *fields)
+		hash = get_h(key)
+		deleted = 0
+		fields.each do |field|
+			unless hash.delete(field).nil?
+				deleted += 1
+			end
+		end
+		set(key, hash)
+		return deleted
+	end
+
+	# Returns whether or not the field exists in key
+	def hexists(key, field)
+		get_h(key).has_key?(field)
+	end
+
+	# Returns an array of all fields and values in hash
+	def hgetall(key)
+		get_h(key).flatten
+	end
+
+	# Returns array of all keys in hash at key
+	def hkeys(key)
+		get_h(key).keys
+	end
+
+	# Returns array of all values in hash at key
+	def hvals(key)
+		get_h(key).values
+	end
+
+	# Returns number of fields in the hash
+	def hlen(key)
+		get_h(key).length
+	end
+
 	# End of hash commands~
 
-	private :sget, :lget
+	private :get_s, :get_l, :get_h
 end

data/strc.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{strc}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris O'Neal"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
     "strc.gemspec",
     "test/helper.rb",
     "test/test_basic_functions.rb",
+    "test/test_hashes.rb",
     "test/test_keys.rb",
     "test/test_lists.rb",
     "test/test_sets.rb",
@@ -41,6 +42,7 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/helper.rb",
     "test/test_basic_functions.rb",
+    "test/test_hashes.rb",
     "test/test_keys.rb",
     "test/test_lists.rb",
     "test/test_sets.rb",

data/test/test_hashes.rb

@@ -0,0 +1,97 @@
+require 'helper'
+
+class TestHashes < Test::Unit::TestCase
+	def setup
+		@test = STRC.new
+		@test.hset("poop", "a", 1)
+		@test.hset("poop", "qwe", "aaa")
+	end
+
+	context "hset" do
+		should "create a new hash" do
+			@test.hset("test", "a", 1)
+			assert(@test.exists("test"))
+			assert_equal(1, @test.hget("test", "a"))
+		end
+
+		should "add fields to existing hashes" do
+			@test.hset("poop", "b", 2)
+			assert_equal(2, @test.hget("poop", "b"))
+		end
+
+		should "set existing fields in hashes" do
+			@test.hset("poop", "a", 15)
+			assert_equal(15, @test.hget("poop", "a"))
+		end
+	end
+
+	context "hsetnx" do
+		should "set a field if it doesn't exist" do
+			@test.hsetnx("poop", "b", 10)
+			assert_equal(10, @test.hget("poop", "b"))
+		end
+
+		should "not set to a field if it exists" do
+			@test.hsetnx("poop", "qwe", 100)
+			assert_not_equal(100, @test.hget("poop", "qwe"))
+		end
+	end
+
+	context "hget" do
+		should "return value for field" do
+			assert_equal(1, @test.hget("poop", "a"))
+		end
+
+		should "return nil for nonexistant fields" do
+			assert_nil(@test.hget("poop", "b"))
+		end
+	end
+
+	context "hdel" do
+		should "delete fields" do
+			@test.hdel("poop", "a")
+			assert_nil(@test.hget("poop", "a"))
+		end
+
+		should "return number of deleted fields" do
+			result = @test.hdel("poop", "a")
+			assert_equal(1, result)
+			result = @test.hdel("poop", "asdf")
+			assert_equal(0, result)
+		end
+	end
+
+	context "hexists" do
+		should "return true if field exists" do
+			assert(@test.hexists("poop", "a"))
+		end
+
+		should "return false if field doesn't exist" do
+			assert(!@test.hexists("poop", "asdf"))
+		end
+	end
+
+	context "hgetall" do
+		should "return an array of keys and values" do
+			assert_equal(["a", 1, "qwe", "aaa"], @test.hgetall("poop"))
+		end
+	end
+
+	context "hkeys" do
+		should "return an array of keys" do
+			assert_equal(["a", "qwe"], @test.hkeys("poop"))
+		end
+	end
+
+	context "hvals" do
+		should "return an array of values" do
+			assert_equal([1, "aaa"], @test.hvals("poop"))
+		end
+	end
+
+	context "hlen" do
+		should "give number of keys in hash" do
+			assert_equal(2, @test.hlen("poop"))
+		end
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: strc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &9732852 !ruby/object:Gem::Requirement
+  requirement: &9559164 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9732852
+  version_requirements: *9559164
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9732216 !ruby/object:Gem::Requirement
+  requirement: &9558396 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *9732216
+  version_requirements: *9558396
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &9726516 !ruby/object:Gem::Requirement
+  requirement: &9556440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *9726516
+  version_requirements: *9556440
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &9726036 !ruby/object:Gem::Requirement
+  requirement: &9555588 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9726036
+  version_requirements: *9555588
 description: STRC is a terrible Ruby clone of Redis
 email: ctoneal@gmail.com
 executables: []
@@ -75,6 +75,7 @@ files:
 - strc.gemspec
 - test/helper.rb
 - test/test_basic_functions.rb
+- test/test_hashes.rb
 - test/test_keys.rb
 - test/test_lists.rb
 - test/test_sets.rb
@@ -95,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 230414097
+      hash: -157389393
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,6 +112,7 @@ summary: Super Terrible Redis Clone
 test_files:
 - test/helper.rb
 - test/test_basic_functions.rb
+- test/test_hashes.rb
 - test/test_keys.rb
 - test/test_lists.rb
 - test/test_sets.rb