gotime-cassandra_object 3.0.2 → 3.0.3

data/.travis.yml

@@ -1,6 +1,7 @@
 before_install:
+  - cassandra -v
   - sudo service cassandra start
   - sleep 3
 rvm:
   - 1.9.2
-  - 1.9.3
+  - 1.9.3

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '3.0.2'
+  s.version = '3.0.3'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
   s.authors = ["Michael Koziarski", "gotime"]

data/lib/cassandra_object/tasks/column_family.rb

@@ -52,14 +52,3 @@ module CassandraObject
   end
 end
 
-class Cassandra
-  class ColumnFamily
-    def with_fields(options)
-      struct_fields.collect { |f| f[1][:name] }.each do |f|
-        send("#{f}=", options[f.to_sym] || options[f.to_s])
-      end
-      self
-    end
-  end
-end
-

data/lib/cassandra_object/tasks/keyspace.rb

@@ -1,29 +1,18 @@
 module CassandraObject
   module Tasks
     class Keyspace
-      def self.parse(hash)
-        ks = Cassandra::Keyspace.new.with_fields hash
-        ks.cf_defs = []
-        hash['cf_defs'].each do |cf|
-          ks.cf_defs << Cassandra::ColumnFamily.new.with_fields(cf)
-        end
-        ks
-      end
-
       def exists?(name)
         connection.keyspaces.include? name.to_s
       end
 
       def create(name, options = {})
-        opts = {
-          name: name.to_s,
-          strategy_class: 'org.apache.cassandra.locator.SimpleStrategy',
-          replication_factor: 1,
-          cf_defs: []
-        }.merge(options)
-        
-        ks = Cassandra::Keyspace.new.with_fields(opts)
-        connection.add_keyspace ks
+        keyspace = Cassandra::Keyspace.new
+        keyspace.name           = name.to_s
+        keyspace.replication_factor = options[:replication_factor] || 1
+        keyspace.strategy_class = options[:strategy_class] || 'org.apache.cassandra.locator.SimpleStrategy'
+        keyspace.cf_defs        = options[:cf_defs] || []
+
+        connection.add_keyspace keyspace
       end
 
       def drop(name)
@@ -44,22 +33,6 @@ module CassandraObject
         connection.clear_keyspace!
       end
 
-      def schema_dump
-        connection.schema
-      end
-
-      def schema_load(schema)
-        connection.schema.cf_defs.each do |cf|
-          connection.drop_column_family cf.name
-        end
-
-        keyspace = get
-        schema.cf_defs.each do |cf|
-          cf.keyspace = keyspace
-          connection.add_column_family cf
-        end
-      end
-
       private
         def connection
           @connection ||= begin
@@ -69,14 +42,3 @@ module CassandraObject
     end
   end
 end
-
-class Cassandra
-  class Keyspace
-    def with_fields(options)
-      struct_fields.collect { |f| f[1][:name] }.each do |f|
-        send("#{f}=", options[f.to_sym] || options[f.to_s])
-      end
-      self
-    end
-  end
-end

data/lib/cassandra_object/tasks/ks.rake

@@ -23,7 +23,7 @@ namespace :ks do
   end
 
   desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n)'
-  task :rollback => :environment do
+  task rollback: :environment do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
     CassandraObject::Schema::Migrator.rollback CassandraObject::Schema::Migrator.migrations_path, step
     schema_dump
@@ -38,14 +38,10 @@ namespace :ks do
 
   namespace :schema do
     desc 'Create ks/schema.json file that can be portably used against any Cassandra instance supported by CassandraObject'
-    task :dump => :environment do
+    task dump: :environment do
       schema_dump
     end
 
-    desc 'Load ks/schema.json file into Cassandra'
-    task :load => :environment do
-      schema_load
-    end
   end
 
   namespace :test do
@@ -58,19 +54,11 @@ namespace :ks do
 
   private
     def schema_dump(env = Rails.env)
-      File.open "#{Rails.root}/ks/schema.json", 'w' do |file|
-        schema = ActiveSupport::JSON.decode(get_keyspace.schema_dump.to_json)
-        JSON.pretty_generate(schema).split(/\n/).each do |line|
-          file.puts line
-        end
-      end
+      # File.open "#{Rails.root}/ks/schema.rb", 'w' do |file|
+      # end
     end
 
     def schema_load(env = Rails.env)
-      File.open "#{Rails.root}/ks/schema.json", 'r' do |file|
-        hash = JSON.parse(file.read(nil))
-        get_keyspace.schema_load CassandraObject::Tasks::Keyspace.parse(hash)
-      end
     end
 
     def cassandra_config

data/lib/cassandra_object/types/array_type.rb

@@ -28,7 +28,7 @@ module CassandraObject
         private
           def setify!
             if options[:unique]
-              compact!
+              reject!(&:blank?)
               uniq!
               begin sort! rescue ArgumentError end
             end

data/test/support/connect.rb

@@ -1,4 +1,13 @@
 CassandraObject::Base.establish_connection(
-  keyspace: 'place_directory_development',
+  keyspace: 'cassandra_object_test',
   servers: '127.0.0.1:9160'
-)
+)
+
+CassandraObject::Tasks::Keyspace.new.tap do |keyspace_task|
+  keyspace_task.drop('cassandra_object_test') if keyspace_task.exists?('cassandra_object_test')
+  keyspace_task.create('cassandra_object_test')
+end
+
+CassandraObject::Tasks::ColumnFamily.new('cassandra_object_test').tap do |column_family_task|
+  column_family_task.create('Issues') unless column_family_task.exists?('Issues')
+end

data/test/unit/types/array_type_test.rb

@@ -42,8 +42,8 @@ class CassandraObject::Types::ArrayTypeTest < CassandraObject::Types::TestCase
     assert_equal({'favorite_colors' => [['red'], []]}, issue.changes)
   end
 
-  test 'unique array removes nil' do
-    issue = TestIssue.create favorite_colors: ['blue', 'red', nil]
+  test 'unique array removes blank' do
+    issue = TestIssue.create favorite_colors: ['blue', 'red', '', nil]
     assert_equal ['blue', 'red'], issue.favorite_colors
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-06 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel