sandra 0.1.0 → 0.1.1

data/lib/sandra.rb

@@ -1,14 +1,17 @@
 require 'active_model'
 require 'cassandra'
 require 'sandra/key_validator'
+require 'sandra/list'
 
 module Sandra
   def self.included(base)
     base.extend(ClassMethods)
     base.extend(ActiveModel::Naming)
+    base.extend(ActiveModel::Callbacks)
     base.class_eval do
       include ActiveModel::Validations
       include ActiveModel::Conversion
+      define_model_callbacks :create, :update, :save, :destroy
       attr_accessor :attributes, :new_record
       def initialize(attrs = {})
         @attributes = attrs.stringify_keys
@@ -17,6 +20,10 @@ module Sandra
     end
   end
 
+  def key
+    attributes[self.class.key.to_s]
+  end
+
   def new_record?
     new_record
   end
@@ -26,19 +33,24 @@ module Sandra
   end
 
   def save
-    if valid?
-      attrs = attributes.dup
-      key = attrs.delete(self.class.key)
-      self.class.insert(key, attrs)
-      new_record = false
-      true
-    else
-      false
+    callback_target = self.new_record? ? :create : :update
+    run_callbacks callback_target do
+      run_callbacks :save do
+        attrs = attributes.dup
+        key = attrs.delete(self.class.key)
+        if key && valid?
+          self.class.insert(key, attrs)
+          new_record = false
+          true
+        else
+          false
+        end
+      end
     end
   end
 
   module ClassMethods
-    def column(col_name)
+    def column(col_name, type)
       define_method col_name do
         attr = col_name.to_s
         attributes[attr]
@@ -50,7 +62,7 @@ module Sandra
     end
 
     def establish_connection(options = {})
-      connection_options = YAML.load_file("#{::Rails.root.to_s}/config/sandra.yml")[Rails.env].merge(options)
+      connection_options = YAML.load_file("#{::Rails.root.to_s}/config/sandra.yml")[::Rails.env].merge(options)
       keyspace = connection_options["keyspace"]
       host = "#{connection_options["host"]}:#{connection_options["port"]}"
       @connection = Cassandra.new(keyspace, host)
@@ -61,25 +73,29 @@ module Sandra
     end
 
     def get(key)
-      hash = connection.get("User", key)
+      hash = connection.get(self.to_s, key)
       unless hash.empty?
-        obj = self.new(hash)
-        obj.username = key
-        obj.new_record = false
-        obj
+        self.new_object(key, hash)
       else
         nil
       end
     end
 
+    def new_object(key, attributes)
+      obj = self.new(attributes)
+      obj.send("#{@key}=", key)
+      obj.new_record = false
+      obj
+    end
+
     def insert(key, columns = {})
-      connection.insert("User", key, columns)
+      connection.insert(self.to_s, key, columns)
     end
 
-    def key_attribute(name)
+    def key_attribute(name, type)
       @key = name
       validates name, :presence => true, :key => true
-      column name
+      column name, type
     end
 
     def key
@@ -91,5 +107,26 @@ module Sandra
       obj.save
       obj
     end
+
+    def range(options)
+      connection.get_range(self.to_s, options).map do |key, value|
+        self.new_object(key, value)
+      end
+    end
+
+    def list(name, type)
+      define_method name do
+        var_name = "@__#{name}_list"
+        unless instance_variable_get(var_name)
+          instance_variable_set(var_name, Sandra::List.new(name, type, self))
+        end
+        instance_variable_get(var_name)
+      end
+    end
+
+    def multi_get(keys)
+      collection = connection.multi_get(self.to_s, keys)
+      collection.map {|key, attrs| self.new_object(key, attrs) }
+    end
   end
 end

metadata

@@ -1,88 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sandra
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Charles Max Wood
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2010-08-08 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cassandra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70280507014000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70280507014000
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70280507013560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70280507013560
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70280507013140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70280507013140
 description: Provides an Object Relational interface to Cassandra
 email: chuck@teachmetocode.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - MIT-LICENSE
 - lib/sandra.rb
 homepage: http://teachmetocode.com/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: ORM for Cassandra in Ruby
 test_files: []
-