orientdb-schema-migrator 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1248c231b6e9daabc14adad92504c3c554bf5c99
-  data.tar.gz: 567fdd36e4f5420c8be2c50474870eabffac84d0
+  metadata.gz: cf9d9e3fb0150f23f6bfd7a70b5da16feba0c8fb
+  data.tar.gz: b9da196ea991fba8ba19a7160f619bc35d9d6ce3
 SHA512:
-  metadata.gz: c3fee532d00b7257a074de17c5da9f5802be37f0b1ba3e03e835db913bb5ed6d52a27229ed4e645ad0e7f81c1a21775792ed996f96f381292a0e13ee97d5c86f
-  data.tar.gz: 1599105f1143cab750e070362a4ff5c59101a05a9371fa851015d4473dcd804cba5600fffb1ae1e67bd99faa777d292d84e02427df6f961228962b00e7dd5495
+  metadata.gz: 3beca086f3fe46ae19be29c1ff8718599177444622e07be46f6de42c3fbdd2eb30aace0fe7c417be5f0719b1a62920d499d57363006c24a9fc0dd3e8a605add0
+  data.tar.gz: c28718cd7823755f1902159573b3a266a474ab6c77e9229e62cfe99529fd0fb60d1af4909c7378651bb0a17315e2cfa32dd507efcba36a1caa4020868c18189d

data/Rakefile

@@ -19,12 +19,12 @@ db_namespace = namespace :db do
   }
 
   task :connect do
-    OrientdbSchemaMigrator::ODBClient.connect(:database => db, :user => db_user, :password => db_pass)
+    OrientdbSchemaMigrator.client.connect(:database => db, :user => db_user, :password => db_pass)
   end
 
   desc "Verify your orientdb test database setup"
   task :verify_test_db do
-    if OrientdbSchemaMigrator::ODBClient.database_exists?(config)
+    if OrientdbSchemaMigrator.client.database_exists?(config)
       puts "Test database exists"
     else
       raise "Failure: database does not exist"

data/lib/orientdb-schema-migrator.rb

@@ -1,5 +1,5 @@
 require "orientdb4r"
-
+require "yaml"
 require "orientdb_schema_migrator/version"
 require "orientdb_schema_migrator/migration"
 require "orientdb_schema_migrator/migration_generator"
@@ -9,5 +9,33 @@ require "orientdb_schema_migrator/proxy"
 require "orientdb_schema_migrator/railtie" if defined?(Rails)
 
 module OrientdbSchemaMigrator
-  ODBClient = Orientdb4r.client
+  def self.get_config
+    config_file =
+      if defined?(Rails)
+        Rails.root.to_s + '/config/orientdb.yml'
+      elsif ENV['ODB_TEST']
+        File.expand_path('../../spec/support/config.yml', __FILE__)
+      elsif ENV['odb_config_path']
+        ENV['odb_config_path']
+      else
+        raise "No odb config path defined"
+      end
+    env =
+      if defined?(Rails)
+        Rails.env
+      elsif ENV['ODB_TEST']
+        'test'
+      else
+        raise "No environment specified to load database connection config"
+      end
+    YAML.load_file(config_file)[env]
+  end
+
+  def self.client
+    if defined?($client)
+      $client
+    else
+      $client = Orientdb4r.client(:host => get_config["host"])
+    end
+  end
 end

data/lib/orientdb_schema_migrator/migration.rb

@@ -5,7 +5,7 @@ module OrientdbSchemaMigrator
     def self.create_class class_name, class_options={}
       # check if class exists first
       assert_class_not_exists!(class_name)
-      ODBClient.create_class class_name, class_options
+      OrientdbSchemaMigrator.client.create_class class_name, class_options
       if block_given?
         proxy = Proxy.new(self, class_name)
         yield proxy
@@ -16,14 +16,14 @@ module OrientdbSchemaMigrator
       # check if class exists first
       if class_exists?(class_name)
         # delete vertices/edges first
-        super_class = ODBClient.get_class(class_name)["superClass"]
+        super_class = OrientdbSchemaMigrator.client.get_class(class_name)["superClass"]
         if super_class == "V"
-          ODBClient.command "delete vertex #{class_name}"
+          OrientdbSchemaMigrator.client.command "delete vertex #{class_name}"
         elsif super_class == "E"
-          ODBClient.command "delete edge #{class_name}"
+          OrientdbSchemaMigrator.client.command "delete edge #{class_name}"
         end
         # drop class
-        ODBClient.command "drop class #{class_name}"
+        OrientdbSchemaMigrator.client.command "drop class #{class_name}"
         return true
       else
         return false
@@ -32,52 +32,52 @@ module OrientdbSchemaMigrator
 
     def self.rename_class old_name, new_name
       assert_class_exists!(old_name)
-      ODBClient.command "alter class #{old_name} name #{new_name}"
+      OrientdbSchemaMigrator.client.command "alter class #{old_name} name #{new_name}"
     end
 
     def self.add_property class_name, property_name, type, property_options={}
       assert_class_exists!(class_name)
       assert_property_not_exists!(class_name, property_name)
