quandl_cassandra 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: daa4cc9a5d756ff80a50a91316379e7d98c4f91b
-  data.tar.gz: 22a6937e363c1b387544fba9e6f9a69314045c11
+  metadata.gz: f83fe0075114dcd993b31f6b0a0f56799d66bb90
+  data.tar.gz: daad90584e0adbf6edd4190ca50fb5f97b8d9eef
 SHA512:
-  metadata.gz: b66b468f943f40bfb4c791792a9c21bf9258d75786617663d3bec984d9b43b93aa7844d107e909e56e8f32a6558df527d802b4203c96a084da6628c4471b7212
-  data.tar.gz: 3835af6152e6fd3e211e72bfdfacf41f348779a37d1f8bceda95064ef4163dcbd77528c3ed9a4d380143136d5e305305ef19864d1f492782cdd1fddec84d84da
+  metadata.gz: 5140c4b99eec70768e703a1f1f44305462e518c0e3af9712c17448c11dbf69c4b4736a19f30eb28914136e3d4c021edc69ab5afb56328d430a554274e6542195
+  data.tar.gz: ad3c0b11d1657d9f78480dc2fcfd35af61080a4b2bf0e7721ae266dd5de0ae5a7c7f543ba2c2d71d06e52025385088cdef368d87ce997bf729546af06001e7ca

data/UPGRADE.md

@@ -1,6 +1,12 @@
+## 1.0.3
+
+* add Base#delete and Base#destroy
+* add persistence specs and creation of test keyspace
+
+
 ## 1.0.2
 
-* Dataset .connection, .find should raise Cql::QueryError given missing keyspace
+* Post .connection, .find should raise Cql::QueryError given missing keyspace
 
 
 ## 1.0.0

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

@@ -67,7 +67,7 @@ module Quandl::Cassandra::Base::Connection
         hosts:        Quandl::Cassandra.configuration.hosts, 
         consistency:  Quandl::Cassandra.configuration.consistency )
       # switch keyspace
-      c.use( Quandl::Cassandra.configuration.keyspace )
+      c.use( Quandl::Cassandra.configuration.keyspace ) if Quandl::Cassandra.configuration.keyspace.present?
       @@connection = c
       c
     end

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

@@ -42,7 +42,7 @@ module Quandl::Cassandra::Base::Persistence
       touch
       save_changes! if self.class.autosave_changes == true
       cycle_changes!
-      new_record = false
+      self.new_record = false
       true
     end
   end
@@ -52,6 +52,18 @@ module Quandl::Cassandra::Base::Persistence
     self.updated_at = Time.now if respond_to?(:updated_at=)
   end
   
+  def destroy
+    return false if new_record?
+    run_callbacks :destroy do
+      self.class.delete(id)
+    end
+  end
+  
+  def delete
+    return false if new_record?
+    self.class.delete(id)
+  end
+  
   def update_attributes(values)
     values = self.class.sanitize_attributes(values)
     # add primary key parts to values

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

@@ -5,10 +5,6 @@ module Quandl::Cassandra::Base::Sanitization
   module ClassMethods
     
     def bind_primary_key(*args)
-      if args.count > primary_key.count
-        message = "wrong number of arguments (#{args.count} for 1..#{primary_key.count}) expected: #{primary_key.join(', ')}"
-        raise(ArgumentError, message)
-      end
       attrs = {}
       primary_key.each_with_index { |k, i| attrs[k] = args[i] if args[i].present? }
       attrs

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

@@ -44,12 +44,14 @@ module Quandl::Cassandra::Base::Schema
     end
     
     def column_aliases
+      return [] if system_schema.blank?
       @column_aliases ||= JSON.parse(system_schema['column_aliases']).collect(&:to_sym)
     rescue JSON::ParserError
       []
     end
     
     def key_aliases
+      return [] if system_schema.blank?
       @key_aliases ||= JSON.parse(system_schema['key_aliases']).collect(&:to_sym)
     rescue JSON::ParserError
       []

data/lib/quandl/cassandra/version.rb

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

data/spec/config/cassandra.rb

@@ -0,0 +1,25 @@
+# set host
+Quandl::Cassandra.configure do |c|
+  c.hosts         = ['localhost','192.168.33.10']
+  c.consistency   = :one
+end
+
+# reset 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};")
+
+# 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 (
+  id uuid PRIMARY KEY,
+  content text,
+  author varchar,
+  updated_at timestamp );")
+  
+class Post < Quandl::Cassandra::Base; end

data/spec/config/logger.rb

@@ -0,0 +1,6 @@
+
+logger = Logger.new( 'log/test.log', 2, 52428800 )
+logger.formatter = proc do |severity, datetime, progname, msg|
+  "[#{datetime.strftime("%Y-%m-%d %H:%M:%S")}]: #{msg}\n"
+end
+Quandl::Logger.use(logger)

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

@@ -1,23 +1,22 @@
 require 'spec_helper'
 
-class TestModel < Quandl::Cassandra::Base; end
-
 describe Quandl::Cassandra::Base::Connection do
-  before(:all){ Quandl::Cassandra.configuration.keyspace = 'missing_keyspace' }
-  
-  subject{ TestModel }
   
-  describe ".connection" do
+  describe ".reset_connection" do
     it "should raise Cql::QueryError" do
-      expect{ TestModel.connection }.to raise_error(Cql::QueryError)
+      Quandl::Cassandra.configuration.keyspace = 'missing_keyspace'
+      expect{ Post.reset_connection }.to raise_error(Cql::QueryError)
     end    
   end
   
   describe ".find" do
     it "should raise Cql::QueryError" do
-      expect{ TestModel.find(1) }.to raise_error(Cql::QueryError)
+      expect{ Post.find(1) }.to raise_error(Cql::QueryError)
     end
   end
   
-  after(:all){ Quandl::Cassandra.configuration.keyspace = 'wikiposit' }
+  after(:all) do
+    Quandl::Cassandra.configuration.keyspace = 'quandl_cassandra_test'
+    Quandl::Cassandra::Base.reset_connection
+  end
 end

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

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Quandl::Cassandra::Base::Persistence do
+  
+  let(:id){ Cql::Uuid.new(SecureRandom.uuid) }
+  
+  subject{ Post.new }
+  
+  it{ should respond_to :id }
+  it{ should respond_to :content }
+  it{ should respond_to :author }
+  it{ should respond_to :updated_at }
+  
+  its(:new_record?){ should be_true }
+  
+  describe ".create" do
+    
+    let(:post){ Post.create( id: id, content: 'test content', author: "quandl" ) }
+    subject{ post }
+    
+    its(:new_record?){ should be_false }
+    
+    describe ".find" do
+      subject{ Post.find(post.id) }
+      
+      its(:id){ should eq id }
+      its(:content){ should eq 'test content' }
+      its(:author){ should eq 'quandl' }
+      its(:new_record?){ should be_false }
+    end
+    
+    describe ".destroy" do
+      before(:each){ post.destroy }
+      it "should not find the post" do
+        Post.find(post.id).should be_nil
+      end
+    end
+    
+    describe ".delete" do
+      before(:each){ post.delete }
+      it "should not find the post" do
+        Post.find(post.id).should be_nil
+      end
+    end
+    
+  end
+  
+end

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

@@ -1,7 +1,5 @@
 require 'spec_helper'
 
-class TestModel < Quandl::Cassandra::Base; end
-
 describe Quandl::Cassandra::Base::Sanitization do
   
 end

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

@@ -1,46 +1,46 @@
 require 'spec_helper'
 
-class TestModel < Quandl::Cassandra::Base; end
-
 describe Quandl::Cassandra::Base::Scoping do
 
-  subject{ TestModel }
+  subject{ Post }
   
   [:where, :select, :limit, :order].each do |name|
     it{ should respond_to name }
   end
   
-  its(:scope_names){ should eq TestModel.scope.scope_names }
-  # 
-  # describe ".find_or_build" do
-  #   it "given nil should be a new record" do
-  #     TestModel.find_or_build(nil).new_record?.should be_true
-  #   end
-  #   it "given empty sting should be a new record" do
-  #     TestModel.find_or_build('').new_record?.should be_true
-  #   end
-  # end
-  # 
+  let(:id){ SecureRandom.uuid }
+  
+  its(:scope_names){ should eq Post.scope.scope_names }
+  
+  describe ".find_or_build" do
+    it "given nil should be a new record" do
+      Post.find_or_build(nil).new_record?.should be_true
+    end
+    it "given empty sting should be a new record" do
+      Post.find_or_build('').new_record?.should be_true
+    end
+  end
+  
   describe ".to_cql" do
     
-    let(:scope) { TestModel.scope.new }
+    let(:scope) { Post.scope.new }
     subject{ scope.to_cql }
   
     describe "#where" do
-      before(:each){ scope.where( id: 1 ) }
-      it{ should eq "SELECT * FROM test_models WHERE id = 1" }
+      before(:each){ scope.where( id: id ) }
+      it{ should eq "SELECT * FROM posts WHERE id = #{id}" }
 
       describe "#limit" do
         before(:each){ scope.limit( 10 ) }
-        it{ should eq "SELECT * FROM test_models WHERE id = 1 LIMIT 10" }
+        it{ should eq "SELECT * FROM posts WHERE id = #{id} LIMIT 10" }
 
         describe "#select" do
           before(:each){ scope.select( :name, :value ) }
-          it{ should eq "SELECT name,value FROM test_models WHERE id = 1 LIMIT 10" }
+          it{ should eq "SELECT name,value FROM posts WHERE id = #{id} LIMIT 10" }
         
           describe "#order" do
             before(:each){ scope.order("name DESC") }
-            it{ should eq "SELECT name,value FROM test_models WHERE id = 1 ORDER BY name DESC LIMIT 10" }
+            it{ should eq "SELECT name,value FROM posts WHERE id = #{id} ORDER BY name DESC LIMIT 10" }
           end
         
         end

data/spec/lib/quandl/cassandra_spec.rb

@@ -6,7 +6,7 @@ describe Quandl::Cassandra do
     subject{ Quandl::Cassandra.configuration }
     its(:hosts){ should be_present }
     its(:consistency){ should eq :one }
-    its(:keyspace){ should eq 'wikiposit' }
+    its(:keyspace){ should eq 'quandl_cassandra_test' }
   end
 
 end

data/spec/spec_helper.rb

@@ -5,10 +5,14 @@ QUANDL_LOGGER = true
 require "rspec"
 require 'factory_girl'
 require 'pry'
+require 'securerandom'
 
 require "quandl/cassandra"
 require "quandl/fabricate"
 
+# 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) }
@@ -16,20 +20,6 @@ Dir.glob( File.join( File.dirname(__FILE__), 'expectations/**/*.rb' ) ).each{|f|
 # require factories
 Dir.glob( File.join( File.dirname(__FILE__), 'factories/**/*.rb' ) ).each{|f| require(f) }
 
-include Quandl::Cassandra
-
-logger = Logger.new( 'log/test.log', 2, 52428800 )
-logger.formatter = proc do |severity, datetime, progname, msg|
-  "[#{datetime.strftime("%Y-%m-%d %H:%M:%S")}]: #{msg}\n"
-end
-Quandl::Logger.use(logger)
-
-Quandl::Cassandra.configure do |c|
-  c.hosts         = ['192.168.33.10']
-  c.keyspace      = 'wikiposit'
-  c.consistency   = :one
-end
-
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quandl_cassandra
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Blake Hilscher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -235,9 +235,12 @@ files:
 - lib/quandl/cassandra/version.rb
 - lib/quandl/strategy.rb
 - quandl_cassandra.gemspec
+- spec/config/cassandra.rb
+- spec/config/logger.rb
 - spec/expectations/string.rb
 - spec/expectations/time.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
 - spec/lib/quandl/cassandra/base/scoping_spec.rb
 - spec/lib/quandl/cassandra_spec.rb
@@ -267,9 +270,12 @@ signing_key:
 specification_version: 4
 summary: Quandl cassandra interface.
 test_files:
+- spec/config/cassandra.rb
+- spec/config/logger.rb
 - spec/expectations/string.rb
 - spec/expectations/time.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
 - spec/lib/quandl/cassandra/base/scoping_spec.rb
 - spec/lib/quandl/cassandra_spec.rb