fracassandra 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/fracassandra.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fracassandra}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Tregunna"]

data/lib/fracassandra/model.rb

@@ -7,19 +7,10 @@ module Fracassandra
   class Model
     attr_reader :key
 
-    def initialize(key_name=nil, defaults={})
-      if key_name.is_a?(Hash)
-        defaults = key_name
-        key_name = nil
-      end
-
-      if key_name
-        @key = key_name.to_s
-      else
-        r = @@attributes.select { |k,v| v[:key] == true }[0]
-        raise "Invalid key error. No key was given in either the model or as an argument to new" if r.nil?
-        @key = r[0]
-      end
+    def initialize(defaults={})
+      r = @@attributes.select { |k,v| v[:key] == true }[0]
+      raise "Invalid key error. No key was given in either the model or as an argument to new" if r.nil?
+      @key = r[0]
 
       defaults.each_pair do |attribute, value|
         self.send(:"#{attribute}=", value)
@@ -36,7 +27,7 @@ module Fracassandra
 
       t = Fracassandra::database.get(@@column_family_name, key)
       return nil if t.nil?
-      r = self.new(key)
+      r = self.new
       t.each_pair do |k, v|
         r.send(:"#{k}=", v)
       end
@@ -51,18 +42,32 @@ module Fracassandra
     def self.column_family(column_family_name)
       @@column_family_name = column_family_name.to_s
     end
+    
+    def self.timestamps!
+      @@attributes['created_at'] = {}
+      @@attributes['updated_at'] = {}
+    end
 
     def save
       raise DatabaseError, "No database defined. Please set Frassandra.database= to a Cassandra connection." unless $cassandra
       raise DatabaseError, "No column family defined. Please edit your model." unless @@column_family_name
 
+      attribute_keys = @@attributes.keys
+      ivars = instance_variables.map do |ivar_name|
+        ivar_name[1..-1] if attribute_keys.include? ivar_name[1..-1]
+      end.compact
+      
       h = {}
-      @@attributes.each_pair do |attribute_name, hash|
-        next if hash[:key]
-        hash.each_pair do |key, value|
-          h[attribute_name] = (key == :value) ? value : nil
-        end
+      ivars.each do |ivar_name|
+        next if @@attributes[ivar_name][:key]
+        h[ivar_name] = instance_variable_get("@#{ivar_name}")
+      end
+
+      now = Time.now.to_i
+      if ivars.include? "created_at"
+        @created_at ||= now
       end
+      @updated_at ||= now
 
       Fracassandra::database.insert(@@column_family_name, key, h)
     end
@@ -72,24 +77,25 @@ module Fracassandra
     end
 
     def eql?(other)
-      @@attributes.each_pair do |attribute_name, hash|
+      @@attributes.each_pair do |attribute_name, _|
         return false unless send(attribute_name.to_s).eql? other.send(attribute_name.to_s)
       end
       true
     end
 
     def method_missing(sym, *args, &blk)
-      name = sym.to_s
-
-      if @@attributes.keys.include?(name.sub(/=$/, '').to_s)
-        attribute = @@attributes[name.sub(/=$/, '').to_s]
-        if name.include?("=")
-          raise DatabaseError, "Key values are immutable, don't try and change them." if attribute[:key] && attribute[:value]
-          opts = attribute
-          opts[:value] = args[0]
-          @key = opts[:value] if opts[:key]
+      name = sym.to_s.sub(/=$/, '')
+      attribute_names = @@attributes.keys.map { |k| k.sub(/=$/, '') }
+
+      if attribute_names.include? name
+        attribute = @@attributes[name]
+        ivar = instance_variable_get("@#{name}")
+        if sym.to_s.include? "="
+          raise DatabaseError, "Key values are immutable, don't try and change them." if attribute[:key] && ivar
+          instance_variable_set("@#{name}", args[0])
+          @key = instance_variable_get("@#{name}") if attribute[:key]
         else
-          @@attributes[name.to_s][:value]
+          ivar
         end
       else
         super

data/spec/model_spec.rb

@@ -17,6 +17,7 @@ describe "A user record" do
 
   before(:each) do
     @record = {
+      'username' => 'jeremytregunna',
       'password' => "foobar",
       'salt' => "2F37B7B2-18F9-47BB-8D60-AEFF7275EF87",
       'email' => "jeremy.tregunna@me.com"
@@ -24,40 +25,35 @@ describe "A user record" do
   end
 
   it "responds to the password getter" do
-    u = User.new("jeremytregunna", @record)
+    u = User.new(@record)
     u.password.should == "foobar"
   end
 
   it "changes the value of password" do
-    u = User.new("jeremytregunna", @record)
+    u = User.new(@record)
     u.password = "barfoo"
     u.password.should == "barfoo"
   end
 
   it "can retrieve the key by attribute name" do
-    u = User.new({
-      'username' => 'jeremytregunna',
-      'password' => "foobar",
-      'salt' => "2F37B7B2-18F9-47BB-8D60-AEFF7275EF87",
-      'email' => "jeremy.tregunna@me.com"
-    })
+    u = User.new(@record)
     u.username.should == "jeremytregunna"
   end
 
   it "raises an exception when trying to change the key" do
-    u = User.new("jeremytregunna", @record)
+    u = User.new(@record)
     lambda { u.username = "godzilla" }.should raise_error(Fracassandra::DatabaseError)
   end
 
   it "creates a valid user record with minimal data" do
-    u = User.create("jeremytregunna", @record)
+    u = User.new(@record)
     u.should_not be_nil
   end
 
   it "saves the record and can find it afterwards" do
-    u1 = User.create("jeremytregunna", @record)
+    u1 = User.new(@record)
     u1.save
-    u2 = User["jtregunna"]
+    u2 = User["jeremytregunna"]
     u2.should.eql? u1
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fracassandra
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jeremy Tregunna