redi2casa 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e43c9e712abbadf2d40c505753886fce924bdecf
-  data.tar.gz: 9e42990c5fcae1788120a943a916ce3fb56106a4
+  metadata.gz: 35b5e5cfc4873a689448142620660d1666616b8a
+  data.tar.gz: fb129440f8573bc3c27986ad89db70ff9f1dceb1
 SHA512:
-  metadata.gz: 777f367a89886b87f333b1db07ba3dbd53eb21db75811b40b04dec5931c07d7b7ede74b638bcda6b91046e47b3d6a341eb398bea77e190e3eb35eeb20a0cf4c9
-  data.tar.gz: 66495e184f84d9b55362d369525ed6cdfe5e56414e9a638f6f02fdd8dedbae24ac7a3165a524b27b1737b06c7b052d31fc6df141a0c6ed3eda47fd6f97ba6e1c
+  metadata.gz: a45ebd0bbedbf872526e0208c87172e7f28f736cbbf064bfb23baf39468bb0ab6bb5d0a1d1f6c06f4baa9d0091472c0b1cf4827b08ded1b51db7099305ac8d7e
+  data.tar.gz: b481b19b93d9a097e2ab2514e3158d1d0f6a457f807fb705804e50bf190549baa5865b7d005affdc5d5c209494308573f49382253ce5b015284c0615fb24c4e0

data/.ruby-gemset

@@ -0,0 +1 @@
+redi2casa

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.0.0-p247

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    redi2casa (0.1.1)
+    redi2casa (0.1.5)
       cql-rb
 
 GEM
   remote: https://rubygems.org/
   specs:
-    cql-rb (1.1.2)
+    cql-rb (1.1.3)
     diff-lcs (1.2.5)
-    rake (10.1.0)
+    rake (10.1.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)

data/lib/redi2casa/del.rb

@@ -4,15 +4,17 @@ class Redi2casa
     if type == "counter"
       raise RuntimeError.new("deleting counters is not supported")
     elsif type == 'keyvalue'
-      execute "delete from keyvalue where key = '#{key}'"
+      execute("delete from keyvalue where key = ?", key)
     elsif type == 'hash'
-      execute "delete from hashes where key = '#{key}'"
+      execute("delete from hashes where key = ?", key)
     elsif type == 'list'
-      execute "delete from lists where namespace = '#{key}'"
+      execute("delete from lists where namespace = ?", key)
     elsif type == 'set'
-      execute "delete from sets where key = '#{key}'"
+      execute("delete from sets where key = ?", key)
     elsif type == 'sorted_set'
-      execute "delete from sorted_sets where key = '#{key}'"
+      execute("delete from sorted_sets where key = ?", key)
+    else
+      raise RuntimeError.new("Invalid type")
     end
   end
 end

data/lib/redi2casa/get.rb

@@ -1,11 +1,11 @@
 class Redi2casa
   def get key, type = 'keyvalue'
     if type == 'keyvalue'
-      resp = execute "select * from keyvalue where key = '#{key}'"
+      resp = execute("select * from keyvalue where key = ?", key)
       parse_response(resp, "value")
     elsif type == 'counter'
       # @ is a special column in counter used by incrby
-      resp = execute "select value from counters where KEY='#{key}' and column1 = '@'"
+      resp = execute("select value from counters where KEY = ? and column1 = '@'", key)
       parse_response(resp, "value").to_i
     end
   end

data/lib/redi2casa/hdel.rb

@@ -3,7 +3,7 @@ class Redi2casa
     if type == "counter"
       raise RuntimeError.new("deleting counters is not supported")
     elsif type == "hash"
-      execute "delete from hashes where key = '#{key}' and column1 = '#{column1}'"
+      execute("delete from hashes where key = ? and column1 = ?", key, column1)
     end
   end
 end

data/lib/redi2casa/hget.rb

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

data/lib/redi2casa/hgetall.rb

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

data/lib/redi2casa/hincrby.rb

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

data/lib/redi2casa/hkeys.rb

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

data/lib/redi2casa/hlen.rb

@@ -2,11 +2,12 @@ class Redi2casa
   # Supports only hashes now
   def hlen key, type = "hash"
     if type == "hash"
-      response = execute "select count(*) from hashes where key = '#{key}'"
-      parse_response(response, "count").to_i
+      response = execute("select count(*) from hashes where key = ?", key)
     elsif type == "counter"
-      response = execute "select count(*) from counters where key = '#{key}'"
-      parse_response(response, "count").to_i
+      response = execute("select count(*) from counters where key = ?", key)
+    else
+      raise RuntimeError.new("Invalid type")
     end
+    parse_response(response, "count").to_i
   end
 end

data/lib/redi2casa/hmget.rb

@@ -8,7 +8,7 @@ class Redi2casa
       raise RuntimeError.new("invalid table")
     end
 
-    resp = execute "select column1, value from #{table} where key = '#{key}' and column1 IN ('#{column1s.join("','")}')"
+    resp = execute("select column1, value from #{table} where key = ? and column1 IN ?", key, column1s)
     hash = {}
     resp.each do |r|
       hash[r["column1"]] = r["value"]

data/lib/redi2casa/hset.rb

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

data/lib/redi2casa/lpop.rb

@@ -1,7 +1,7 @@
 class Redi2casa
   #has a read modify write problem
   def lpop namespace
-    resp = execute "select values from lists where namespace='#{namespace}'"
+    resp = execute("select values from lists where namespace = ?", namespace)
     values = []
     resp.each {|entry| values = entry.to_hash["values"]}
     resp = values.shift

data/lib/redi2casa/lpush.rb

@@ -1,5 +1,5 @@
 class Redi2casa
   def lpush namespace, data
-    execute "UPDATE lists SET values = ['#{data}'] + values WHERE namespace = '#{namespace}'"
+    execute("UPDATE lists SET values = ? + values WHERE namespace = ?", [ data], namespace)
   end
 end

data/lib/redi2casa/lrange.rb

@@ -1,6 +1,6 @@
 class Redi2casa
   def lrange namespace, first, last
