gotime-cassandra_object 4.5.1 → 4.6.0

data/lib/cassandra_object/schema/tasks.rb

@@ -29,16 +29,20 @@ module CassandraObject
 
       private
         def run_command(command)
-          `echo "#{command};" | cqlsh -k #{keyspace} #{server}`.sub(/^(.*)$/, '').strip
+          `echo "#{command};" | #{cqlsh} -k #{keyspace} #{server}`.sub(/^(.*)$/, '').strip
+        end
+
+        def cqlsh
+          ENV['CQLSH'] || 'cqlsh'
         end
 
         def keyspace
-          CassandraObject::Base.connection_config.keyspace
+          CassandraObject::Base.config.keyspace
         end
 
         def server
-          CassandraObject::Base.connection_config.servers.first.gsub(/:.*/, '')
+          CassandraObject::Base.config.servers.first.gsub(/:.*/, '')
         end
     end
   end
-end
+end

data/lib/cassandra_object/scope.rb

@@ -45,4 +45,4 @@ module CassandraObject
         end
       end
   end
-end
+end

data/lib/cassandra_object/scope/batches.rb

@@ -29,4 +29,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/scope/finder_methods.rb

@@ -44,4 +44,4 @@ module CassandraObject
         end
     end
   end
-end
+end

data/lib/cassandra_object/scope/query_methods.rb

@@ -106,4 +106,4 @@ module CassandraObject
         end
     end
   end
-end
+end

data/lib/cassandra_object/tasks/ks.rake

@@ -2,10 +2,10 @@ ks_namespace = namespace :ks do
   desc 'Create the keyspace in cassandra_config/cassandra.yml for the current environment'
   task create: :environment do
     begin
-      CassandraObject::Schema.create_keyspace cassandra_config['keyspace']
+      CassandraObject::Schema.create_keyspace cassandra_config.keyspace, cassandra_config.keyspace_options
     rescue Exception => e
       if e.message =~ /conflicts/
-        p "Keyspace #{cassandra_config['keyspace']} already exists"
+        p "Keyspace #{cassandra_config.keyspace} already exists"
       else
         raise e
       end
@@ -14,10 +14,10 @@ ks_namespace = namespace :ks do
 
   task drop: :environment do
     begin
-      CassandraObject::Schema.drop_keyspace cassandra_config['keyspace']
+      CassandraObject::Schema.drop_keyspace cassandra_config.keyspace
     rescue Exception => e
       if e.message =~ /non existing keyspace/
-        p "Keyspace #{cassandra_config['keyspace']} does not exist"
+        p "Keyspace #{cassandra_config.keyspace} does not exist"
       else
         raise e
       end
@@ -55,8 +55,8 @@ ks_namespace = namespace :ks do
   private
     def cassandra_config
       @cassandra_config ||= begin
-        cassandra_configs = YAML.load_file(Rails.root.join("config", "cassandra.yml"))
-        cassandra_configs[Rails.env || 'development']
+        cassandra_configs = YAML.load_file(Rails.root.join('config', 'cassandra.yml'))
+        CassandraObject::Config.new cassandra_configs[Rails.env || 'development']
       end
     end
 end

data/lib/cassandra_object/types/array_type.rb

@@ -73,4 +73,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/types/base_type.rb

@@ -23,4 +23,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/types/boolean_type.rb

@@ -4,7 +4,7 @@ module CassandraObject
       TRUE_VALS = [true, 'true', '1']
       FALSE_VALS = [false, 'false', '0', '', nil]
       VALID_VALS = TRUE_VALS + FALSE_VALS
-      
+
       def encode(bool)
         unless VALID_VALS.include?(bool)
           raise ArgumentError.new("#{bool.inspect} is not a Boolean")
@@ -18,4 +18,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/types/float_type.rb

@@ -14,4 +14,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/types/integer_type.rb

@@ -14,4 +14,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/types/json_type.rb

@@ -10,4 +10,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/types/string_type.rb

@@ -12,4 +12,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/types/time_type.rb

@@ -21,4 +21,4 @@ module CassandraObject
       end
     end
   end
-end
+end

data/lib/cassandra_object/validations.rb

@@ -10,11 +10,11 @@ module CassandraObject
   module Validations
     extend ActiveSupport::Concern
     include ActiveModel::Validations
-    
+
     included do
       define_callbacks :validate, scope: :name
     end
-    
+
     module ClassMethods
       def create!(attributes = {})
         new(attributes).tap do |object|
