active_column 0.1.1 → 0.2

data/.gitignore

@@ -1,4 +1,5 @@
 pkg/*
+doc/*
 .yardoc/*
 *.gem
 .bundle

data/.rvmrc

@@ -1,7 +1 @@
-
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/ruby-1.9.2-p0@active_column" ]] ; then
-  \. "${rvm_path:-$HOME/.rvm}/environments/ruby-1.9.2-p0@active_column"
-else
-  rvm --create  "ruby-1.9.2-p0@active_column"
-fi
+rvm --create 1.9.2@active_column

data/Gemfile.lock

@@ -1,51 +1,50 @@
 PATH
   remote: .
   specs:
-    active_column (0.0.3)
-      activesupport
+    active_column (0.2)
       cassandra (>= 0.9)
       rake
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ParseTree (3.0.6)
+    ParseTree (3.0.7)
       RubyInline (>= 3.7.0)
       sexp_processor (>= 3.0.0)
-    RubyInline (3.8.6)
+    RubyInline (3.9.0)
       ZenTest (~> 4.3)
-    ZenTest (4.4.2)
+    ZenTest (4.5.0)
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
+      mail (~> 2.2.15)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.6)
-    bluecloth (2.0.9)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    arel (2.0.9)
+    bluecloth (2.1.0)
     builder (2.1.2)
-    cassandra (0.9.0)
+    cassandra (0.9.1)
       json
       rake
       simple_uuid (>= 0.1.0)
@@ -56,65 +55,67 @@ GEM
     file-tail (1.0.5)
       spruz (>= 0.1.0)
     i18n (0.5.0)
-    json (1.4.6)
-    mail (2.2.12)
+    json (1.5.1)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
+    mocha (0.9.12)
     polyglot (0.3.1)
     predicated (0.2.2)
-    rack (1.2.1)
-    rack-mount (0.6.13)
+    rack (1.2.2)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    rspec-rails (2.3.1)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.3.0)
+      rspec (~> 2.5.0)
     ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_parser (2.0.5)
+    ruby_parser (2.0.6)
       sexp_processor (~> 3.0)
     sexp_processor (3.0.5)
-    simple_uuid (0.1.1)
-    sourcify (0.4.0)
+    simple_uuid (0.1.2)
+    sourcify (0.4.2)
+      file-tail (>= 1.0.5)
       ruby2ruby (>= 1.2.5)
       sexp_processor (>= 3.0.5)
-    spruz (0.2.2)
+    spruz (0.2.5)
     thor (0.14.6)
     thrift (0.5.0)
     thrift_client (0.6.0)
       thrift (~> 0.5.0)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.27)
     wrong (0.5.0)
       ParseTree (~> 3.0)
       diff-lcs (~> 1.1.2)
@@ -124,18 +125,16 @@ GEM
       ruby_parser (~> 2.0.4)
       sexp_processor (~> 3.0)
       sourcify (>= 0.3.0)
-    yard (0.6.4)
+    yard (0.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   active_column!
-  activesupport
   bluecloth
-  cassandra (>= 0.9)
+  mocha
   rails (>= 3.0)
-  rake
-  rspec-rails
+  rspec-rails (>= 2.5.0)
   wrong
   yard

data/README.md

@@ -33,8 +33,12 @@ bundle install
 
 ### Configuration
 
-ActiveColumn requires Cassandra 0.7 or above, as we as the [cassandra gem](https://github.com/fauna/cassandra),
-version 0.9 or above.
+ActiveColumn requires Cassandra 0.7 or above, as well as the [cassandra gem](https://github.com/fauna/cassandra),
+version 0.9 or above.  You must also be sure to use the Cassandra 0.7 support in the gem, which can be done by
+adding Cassandra to your Gemfile like this:
+<pre>
+gem 'cassandra', '>= 0.9', :require => 'cassandra/0.7'
+</pre>
 
 Data migrations in ActiveColumn are used within a Rails project, and are driven off of a configuration file,
 config/cassandra.yml.  It should look something like this:
@@ -74,4 +78,4 @@ As you can see, I create a global $cassandra variable, which I use in my tests t
 
 One other thing to note is that you obviously must have Cassandra installed and running!  Please take a look at the
 [mama_cass gem](https://github.com/carbonfive/mama_cass) for a quick way to get up and running with Cassandra for
-development and testing.
+development and testing.

data/active_column.gemspec

@@ -18,15 +18,14 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.has_rdoc      = true
 
   s.add_dependency 'cassandra', '>= 0.9'
-  s.add_dependency 'activesupport'
   s.add_dependency 'rake'
 
   s.add_development_dependency 'rails', '>= 3.0'
-  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'rspec-rails', '>= 2.5.0'
   s.add_development_dependency 'wrong'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'bluecloth'
+  s.add_development_dependency 'mocha'
 end

data/docs/Migrate.md

@@ -23,7 +23,7 @@ the equivalent of a database in MySQL (or other relational dbs).  To see the ava
 rake -T ks
 </pre>
 
-3. Create your databases with the **ks:create:all** rake task:
+3. Create your keyspaces with the **ks:create:all** rake task:
 
 <pre>
 rake ks:create:all
@@ -40,6 +40,11 @@ command:
 rails g active_column:migration NameOfYourMigration
 </pre>
 
+If you are using Rails 2, run this command instead:
+<pre>
+./script/generate ks_migration NameOfYourMigration
+</pre>
+
 The name of the migration might be something like "CreateUsersColumnFamily".  After you run this command, you should see
 a new file that is located here:
 
@@ -71,7 +76,10 @@ this:
 class CreateUsersColumnFamily &lt; ActiveColumn::Migration
 
   def self.up
-    create_column_family :users
+    create_column_family :users do |cf|
+      cf.comment = 'Users column family'
+      cf.comparator_type = :string
+    end
   end
 
   def self.down
@@ -88,13 +96,28 @@ rake ks:migrate
 </pre>
 
 This will create the column family for your development environment.  But you also need it in your test environment.
-For now, you have to do this like the following.  However, soon this will be updated to work more like ActiveRecord
-migrations.
 
-7. Run the migrate rake task (for test):
+7. Prepare the test environment keyspace:
+
+<pre>
+rake ks:test:prepare
+</pre>
+
+And BAM!  You have your development and test keyspaces set up correctly.
+
+### Inside your migrations
+
+ActiveColumn::Migration, which all migrations extend by default, offers some useful functions.  They are documented
+via rdoc in the code itself.
+
+### But I'm using Sinatra!
 
+If you are using Rails, you don't need to do anything beyond including the active\_column gem in your Gemfile.
+However, if you are using Sinatra (or some other framework), you can get these rake tasks to work merely by adding
+the following line to your Rakefile:
 <pre>
-RAILS_ENV=test rake ks:migrate
+require 'active_column'
 </pre>
 
-And BAM!  You have your development and test keyspaces set up correctly.
+Please note, however, that the Rails generator is only available if you are using Rails.  If you are not using Rails,
+you will have to create your migrations by hand.

data/generators/ks_migration/USAGE

@@ -0,0 +1,6 @@
+Description:
+    Create an empty Cassandra migration file in 'ks/migrate'.  Very similar to Rails database migrations.
+   
+Example:
+    ./script/generate ks_migration CreateFooColumnFamily
+

data/generators/ks_migration/ks_migration_generator.rb

@@ -0,0 +1,17 @@
+require 'rails_generator/base'
+
+class KsMigrationGenerator < Rails::Generator::NamedBase
+
+  def manifest
+    record do |m|
+      m.directory 'ks/migrate'
+      timestamp = Time.now.utc.strftime("%Y%m%d%H%M%S")
+      m.template 'migration.rb.erb', "ks/migrate/#{timestamp}_#{file_name.underscore}.rb"
+    end
+  end
+
+  def banner
+    "Usage: ./script/generate ks_migration NAME [options]"
+  end
+
+end

data/generators/ks_migration/templates/migration.rb.erb

@@ -0,0 +1,11 @@
+class <%= name %> < ActiveColumn::Migration
+
+  def self.up
+
+  end
+
+  def self.down
+
+  end
+
+end

data/lib/active_column.rb

@@ -1,28 +1,35 @@
 require 'cassandra/0.7'
-require 'active_support'
-require 'active_support/core_ext/string'
+require 'benchmark'
+require 'yaml'
 
 module ActiveColumn
 
   autoload :Base,           'active_column/base'
-  autoload :Connection,     'active_column/connection'
+  autoload :Configuration,  'active_column/configuration'
   autoload :KeyConfig,      'active_column/key_config'
   autoload :Version,        'active_column/version'
+  autoload :Helpers,        'active_column/helpers'
 
   require                   'active_column/errors'
+  require                   'active_column/migrator'
   require                   'active_column/migration'
 
   module Tasks
     autoload :Keyspace,     'active_column/tasks/keyspace'
     autoload :ColumnFamily, 'active_column/tasks/column_family'
-
-    require                 'active_column/tasks/ks'
   end
 
-  module Generators
-    require                 'active_column/generators/migration_generator'
+  load                      'active_column/tasks/ks.rake'
+
+
+  if defined? ::Rails
+    module Generators
+      if ::Rails::VERSION::MAJOR >= 3
+        require             'active_column/generators/migration_generator'
+      end
+    end
   end
 
-  extend Connection
-  
+  extend Configuration
+
 end

data/lib/active_column/configuration.rb

@@ -0,0 +1,36 @@
+module ActiveColumn
+
+  module Configuration
+
+    def connect(config)
+      default_thrift_options = { :timeout => 3, :retries => 2, :server_retry_period => nil }
+      override_thrift_options = (config['thrift'] || {}).inject({}){|h, (k, v)| h[k.to_sym] = v; h} # symbolize keys
+      thrift_options = default_thrift_options.merge(override_thrift_options)
+      self.connection = Cassandra.new(config['keyspace'], config['servers'], thrift_options)
+    end
+
+    def connected?
+      defined? @@connection
+    end
+
+    def connection
+      @@connection
+    end
+
+    def connection=(connection)
+      @@connection = connection
+      @@keyspace_tasks = ActiveColumn::Tasks::Keyspace.new
+      @@keyspace = connection.keyspace
+    end
+
+    def keyspace_tasks
+      @@keyspace_tasks
+    end
+
+    def column_family_tasks
+      ActiveColumn::Tasks::ColumnFamily.new(@@keyspace)
+    end
+
+  end
+
+end

data/lib/active_column/helpers.rb

@@ -0,0 +1,36 @@
+module ActiveColumn
+  module Helpers
+
+    def self.current_env
+      ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+    end
+
+    def current_env
+      ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+    end
+
+    def testing?
+      self.current_env == 'test'
+    end
+
+    def log(msg, e = nil)
+      puts msg if e || !testing?
+      p e if e
+      nil
+    end
+
+  end
+end
+
+class Object
+  def to_json(*a)
+    result = {
+      JSON.create_id => self.class.name
+    }
+    instance_variables.inject(result) do |r, name|
+      r[name[1..-1]] = instance_variable_get name
+      r
+    end
+    result.to_json(*a)
+  end
+end