gotime-cassandra_object 2.10.11 → 2.11.0

data/Gemfile

@@ -3,5 +3,4 @@ gemspec
 
 group :test do
   gem 'cassandra', git: 'git://github.com/twitter/cassandra.git', require: 'cassandra/1.0'
-  gem 'rails', path: '~/code/rails'
 end

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '2.10.11'
+  s.version = '2.11.0'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('activemodel', ">= 3.0")
   s.add_runtime_dependency('cassandra', ">= 0.12.0")
+  s.add_runtime_dependency('thrift_client', "~> 0.7.0")
 
   s.add_development_dependency('bundler')
 end

data/lib/cassandra_object/schema/migration.rb

@@ -1,104 +1,104 @@
 module CassandraObject
   module Schema
-
     class Migration
 
       @@verbose = true
       cattr_accessor :verbose
 
-      # Returns the raw connection to Cassandra
-      def self.connection
-        CassandraObject::Base.connection
-      end
+      class << self
+        def connection
+          CassandraObject::Base.connection
+        end
 
-      def self.migrate(direction)
-        return unless respond_to?(direction)
+        def migrate(direction)
+          return unless respond_to?(direction)
 
-        case direction
-        when :up   then announce "migrating"
-        when :down then announce "reverting"
-        end
+          case direction
+          when :up   then announce "migrating"
+          when :down then announce "reverting"
+          end
+
+          result = nil
+          time = Benchmark.measure { result = send("#{direction}") }
 
-        result = nil
-        time = Benchmark.measure { result = send("#{direction}") }
+          case direction
+          when :up   then announce "migrated (%.4fs)" % time.real; write
+          when :down then announce "reverted (%.4fs)" % time.real; write
+          end
 
-        case direction
-        when :up   then announce "migrated (%.4fs)" % time.real; write
-        when :down then announce "reverted (%.4fs)" % time.real; write
+          result
         end
 
-        result
-      end
+        # Creates a new column family with the given name.  Column family configurations can be set within
+        # a block like this:
+        #
+        #  create_column_family(:users) do |cf|
+        #    cf.comment = 'Users column family'
+        #    cf.comparator_type = 'TimeUUIDType'
+        #  end
+        #
+        # A complete list of available configuration settings is here:
+        #
+        # http://github.com/fauna/cassandra/blob/master/vendor/0.7/gen-rb/cassandra_types.rb
+        #
+        # Scroll down to the CfDef definition.
+        def create_column_family(name, &block)
+          say_with_time("create_column_family #{name}") do
+            column_family_tasks.create(name, &block)
+          end
+        end
 
-      # Creates a new column family with the given name.  Column family configurations can be set within
-      # a block like this:
-      #
-      #  create_column_family(:users) do |cf|
-      #    cf.comment = 'Users column family'
-      #    cf.comparator_type = 'TimeUUIDType'
-      #  end
-      #
-      # A complete list of available configuration settings is here:
-      #
-      # http://github.com/fauna/cassandra/blob/master/vendor/0.7/gen-rb/cassandra_types.rb
-      #
-      # Scroll down to the CfDef definition.
-      def self.create_column_family(name, &block)
-        say_with_time("create_column_family #{name}") do
-          column_family_tasks.create(name, &block)
+        # Drops the given column family
+        def drop_column_family(name)
+          say_with_time("drop_column_family #{name}") do
+            column_family_tasks.drop(name)
+          end
         end
-      end
 
-      # Drops the given column family
-      def self.drop_column_family(name)
-        say_with_time("drop_column_family #{name}") do
-          column_family_tasks.drop(name)
+        # Renames the column family from the old name to the new name
+        def rename_column_family(old_name, new_name)
+          say_with_time("rename_column_family #{name}") do
+            column_family_tasks.rename(old_name, new_name)
+          end
         end
-      end
 
-      # Renames the column family from the old name to the new name
-      def self.rename_column_family(old_name, new_name)
-        say_with_time("rename_column_family #{name}") do
-          column_family_tasks.rename(old_name, new_name)
+        def write(text="")
+          puts(text) if verbose
         end
-      end
 
-      def self.write(text="")
-        puts(text) if verbose
-      end
+        def announce(message)
+          version = defined?(@version) ? @version : nil
 
-      def self.announce(message)
-        version = defined?(@version) ? @version : nil
+          text = "#{version} #{name}: #{message}"
+          length = [0, 75 - text.length].max
+          write "== %s %s" % [text, "=" * length]
+        end
 
-        text = "#{version} #{name}: #{message}"
-        length = [0, 75 - text.length].max
-        write "== %s %s" % [text, "=" * length]
-      end
+        def say(message, subitem=false)
+          write "#{subitem ? "   ->" : "--"} #{message}"
+        end
 
-      def self.say(message, subitem=false)
-        write "#{subitem ? "   ->" : "--"} #{message}"
-      end
+        def say_with_time(message)
+          say(message)
+          result = nil
+          time = Benchmark.measure { result = yield }
+          say "%.4fs" % time.real, :subitem
+          say("#{result} rows", :subitem) if result.is_a?(Integer)
+          result
+        end
 
-      def self.say_with_time(message)
-        say(message)
-        result = nil
-        time = Benchmark.measure { result = yield }
-        say "%.4fs" % time.real, :subitem
-        say("#{result} rows", :subitem) if result.is_a?(Integer)
-        result
-      end
+        def suppress_messages
+          save, self.verbose = verbose, false
+          yield
+        ensure
+          self.verbose = save
+        end
 
-      def self.suppress_messages
-        save, self.verbose = verbose, false
-        yield
-      ensure
-        self.verbose = save
+        private
+          def column_family_tasks
+            Tasks::ColumnFamily.new(CassandraObject::Base.connection.keyspace)
+          end
       end
-
-      private
-        def self.column_family_tasks
-          Tasks::ColumnFamily.new(CassandraObject::Base.connection.keyspace)
-        end
     end
   end
-end
+end

data/lib/cassandra_object/schema/migrator.rb

@@ -1,82 +1,80 @@
 module CassandraObject
   module Schema
-
     class Migrator
-
-      def self.migrate(migrations_path, target_version = nil)
-        case
-        when target_version.nil?
-          up(migrations_path, target_version)
-        when current_version == 0 && target_version == 0
-        when current_version > target_version
-          down(migrations_path, target_version)
-        else
-          up(migrations_path, target_version)
+      class << self
+        def migrate(migrations_path, target_version = nil)
+          case
+          when target_version.nil?
+            up(migrations_path, target_version)
+          when current_version == 0 && target_version == 0
+          when current_version > target_version
+            down(migrations_path, target_version)
+          else
+            up(migrations_path, target_version)
+          end
         end
-      end
 
-      def self.rollback(migrations_path, steps = 1)
-        move(:down, migrations_path, steps)
-      end
+        def rollback(migrations_path, steps = 1)
+          move(:down, migrations_path, steps)
+        end
 
-      def self.forward(migrations_path, steps = 1)
-        move(:up, migrations_path, steps)
-      end
+        def forward(migrations_path, steps = 1)
+          move(:up, migrations_path, steps)
+        end
 
-      def self.up(migrations_path, target_version = nil)
-        new(:up, migrations_path, target_version).migrate
-      end
+        def up(migrations_path, target_version = nil)
+          new(:up, migrations_path, target_version).migrate
+        end
 
-      def self.down(migrations_path, target_version = nil)
-        new(:down, migrations_path, target_version).migrate
-      end
+        def down(migrations_path, target_version = nil)
+          new(:down, migrations_path, target_version).migrate
+        end
 
-      def self.run(direction, migrations_path, target_version)
-        new(direction, migrations_path, target_version).run
-      end
+        def run(direction, migrations_path, target_version)
+          new(direction, migrations_path, target_version).run
+        end
 
-      def self.migrations_path
-        'ks/migrate'
-      end
+        def migrations_path
+          'ks/migrate'
+        end
 
-      def self.schema_migrations_column_family
-        :schema_migrations
-      end
+        def schema_migrations_column_family
+          :schema_migrations
+        end
 
-      def self.column_family_tasks
-        cas = CassandraObject::Base.connection
-        Tasks::ColumnFamily.new(cas.keyspace)
-      end
+        def column_family_tasks
+          cas = CassandraObject::Base.connection
+          Tasks::ColumnFamily.new(cas.keyspace)
+        end
 
-      def self.get_all_versions
-        cas = CassandraObject::Base.connection
-        cas.get(schema_migrations_column_family, 'all').map {|(name, _value)| name.to_i}.sort
-      end
+        def get_all_versions
+          cas = CassandraObject::Base.connection
+          cas.get(schema_migrations_column_family, 'all').map {|(name, _value)| name.to_i}.sort
+        end
 
-      def self.current_version
-        sm_cf = schema_migrations_column_family
-        if column_family_tasks.exists?(sm_cf)
-          get_all_versions.max || 0
-        else
-          0
+        def current_version
+          sm_cf = schema_migrations_column_family
+          if column_family_tasks.exists?(sm_cf)
+            get_all_versions.max || 0
+          else
+            0
+          end
         end
-      end
 
-      private
+        private
 
-      def self.move(direction, migrations_path, steps)
-        migrator = self.new(direction, migrations_path)
-        start_index = migrator.migrations.index(migrator.current_migration)
+          def move(direction, migrations_path, steps)
+            migrator = self.new(direction, migrations_path)
+            start_index = migrator.migrations.index(migrator.current_migration)
 
-        if start_index
-          finish = migrator.migrations[start_index + steps]
-          version = finish ? finish.version : 0
-          send(direction, migrations_path, version)
-        end
+            if start_index
+              finish = migrator.migrations[start_index + steps]
+              version = finish ? finish.version : 0
+              send(direction, migrations_path, version)
+            end
+          end
       end
 
-      public
-
       def initialize(direction, migrations_path, target_version = nil)
         sm_cf = self.class.schema_migrations_column_family
 
@@ -140,32 +138,32 @@ module CassandraObject
 
       def migrations
         @migrations ||= begin
-                          files = Dir["#{@migrations_path}/[0-9]*_*.rb"]
+          files = Dir["#{@migrations_path}/[0-9]*_*.rb"]
 
-                          migrations = files.inject([]) do |klasses, file|
-                            version, name = file.scan(/([0-9]+)_([_a-z0-9]*).rb/).first
+          migrations = files.inject([]) do |klasses, file|
+            version, name = file.scan(/([0-9]+)_([_a-z0-9]*).rb/).first
 
-                            raise IllegalMigrationNameError.new(file) unless version
-                            version = version.to_i
+            raise IllegalMigrationNameError.new(file) unless version
+            version = version.to_i
 
-                            if klasses.detect { |m| m.version == version }
-                              raise DuplicateMigrationVersionError.new(version)
-                            end
+            if klasses.detect { |m| m.version == version }
+              raise DuplicateMigrationVersionError.new(version)
+            end
 
-                            if klasses.detect { |m| m.name == name.camelize }
-                              raise DuplicateMigrationNameError.new(name.camelize)
-                            end
+            if klasses.detect { |m| m.name == name.camelize }
+              raise DuplicateMigrationNameError.new(name.camelize)
+            end
 
-                            migration = MigrationProxy.new
-                            migration.name     = name.camelize
-                            migration.version  = version
-                            migration.filename = file
-                            klasses << migration
-                          end
+            migration = MigrationProxy.new
+            migration.name     = name.camelize
+            migration.version  = version
+            migration.filename = file
+            klasses << migration
+          end
 
-                          migrations = migrations.sort_by { |m| m.version }
-                          down? ? migrations.reverse : migrations
-                        end
+          migrations = migrations.sort_by { |m| m.version }
+          down? ? migrations.reverse : migrations
+        end
       end
 
       def pending_migrations
@@ -179,35 +177,34 @@ module CassandraObject
 
       private
 
-      def column_family_tasks
-        Tasks::ColumnFamily.new(connection.keyspace)
-      end
+        def column_family_tasks
+          Tasks::ColumnFamily.new(connection.keyspace)
+        end
 
-      def connection
-        CassandraObject::Base.connection
-      end
+        def connection
+          CassandraObject::Base.connection
+        end
 
-      def record_version_state_after_migrating(migration)
-        sm_cf = self.class.schema_migrations_column_family
+        def record_version_state_after_migrating(migration)
+          sm_cf = self.class.schema_migrations_column_family
 
-        @migrated_versions ||= []
-        if down?
-          @migrated_versions.delete(migration.version)
-          connection.remove sm_cf, 'all', migration.version
-        else
-          @migrated_versions.push(migration.version).sort!
-          connection.insert sm_cf, 'all', { migration.version => migration.name }
+          @migrated_versions ||= []
+          if down?
+            @migrated_versions.delete(migration.version)
+            connection.remove sm_cf, 'all', migration.version
+          else
+            @migrated_versions.push(migration.version).sort!
+            connection.insert sm_cf, 'all', { migration.version => migration.name }
+          end
         end
-      end
 
-      def up?
-        @direction == :up
-      end
-
-      def down?
-        @direction == :down
-      end
+        def up?
+          @direction == :up
+        end
 
+        def down?
+          @direction == :down
+        end
     end
   end
 end

data/lib/cassandra_object/tasks/column_family.rb

@@ -1,15 +1,10 @@
 module CassandraObject
   module Tasks
     class ColumnFamily
-
-      COMPARATOR_TYPES = { :time      => 'TimeUUIDType',
-                           :timestamp => 'TimeUUIDType',
-                           :long      => 'LongType',
-                           :string    => 'BytesType',
-                           :utf8      => 'UTF8Type' }
-
-      COLUMN_TYPES = {     :standard  => 'Standard',
-                           :super     => 'Super' }
+      COLUMN_TYPES = {
+        standard: 'Standard',
+        super:    'Super'
+      }
 
       def initialize(keyspace)
         @keyspace = keyspace
@@ -23,7 +18,7 @@ module CassandraObject
         cf = Cassandra::ColumnFamily.new
         cf.name = name.to_s
         cf.keyspace = @keyspace.to_s
-        cf.comparator_type = 'BytesType'
+        cf.comparator_type = 'UTF8Type'
         cf.column_type = 'Standard'
 
         yield(cf) if block_given?
@@ -40,39 +35,21 @@ module CassandraObject
         connection.rename_column_family(old_name.to_s, new_name.to_s)
       end
 
-      def clear(name)
-        connection.truncate!(name.to_s)
-      end
-
       private
-
-      def connection
-        CassandraObject::Base.connection
-      end
-
-      def post_process_column_family(cf)
-        comp_type = cf.comparator_type
-        if comp_type && COMPARATOR_TYPES.has_key?(comp_type)
-          cf.comparator_type = COMPARATOR_TYPES[comp_type]
+        def connection
+          CassandraObject::Base.connection
         end
 
-        comp_type = cf.subcomparator_type
-        if comp_type && COMPARATOR_TYPES.has_key?(comp_type)
-          cf.subcomparator_type = COMPARATOR_TYPES[comp_type]
-        end
+        def post_process_column_family(cf)
+          col_type = cf.column_type
+          if col_type && COLUMN_TYPES.has_key?(col_type)
+            cf.column_type = COLUMN_TYPES[col_type]
+          end
 
-        col_type = cf.column_type
-        if col_type && COLUMN_TYPES.has_key?(col_type)
-          cf.column_type = COLUMN_TYPES[col_type]
+          cf
         end
-
-        cf
-      end
-
     end
-
   end
-
 end
 
 class Cassandra

data/lib/cassandra_object/tasks/keyspace.rb

@@ -1,9 +1,6 @@
 module CassandraObject
-
   module Tasks
-
     class Keyspace
-
       def self.parse(hash)
         ks = Cassandra::Keyspace.new.with_fields hash
         ks.cf_defs = []
@@ -69,11 +66,8 @@ module CassandraObject
           end
           @connection
         end
-
     end
-
   end
-
 end
 
 class Cassandra

data/test/unit/tasks/column_family_test.rb

@@ -0,0 +1,29 @@
+require 'test_helper'
+
+class CassandraObject::Tasks::ColumnFamilyTest < CassandraObject::TestCase
+  setup do
+    column_family_task.drop('Gadgets') if column_family_task.exists?('Gadgets')
+    column_family_task.drop('Widgets') if column_family_task.exists?('Widgets')
+  end
+
+  test 'create' do
+    assert !column_family_task.exists?('Widgets')
+    column_family_task.create 'Widgets'
+    assert column_family_task.exists?('Widgets')
+  end
+
+  # test 'rename' do
+  #   column_family_task.create 'Widgets'
+  #   column_family_task.rename 'Widgets', 'Gadgets'
+  # 
+  #   sleep 2
+  # 
+  #   assert !column_family_task.exists?('Widgets')
+  #   assert column_family_task.exists?('Gadgets')
+  # end
+
+  private
+    def column_family_task
+      @column_family_task ||= CassandraObject::Tasks::ColumnFamily.new(CassandraObject::Base.connection.keyspace)
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.10.11
+  version: 2.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000 Z
+date: 2012-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70104281371060 !ruby/object:Gem::Requirement
+  requirement: &70366970329520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70104281371060
+  version_requirements: *70366970329520
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70104281368940 !ruby/object:Gem::Requirement
+  requirement: &70366970329000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,21 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70104281368940
+  version_requirements: *70366970329000
+- !ruby/object:Gem::Dependency
+  name: thrift_client
+  requirement: &70366970326120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70366970326120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70104281386900 !ruby/object:Gem::Requirement
+  requirement: &70366970325440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70104281386900
+  version_requirements: *70366970325440
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []
@@ -131,6 +142,7 @@ files:
 - test/unit/identity_test.rb
 - test/unit/inspect_test.rb
 - test/unit/persistence_test.rb
+- test/unit/tasks/column_family_test.rb
 - test/unit/timestamps_test.rb
 - test/unit/types/array_type_test.rb
 - test/unit/types/base_type_test.rb
@@ -162,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Cassandra ActiveModel