cassandro 0.3.1 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTFjNGIyNDZkNTk5MzJkMGMwOTA3NTBkZDlmYjlmMWY4M2Q0OGEzYQ==
+    ZmZmNjQ5NjhmZTRlZjZmNWQyYmI5Y2E0MDE5ZGY2M2MyMDcxMTEzOQ==
   data.tar.gz: !binary |-
-    OWNhMmRlZDViODY3YmMzOGUwYWE1NDhhODA4YTIwYmFlYTVmNjliNw==
+    MzliYzM5ODRjMDBhYzI0MGM2MWM2M2IxZGMzNDNkMmM2MWJhODg4OQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTM0NjA5YTMzZmM4MmVlNjMzMTNiODU5MDc5OWJjZTIwMjk3ZTJmODA4ZmUz
-    NDBlNTQ1MWRmZTA4OGI0ODY3MTNmYzQ4YmNlM2UwOGZjMjEyNzc3MzI0MTQy
-    OWQ1NzA1ODcxZDI3OWE3ZjYzOGQ0NGFjMjhjNWVmMjBiY2MzNWU=
+    NDhjZGIyY2NjNzFjMDY5NjIyYmZkMTk1YmM4ZmQ5Mzk3MTNiYjU2YjMyZTNj
+    ZWVkOGQ2YzhiYWFkMWJlODZkZDNmMjllYjlkYjY5ZDEzMWUxOTQwMTIxMmUw
+    ZmI3ZDgwNTAyYjA4Yjc3NjM1Mjk4OWU2OTc5YTY0MDA4YjVmYzE=
   data.tar.gz: !binary |-
-    ZjIxNzI0NmExMDkxMWMzMjc5YWJmYTljMmQxNWUwNGE2ZTkyZDhlMDg2NDI2
-    ZGYxNzdmOTk1OWQwZTZkOTk3YWJjNTg3MjBmNGM5ZDc5OWJlYzY3YjlmNDhl
-    ZDI2MGY0OGMxMTIwMjgxYWZkNTI0Y2Y4YTNkM2QwZGJmMTY4MmY=
+    M2JjMTAzY2UzMGFjMmFlODA5NDk1N2I2MjQ1MzY2ZTNjYjFhMTE0MjExZWFj
+    N2M0OGQ4ZjQ3NzUwNThlMzliZWU3MmJmYTdlMDUwNTk4Yzk0NjVhOWQ3ZjZh
+    NDZlMzBlNGQ2MDM4ZTg0ODRjNWQyMTExYmVjNWQ1NzA1OGQ5MTA=

data/README.md

@@ -20,7 +20,18 @@ Cassandro.connect(
 Creating a new keyspace. For full details of keyspace creation visit [CLI keyspace](http://www.datastax.com/documentation/cassandra/2.0/cassandra/reference/referenceStorage_r.html)
 
 ```ruby
+# < 1.0.0
 Cassandro.create_keyspace('new_keyspace', 'SimpleStrategy', 1)
+
+# >= 1.0.0, allow more options
+Cassandro.create_keyspace('new_keyspace', {
+  replication: {
+    class: 'NetworkTopologyStrategy',
+    dc_1: 2,
+    dc_2: 2
+  },
+  durable_writes: true
+})
 ```
 
 Select keyspace outside `#connect`

data/cassandro.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "cassandro"
-  s.version = "0.3.1"
+  s.version = "1.0.0"
   s.summary = "Ruby ORM for Apache Cassandra"
   s.license = "MIT"
   s.description = "Lightweight Apache Cassandra ORM for Ruby"

data/lib/cassandro/core.rb

@@ -36,14 +36,21 @@ module Cassandro
     @@session.execute(cql_command)
   end
 
-  def self.create_keyspace(name, strategy = 'SimpleStrategy', replication_factor = 1)
+  def self.create_keyspace(name, options = { replication: { class: 'SimpleStrategy', replication_factor: 1}} )
+    with = "WITH " + options.map do |key, option|
+      param_string = "#{key.to_s.upcase} = " +
+      if option.is_a?(Hash)
+        "{ #{option.map { |k,v| "'#{k}': #{v.is_a?(String) ? "'#{v}'": v.to_s}" }.join(", ")} }"
+      else
+        option.is_a?(String) ? "'#{option}'": option.to_s
+      end
+    end.join(" AND ")
+
     keyspace_definition = <<-KSDEF
       CREATE KEYSPACE IF NOT EXISTS #{name}
-      WITH replication = {
-        'class': '#{strategy}',
-        'replication_factor': #{replication_factor}
-      }
+      #{with}
     KSDEF
+
     @@session.execute(keyspace_definition)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cassandro
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Lautaro Orazi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver