sandra-rails 0.0.4 → 0.0.5

data/lib/sandra-rails/tasks/sandra.rake

@@ -1,14 +1,29 @@
 namespace :sandra do
   task :migrate => :environment do
-    sandra_config = YAML::load_file("#{::Rails.root.to_s}/config/sandra.yml")[::Rails.env]
+    sandra_config = YAML::load_file("#{::Rails.root.to_s}/config/sandra.yml")[::Rails.env].symbolize_keys
     keyspace = sandra_config[:keyspace]
     store = Cassandra.new(keyspace)
     cfs = sandra_config[:column_families]
-    cfs.each do |name, options|
-      options = Hash(options)
+    current_cfs = {}
+    store.schema.cf_defs.each do |cfdef|
+      current_cfs[cfdef.name] = cfdef
+    end
+    updated_cfs = current_cfs.keys & cfs.keys
+    deleted_cfs = current_cfs.keys - cfs.keys
+    new_cfs = cfs.keys - current_cfs.keys
+    new_cfs.each do |name, options|
+      options = options.is_a?(Hash) ? options : {}
       cf_def = CassandraThrift::CfDef.new({:keyspace => keyspace, :name => name}.merge(options))
       store.add_column_family(cf_def)
+    end
+    # TODO: Update existing column families
+    #updated_cfs.each do |name, options|
+      #options = options.is_a?(Hash) ? options : {}
+      #cf_def = update_cf(current_cfs[name], options)
       store.update_column_family(cf_def)
+    #end
+    deleted_cfs.each do |name|
+      store.drop_column_family(name)
     end
   end
 end

data/lib/sandra-rails/version.rb

@@ -1,5 +1,5 @@
 module Sandra
   module Rails
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/sandra-rails.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_runtime_dependency "sandra"
-  s.add_runtime_dependency "actionpack", ["~> 3.2.0"]
-  s.add_runtime_dependency "railties", ["~> 3.2.0"]
+  s.add_runtime_dependency "actionpack", ["~> 3.1.0"]
+  s.add_runtime_dependency "railties", ["~> 3.1.0"]
   # s.add_runtime_dependency "rest-client"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sandra-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-05 00:00:00.000000000Z
+date: 2012-03-06 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sandra
-  requirement: &70324487139080 !ruby/object:Gem::Requirement
+  requirement: &70208568698540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,29 +21,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324487139080
+  version_requirements: *70208568698540
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70324487138540 !ruby/object:Gem::Requirement
+  requirement: &70208568697860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70324487138540
+  version_requirements: *70208568697860
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70324487137980 !ruby/object:Gem::Requirement
+  requirement: &70208568697200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70324487137980
+  version_requirements: *70208568697200
 description: Connect Sandra with Rails
 email:
 - chuck@teachmetocode.com