eurydice 1.0.0-java → 1.0.1-java

data/.rvmrc

@@ -1 +1 @@
-rvm --create use jruby-1.6.2@eurydice
+rvm --create use jruby-1.6.5@eurydice

data/Rakefile

@@ -0,0 +1,6 @@
+# encoding: utf-8
+
+require 'bundler'
+
+
+Bundler::GemHelper.install_tasks

data/lib/cassandra.rb

@@ -45,6 +45,11 @@ module Cassandra
     :lte => IndexOperator::LTE
   }.freeze
   
+  LOCATOR_STRATEGY_CLASSES = {
+    :simple           => 'org.apache.cassandra.locator.SimpleStrategy'.freeze,
+    :network_topology => 'org.apache.cassandra.locator.NetworkTopologyStrategy'.freeze
+  }.freeze
+  
   class KsDef
     def self.from_h(h)
       ks_def = h.reduce(self.new) do |ks_def, (field_name, field_value)|
@@ -78,6 +83,12 @@ module Cassandra
           acc[field_name] = field_value
         end
         acc
+      end.tap do |h|
+        if h[:strategy_class] == LOCATOR_STRATEGY_CLASSES[:simple] || h[:strategy_class] == LOCATOR_STRATEGY_CLASSES[:network_topology]
+          h[:strategy_options].keys.each do |k|
+            h[:strategy_options][k] = h[:strategy_options][k].to_i
+          end
+        end
       end
     end
   end

data/lib/eurydice/pelops/keyspace.rb

@@ -28,7 +28,10 @@ module Eurydice
     
       def create!(options={})
         thrift_exception_handler do
-          ks_def = Cassandra::KsDef.from_h({:strategy_class => 'org.apache.cassandra.locator.LocalStrategy'}.merge(options).merge(:name => @name))
+          ks_properties = options.merge(:name => @name)
+          ks_properties[:strategy_class] = DEFAULT_STRATEGY_CLASS unless ks_properties.key?(:strategy_class)
+          ks_properties[:strategy_options] = DEFAULT_STRATEGY_OPTIONS if !ks_properties.key?(:strategy_options) && ks_properties[:strategy_class] == DEFAULT_STRATEGY_CLASS
+          ks_def = Cassandra::KsDef.from_h(ks_properties)
           keyspace_manager.add_keyspace(ks_def)
           @driver.add_pool(@pool_name, @cluster, @name)
         end
@@ -70,6 +73,11 @@ module Eurydice
       def column_family_manger
         @column_family_manger ||= @driver.create_column_family_manager(@cluster, @name)
       end
+      
+    private
+    
+      DEFAULT_STRATEGY_CLASS = Cassandra::LOCATOR_STRATEGY_CLASSES[:simple]
+      DEFAULT_STRATEGY_OPTIONS = {:replication_factor => 1}.freeze
     end
   end
 end

data/lib/eurydice/version.rb

@@ -2,5 +2,5 @@
 
 
 module Eurydice
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/eurydice/pelops/column_family_spec.rb

@@ -381,7 +381,8 @@ module Eurydice
           it 'returns an Enumerator that yields each column in a row' do
             row = {}
             enum = @cf.each_column('ABC')
-            enum.each do |k, v|
+            enum.each do |pair|
+              k, v = *pair # JRuby 1.6.4 Enumerator#each does not splat the arguments
               row[k] = v
             end
             row.should == Hash[('a'..'z').map { |a| [a, a.upcase] }]

data/spec/eurydice/pelops/keyspace_spec.rb

@@ -26,14 +26,14 @@ module Eurydice
         it 'creates a keyspace with specific strategy options' do
           @keyspace = @cluster.keyspace(@keyspace_name, :create => false)
           @keyspace.create!(:strategy_options => {:replication_factor => 2})
-          @keyspace.definition(true)[:strategy_options][:replication_factor].should == '2'
+          @keyspace.definition(true)[:strategy_options][:replication_factor].should == 2
         end
         
         it 'creates a whole schema' do
           @keyspace = @cluster.keyspace(@keyspace_name, :create => false)
           @keyspace.create!(
             :strategy_class => 'org.apache.cassandra.locator.NetworkTopologyStrategy',
-            :strategy_options => {:replication_factor => 2},
+            :strategy_options => {:dc1 => 1, :dc2 => 2},
             :column_families => {
               'some_family' => {
                 :comparator_type => :ascii,
@@ -57,7 +57,7 @@ module Eurydice
           )
           definition = @keyspace.definition(true)
           definition[:strategy_class].should == 'org.apache.cassandra.locator.NetworkTopologyStrategy'
-          definition[:strategy_options].should == {:replication_factor => '2'}
+          definition[:strategy_options].should == {:dc1 => 1, :dc2 => 2}
           definition[:column_families]['some_family'][:comparator_type].should == 'org.apache.cassandra.db.marshal.AsciiType'
           definition[:column_families]['some_family'][:comment].should == 'This is some family'
           definition[:column_families]['another_family'][:comment].should == 'This is another family'
@@ -82,7 +82,8 @@ module Eurydice
           @keyspace = @cluster.keyspace(@keyspace_name)
           definition = @keyspace.definition
           definition[:name].should == @keyspace_name
-          definition[:strategy_class].should == 'org.apache.cassandra.locator.LocalStrategy'
+          definition[:strategy_class].should == 'org.apache.cassandra.locator.SimpleStrategy'
+          definition[:strategy_options].should == {:replication_factor => 1}
         end
       end
     end

metadata

@@ -1,38 +1,31 @@
 --- !ruby/object:Gem::Specification 
 name: eurydice
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+  prerelease: 
+  version: 1.0.1
 platform: java
 authors: 
-- Theo Hultberg
+  - Theo Hultberg
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-07 00:00:00 +02:00
-default_executable: 
+date: 2011-11-01 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: pelops-jars
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        version: "1.2"
-  type: :runtime
-  version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: pelops-jars
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: "1.2"
+    type: :runtime
+    version_requirements: *id001
 description: ""
 email: 
-- theo@burtcorp.com
+  - theo@burtcorp.com
 executables: []
 
 extensions: []
@@ -40,32 +33,32 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
-- .rspec
-- .rvmrc
-- Gemfile
-- Gemfile.lock
-- README.mdown
-- eurydice.gemspec
-- examples/01_connect.rb
-- examples/02_create_keyspace.rb
-- examples/03_create_column_family.rb
-- examples/04_storing_data.rb
-- examples/05_loading_data.rb
-- examples/06_cluster_info.rb
-- examples/common.rb
-- lib/cassandra.rb
-- lib/eurydice.rb
-- lib/eurydice/pelops.rb
-- lib/eurydice/pelops/cluster.rb
-- lib/eurydice/pelops/column_family.rb
-- lib/eurydice/pelops/keyspace.rb
-- lib/eurydice/version.rb
-- spec/eurydice/pelops/cluster_spec.rb
-- spec/eurydice/pelops/column_family_spec.rb
-- spec/eurydice/pelops/keyspace_spec.rb
-- spec/spec_helper.rb
-has_rdoc: true
+  - .gitignore
+  - .rspec
+  - .rvmrc
+  - Gemfile
+  - Gemfile.lock
+  - README.mdown
+  - Rakefile
+  - eurydice.gemspec
+  - examples/01_connect.rb
+  - examples/02_create_keyspace.rb
+  - examples/03_create_column_family.rb
+  - examples/04_storing_data.rb
+  - examples/05_loading_data.rb
+  - examples/06_cluster_info.rb
+  - examples/common.rb
+  - lib/cassandra.rb
+  - lib/eurydice.rb
+  - lib/eurydice/pelops.rb
+  - lib/eurydice/pelops/cluster.rb
+  - lib/eurydice/pelops/column_family.rb
+  - lib/eurydice/pelops/keyspace.rb
+  - lib/eurydice/version.rb
+  - spec/eurydice/pelops/cluster_spec.rb
+  - spec/eurydice/pelops/column_family_spec.rb
+  - spec/eurydice/pelops/keyspace_spec.rb
+  - spec/spec_helper.rb
 homepage: http://github.com/iconara/eurydice
 licenses: []
 
@@ -73,25 +66,23 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: eurydice
-rubygems_version: 1.3.6
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Ruby wrapper for the Pelops library