quandl_cassandra 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f83fe0075114dcd993b31f6b0a0f56799d66bb90
-  data.tar.gz: daad90584e0adbf6edd4190ca50fb5f97b8d9eef
+  metadata.gz: a1b7c7cb00077c1c1d39ab0bc9a8141e2c7f7197
+  data.tar.gz: 3fd25aaa7cf8f6105425ecf0ae4d2c0c212afe13
 SHA512:
-  metadata.gz: 5140c4b99eec70768e703a1f1f44305462e518c0e3af9712c17448c11dbf69c4b4736a19f30eb28914136e3d4c021edc69ab5afb56328d430a554274e6542195
-  data.tar.gz: ad3c0b11d1657d9f78480dc2fcfd35af61080a4b2bf0e7721ae266dd5de0ae5a7c7f543ba2c2d71d06e52025385088cdef368d87ce997bf729546af06001e7ca
+  metadata.gz: 3c48d85c066b89c52c3e03b0f0086eb69a5b8d5f99da04208d0f898c4e54e5f5fd6043799eba5dd0dce576df357b4a0c3a27992fa7c306c24edee991a97f6746
+  data.tar.gz: 4a397f15caa8cf38f7c75d8c120f82f1547c408fd4f2c8ae9d74a9966c2c5a1fdea46fb68c6c374ee9b64768bff0c9a5cab55998e29778e88397d4e184b03741

data/lib/quandl/cassandra/base/attributes.rb

@@ -42,10 +42,19 @@ module Attributes
   end
   
   def initialize(*args)
+    attrs = args.extract_options!
     @attributes = {}
-    self.assign_attributes(args.extract_options!)
+    # result set attributes?
+    result_set = attrs.delete(:_result_set) if attrs.has_key?(:_result_set)
+    # assign
+    if result_set.present? && result_set.is_a?(Hash)
+      @attributes = result_set.symbolize_keys!
+      self.new_record = false
+    end
+    # assign attributes
+    self.assign_attributes(attrs)
   end
-  
+
   def inspect
     "#{self.class.name} " + attributes.inspect
   end

data/lib/quandl/cassandra/base/connection.rb

@@ -4,6 +4,10 @@ module Quandl::Cassandra::Base::Connection
   
   module ClassMethods
     
+    def truncate
+      execute("TRUNCATE #{table_name}")
+    end
+    
     def delete(*ids)
       statement = prepare("DELETE FROM #{table_name} WHERE id = ?")
       Array(ids).flatten.

data/lib/quandl/cassandra/base/persistence.rb

@@ -22,10 +22,7 @@ module Quandl::Cassandra::Base::Persistence
     
     def new_from_query_result(result)
       return nil if result.blank?
-      r = self.new
-      r.new_record = false
-      r.attributes = result
-      r
+      self.new( _result_set: result )
     end
     
   end

data/lib/quandl/cassandra/version.rb

@@ -1,5 +1,5 @@
 module Quandl
 module Cassandra
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end
 end

data/spec/config/cassandra.rb

@@ -4,22 +4,24 @@ Quandl::Cassandra.configure do |c|
   c.consistency   = :one
 end
 
-# reset keyspace
+# check for keyspace
 keyspace_exists = Quandl::Cassandra::Base.execute("SELECT * FROM system.schema_keyspaces WHERE keyspace_name = 'quandl_cassandra_test';")
-Quandl::Cassandra::Base.execute("DROP KEYSPACE quandl_cassandra_test;") if keyspace_exists.present?
 
-# create keyspace
-Quandl::Cassandra::Base.execute("CREATE KEYSPACE quandl_cassandra_test WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor': 3};")
+# create keyspace if not exists
+Quandl::Cassandra::Base.execute("CREATE KEYSPACE quandl_cassandra_test WITH REPLICATION = {'class' : 'SimpleStrategy', 'replication_factor': 1};") unless keyspace_exists
 
 # reconnect to keyspace
 Quandl::Cassandra.configuration.keyspace = 'quandl_cassandra_test'
 Quandl::Cassandra::Base.reset_connection
 
 # create posts table
-Quandl::Cassandra::Base.execute("CREATE TABLE posts (
+begin
+  Quandl::Cassandra::Base.execute("CREATE TABLE posts (
   id uuid PRIMARY KEY,
   content text,
   author varchar,
   updated_at timestamp );")
-  
+rescue
+end
+
 class Post < Quandl::Cassandra::Base; end

data/spec/factories/post.rb

@@ -0,0 +1,13 @@
+FactoryGirl.define do
+
+  sequence :content do |n|
+    "title#{n}"
+  end
+
+  factory :post do
+    id        {Cql::Uuid.new(SecureRandom.uuid)}
+    content
+    author    "quandl"
+  end
+  
+end

data/spec/lib/quandl/cassandra/base/callbacks_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+class PostWithCallbacks < Quandl::Cassandra::Base
+  
+  table_name :posts
+  
+  after_initialize :set_values
+  
+  def set_values
+    self.content = 'always change'
+    self.author = 'only set as default' unless author.present?
+  end
+  
+end
+
+describe Quandl::Cassandra::Base::Connection do
+  subject{ PostWithCallbacks.new( content: 'should be changed', author: 'should not change' ) }
+  
+  its(:content){ should eq 'always change' }
+  its(:author){ should eq 'should not change' }
+  its(:changes){ should eq({"content"=>[nil, "always change"], "author"=>[nil, "should not change"]}) }
+  
+  describe ".new_from_query_result" do
+    subject{ PostWithCallbacks.new_from_query_result({ content: 'should be changed', author: 'should not change' }) }
+  
+    its(:content){ should eq 'always change' }
+    its(:author){ should eq 'should not change' }
+    its(:changes){ should eq({"content"=>["should be changed", "always change"]}) }
+  
+  end
+  
+end

data/spec/lib/quandl/cassandra/base/persistence_spec.rb

@@ -13,6 +13,15 @@ describe Quandl::Cassandra::Base::Persistence do
   
   its(:new_record?){ should be_true }
   
+  describe ".new_from_query_result" do
+    subject{ Post.new_from_query_result({ id: id, content: 'blah', author: 'someone' }) }
+    
+    its(:changes){ should be_blank }
+    its(:id){ should eq id }
+    its(:content){ should eq 'blah' }
+    its(:author){ should eq 'someone' }
+  end
+  
   describe ".create" do
     
     let(:post){ Post.create( id: id, content: 'test content', author: "quandl" ) }
@@ -27,6 +36,8 @@ describe Quandl::Cassandra::Base::Persistence do
       its(:content){ should eq 'test content' }
       its(:author){ should eq 'quandl' }
       its(:new_record?){ should be_false }
+      its(:changes){ should be_blank }
+      its(:changed?){ should be_false }
     end
     
     describe ".destroy" do

data/spec/lib/quandl/cassandra/base/scoping_spec.rb

@@ -1,7 +1,13 @@
 require 'spec_helper'
 
 describe Quandl::Cassandra::Base::Scoping do
-
+  
+  before(:all){ 
+    Post.truncate
+    5.times{ create(:post) } 
+  }
+  let(:posts){ Post.all }
+  
   subject{ Post }
   
   [:where, :select, :limit, :order].each do |name|
@@ -12,6 +18,35 @@ describe Quandl::Cassandra::Base::Scoping do
   
   its(:scope_names){ should eq Post.scope.scope_names }
   
+  describe ".all" do
+    
+    subject{ posts }
+    its(:count){ should eq 5 }
+    
+    describe "#first" do
+      subject{ posts.first }
+      
+      its(:changes){ should be_blank }
+      its(:id){ should be_a Cql::Uuid }
+    end
+  end
+  
+  describe ".where" do
+    
+    let(:ids){ posts.collect(&:id)[1..3] }
+    subject{ Post.where(id: ids ) }
+
+    its(:count){ should eq 3 }
+    
+    describe "#first" do
+      subject{ posts.first }
+      
+      its(:changes){ should be_blank }
+      its(:id){ should be_a Cql::Uuid }
+    end
+    
+  end
+  
   describe ".find_or_build" do
     it "given nil should be a new record" do
       Post.find_or_build(nil).new_record?.should be_true

data/spec/spec_helper.rb

@@ -9,12 +9,12 @@ require 'securerandom'
 
 require "quandl/cassandra"
 require "quandl/fabricate"
+require 'rspec/expectations'
 
 # require config
 Dir.glob( File.join( File.dirname(__FILE__), 'config/**/*.rb' ) ).each{|f| require(f) }
 
 # require expectations
-require 'rspec/expectations'
 Dir.glob( File.join( File.dirname(__FILE__), 'expectations/**/*.rb' ) ).each{|f| require(f) }
 
 # require factories

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassandra
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Blake Hilscher
@@ -239,6 +239,8 @@ files:
 - spec/config/logger.rb
 - spec/expectations/string.rb
 - spec/expectations/time.rb
+- spec/factories/post.rb
+- spec/lib/quandl/cassandra/base/callbacks_spec.rb
 - spec/lib/quandl/cassandra/base/connection_spec.rb
 - spec/lib/quandl/cassandra/base/persistence_spec.rb
 - spec/lib/quandl/cassandra/base/sanitization_spec.rb
@@ -274,6 +276,8 @@ test_files:
 - spec/config/logger.rb
 - spec/expectations/string.rb
 - spec/expectations/time.rb
+- spec/factories/post.rb
+- spec/lib/quandl/cassandra/base/callbacks_spec.rb
 - spec/lib/quandl/cassandra/base/connection_spec.rb
 - spec/lib/quandl/cassandra/base/persistence_spec.rb
 - spec/lib/quandl/cassandra/base/sanitization_spec.rb