-    resp = execute "select values from lists where namespace='#{namespace}'"
+    resp = execute("select values from lists where namespace = ?", namespace)
     resp.each {|entry| 
       values = entry.to_hash["values"] || []
       return values[first..last]

data/lib/redi2casa/ltrim.rb

@@ -1,6 +1,6 @@
 class Redi2casa
   def ltrim namespace, first, last
-    resp = execute "select values from lists where namespace='#{namespace}'"
+    resp = execute("select values from lists where namespace = ?", namespace)
     values = {}
     resp.each {|entry| values = entry.to_hash["values"]}
     values_count = values.count
@@ -17,11 +17,11 @@ class Redi2casa
   end
 
   def lflush namespace
-    execute "UPDATE lists SET values = []  WHERE namespace = '#{namespace}'"
+    execute("UPDATE lists SET values = []  WHERE namespace = ?", namespace)
   end
 
   private
   def lrepush namespace, list
-    execute "UPDATE lists SET values = ['#{list.join("','")}']  WHERE namespace = '#{namespace}'"
+    execute("UPDATE lists SET values = ?  WHERE namespace = ?", list, namespace)
   end
 end

data/lib/redi2casa/rpop.rb

@@ -1,6 +1,6 @@
 class Redi2casa
   def rpop namespace
-    resp = execute "select values from lists where namespace='#{namespace}'"
+    resp = execute("select values from lists where namespace = ?", namespace)
     values = []
     resp.fetch {|entry| values = entry.to_hash["values"]}
     resp = values.pop

data/lib/redi2casa/rpush.rb

@@ -1,5 +1,5 @@
 class Redi2casa
   def rpush namespace, data
-    execute "UPDATE lists SET values = values + ['#{data}'] WHERE namespace = '#{namespace}'"
+    execute("UPDATE lists SET values = values + [?] WHERE namespace = ?", data, namespace) 
   end
 end

data/lib/redi2casa/sadd.rb

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

data/lib/redi2casa/sadd_with_expire.rb

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

data/lib/redi2casa/set.rb

@@ -1,5 +1,5 @@
 class Redi2casa
   def set key, value
-    execute "UPDATE keyvalue set value = '#{value}' where key = '#{key}'"
+    execute("UPDATE keyvalue set value = ? where key = ?", value, key)
   end
 end

data/lib/redi2casa/set_bit.rb

@@ -4,7 +4,7 @@ class Redi2casa
     if !(bit != 0 || bit != 1)
       raise RuntimeError.new("Invalid bit")
     end
-    hset("#{key}","#{offset}", bit)
+    hset("#{key}","#{offset}", bit.to_s)
   end
   alias :setbit :set_bit
 end

data/lib/redi2casa/setex.rb

@@ -1,5 +1,5 @@
 class Redi2casa
   def setex key, ttl, value
-    execute "UPDATE keyvalue using TTL #{ttl} set value = '#{value}' where key = '#{key}'"
+    execute("UPDATE keyvalue using TTL ? set value = ? where key = ?", ttl, value, key)
   end
 end

data/lib/redi2casa/smembers.rb

@@ -1,6 +1,6 @@
 class Redi2casa
   def smembers key
-    resp = execute "select * from sets where key = '#{key}'"
+    resp = execute("select * from sets where key = ?", key)
     if resp.first
       resp.first["members"].to_a
     else

data/lib/redi2casa/srem.rb

@@ -1,5 +1,5 @@
 class Redi2casa
   def srem key, member
-    execute "update sets set members = members - {'#{member}'} where key = '#{key}'"
+    execute("update sets set members = members - {'#{member}'} where key = ?", key)
   end
 end

data/lib/redi2casa/version.rb

@@ -1,3 +1,3 @@
 class Redi2casa
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/redi2casa/zadd.rb

@@ -1,6 +1,6 @@
 class Redi2casa
   # Random text is an extra column added to make sure we have multiple entries with same key, score and value
   def zadd key, score, value
-    execute "insert into sorted_sets (key, score,value, random_text) values ('#{key}',#{score}, '#{value}', '#{Time.now.to_i}')"
+    execute("insert into sorted_sets (key, score,value, random_text) values (?, ?, ?, ?)", key, score, value, Time.now.to_i.to_s)
   end
 end

data/lib/redi2casa/zrangebyscore.rb

@@ -2,9 +2,9 @@ class Redi2casa
   # Ranges are exclusive
   def zrangebyscore key, lower_limit, higher_limit = -1
     if higher_limit == -1
-      resp = execute "select value from sorted_sets where key = '#{key}' and score > #{lower_limit}"
+      resp = execute("select value from sorted_sets where key = ? and score > ?", key, lower_limit)
     else
-      resp = execute "select value from sorted_sets where key = '#{key}' and score > #{lower_limit} and score < #{higher_limit}"
+      resp = execute("select value from sorted_sets where key = ? and score > ? and score < ?", key, lower_limit, higher_limit)
     end
     resp.collect do |entry|
       entry['value']

data/lib/redi2casa/zrem.rb

@@ -1,8 +1,10 @@
 class Redi2casa
   def zrem key, member
-    resp = execute "select * from sorted_sets where key = '#{key}'"
+    resp = execute("select * from sorted_sets where key = ?", key)
     resp.each do |entry|
-      execute "delete from sorted_sets where key = '#{key}' and score = #{entry['score']} and value = '#{entry['value']}'" if entry['value'] == member.to_s
+      if entry['value'] == member.to_s
+        execute("delete from sorted_sets where key = ? and score = ? and value = ?", key, entry['score'], entry['value'])
+      end
     end
   end
 end

data/lib/redi2casa/zscore.rb

@@ -1,6 +1,6 @@
 class Redi2casa
   def zscore key, value
-    resp = execute "select * from sorted_sets where key = '#{key}'"
+    resp = execute("select * from sorted_sets where key = ?", key)
     resp.each do |entry|
       return entry['score'] if entry['value'] == value.to_s
     end

data/lib/redi2casa.rb

@@ -21,16 +21,17 @@ class Redi2casa
     resp.map {|entry| entry[key].to_s }.first
   end
 
-  def execute query
+  def execute base_query, *args
     @failed ||= 0
-    @db_conn.execute query
+    statement = @db_conn.prepare(base_query)
+    statement.execute(*args)
   rescue Cql::NotConnectedError, Cql::Io::ConnectionError, Cql::Io::ConnectionTimeoutError
     reconnect
     @failed += 1
     retry if @failed < 3
     raise
   rescue Cql::QueryError
-    raise Redi2casaError.new("Cql::QueryError query:#{query}")
+    raise Redi2casaError.new("Cql::QueryError query:#{base_query}, args: #{args.inspect}")
   ensure
     @failed = 0
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redi2casa
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - vireshas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cql-rb
@@ -75,6 +75,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-gemset
+- .ruby-version
 - Changes.md
 - Examples.md
 - Gemfile