Merge pull request maxdemarzi#107 from sasasasumna/qa

Added QA environment

.gitignore

@@ -1,6 +1,7 @@
 .idea
 .rvmrc
 .DS_Store
+.bundle
 deja_test.rb
 test.rb
 neo4j

lib/config/graph.yml

@@ -11,6 +11,7 @@ development:
   authentication: nil  # 'basic' or 'digest'
   username: nil
   password: nil
+
 staging:
   protocol: "http://"
   server: "internal-Neo4J-LB-1693655064.us-west-2.elb.amazonaws.com"
@@ -24,6 +25,7 @@ staging:
   authentication: nil  # 'basic' or 'digest'
   username: nil
   password: nil
+
 test:
   protocol: "http://"
   server: "localhost"
@@ -37,6 +39,21 @@ test:
   authentication: nil  # 'basic' or 'digest'
   username: nil
   password: nil
+
+qa:
+  protocol: "http://"
+  server: "localhost"
+  port: 7474
+  directory: ""  # prefix this path with '/'
+  cypher_path: "/cypher"
+  gremlin_path: "/ext/GremlinPlugin/graphdb/execute_script"
+  log_file: "neography.log"
+  log_enabled: false
+  max_threads: 20
+  authentication: nil  # 'basic' or 'digest'
+  username: nil
+  password: nil
+
 production:
   protocol: "http://"
   server: "localhost"

lib/deja.rb

@@ -11,8 +11,6 @@
 module Deja
   extend ActiveSupport::Autoload
 
-  ENV['RAILS_ENV'] ||= 'development'
-
   autoload :RestIndex
   autoload :Node
   autoload :Cast
@@ -41,7 +39,7 @@ class << self; attr_accessor :neo, :tx, :batch ; end
 
   config_hash = YAML.load_file("#{File.dirname(File.expand_path(__FILE__))}/config/graph.yml")
   Neography.configure do |config|
-    config_hash[ENV['RAILS_ENV']].each do |k, v|
+    config_hash[CB.environment].each do |k, v|
       config.send("#{k}=".to_sym, v)
     end
   end