@@ -31,7 +31,7 @@ module CassandraObject
         false
       end
     end
-    
+
     def save!
       save || raise(RecordInvalid.new(self))
     end

data/lib/gotime-cassandra_object.rb

@@ -5,23 +5,25 @@ require 'cassandra-cql'
 module CassandraObject
   extend ActiveSupport::Autoload
 
-  autoload :Base
-  autoload :Connection
-  autoload :Consistency
   autoload :AttributeMethods
+  autoload :Base
   autoload :BelongsTo
-  autoload :Persistence
   autoload :Callbacks
-  autoload :Validations
+  autoload :Config
+  autoload :Connection
+  autoload :Consistency
+  autoload :Core
   autoload :Identity
   autoload :Inspect
-  autoload :Serialization
+  autoload :Persistence
   autoload :Savepoints
   autoload :Schema
   autoload :Scope
   autoload :Scoping
+  autoload :Serialization
   autoload :Timestamps
   autoload :Type
+  autoload :Validations
 
   module BelongsTo
     extend ActiveSupport::Autoload
@@ -44,7 +46,7 @@ module CassandraObject
 
   module Types
     extend ActiveSupport::Autoload
-    
+
     autoload :BaseType
     autoload :ArrayType
     autoload :BooleanType
@@ -57,4 +59,4 @@ module CassandraObject
   end
 end
 
-require 'cassandra_object/railtie' if defined?(Rails)
+require 'cassandra_object/railtie' if defined?(Rails)

data/test/support/connect.rb

@@ -1,8 +1,8 @@
-CassandraObject::Base.establish_connection(
+CassandraObject::Base.config = {
   keyspace: 'cassandra_object_test',
   servers: '127.0.0.1:9160',
   thrift: {timeout: 10000}
-)
+}
 
 begin
   CassandraObject::Schema.drop_keyspace 'cassandra_object_test'
@@ -12,4 +12,4 @@ end
 sleep 1
 CassandraObject::Schema.create_keyspace 'cassandra_object_test'
 CassandraObject::Schema.create_column_family 'Issues'
-CassandraObject::Base.default_consistency = 'QUORUM'
+CassandraObject::Base.default_consistency = 'QUORUM'

data/test/support/issue.rb

@@ -2,4 +2,4 @@ class Issue < CassandraObject::Base
   string :description
   string :title
   before_create { self.description ||= 'funny' }
-end
+end

data/test/test_helper.rb

@@ -18,7 +18,7 @@ module CassandraObject
           'Issue'
         end
 
-        instance_eval(&block)
+        instance_eval(&block) if block_given?
       end
     end
   end

data/test/unit/active_model_test.rb

@@ -1,7 +1,12 @@
 require 'test_helper'
 
 class ActiveModelTest < CassandraObject::TestCase
-  # include ActiveModel::Lint::Tests
+
+  include ActiveModel::Lint::Tests
+
+  # overrides ActiveModel::Lint::Tests#test_to_param
+  def test_to_param
+  end
 
   def setup
     @model = Issue.new

data/test/unit/attribute_methods/definition_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class CassandraObject::AttributeMethods::DefinitionTest < CassandraObject::TestCase
   class TestType < CassandraObject::Types::BaseType
   end
-  
+
   test 'typecast' do
     definition = CassandraObject::AttributeMethods::Definition.new(:foo, TestType, {a: :b})
 

data/test/unit/attribute_methods/dirty_test.rb

@@ -5,7 +5,7 @@ class CassandraObject::AttributeMethods::DirtyTest < CassandraObject::TestCase
     record = temp_object do
       string :name
     end.new name: 'foo'
-    
+
     assert record.changed?
 
     record.save!
@@ -42,7 +42,7 @@ class CassandraObject::AttributeMethods::DirtyTest < CassandraObject::TestCase
     record = temp_object do
       boolean :awesome
     end.create(awesome: false)
-    
+
     record.awesome = false
     assert !record.changed?
 

data/test/unit/attribute_methods/primary_key_test.rb

@@ -23,4 +23,4 @@ class CassandraObject::AttributeMethods::PrimaryKeyTest < CassandraObject::TestC
 
     assert_not_nil issue.attributes['id']
   end
-end
+end

data/test/unit/attribute_methods/typecasting_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class CassandraObject::AttributeMethods::TypecastingTest < CassandraObject::TestCase
   class CustomType
   end
-  
+
   class CustomCoder < CassandraObject::Types::BaseType
   end
 
@@ -83,4 +83,30 @@ class CassandraObject::AttributeMethods::TypecastingTest < CassandraObject::Test
     issue = TestIssue.find issue.id
     assert_equal('hola', issue.name)
   end
-end
+
+  test 'multiple attributes definition' do
+    class MultipleAttributesIssue < CassandraObject::Base
+      self.column_family = 'Issues'
+    end
+
+    assert_nothing_raised {
+      MultipleAttributesIssue.string :hello, :greetings, :bye
+    }
+    issue = MultipleAttributesIssue.new :hello => 'hey', :greetings => 'how r u', :bye => 'see ya'
+
+    assert_equal 'how r u', issue.greetings
+  end
+
+  test 'multiple attributes with options' do
+    class MultipleAttributesIssue < CassandraObject::Base
+      self.column_family = 'Issues'
+    end
+
+    MultipleAttributesIssue.expects(:attribute).with(:hello, { :unique => :true, :type => :string })
+    MultipleAttributesIssue.expects(:attribute).with(:world, { :unique => :true, :type => :string })
+
+    class MultipleAttributesIssue < CassandraObject::Base
+      string :hello, :world, :unique => :true
+    end
+  end
+end

data/test/unit/base_test.rb

@@ -16,46 +16,4 @@ class CassandraObject::BaseTest < CassandraObject::TestCase
     assert_equal 'CassandraObject::BaseTest::Sons', Son.column_family
     assert_equal 'CassandraObject::BaseTest::Sons', Grandson.column_family
   end
-
-  test 'initialiaze' do
-    issue = Issue.new
-    
-    assert issue.new_record?
-    assert !issue.destroyed?
-  end
-
-  test 'dup' do
-    issue = Issue.create description: 'foo'
-
-    dup_issue = issue.dup
-
-    assert dup_issue.new_record?
-    assert_not_equal issue.id, dup_issue.id
-    assert_nil dup_issue.created_at
-    assert_nil dup_issue.updated_at
-    assert_equal 'foo', issue.description
-  end
-
-  test 'equality of new records' do
-    assert_not_equal Issue.new, Issue.new
-  end
-
-  test 'equality' do
-    first_issue = Issue.create description: 'poop'
-    second_issue = Issue.create description: 'poop'
-
-    assert_equal first_issue, first_issue
-    assert_equal first_issue, Issue.find(first_issue.id)
-    assert_not_equal first_issue, second_issue
-  end
-
-  test 'to_param' do
-    issue = Issue.new
-    assert_equal issue.id, issue.to_param
-  end
-  
-  test 'hash' do
-    issue = Issue.create
-    assert_equal issue.id.hash, issue.hash
-  end
-end
+end

data/test/unit/belongs_to/reflection_test.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+class CassandraObject::BelongsTo::ReflectionTest < CassandraObject::TestCase
+  class ::Status < CassandraObject::Base; end
+  class ::User < CassandraObject::Base
+    belongs_to :status
+  end
+
+  test 'class_name' do
+    assert_equal 'Status', User.new.belongs_to_reflections[:status].class_name
+  end
+end

data/test/unit/belongs_to_test.rb

@@ -49,4 +49,4 @@ class CassandraObject::BelongsToTest < CassandraObject::TestCase
     record = TestObject.find(record.id)
     assert_equal issue, record.target
   end
-end
+end

data/test/unit/callbacks_test.rb

@@ -43,4 +43,4 @@ class CassandraObject::CallbacksTest < CassandraObject::TestCase
 
     assert_equal ['after_destroy'], issue.callback_history
   end
-end
+end

data/test/unit/config_test.rb

@@ -0,0 +1,23 @@
+require 'test_helper'
+
+class CassandraObject::ConfigTest < CassandraObject::TestCase
+  test 'config writer' do
+    config =  CassandraObject::Config.new(
+      keyspace: 'place_directory_development',
+      servers: '192.168.0.100:9160',
+      thrift: {'timeout' => 10},
+      keyspace_options: {'placement_strategy' => 'NetworkTopologyStrategy'}
+    )
+
+    assert_equal ['192.168.0.100:9160'], config.servers
+    assert_equal 'place_directory_development', config.keyspace
+    assert_equal 10, config.thrift_options[:timeout]
+    assert_equal 'NetworkTopologyStrategy', config.keyspace_options[:placement_strategy]
+  end
+  
+  test 'defaults' do
+    config = CassandraObject::Config.new(keyspace: 'widget_factory')
+
+    assert_equal ["127.0.0.1:9160"], config.servers
+  end
+end