cassandra-model 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/cassandra-model.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cassandra-model}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tien Le"]
-  s.date = %q{2010-11-28}
+  s.date = %q{2010-12-22}
   s.description = %q{Cassandra-model allows you to map ColumnFamily/SuperColumnFamily in Cassandra to Ruby objects. It was designed to be fast and simple.}
   s.email = %q{tienlx /at/ gmail /dot/ com}
   s.extra_rdoc_files = [

data/lib/cassandra-model/base.rb

@@ -21,7 +21,10 @@ module CassandraModel
       end
 
       def key(name)
-        class_eval "def #{name}=(value); @key = value.to_s; end"
+        class_eval <<-EVAL, __FILE__, __LINE__ + 1
+          def #{name}=(value); @key = value.to_s; end
+          def #{name}; @key; end
+        EVAL
       end
 
       def column(name, type = :string)
@@ -56,8 +59,8 @@ module CassandraModel
       end
     end
 
-    attr_accessor :new_record
-    attr_reader :key, :attributes, :errors
+    attr_accessor :key, :new_record
+    attr_reader :attributes, :errors
 
     def initialize(attrs = {}, convert = true)
       @new_record = true

data/lib/cassandra-model/persistence.rb

@@ -27,7 +27,7 @@ module CassandraModel
       end
 
       def update_attributes(attrs)
-        attributes = attrs
+        self.attributes = attrs
         save
       end
 
@@ -40,6 +40,7 @@ module CassandraModel
       def write(attrs)
         self.class.write(key, attrs)
         @new_record = false
+        self
       end
     end
 
@@ -58,8 +59,11 @@ module CassandraModel
         attrs = connection.get(column_family, key, options)
         return nil if attrs.empty?
         new(attrs, false).tap do |object|
+          object.key = key
           object.new_record = false
         end
+      rescue
+        nil
       end
 
       alias :find :get
@@ -71,8 +75,11 @@ module CassandraModel
       end
 
       def exists?(key)
+        return false if key.nil? || key == ''
         #connection.exists?(column_family, key)
         !connection.get(column_family, key).empty?
+      rescue
+        false
       end
 
       def all(keyrange = ''..'', options = {})

data/test/cassandra_model_test.rb

@@ -64,7 +64,10 @@ class CassandraModelTest < Test::Unit::TestCase
     should "destroy a record" do
       @user.destroy
       assert User.get("tl").nil?
+      assert User.get(nil).nil?
+
       assert_raise(CassandraModel::RecordNotFound) { User["tl"] }
+      assert_raise(CassandraModel::RecordNotFound) { User[nil] }
     end
 
     should "return true if record exists and otherwise" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tien Le
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-28 00:00:00 +07:00
+date: 2010-12-22 00:00:00 +07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency