redi2casa 0.0.2 → 0.0.3

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in redi2casa.gemspec
-gem "cassandra-cql", :git => "git@github.com:vireshas/cassandra-cql.git"
 gemspec

data/Gemfile.lock

@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    redi2casa (0.0.3)
+      cql-rb
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    cql-rb (1.1.1)
+    rake (10.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  cql-rb
+  rake
+  redi2casa!

data/README.md

@@ -1,39 +1,29 @@
-# Redi2casa
-
-Redis datastructures using Cassandra
+# Redi2casa <a href="http://badge.fury.io/rb/redi2casa"><img src="https://badge.fury.io/rb/redi2casa@2x.png" alt="Gem Version" height="18"></a>  
+  
+Redis datastructures using Cassandra. 
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-    gem "cassandra-cql", :git => "git://github.com/vireshas/cassandra-cql.git"
-    gem "redi2casa", :git => "git://github.com/vireshas/redi2casa.git"
-
-And then execute:
+    $ gem install redi2casa
 
-    $ bundle install
+#### Configuring cassandra  
 
-Or install it yourself as:
+###### You need to install cassandra-2.0.x (please follow these instructions, https://gist.github.com/vireshas/7462447)
 
-    $ gem install redi2casa
+    From the cloned location execute:  
+    cqlsh -f cqlsh_cmds --debug
+    cassandra-cli -k redi2casa -f cassandra_cli_cmds
 
 ## Usage
 
-#### configuring cassandra
-
-    create namespace: CREATE KEYSPACE redi2casa WITH replication = {'class': 'SimpleStrategy', 'replication_factor': 1};
-    cqlsh: create table sets(namespace text primary key, key map<text, text>);
-    cassandra-cli: create column family counters with column_type = 'Standard' and comparator = 'UTF8Type' and default_validation_class = 'CounterColumnType' and key_validation_class = 'UTF8Type';
-    
-### Now you can
-
     require "redi2casa"
-    r = Redi2casa.new "127.0.0.1:9160", {:keyspace => 'keyspace1'}  
+    r = Redi2casa.new ["localhost"], 'redi2casa'    
+    
+    Available:  [hset, hget, hincrby, lpush, ltrim, lpop, lrange, rpush, rpop]
 
-  You should keep one thing in mind while using hget with hash!, you should explicitly mention that you are using hget with hash  
-  
+    You should be passing an extra param(hash) when you call hget to retrieve a hash    
     r.hset "a", "b", "hello_world"
-    r.hget "a", "b", "hash"  #the last parameter is needed for hash  
+    r.hget "a", "b", "hash"  #the last parameter is needed at the moment  
     
   You can find more examples here: https://gist.github.com/vireshas/99bc322cf0ac42fbf7ee  
 

data/cassandra_cli_cmds

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

data/cqlsh_cmds

@@ -0,0 +1,4 @@
+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>);

data/lib/redi2casa/hget.rb

@@ -1,11 +1,11 @@
 class Redi2casa
   def hget namespace, key, type = "counters"
     if type.to_s == "hash"
-      resp = @db_conn.execute("select * from sets where namespace = ?", namespace).fetch
-      resp.nil? ? nil : resp.to_hash['key'][key]
+      resp = @db_conn.execute("select key from hashes where namespace = '#{namespace}'")
+      parse_response(resp, "key")
     elsif type.to_s == "counters"
-      response = @db_conn.execute("select * from counters where KEY='#{namespace}' and column1 = '#{key}'")
-      response.fetch {|entry| return entry.to_hash["value"]}
+      resp = @db_conn.execute("select value from counters where KEY='#{namespace}' and column1 = '#{key}'")
+      parse_response(resp, "value")
     end
   end
 end

data/lib/redi2casa/hgetall.rb

@@ -2,12 +2,10 @@ class Redi2casa
   def hgetall key, type = "counters"
     if type.to_s == "counters"
       response = @db_conn.execute("select * from counters where KEY='#{key}'")
-      hsh = {}
-      response.fetch {|resp| entry = resp.to_hash; hsh[entry["column1"]] = entry["value"] }
-      hsh
+      response.inject({}) {|hsh, entry| hsh[entry["column1"]] = entry["value"]; hsh}
     elsif type.to_s == "hash"
-      resp = @db_conn.execute("select * from sets where namespace = ?", key).fetch
-      resp.nil? ? nil : resp.to_hash['key']
+      resp = @db_conn.execute("select key from hashes where namespace = '#{key}'")
+      parse_response(resp, "key")
     end
   end
 end

data/lib/redi2casa/hset.rb

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

data/lib/redi2casa/lpop.rb

@@ -1,4 +1,5 @@
 class Redi2casa
+  #has a read modify write problem
   def lpop namespace
     resp = @db_conn.execute("select values from lists where namespace='#{namespace}'")
     values = []

data/lib/redi2casa/version.rb

@@ -1,3 +1,3 @@
 class Redi2casa
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/redi2casa.rb

@@ -1,9 +1,15 @@
 require "redi2casa/version"
-require "cassandra-cql"
+require "cql"
+
 Gem.find_files("redi2casa/*.rb").each { |path| require path }
 
 class Redi2casa
-  def initialize(host, keyspace)
-    @db_conn =  CassandraCQL::Database.new(host, keyspace)
+  def initialize(hosts, keyspace)
+    @db_conn =  Cql::Client.connect(:hosts => hosts)
+    @db_conn.use(keyspace)
+  end
+
+  def parse_response(resp, key)
+    resp.map {|entry| entry[key].to_s }.first
   end
 end

data/redi2casa.gemspec

@@ -18,6 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "cql-rb"
+
+  spec.add_development_dependency "cql-rb"
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redi2casa
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: cql-rb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: cql-rb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,9 +84,12 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- cassandra_cli_cmds
+- cqlsh_cmds
 - lib/redi2casa.rb
 - lib/redi2casa/hget.rb
 - lib/redi2casa/hgetall.rb
@@ -83,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -990581828638707000
+      hash: 1475517929010687912
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -92,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -990581828638707000
+      hash: 1475517929010687912
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25