gotime-cassandra_object 2.9.1 → 2.9.2

data/gotime-cassandra_object.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'gotime-cassandra_object'
-  s.version = '2.9.1'
+  s.version = '2.9.2'
   s.description = 'Cassandra ActiveModel'
   s.summary = 'Cassandra ActiveModel'
 

data/lib/cassandra_object/schema/migration.rb

@@ -96,11 +96,9 @@ module CassandraObject
       end
 
       private
-
-      def self.column_family_tasks
-        Tasks::ColumnFamily.new(CassandraObject::Base.connection.keyspace)
-      end
-
+        def self.column_family_tasks
+          Tasks::ColumnFamily.new(CassandraObject::Base.connection.keyspace)
+        end
     end
   end
 end

data/lib/cassandra_object/tasks/column_family.rb

@@ -1,7 +1,5 @@
 module CassandraObject
-
   module Tasks
-
     class ColumnFamily
 
       COMPARATOR_TYPES = { :time      => 'TimeUUIDType',
@@ -21,14 +19,14 @@ module CassandraObject
         connection.schema.cf_defs.find { |cf_def| cf_def.name == name.to_s }
       end
 
-      def create(name, &block)
+      def create(name)
         cf = Cassandra::ColumnFamily.new
         cf.name = name.to_s
         cf.keyspace = @keyspace.to_s
         cf.comparator_type = 'BytesType'
         cf.column_type = 'Standard'
 
-        block.call cf if block
+        yield(cf) if block_given?
 
         post_process_column_family(cf)
         connection.add_column_family(cf)

data/lib/cassandra_object/tasks/keyspace.rb

@@ -62,14 +62,13 @@ module CassandraObject
       end
 
       private
-
-      def connection
-        unless @connection
-          c = CassandraObject::Base.connection
-          @connection = Cassandra.new('system', c.servers, c.thrift_client_options)
+        def connection
+          unless @connection
+            c = CassandraObject::Base.connection
+            @connection = Cassandra.new('system', c.servers, c.thrift_client_options)
+          end
+          @connection
         end
-        @connection
-      end
 
     end
 

data/lib/cassandra_object/tasks/ks.rake

@@ -1,65 +1,36 @@
 namespace :ks do
-  task :configure => :environment do
-    @configs = YAML.load_file(Rails.root.join("config", "cassandra.yml"))
-    @config = @configs[Rails.env || 'development']
-  end
-
-  #task :set_keyspace => :configure do
-    #set_keyspace
-  #end
-
   desc 'Create the keyspace in config/cassandra.yml for the current environment'
-  task :create => :configure do
-    CassandraObject::Tasks::Keyspace.new.create @config['keyspace'], @config
-    puts "Created keyspace: #{@config['keyspace']}"
-  end
-
-  namespace :create do
-    desc 'Create keyspaces in config/cassandra.yml for all environments'
-    task :all => :configure do
-      created = []
-      @configs.values.each do |config|
-        CassandraObject::Tasks::Keyspace.new.create config['keyspace'], config
-        created << config['keyspace']
-      end
-      puts "Created keyspaces: #{created.join(', ')}"
-    end
+  task :create => :environment do
+    CassandraObject::Tasks::Keyspace.new.create config['keyspace'], config
+    puts "Created keyspace: #{config['keyspace']}"
   end
 
   desc 'Drop keyspace in config/cassandra.yml for the current environment'
-  task :drop => :configure do
-    CassandraObject::Tasks::Keyspace.new.drop @config['keyspace']
-    puts "Dropped keyspace: #{@config['keyspace']}"
-  end
-
-  namespace :drop do
-    desc 'Drop keyspaces in config/cassandra.yml for all environments'
-    task :all => :configure do
-      dropped = []
-      @configs.values.each do |config|
-        CassandraObject::Tasks::Keyspace.new.drop config['keyspace']
-        dropped << config['keyspace']
-      end
-      puts "Dropped keyspaces: #{dropped.join(', ')}"
-    end
+  task :drop => :environment do
+    CassandraObject::Tasks::Keyspace.new.drop config['keyspace']
+    puts "Dropped keyspace: #{config['keyspace']}"
   end
 
   desc 'Migrate the keyspace (options: VERSION=x)'
-  task :migrate => :configure do
+  task :migrate => :environment do
     version = ( ENV['VERSION'] ? ENV['VERSION'].to_i : nil )
     CassandraObject::Schema::Migrator.migrate CassandraObject::Schema::Migrator.migrations_path, version
     schema_dump
   end
 
+  namespace :migrate do
+    task :reset => ["ks:drop", "ks:create", "ks:migrate"]]
+  end
+
   desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n)'
-  task :rollback => :set_keyspace 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
   end
 
   desc 'Pushes the schema to the next version (specify steps w/ STEP=n)'
-  task :forward => :set_keyspace do
+  task :forward => :environment do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
     CassandraObject::Schema::Migrator.forward CassandraObject::Schema::Migrator.migrations_path, step
     schema_dump
@@ -67,55 +38,48 @@ 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 => :configure do
+    task :dump => :environment do
       schema_dump
     end
 
     desc 'Load ks/schema.json file into Cassandra'
-    task :load => :configure do
+    task :load => :environment do
       schema_load
     end
   end
 
   namespace :test do
     desc 'Load the development schema in to the test keyspace'
-    task :prepare => :configure do
+    task :prepare => :environment do
       schema_dump :development
       schema_load :test
     end
   end
 
-  desc 'Retrieves the current schema version number'
-  task :version => :set_keyspace do
-    version = CassandraObject::Schema::Migrator.current_version
-    puts "Current version: #{version}"
-  end
-
   private
-
-  def schema_dump(env = Rails.env)
-    ks = set_keyspace env
-    File.open "#{Rails.root}/ks/schema.json", 'w' do |file|
-      schema = ActiveSupport::JSON.decode(ks.schema_dump.to_json)
-      JSON.pretty_generate(schema).split(/\n/).each do |line|
-        file.puts line
+    def schema_dump(env = Rails.env)
+      ks = set_keyspace env
+      File.open "#{Rails.root}/ks/schema.json", 'w' do |file|
+        schema = ActiveSupport::JSON.decode(ks.schema_dump.to_json)
+        JSON.pretty_generate(schema).split(/\n/).each do |line|
+          file.puts line
+        end
       end
     end
-  end
 
-  def schema_load(env = Rails.env)
-    ks = set_keyspace env
-    File.open "#{Rails.root}/ks/schema.json", 'r' do |file|
-      hash = JSON.parse(file.read(nil))
-      ks.schema_load CassandraObject::Tasks::Keyspace.parse(hash)
+    def schema_load(env = Rails.env)
+      ks = set_keyspace env
+      File.open "#{Rails.root}/ks/schema.json", 'r' do |file|
+        hash = JSON.parse(file.read(nil))
+        ks.schema_load CassandraObject::Tasks::Keyspace.parse(hash)
+      end
     end
-  end
 
-  def set_keyspace(env = Rails.env)
-    config = @configs[env.to_s || 'development']
-    ks = CassandraObject::Tasks::Keyspace.new
-    ks.set config['keyspace']
-    ks
-  end
+    def config
+      @config ||= begin
+        configs = YAML.load_file(Rails.root.join("config", "cassandra.yml"))
+        configs[Rails.env || 'development']
+      end
+    end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotime-cassandra_object
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-30 00:00:00.000000000 Z
+date: 2012-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &70268900134300 !ruby/object:Gem::Requirement
+  requirement: &70334356748580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70268900134300
+  version_requirements: *70334356748580
 - !ruby/object:Gem::Dependency
   name: cassandra
-  requirement: &70268900133840 !ruby/object:Gem::Requirement
+  requirement: &70334356747580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70268900133840
+  version_requirements: *70334356747580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70268900133280 !ruby/object:Gem::Requirement
+  requirement: &70334356745380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70268900133280
+  version_requirements: *70334356745380
 description: Cassandra ActiveModel
 email: gems@gotime.com
 executables: []