-      ODBClient.create_property class_name,property_name,type, property_options
+      OrientdbSchemaMigrator.client.create_property class_name,property_name,type, property_options
     end
 
     def self.drop_property class_name, property_name
       assert_class_exists!(class_name)
       assert_property_exists!(class_name, property_name)
-      ODBClient.command "drop property #{class_name}.#{property_name}"
+      OrientdbSchemaMigrator.client.command "drop property #{class_name}.#{property_name}"
     end
 
     def self.alter_property class_name, property_name, attribute_name, new_value
       assert_class_exists!(class_name)
       assert_property_exists!(class_name, property_name)
-      ODBClient.command "alter property #{class_name}.#{property_name} #{attribute_name} #{new_value}"
+      OrientdbSchemaMigrator.client.command "alter property #{class_name}.#{property_name} #{attribute_name} #{new_value}"
     end
 
     def self.add_index class_name, property_name, index_name, type
       assert_class_exists!(class_name)
       assert_property_exists!(class_name, property_name)
       assert_index_not_exists!(class_name, index_name)
-      ODBClient.command "create index #{index_name} on #{class_name} (#{property_name}) #{type}"
+      OrientdbSchemaMigrator.client.command "create index #{index_name} on #{class_name} (#{property_name}) #{type}"
     end
 
     def self.drop_index index_name
-      ODBClient.command "drop index #{index_name}"
+      OrientdbSchemaMigrator.client.command "drop index #{index_name}"
     end
 
     def self.class_exists? class_name
-      ODBClient.class_exists? class_name
+      OrientdbSchemaMigrator.client.class_exists? class_name
     end
 
     def self.index_exists?(class_name, index_name)
       return false unless class_exists?(class_name)
-      indexes = ODBClient.get_class(class_name)["indexes"]
+      indexes = OrientdbSchemaMigrator.client.get_class(class_name)["indexes"]
       return false unless indexes
       return indexes.any? { |idx| idx['name'] == index_name }
     end
 
     def self.property_exists? class_name, property_name
       if class_exists? class_name
-        properties = ODBClient.get_class(class_name)["properties"]
+        properties = OrientdbSchemaMigrator.client.get_class(class_name)["properties"]
         if properties
           return properties.collect{|i| i["name"]}.include? property_name
         else

data/lib/orientdb_schema_migrator/migrator.rb

@@ -16,11 +16,11 @@ module OrientdbSchemaMigrator
       end
 
       def connect_to_db db, user, password
-        ODBClient.connect :database => db, :user => user, :password => password
+        OrientdbSchemaMigrator.client.connect :database => db, :user => user, :password => password
       end
 
       def disconnect
-        ODBClient.disconnect
+        OrientdbSchemaMigrator.client.disconnect
       end
 
       def migrate(target_version = nil)
@@ -55,7 +55,7 @@ module OrientdbSchemaMigrator
       end
 
       def current_version
-        response = ODBClient.command "SELECT schema_version FROM schema_versions ORDER BY @rid DESC LIMIT 1"
+        response = OrientdbSchemaMigrator.client.command "SELECT schema_version FROM schema_versions ORDER BY @rid DESC LIMIT 1"
         results = response['result']
         results.any? ? results.first['schema_version'] : nil
       end
@@ -107,11 +107,11 @@ module OrientdbSchemaMigrator
     end
 
     def record_migration(migration)
-      ODBClient.command "INSERT INTO schema_versions (schema_version) VALUES (#{migration[:version]})"
+      OrientdbSchemaMigrator.client.command "INSERT INTO schema_versions (schema_version) VALUES (#{migration[:version]})"
     end
 
     def drop_migration(migration)
-      ODBClient.command "DELETE FROM schema_versions WHERE schema_version = '#{migration[:version]}'"
+      OrientdbSchemaMigrator.client.command "DELETE FROM schema_versions WHERE schema_version = '#{migration[:version]}'"
     end
 
     def up?

data/lib/orientdb_schema_migrator/version.rb

@@ -1,3 +1,3 @@
 module OrientdbSchemaMigrator
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/tasks/orientdb_schema_migrator.rake

@@ -1,5 +1,3 @@
-require 'yaml'
-
 namespace :odb do
   task :config do
     if !ENV['ODB_TEST']
@@ -17,27 +15,7 @@ namespace :odb do
   end
 
   def with_connection &block
-    config_file =
-      if defined?(Rails)
-        Rails.root.to_s + '/config/orientdb.yml'
-      elsif ENV['ODB_TEST']
-        File.expand_path('../../../spec/support/config.yml', __FILE__)
-      elsif ENV['odb_config_path']
-        ENV['odb_config_path']
-      else
-        raise "No odb config path defined"
-      end
-
-    env =
-      if defined?(Rails)
-        Rails.env
-      elsif ENV['ODB_TEST']
-        'test'
-      else
-        raise "No environment specified to load database connection config"
-      end
-
-    config = YAML.load_file(config_file)[env]
+    config = OrientdbSchemaMigrator.get_config
     OrientdbSchemaMigrator::Migrator.connect_to_db(config['db'], config['user'], config['password'])
     begin
       yield

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orientdb-schema-migrator
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - CoPromote
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orientdb4r