active_column 0.0.2 → 0.1

data/spec/spec_helper.rb

@@ -1,13 +1,33 @@
-require 'cassandra'
 require 'active_column'
+require 'rails'
+require 'rspec-rails'
+require 'rspec/rails/adapters'
+require 'wrong/adapters/rspec'
+
+Wrong.config.alias_assert :expect
 
 Dir[ File.expand_path("../support/**/*.rb", __FILE__) ].each {|f| require f}
 
 $cassandra = ActiveColumn.connection = Cassandra.new('active_column', '127.0.0.1:9160')
-$cassandra.clear_keyspace!
+
+ks_tasks = ActiveColumn::Tasks::Keyspace.new
+unless ks_tasks.exists?('active_column')
+  ks_tasks.create('active_column')
+
+  cf_tasks = ActiveColumn::Tasks::ColumnFamily.new
+  [:tweets, :tweet_dms].each do |cf|
+    cf_tasks.create(cf, :keyspace => 'active_column')
+  end
+end
+
+ks_tasks.set 'active_column'
+ks_tasks.clear
 
 RSpec.configure do |config|
 
+  config.before do
+  end
+  
 end
 
 class Counter
@@ -28,7 +48,7 @@ class Counter
 
   def get_counts
     @keys.each_with_object( {} ) do |key, counts|
-      counts[key] = $cassandra.count_columns(@cf, key)
+      counts[key] = $cassandra.get(@cf, key).length
     end
   end
-end
+end

data/spec/support/aggregating_tweet.rb

@@ -3,8 +3,10 @@ class AggregatingTweet < ActiveColumn::Base
   column_family :tweets
   key :user_id, :values => :user_keys
 
+  attr_accessor :user_id, :message
+
   def user_keys
-    [ attributes[:user_id], 'all' ]
+    [ user_id, 'all' ]
   end
 
 end

data/spec/support/migrate/migrator_spec/1_migration1.rb

@@ -0,0 +1,11 @@
+class Migration1 < ActiveColumn::Migration
+
+  def self.up
+    $migrator_spec_data[1] = true
+  end
+
+  def self.down
+    $migrator_spec_data.delete 1
+  end
+  
+end

data/spec/support/migrate/migrator_spec/2_migration2.rb

@@ -0,0 +1,11 @@
+class Migration2 < ActiveColumn::Migration
+
+  def self.up
+    $migrator_spec_data[2] = true
+  end
+
+  def self.down
+    $migrator_spec_data.delete 2
+  end
+  
+end

data/spec/support/migrate/migrator_spec/3_migration3.rb

@@ -0,0 +1,11 @@
+class Migration3 < ActiveColumn::Migration
+
+  def self.up
+    $migrator_spec_data[3] = true
+  end
+
+  def self.down
+    $migrator_spec_data.delete 3
+  end
+  
+end

data/spec/support/migrate/migrator_spec/4_migration4.rb

@@ -0,0 +1,11 @@
+class Migration4 < ActiveColumn::Migration
+
+  def self.up
+    $migrator_spec_data[4] = true
+  end
+
+  def self.down
+    $migrator_spec_data.delete 4
+  end
+  
+end

data/spec/support/tweet.rb

@@ -1,6 +1,8 @@
-class Tweet < ActiveColumn::Base
+class Tweet
+  include ActiveColumn
 
-  column_family :tweets
   key :user_id
 
+  attr_accessor :user_id, :message
+
 end

data/spec/support/tweet_dm.rb

@@ -1,15 +1,17 @@
-class TweetDM < ActiveColumn::Base
+class TweetDM
+  include ActiveColumn
 
-  column_family :tweet_dms
   key :user_id,      :values => :user_keys
   key :recipient_id, :values => :recipient_keys
 
+  attr_accessor :user_id, :recipient_ids, :message
+
   def user_keys
-    [ attributes[:user_id], 'all' ]
+    [ user_id, 'all' ]
   end
 
   def recipient_keys
-    attributes[:recipient_ids] + ['all']
+    recipient_ids + ['all']
   end
 
 end

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 2
-  version: 0.0.2
+  - 1
+  version: "0.1"
 platform: ruby
 authors: 
 - Michael Wynholds
@@ -14,11 +13,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-13 00:00:00 -08:00
+date: 2010-12-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: simple_uuid
+  name: cassandra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -27,11 +26,12 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 9
+        version: "0.9"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: cassandra
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,7 +44,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -54,9 +54,75 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id003
-description: Provides time line support for Cassandra
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: wrong
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bluecloth
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id008
+description: Provides time line support and database migrations for Cassandra
 email: 
 - mike@wynholds.com
 executables: []
@@ -68,21 +134,40 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rvmrc
+- .yardopts
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - active_column.gemspec
+- docs/Create.md
+- docs/Migrate.md
+- docs/Query.md
 - lib/active_column.rb
 - lib/active_column/base.rb
 - lib/active_column/connection.rb
+- lib/active_column/errors.rb
+- lib/active_column/generators/migration_generator.rb
+- lib/active_column/generators/templates/migration.rb.erb
+- lib/active_column/key_config.rb
+- lib/active_column/migration.rb
+- lib/active_column/tasks/column_family.rb
+- lib/active_column/tasks/keyspace.rb
+- lib/active_column/tasks/ks.rb
 - lib/active_column/version.rb
 - spec/active_column/base_crud_spec.rb
 - spec/active_column/base_finders_spec.rb
+- spec/active_column/migrator_spec.rb
+- spec/active_column/tasks/column_family_spec.rb
+- spec/active_column/tasks/keyspace_spec.rb
 - spec/spec_helper.rb
 - spec/support/aggregating_tweet.rb
 - spec/support/compound_key.rb
 - spec/support/config/storage-conf.xml
+- spec/support/migrate/migrator_spec/1_migration1.rb
+- spec/support/migrate/migrator_spec/2_migration2.rb
+- spec/support/migrate/migrator_spec/3_migration3.rb
+- spec/support/migrate/migrator_spec/4_migration4.rb
 - spec/support/simple_key.rb
 - spec/support/tweet.rb
 - spec/support/tweet_dm.rb
@@ -117,14 +202,21 @@ rubyforge_project: active_column
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Provides time line support for Cassandra
+summary: Provides time line support and database migrations for Cassandra
 test_files: 
 - spec/active_column/base_crud_spec.rb
 - spec/active_column/base_finders_spec.rb
+- spec/active_column/migrator_spec.rb
+- spec/active_column/tasks/column_family_spec.rb
+- spec/active_column/tasks/keyspace_spec.rb
 - spec/spec_helper.rb
 - spec/support/aggregating_tweet.rb
 - spec/support/compound_key.rb
 - spec/support/config/storage-conf.xml
+- spec/support/migrate/migrator_spec/1_migration1.rb
+- spec/support/migrate/migrator_spec/2_migration2.rb
+- spec/support/migrate/migrator_spec/3_migration3.rb
+- spec/support/migrate/migrator_spec/4_migration4.rb
 - spec/support/simple_key.rb
 - spec/support/tweet.rb
 - spec/support/tweet_dm.rb