redi2casa 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 687c3c2c393c650329494de0b2b9768cef684f2f
-  data.tar.gz: 91f6d292884b3270a5ec8be1ce40d904bc68d851
+  metadata.gz: 6d5b3420d36a8292cb6d06c1a4e0233731ad4446
+  data.tar.gz: 415d1260880d010fbd378cdc5d33d8c024b9719a
 SHA512:
-  metadata.gz: 2e3b99361d8f29511f3d4d5a4a84045a5ff80ec0fe292480ef1924c7fe75dcc931510770a89865dd8dc6bbe73cfac54bf05c17400f3d96c96e79645b2bac784d
-  data.tar.gz: c82d6e0646d02d0d9efe12be7c596cb19772afa6aaa20ac28a53f1709287fc227320f6554cca2144ac301b48cc58ce1b18ddb09c5122bfb2b1da541cf4613ebd
+  metadata.gz: b1c2e4898460665dda13bc1c6ceeb97e21089a9d19445eb3bd8244c7e9d8ef874db846cba4323795c325588d69bb4dd66119f3090872e1adaa96f73e575a6067
+  data.tar.gz: 8163288c905fa1845881c8b359c576d0a5a7c6fdf0164910faf6142b230ff4221232607899277c52b3588548d8346cf7ac7ee386aa15d13f5e888c84b000320c

data/Examples.md

@@ -1,52 +1,51 @@
 r = Redi2casa.new([localhost], 'redi2casa')
 
-
-# Do not mix counters and non-counter values in a single Hash
+### Do not mix counters and non-counter values in a single Hash
 
 Hash - counters
 ---------------
 
-  Increment: r.hicnrby "c", "e", 10
-  r.hget "c", "e"  => 10
-  Decrement: r.hincrby "c", "e", -10
-  r.hget "c", "e"  => 0
-  r.hincrby "c", "a", 100
+    Increment: r.hicnrby "c", "e", 10  
+    r.hget "c", "e"  => 10  
+    Decrement: r.hincrby "c", "e", -10  
+    r.hget "c", "e"  => 0  
+    r.hincrby "c", "a", 100  
+    r.hgetall "c"  => { "a" => 100, "e" => 0 }
 
-  r.hgetall "c"  => { "a" => 100, "e" => 0 }
+    ## r.hset does not work for counters as yet ##
 
-  ## r.hset does not work for counters as yet ##
 
 Hash - Non-counters
 -------------------
-
-  r.hset "a", "b", "hello_world"
-  r.hset "a", "b", "bye_world"
-  r.hget "a", "b" =>  "hello_world"
-
-  r.hgetall "a"  => {"a" => "hello_world", "b" => "bye_world"}
+  
+    r.hset "a", "b", "hello_world"
+    r.hset "a", "b", "bye_world"
+    r.hget "a", "b" =>  "hello_world"
+  
+    r.hgetall "a"  => {"a" => "hello_world", "b" => "bye_world"}
 
 List
 -----
 
-  r.lpush "a", "hello"
-  r.lpush "a", "hello1"
-  r.rpush "a", "hello3"
-
-  r.lrange "a", 0, -1 => ["hello", "hello1", "hello3"]
-  r.lpop   "a"  => "hello"
-  r.lrange "a", 0, -1 => ["hello1", "hello3"]
-
-  r.rpop "a"  => "hello3"
-  r.lrange "a", 0, -1 => ["hello1"]
+    r.lpush "a", "hello"
+    r.lpush "a", "hello1"
+    r.rpush "a", "hello3"
+  
+    r.lrange "a", 0, -1 => ["hello", "hello1", "hello3"]
+    r.lpop   "a"  => "hello"
+    r.lrange "a", 0, -1 => ["hello1", "hello3"]
+  
+    r.rpop "a"  => "hello3"
+    r.lrange "a", 0, -1 => ["hello1"]
 
 
 Key-value pairs
 ---------------
-
-  r.set "a", "welcome"
-  r.get "a" => "welcome"
-
-  r.setex "a", 10, "c"
-  r.get "a" => "c"
- ### after 10 seconds
-  r.get "a" => nil
+  
+    r.set "a", "welcome"
+    r.get "a" => "welcome"
+  
+    r.setex "a", 10, "c"
+    r.get "a" => "c"
+    ### after 10 seconds
+    r.get "a" => nil

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    redi2casa (0.0.3)
+    redi2casa (0.0.4)
+      bitwise
       cql-rb
 
 GEM
   remote: https://rubygems.org/
   specs:
+    bitwise (0.6.0)
     cql-rb (1.1.1)
     rake (10.1.0)
 

data/cassandra_cli_cmds

@@ -1 +1,2 @@
 create column family counters with column_type = 'Standard' and comparator = 'UTF8Type' and default_validation_class = 'CounterColumnType' and key_validation_class = 'UTF8Type';
+create column family hashes with column_type = 'Standard' and comparator = 'UTF8Type' and default_validation_class = 'UTF8Type' and key_validation_class = 'UTF8Type';

data/cqlsh_cmds

@@ -1,6 +1,5 @@
-CREATE KEYSPACE redi2casa WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};
+create keyspace redi2casa WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};
 use redi2casa;
-create table hashes(namespace text primary key, key map<text, text>);
 create table lists(namespace text primary key, values list<text>);
 create table keyvalue(key text primary key, value text);
-create table sets(key text primary key, value set<text>);
+create table sets(key text primary key, members set<text>);

data/lib/redi2casa/hdel.rb

@@ -0,0 +1,9 @@
+class Redi2casa
+  def hdel key, column1, type = "counter"
+    if type == "counter"
+      @db_conn.execute("delete from counters where key = '#{key}' and column1 = '#{column1}'")
+    elsif type == "hash"
+      @db_conn.execute("delete from hashes where key = '#{key}' and column1 = '#{column1}'")
+    end
+  end
+end

data/lib/redi2casa/hget.rb

@@ -1,11 +1,11 @@
 class Redi2casa
-  def hget namespace, key, type = "counters"
+  def hget key, column1, type = "counter"
     if type.to_s == "hash"
-      resp = @db_conn.execute("select key from hashes where namespace = '#{namespace}'")
-      parse_response(resp, "key")
-    elsif type.to_s == "counters"
-      resp = @db_conn.execute("select value from counters where KEY='#{namespace}' and column1 = '#{key}'")
+      resp = @db_conn.execute("select value from hashes where key = '#{key}' and column1 = '#{column1}'")
       parse_response(resp, "value")
+    elsif type.to_s == "counter"
+      resp = @db_conn.execute("select value from counters where KEY='#{key}' and column1 = '#{column1}'")
+      parse_response(resp, "value").to_i
     end
   end
 end

data/lib/redi2casa/hgetall.rb

@@ -1,11 +1,11 @@
 class Redi2casa
-  def hgetall key, type = "counters"
-    if type.to_s == "counters"
+  def hgetall key, type = "counter"
+    if type.to_s == "counter"
       response = @db_conn.execute("select * from counters where KEY='#{key}'")
       response.inject({}) {|hsh, entry| hsh[entry["column1"]] = entry["value"]; hsh}
     elsif type.to_s == "hash"
-      resp = @db_conn.execute("select key from hashes where namespace = '#{key}'")
-      parse_response(resp, "key")
+      response = @db_conn.execute("select * from hashes where key = '#{key}'")
+      response.inject({}) {|hsh, entry| hsh[entry["column1"]] = entry["value"]; hsh}
     end
   end
 end

data/lib/redi2casa/hincrby.rb

@@ -1,6 +1,5 @@
 class Redi2casa
-  def hincrby namespace, key, value = 1
-    query = "update counters set value = value + #{value} where key='#{namespace}' and column1 = '#{key}'"
-    @db_conn.execute(query)
+  def hincrby key, column1, value = 1
+    @db_conn.execute("update counters set value = value + #{value} where key='#{key}' and column1 = '#{column1}'")
   end
 end

data/lib/redi2casa/hkeys.rb

@@ -0,0 +1,11 @@
+class Redi2casa
+  def hkeys key, type = "counter"
+    if type.to_s == "counter"
+      response = @db_conn.execute("select column1 from counters where key = '#{key}'")
+      response.collect {|entry| entry["column1"]}
+    elsif type.to_s == "hash"
+      response = @db_conn.execute("select column1 from hashes where key = '#{key}'")
+      response.collect {|entry| entry["column1"]}
+    end
+  end
+end

data/lib/redi2casa/hlen.rb

@@ -0,0 +1,7 @@
+class Redi2casa
+  # Supports only hashes now
+  def hlen key
+    response = @db_conn.execute("select count(*) from hashes where key = '#{key}'")
+    parse_response(response, "count").to_i
+  end
+end

data/lib/redi2casa/hset.rb

@@ -1,5 +1,5 @@
 class Redi2casa
-  def hset namespace, key, value
-    @db_conn.execute("UPDATE hashes SET key = key + {'#{key}' : '#{value}'} WHERE namespace = '#{namespace}'")
+  def hset key, column1, value
+    @db_conn.execute("UPDATE hashes SET value = '#{value}' WHERE column1 = '#{column1}' and key = '#{key}'")
   end
 end

data/lib/redi2casa/sadd_with_expire.rb

@@ -1,5 +1,5 @@
 class Redi2casa
-  def sadd_with_expire( key, ttl, members)
+  def sadd_with_expire( key, ttl, *members)
     @db_conn.execute("update sets using ttl #{ttl} set members = members + {'#{members.join("','")}'} where key = '#{key}'")
   end
 end

data/lib/redi2casa/scard.rb

@@ -0,0 +1,5 @@
+class Redi2casa
+  def scard key
+    smembers(key).size
+  end
+end

data/lib/redi2casa/sismember.rb

@@ -0,0 +1,5 @@
+class Redi2casa
+  def sismember key, value
+    smembers(key).include?(value)
+  end
+end

data/lib/redi2casa/version.rb

@@ -1,3 +1,3 @@
 class Redi2casa
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/redi2casa.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "cql-rb"
+  spec.add_runtime_dependency "bitwise"
 
   spec.add_development_dependency "cql-rb"
   spec.add_development_dependency "bundler"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redi2casa
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - vireshas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-29 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cql-rb
@@ -25,6 +25,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bitwise
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cql-rb
   requirement: !ruby/object:Gem::Requirement
@@ -87,9 +101,12 @@ files:
 - lib/redi2casa.rb
 - lib/redi2casa/del.rb
 - lib/redi2casa/get.rb
+- lib/redi2casa/hdel.rb
 - lib/redi2casa/hget.rb
 - lib/redi2casa/hgetall.rb
 - lib/redi2casa/hincrby.rb
+- lib/redi2casa/hkeys.rb
+- lib/redi2casa/hlen.rb
 - lib/redi2casa/hset.rb
 - lib/redi2casa/lpop.rb
 - lib/redi2casa/lpush.rb
@@ -99,8 +116,10 @@ files:
 - lib/redi2casa/rpush.rb
 - lib/redi2casa/sadd.rb
 - lib/redi2casa/sadd_with_expire.rb
+- lib/redi2casa/scard.rb
 - lib/redi2casa/set.rb
 - lib/redi2casa/setex.rb
+- lib/redi2casa/sismember.rb
 - lib/redi2casa/smembers.rb
 - lib/redi2casa/spop.rb
 - lib/redi2casa/srem.rb