fracassandra 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/fracassandra.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fracassandra}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Tregunna"]
@@ -26,7 +26,6 @@ Gem::Specification.new do |s|
     "fracassandra.gemspec",
     "lib/fracassandra.rb",
     "lib/fracassandra/model.rb",
-    "lib/fracassandra/super_model.rb",
     "spec/model_spec.rb",
     "spec/spec_helper.rb"
   ]

data/lib/fracassandra/model.rb

@@ -7,8 +7,28 @@ module Fracassandra
   class Model
     attr_reader :key
 
+    class << self
+      def column_family(column_family_name=nil)
+        return @column_family_name unless column_family_name
+        @column_family_name = column_family_name.to_s
+      end
+      
+      def attribute(name, options={})
+        @attributes ||= {}
+        @attributes[name.to_s] = options
+      end
+      
+      def list(name, options)
+        raise ArgumentError, "Cannot find 'columns' key in options. Must contain an array of column names." unless options[:columns].is_a? Array
+        @attributes ||= {}
+        @attributes[name.to_s] = options
+      end
+      
+      attr_reader :attributes
+    end
+
     def initialize(defaults={})
-      r = @@attributes.select { |k,v| v[:key] == true }[0]
+      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]
 
@@ -21,45 +41,53 @@ module Fracassandra
       self.new(key, defaults)
     end
 
-    def self.[](key)
-      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
+    def self.[](key, sub_key=nil)
+      raise DatabaseError, "No database defined. Please set Frassandra.database= to a Cassandra connection." unless Fracassandra.database
+      raise DatabaseError, "No column family defined. Please edit your model." unless column_family
 
-      t = Fracassandra::database.get(@@column_family_name, key)
+      t = Fracassandra::database.get(column_family, key)
       return nil if t.nil?
       r = self.new
       t.each_pair do |k, v|
-        r.send(:"#{k}=", v)
+        unless k.is_a? Cassandra::Long
+          r.send(:"#{k}=", v)
+        end
+      end
+      if sub_key
+        h = {}
+        t[sub_key].each_pair do |k, v|
+          h[k.to_i] = v
+        end
+        r.send(:"#{sub_key}=", h)
       end
       r
     end
 
-    def self.attribute(name, options={})
-      @@attributes ||= {}
-      @@attributes[name.to_s] = options
+    def attributes
+      self.class.attributes
     end
 
-    def self.column_family(column_family_name)
-      @@column_family_name = column_family_name.to_s
+    def column_family
+      self.class.column_family
     end
-    
+
     def self.timestamps!
-      @@attributes['created_at'] = {}
-      @@attributes['updated_at'] = {}
+      attribute('created_at')
+      attribute('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
+      raise DatabaseError, "No database defined. Please set Frassandra.database= to a Cassandra connection." unless Fracassandra.database
+      raise DatabaseError, "No column family defined. Please edit your model." unless column_family
 
-      attribute_keys = @@attributes.keys
+      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 = {}
       ivars.each do |ivar_name|
-        next if @@attributes[ivar_name][:key]
+        next if attributes[ivar_name][:key]
         h[ivar_name] = instance_variable_get("@#{ivar_name}")
       end
 
@@ -69,15 +97,15 @@ module Fracassandra
       end
       @updated_at ||= now
 
-      Fracassandra::database.insert(@@column_family_name, key, h)
+      Fracassandra::database.insert(column_family, key, h)
     end
 
     def destroy
-      Fracassandra::database.remove(@@column_family_name, key)
+      Fracassandra::database.remove(column_family, key)
     end
 
     def eql?(other)
-      @@attributes.each_pair do |attribute_name, _|
+      attributes.each_key do |attribute_name|
         return false unless send(attribute_name.to_s).eql? other.send(attribute_name.to_s)
       end
       true
@@ -85,10 +113,10 @@ module Fracassandra
 
     def method_missing(sym, *args, &blk)
       name = sym.to_s.sub(/=$/, '')
-      attribute_names = @@attributes.keys.map { |k| k.sub(/=$/, '') }
+      attribute_names = attributes.keys.map { |k| k.sub(/=$/, '') }
 
       if attribute_names.include? name
-        attribute = @@attributes[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
@@ -102,4 +130,4 @@ module Fracassandra
       end
     end
   end
-end
+end

data/lib/fracassandra.rb

@@ -1,7 +1,7 @@
 # Frac.as Cassandra Library
 # Copyright © 2011, Jeremy Tregunna, All Rights Reserved.
 
-FRACASSANDRA_VERSION = "0.1.1"
+FRACASSANDRA_VERSION = "0.3.0"
 
 require 'fracassandra/model'
 require 'fracassandra/super_model'

data/spec/model_spec.rb

@@ -10,6 +10,13 @@ class User < Fracassandra::Model
   attribute :email
 end
 
+class Group < Fracassandra::Model
+  column_family :Groups
+  
+  attribute :id, :key => true
+  list :name, :columns => [:index, :username]
+end
+
 describe "A user record" do
   before(:all) do
     Fracassandra.database = Cassandra.new("Twitter")
@@ -64,3 +71,38 @@ describe "A user record" do
   #   User["jeremytregunna"].password.should be_nil
   # end
 end
+
+describe "Group model" do
+  before(:all) do
+    Fracassandra.database = Cassandra.new("Twitter")
+  end
+
+  it "creates a group record" do
+    g = Group.new({
+      'id' => '12345',
+      'name' => {
+        1 => 'foobar',
+        2 => 'blurgle'
+      }
+    })
+    g.should_not be_nil
+  end
+  
+  it "is able to fetch a group record" do
+    g1 = Group.new({
+      'id' => '12345',
+      'name' => {
+        1 => 'foobar',
+        2 => 'blurgle'
+      }
+    })
+    g1.save
+    g2 = Group["12345"]
+    g2.should.eql? g1
+  end
+  
+  it "is able to fetch a group record based on super column name" do
+    g = Group["12345", "name"]
+    g.should_not be_nil
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fracassandra
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jeremy Tregunna
@@ -141,7 +141,6 @@ files:
 - fracassandra.gemspec
 - lib/fracassandra.rb
 - lib/fracassandra/model.rb
-- lib/fracassandra/super_model.rb
 - spec/model_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true

data/lib/fracassandra/super_model.rb

@@ -1,10 +0,0 @@
-# Frac.as Cassandra Library
-# Copyright © 2011, Jeremy Tregunna, All Rights Reserved.
-
-module Fracassandra
-  
-  # Super column family... Not done yet.
-  class SuperModel
-    attr_reader :key
-  end
-end