fracassandra 0.3.0 → 0.3.2

data/README.rdoc

@@ -2,9 +2,6 @@
 
 Fracassandra is an object mapper for the Cassandra database.
 
-It's currently not ready for prime time, as super column family support is not available yet. It also
-does not support adjusting the row/key cache sizes, how columns are sorted, etc.
-
 == Example usage
 
 It can be used in familiar ways, for instance:
@@ -18,6 +15,15 @@ It can be used in familiar ways, for instance:
     attribute :email
   end
 
+or with super columns:
+
+  class Group < Fracassandra::Model
+    column_family :Groups
+    
+    attribute :id, :key => true
+	list :name, :columns => [:index, :username]
+  end
+
 This will create a class suitable for use with the Cassandra mapping, using the username as the key to the
 column family, storing a bunch of columns (password, salt and email respectively). Each attribute will respond
 to a getter with the same name, and a setter with the same name. One exception is the :key attribute, which

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.2

data/fracassandra.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fracassandra}
-  s.version = "0.3.0"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Tregunna"]
-  s.date = %q{2011-03-16}
+  s.date = %q{2011-03-23}
   s.description = %q{Hook your cassandra column families into ruby classes, mapping your rows to objects.}
   s.email = %q{jeremy.tregunna@me.com}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "fracassandra.gemspec",
     "lib/fracassandra.rb",
     "lib/fracassandra/model.rb",
+    "lib/fracassandra/sunspot.rb",
     "spec/model_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/fracassandra/model.rb

@@ -6,6 +6,7 @@ module Fracassandra
   # want to look for the SuperModel class.
   class Model
     attr_reader :key
+    attr_accessor :update_operation
 
     class << self
       def column_family(column_family_name=nil)
@@ -23,8 +24,16 @@ module Fracassandra
         @attributes ||= {}
         @attributes[name.to_s] = options
       end
-      
-      attr_reader :attributes
+
+      def on_create(s)
+        @create_hook = s
+      end
+
+      def on_update(s)
+        @update_hook = s
+      end
+
+      attr_reader :attributes, :create_hook, :update_hook
     end
 
     def initialize(defaults={})
@@ -32,6 +41,8 @@ module Fracassandra
       raise "Invalid key error. No key was given in either the model or as an argument to new" if r.nil?
       @key = r[0]
 
+      @update_operation = false
+
       defaults.each_pair do |attribute, value|
         self.send(:"#{attribute}=", value)
       end
@@ -60,6 +71,7 @@ module Fracassandra
         end
         r.send(:"#{sub_key}=", h)
       end
+      r.update_operation = true
       r
     end
 
@@ -71,6 +83,14 @@ module Fracassandra
       self.class.column_family
     end
 
+    def create_hook
+      self.class.create_hook
+    end
+
+    def update_hook
+      self.class.update_hook
+    end
+
     def self.timestamps!
       attribute('created_at')
       attribute('updated_at')
@@ -98,6 +118,12 @@ module Fracassandra
       @updated_at ||= now
 
       Fracassandra::database.insert(column_family, key, h)
+
+      if @update_operation
+        self.send(update_hook.to_sym)
+      elsif create_hook
+        self.send(create_hook.to_sym)
+      end
     end
 
     def destroy

data/lib/fracassandra/sunspot.rb

@@ -0,0 +1,24 @@
+# Sunspot support for Fracassandra
+# Copyright © 2011, Jeremy Tregunna, All Rights Reserved.
+#
+# Sunspot integration for fracassandra
+#
+
+if defined?(Sunspot)
+  module Fracassandra
+    class FracassandraInstanceAdapter < Sunspot::Adapters::InstanceAdapter
+      def id
+        @instance.key
+      end
+    end
+
+    class FracassandraDataAccessor < Sunspot::Adapters::DataAccessor
+      def load(id)
+        @clazz[id]
+      end
+    end
+  end
+
+  Sunspot::Adapters::InstanceAdapter.register(Fracassandra::FracassandraInstanceAdapter, Fracassandra::Model)
+  Sunspot::Adapters::DataAdapter.register(Fracassandra::FracassandraDataAdapter, Fracassandra::Model)
+end

data/lib/fracassandra.rb

@@ -1,24 +1,18 @@
 # Frac.as Cassandra Library
 # Copyright © 2011, Jeremy Tregunna, All Rights Reserved.
 
-FRACASSANDRA_VERSION = "0.3.0"
+FRACASSANDRA_VERSION = "0.3.2"
 
 require 'fracassandra/model'
-require 'fracassandra/super_model'
 
 module Fracassandra
-  $cassandra = nil
-
-  def self.database=(db)
-    $cassandra = db
-  end
-
-  def self.database
-    $cassandra
+  class << self
+    attr_accessor :database
   end
 
   def self.credentials=(options)
-    $cassandra.login!(options[:username], options[:password])
+    raise DatabaseError, "No database defined." unless database
+    database.login!(options[:username], options[:password])
   end
 
   class DatabaseError < Exception

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fracassandra
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 2
+  version: 0.3.2
 platform: ruby
 authors: 
 - Jeremy Tregunna
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -04:00
+date: 2011-03-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,6 +141,7 @@ files:
 - fracassandra.gemspec
 - lib/fracassandra.rb
 - lib/fracassandra/model.rb
+- lib/fracassandra/sunspot.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true