cassie 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c69c7faad6e465a92ab097dc7df5a471585694e1
-  data.tar.gz: cb03bcbb2b28029fd977d9709085b741e6606d60
+  metadata.gz: 75bc223d41cf01f427460302177d0d0b5ad5d30d
+  data.tar.gz: 34dc615d58b19bc55c5cee0bde387824375ccffc
 SHA512:
-  metadata.gz: 4d120d17ebd793fcb0ff7c3387fc3b1b10e6eaaf1003dab3b4b579414582cc47397ffde20c5f2b7fef689e02005f21a528abbe7cf0706f12faf819f60dfc38ac
-  data.tar.gz: 6f09e37b7e431609c0a8184d494e12a2f9b2e6c39e9f8955149d65653fe2014327204963cae78d55dff83ab8b966484a14ce2bced676c59bac8b0c63d73ab146
+  metadata.gz: b0db9476db7746879d6f4118358da035e7ee28feaa5aa9a0055cb14bc93ab9c39d9adc0455df19bda6150588459653728520f3e88376be27e164643fc8d2b0a6
+  data.tar.gz: 1414b64d116c5cce2e301790106e3ec2a645119cd5b332e374ae45d59279322a195ae6d7c56ba9447faa201440453fc8a9b6c34881b9089969eb40c0519f42fa

data/lib/cassie/connection_handler/cluster.rb

@@ -25,10 +25,26 @@ module Cassie::ConnectionHandler
       @cluster ||= initialize_cluster
     end
 
-    # @param [String, Symbol] name The keyspace name to search for
+        # @param [String, Symbol] name The keyspace name to search for
     # @return [Boolean] indicating if the cluster has the keyspace defined
     def keyspace_exists?(name)
-      Cassie.cluster.keyspaces.map(&:name).any?{|k| k.to_s == name.to_s}
+      cluster.keyspaces.map(&:name).any?{|k| k.to_s == name.to_s}
+    end
+
+    # @param [String, Symbol] name The table name to search for. If the name
+    #   includes a '.', it is assumed to be a fully qualified table name. Otherwise
+    #   the table name will be searched for in the current namespace
+    # @return [Boolean] indicating if the cluster has the keyspace defined
+    def table_exists?(name)
+      keyspaces = {}
+      name = "#{keyspace}.#{name}" unless name.to_s.include? "."
+      matches = name.match(/(.*)\.(.*)/)
+      space = matches[1]
+      table = matches[2]
+      cluster.keyspaces.each {|k| keyspaces[k.name.to_s] = k }
+
+      return false unless keyspaces.has_key?(space)
+      keyspaces[space].tables.map(&:name).any?{|t| t.to_s == table}
     end
 
     protected

data/lib/cassie/schema/versioning.rb

@@ -33,7 +33,7 @@ module Cassie::Schema
     # in the Cassandra database if they don't already exist
     # @return [void]
     def initialize_versioning
-      create_schema_keyspace unless keyspace_exists?
+      create_schema_keyspace unless schema_keyspace_exists?
       create_versions_table unless versions_table_exists?
     end
 
@@ -109,10 +109,14 @@ module Cassie::Schema
       '0.0.1.0'
     end
 
-    def keyspace_exists?
+    def schema_keyspace_exists?
       Cassie.keyspace_exists?(Cassie::Schema.schema_keyspace)
     end
 
+    def versions_table_exists?
+      Cassie.table_exists?(qualified_table_name)
+    end
+
     # load version migration class from disk
     def load_applied_versions
       database_versions.tap do |versions|
@@ -138,12 +142,6 @@ module Cassie::Schema
       false
     end
 
-    def versions_table_exists?
-      !!SelectVersionsQuery.new(limit: 1).fetch
-    rescue Cassandra::Errors::InvalidError
-      false
-    end
-
     def create_schema_keyspace
       CreateKeyspaceQuery.new(name: Cassie::Schema.schema_keyspace).execute
     end
@@ -157,7 +155,11 @@ module Cassie::Schema
     end
 
     def uninitialized_message
-      "Cassie Schema Versions table not found at '#{schema_keyspace}.#{versions_table}'. Enable versioned migration support with `cassie schema:init`."
+      "Cassie Schema Versions table not found at '#{qualified_table_name}'. Enable versioned migration support with `cassie schema:init`."
+    end
+
+    def qualified_table_name
+      "#{schema_keyspace}.#{versions_table}"
     end
   end
 end

data/lib/cassie/tasks/schema/init_keyspace.rake

@@ -11,7 +11,7 @@ namespace :cassie do
 
         query = Cassie::Schema::CreateKeyspaceQuery.new
         query.name = name
-        if replicaiton = Cassie.configuration[:replication]
+        if replication = Cassie.configuration[:replication]
           query.replication_class = replication[:class] if replication.has_key?(:class)
           query.replication_factor = replication[:replication_factor] if replication.has_key?(:replication_factor)
         end

data/lib/cassie/version.rb

@@ -1,3 +1,3 @@
 module Cassie
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver