sessionm-cassandra_object 4.0.10 → 4.0.11

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    M2Q1NWZkM2IwNWRiNmE0MTZjYTQzMTIxMDljOGM5NWJiNjEyOGQ5Nw==
-  data.tar.gz: !binary |-
-    MmM3MWFjYTYzY2FhZjE4ZjZiZGM5NzJkYTU1YTU2MGIxYzM0ZTVlOA==
+SHA1:
+  metadata.gz: 1e09d42c44da63c37887407613d4abfab560b4ba
+  data.tar.gz: d712eee439e1832cee073e0829b235016b1248ff
 SHA512:
-  metadata.gz: !binary |-
-    M2UyNTUxMWIyNjNhZmVkYmIyNmJmOTZkZGNmYmZiYTk2ZmU0NTM4OTZlMjdj
-    NWUwNTMxM2ZiNjdiYWE0M2QzOTY2OTJiNTBjYmNjYTU1MjFjZDE0ZGQyYWZh
-    MmMzOWRjNDc4ZDAwYmUzMTYxYjdiNTg3YjliODNkM2I0MmUwZGM=
-  data.tar.gz: !binary |-
-    MWIxZjU2YTczYWIyYjY2MjUxNzI4OGI0YzM1ZjZhYzc1Mjg4OTk4NGNkZTQy
-    ZTczNTFmYTBhMGI3YzU3YjNkMjk3NzM1Zjk5ZjUyYTVlMmQ3ZDQwMDhlOGUz
-    NjVmYTk3ZTRlNDQ4YzEzZmI1YjViOWMyMzljMDQwOTdlOWRiZmM=
+  metadata.gz: 2a72f143c68b66fb4b29f88968504e50ad361af01d22c40316047142863ec87136bb0402ad570d59a36851151d7e6e84066e7dd0eaf0cd350fc23abb484f4c1d
+  data.tar.gz: 617502c23d8ecb0f42b07f423ebfa180ec4d228e5f4a3ae48cd73b39895dc534decf3edc4fa79d5aabdb4b1097e8304cec787d63b1ea88b38ae888c1d6d73d45

data/lib/cassandra_object/adapters/cassandra_driver.rb

@@ -75,7 +75,7 @@ module CassandraObject
 
           query = "BEGIN BATCH\n"
           query << values.map do |name, value|
-            "  INSERT INTO \"#{column_family}\" (#{KEY_FIELD}, #{NAME_FIELD}, #{VALUE_FIELD}) VALUES (#{key}, '#{name}', '#{value}')#{insert_into_options}"
+            "  INSERT INTO \"#{column_family}\" (#{KEY_FIELD}, #{NAME_FIELD}, #{VALUE_FIELD}) VALUES (#{key}, #{escape(name, opts.try(:[], :name_type))}, #{escape(value, opts.try(:[], :value_type))})#{insert_into_options}"
           end.join("\n")
           query << "\nAPPLY BATCH;"
 
@@ -171,6 +171,24 @@ module CassandraObject
           results
         end
 
+        def get_slice(column_family, key, column, start, finish, count, reversed, consistency, opts={})
+          opts[:consistency] = consistency
+
+          key = "textAsBlob('#{key}')"
+
+          query = "SELECT * FROM \"#{column_family}\" WHERE #{KEY_FIELD} = #{key}"
+          query << " AND #{NAME_FIELD} = #{escape(column, opts[:name_type])}" if column
+          query << " AND #{NAME_FIELD} >= #{escape(start, opts[:name_type])}" unless start.empty?
+          query << " AND #{NAME_FIELD} <= #{escape(finish, opts[:name_type])}" unless finish.empty?
+          query << " ORDER BY #{NAME_FIELD} #{opts[:reverse_comparator] ? 'ASC' : 'DESC'}" if reversed
+          query << " LIMIT #{count}"
+
+          self.execute(query, execute_options(opts)).inject({}) do |results, row|
+            results[decode(row[NAME_FIELD], opts[:name_type])] = decode(row[VALUE_FIELD], opts[:value_type])
+            results
+          end
+        end
+
         def execute_options(opts)
           opts.try(:slice,
                    :consistency,
@@ -224,6 +242,36 @@ CQL
 
           self.column_families[column_family.name.to_s] = column_family
         end
+
+        def escape(str, type)
+          case type
+          when :timeuuid
+            convert_str_to_timeuuid str
+          when :blob
+            convert_str_to_hex str
+          else
+            "'#{str}'"
+          end
+        end
+
+        def decode(val, type)
+          case type
+          when :timeuuid
+            SimpleUUID::UUID.new(val.to_s).to_s # binary version
+          else
+            val
+          end
+        end
+
+        # when the column names are timeuuid
+        def convert_str_to_timeuuid(str)
+          SimpleUUID::UUID.new(str).to_guid
+        end
+
+        # insert a blob
+        def convert_str_to_hex(str)
+          '0x' << str.unpack('H*').first
+        end
       end
     end
   end

data/sessionm-cassandra_object.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = 'sessionm-cassandra_object'
-  s.version = '4.0.10'
+  s.version = '4.0.11'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 
-  s.authors = ["Michael Koziarski", "gotime", "sessionm"]
+  s.authors = ["Doug Youch", "sessionm"]
   s.email = 'doug@sessionm.com'
   s.homepage = 'http://github.com/sessionm/cassandra_object'
 

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: sessionm-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 4.0.10
+  version: 4.0.11
 platform: ruby
 authors:
-- Michael Koziarski
-- gotime
+- Doug Youch
 - sessionm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies: []
 description: Cassandra ActiveModel
 email: doug@sessionm.com
@@ -19,9 +18,9 @@ extensions: []
 extra_rdoc_files:
 - README.markdown
 files:
-- .gitignore
-- .ruby-gemset
-- .ruby-version
+- ".gitignore"
+- ".ruby-gemset"
+- ".ruby-version"
 - CHANGELOG
 - Gemfile
 - Gemfile.lock
@@ -142,12 +141,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []