cassandro 1.1.0 → 1.2.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGY2MDljZDAzYjFhOGZmYzZhZjM4MjE0YTcyOTIwNDYxZTIwNTQ4OA==
-  data.tar.gz: !binary |-
-    Y2M3MTA2ZTVjMGJkOTZjNTdiNWZmNGY0NzE0YzU4ZjMyNTM3NmFmNw==
+SHA1:
+  metadata.gz: 0120288029f77b9b0c1f5decbf83dd3aa28ee3f6
+  data.tar.gz: 3f50c226fb664ccbd79eb2e95b6c638b0a0caaf0
 SHA512:
-  metadata.gz: !binary |-
-    MjNjYjQ5MjA5MmJmZGNmMjVlZWE3NWRkNzdlYWQ5OTg1NWVhZjlhMmU0OTE1
-    N2E5NjNjZGVlNTFjZDE2NDAwNTJmMWY4ZmIyMzRkMWMyN2M1ODU1OTE0ODBi
-    MDhkODlhN2FmMjhkNWM3NjJlYWRiNzBhNmRlZDU5MjFlZTNlYWE=
-  data.tar.gz: !binary |-
-    MDc2OTk4YTA4NDc3MzI1MGZmMmViMWYxYjdjMjBkNGFiYTIyNjI4MmVlMDIz
-    ZGM5N2EzZDk1Y2ZlYjM0N2IwMmJmODM1NWU4ZWNkNDkxMmM3NDFjYmUzMTIy
-    ZTdlZDQ4MmRhMGRlOTM1YzAwMGNjYTZmYmMwZTM0YTU4MjY2ZGY=
+  metadata.gz: 734ad77b4020a932713e66d2618815798c14b850a0243fd3f36c2d621dcaaec4b4d937f7c4a66c624dc13c653618039c55534bb2d904c7c28569bd6587aac153
+  data.tar.gz: 97d3d021c5808aa343988e8781beaee4327756fe52a7a68304caed7e1b8657dc0446b2981a42de502a9b8b8e8a6329bf0f398ab487b26857cf303c529d4a7b8b

data/.gitignore

@@ -1 +1,2 @@
 *.gem
+.ruby-version

data/README.md

@@ -119,6 +119,32 @@ class  User < Cassandro::Model
 end
 ```
 
+
+### Setting TTL to a model
+
+```Ruby
+class Person < Cassandro::Model
+  table :people
+  ttl 60
+end
+```
+This will make all the instances of the People class will have a Time To Live of `60` seconds in the database.
+
+Creating a single record with a given TTL:
+
+```Ruby
+class Person < Cassandro::Model
+  table :people
+  attribute :first_name, :text
+  attribute :last_name, :text
+end
+
+Person.create_with_ttl(20, :first_name => "Eddie", :last_name => "Vedder")
+```
+
+This will create a record in the `people` table with a TTL of `20` seconds. It doesn't matter if the model has a different TTL set, this will override that TTL for _this record only_
+
+
 __A complete example__
 
 ```ruby

data/cassandro.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cassandro"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
   s.summary = "Ruby ORM for Apache Cassandra"
   s.license = "MIT"
   s.description = "Lightweight Apache Cassandra ORM for Ruby"

data/lib/cassandro/model.rb

@@ -10,6 +10,7 @@ module Cassandro
       @persisted = persisted
 
       attrs.each do |att, val|
+        next unless self.respond_to?(:"#{att}=")
         case val.class.name
         when "Set"
           send(:"#{att}=", val.to_a)
@@ -173,7 +174,7 @@ module Cassandro
 
       return nil unless result.any?
 
-      self.new(result.first, true)
+      self.new(self.parse_row(result.first), true)
     end
 
     def self.create(attrs = {})
@@ -189,7 +190,7 @@ module Cassandro
       rows = Cassandro.execute(query)
       all = []
       rows.each do |row|
-        all << new(row, true)
+        all << new(self.parse_row(row), true)
       end
       all
     end
@@ -289,6 +290,24 @@ module Cassandro
       pk.first
     end
 
+    def self.options
+      @options ||= {}
+    end
+
+    def self.ttl(seconds)
+      self.options[:ttl] = seconds.to_i
+    end
+
+    def self.create_with_ttl(seconds, attrs = {})
+      old_ttl = self.options[:ttl]
+      self.options[:ttl] = seconds.to_i
+
+      result = self.create(attrs)
+
+      old_ttl ? self.options[:ttl] = old_ttl : self.options.delete(:ttl)
+      result
+    end
+
     def statement_for(operation, options = {})
       case operation
       when :insert
@@ -297,6 +316,7 @@ module Cassandro
           INSERT INTO #{self.class.table_name}(#{@attributes.keys.map { |x| x.to_s}.join(',')})
           VALUES(#{@attributes.keys.map { |x| '?' }.join(",")})
           #{options[:insert_check] ? 'IF NOT EXISTS' : ''}
+          #{self.class.options[:ttl] && self.class.options[:ttl] > 0 ? "USING TTL #{self.class.options[:ttl]}" : ''}
         QUERY
         if @insert_statement.nil? ||
                       @insert_statement.params_metadata.count != @attributes.count
@@ -319,6 +339,8 @@ module Cassandro
         end
 
         case self.class.casts[k]
+        when :set
+          n_attrs << Set.new(attrs[k])
         when :uuid
           n_attrs << Cassandra::Uuid.new(attrs[k])
         when :integer
@@ -333,5 +355,9 @@ module Cassandro
       end
       n_attrs
     end
+
+    def self.parse_row(row)
+      row.each{ |k,v| row[k] = [] if casts[k.to_sym] == :set && v.nil? }
+    end
   end
 end

data/test/cassandro_model_test.rb

@@ -153,6 +153,14 @@ Protest.describe "Cassandro Model" do
 
       assert_equal 1, Test.count(:test_col_1, Cassandra::Uuid.new(uuid))
     end
+
+    test "ignore columns not defined in model" do
+      uuid = SecureRandom.uuid
+      Test.create(test_col_1: uuid, test_col_2: 'test_value_2')
+
+      tests = Test[uuid]
+      assert_equal false, tests.respond_to?("test_col_3")
+    end
   end
 
   context 'Updating' do
@@ -184,4 +192,60 @@ Protest.describe "Cassandro Model" do
       assert_equal "PRIMARY KEY part name found in SET part", patient.errors[:update_error]
     end
   end
+
+  context 'TTL' do
+    setup do
+      class Test < Cassandro::Model
+        table 'tests'
+
+        ttl 20
+
+        attribute :test_col_1, :uuid
+        attribute :test_col_2, :text
+
+        primary_key :test_col_1
+        unique :test_col_1
+      end
+
+      class Patient < Cassandro::Model
+        table :patients
+
+        attribute :name, :text
+        attribute :address, :text
+        attribute :age, :int
+
+        primary_key [:name]
+      end
+      Cassandro.truncate_table('patients')
+    end
+
+    test "should create with TTL defined by the model" do
+      volatile_record = Test.create(:test_col_1 => SecureRandom.uuid, :test_col_2 => "Test Text")
+      results = Cassandro.execute "SELECT TTL(test_col_2) FROM tests WHERE test_col_1 = #{volatile_record.test_col_1}"
+
+      assert results.first["ttl(test_col_2)"] > 0
+      assert results.first["ttl(test_col_2)"] <= 20
+    end
+
+    test "should override TTL defined by the model" do
+      volatile_record = Test.create_with_ttl(10, :test_col_1 => SecureRandom.uuid, :test_col_2 => "Test Text")
+      results = Cassandro.execute "SELECT TTL(test_col_2) FROM tests WHERE test_col_1 = #{volatile_record.test_col_1}"
+
+      assert results.first["ttl(test_col_2)"] > 0
+      assert results.first["ttl(test_col_2)"] <= 10
+    end
+
+    test "should be able to create with TTL if not specified in the model" do
+      dog = Patient.create(:name => "Cassandro", :address => "cassandstreet", :age => 1)
+      results = Cassandro.execute "SELECT TTL(address) FROM patients WHERE name = 'Cassandro'"
+
+      assert !results.first["ttl(address)"]
+
+      cat = Patient.create_with_ttl(30, :name => "Cassandra", :address => "cassandstreet 123", :age => 2)
+      results = Cassandro.execute "SELECT TTL(address) FROM patients WHERE name = 'Cassandra'"
+
+      assert results.first["ttl(address)"] > 0
+      assert results.first["ttl(address)"] <= 30
+    end
+  end
 end

data/test/support/tables.rb

@@ -3,6 +3,7 @@ table = <<-TABLEDEF
   CREATE TABLE IF NOT EXISTS tests (
     test_col_1 UUID,
     test_col_2 VARCHAR,
+    test_col_3 VARCHAR,
     PRIMARY KEY(test_col_1)
   )
 TABLEDEF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandro
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Lautaro Orazi
@@ -9,66 +9,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: protest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.3
 description: Lightweight Apache Cassandra ORM for Ruby
@@ -79,9 +79,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gems
-- .gems-test
-- .gitignore
+- ".gems"
+- ".gems-test"
+- ".gitignore"
 - LICENSE
 - README.md
 - cassandro.gemspec
@@ -114,19 +114,18 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby ORM for Apache Cassandra
 test_files: []
-has_rdoc: