fracassandra 0.1.0 → 0.1.1

data/VERSION

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

data/fracassandra.gemspec

@@ -0,0 +1,73 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{fracassandra}
+  s.version = "0.1.1"
+
+  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.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 = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "fracassandra.gemspec",
+    "lib/fracassandra.rb",
+    "lib/fracassandra/model.rb",
+    "lib/fracassandra/super_model.rb",
+    "spec/model_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/jeremytregunna/fracassandra}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.6.2}
+  s.summary = %q{Simple object mapper for Cassandra}
+  s.test_files = [
+    "spec/model_spec.rb",
+    "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<cassandra>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_runtime_dependency(%q<cassandra>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["> 1.2.3"])
+    else
+      s.add_dependency(%q<cassandra>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<cassandra>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["> 1.2.3"])
+    end
+  else
+    s.add_dependency(%q<cassandra>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<cassandra>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["> 1.2.3"])
+  end
+end
+

data/lib/fracassandra/model.rb

@@ -2,56 +2,60 @@
 # Copyright © 2011, Jeremy Tregunna, All Rights Reserved.
 
 module Fracassandra
-  
   # This class covers a regular column family. If you need super column family support, you will
   # want to look for the SuperModel class.
   class Model
     attr_reader :key
-    
-    def initialize(key=nil, defaults={})
-      if key
-        @key = key.to_s
+
+    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
-      
+
       defaults.each_pair do |attribute, value|
         self.send(:"#{attribute}=", value)
       end
     end
-    
+
     def self.create(key=nil, defaults={})
       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
-      
+
       t = Fracassandra::database.get(@@column_family_name, key)
       return nil if t.nil?
-      r = self.new
+      r = self.new(key)
       t.each_pair do |k, v|
         r.send(:"#{k}=", v)
       end
       r
     end
-    
+
     def self.attribute(name, options={})
       @@attributes ||= {}
       @@attributes[name.to_s] = options
     end
-    
+
     def self.column_family(column_family_name)
       @@column_family_name = column_family_name.to_s
     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
-      
+
       h = {}
       @@attributes.each_pair do |attribute_name, hash|
         next if hash[:key]
@@ -59,24 +63,24 @@ module Fracassandra
           h[attribute_name] = (key == :value) ? value : nil
         end
       end
-      
+
       Fracassandra::database.insert(@@column_family_name, key, h)
     end
-    
+
     def destroy
       Fracassandra::database.remove(@@column_family_name, key)
     end
-    
+
     def eql?(other)
       @@attributes.each_pair do |attribute_name, hash|
         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?("=")

data/lib/fracassandra.rb

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

data/spec/model_spec.rb

@@ -3,7 +3,7 @@ require 'cassandra/0.7'
 
 class User < Fracassandra::Model
   column_family :Users
-  
+
   attribute :username, :key => true
   attribute :password
   attribute :salt
@@ -14,24 +14,57 @@ describe "A user record" do
   before(:all) do
     Fracassandra.database = Cassandra.new("Twitter")
   end
-  
-  it "creates a valid user record with minimal data" do
-    u = User.create("jeremytregunna", {
+
+  before(:each) do
+    @record = {
       'password' => "foobar",
       'salt' => "2F37B7B2-18F9-47BB-8D60-AEFF7275EF87",
       'email' => "jeremy.tregunna@me.com"
-    })
-    u.should_not be_nil
+    }
   end
-  
-  it "saves the record and can find it afterwards" do
-    u1 = User.create("jeremytregunna", {
+
+  it "responds to the password getter" do
+    u = User.new("jeremytregunna", @record)
+    u.password.should == "foobar"
+  end
+
+  it "changes the value of password" do
+    u = User.new("jeremytregunna", @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.username.should == "jeremytregunna"
+  end
+
+  it "raises an exception when trying to change the key" do
+    u = User.new("jeremytregunna", @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.should_not be_nil
+  end
+
+  it "saves the record and can find it afterwards" do
+    u1 = User.create("jeremytregunna", @record)
     u1.save
     u2 = User["jtregunna"]
     u2.should.eql? u1
   end
-end
+
+  # Disabled because of some weird behaviour in Cassandra. Can still find it after it's deleted through the Thrift API,
+  # but Cassandra's CLI shows no columns.
+  # it "deletes the record" do
+  #   User["jeremytregunna"].destroy
+  #   User["jeremytregunna"].password.should be_nil
+  # end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fracassandra
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jeremy Tregunna
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-15 00:00:00 -04:00
+date: 2011-03-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,6 +138,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- fracassandra.gemspec
 - lib/fracassandra.rb
 - lib/fracassandra/model.rb
 - lib/fracassandra/super_model.rb