grape-activerecord 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00c4596408538956fc799ddf52a5fb064845fd03
-  data.tar.gz: 9da3063fdfaaa9656086a3b2f6689db3cb1ce29d
+  metadata.gz: 17f781a322a34e75dbc4b239f9e0da0b1ccd2764
+  data.tar.gz: 3a95a2017201685364d5d1bee8da528d469c84e6
 SHA512:
-  metadata.gz: 18c76a4f1c0a5a8610b1d4d0032aecdbcbb016da37c5487c657d754c7b8d71cf15359369a544f2f6f968900e1c4719a2c0161689a4ffa0e5101219cc6515defa
-  data.tar.gz: 2bc91adce6a8182c0687c0f739c1359d46f8edd1dba617ce12b885fd7a2943e20d2b3028a0cd508cb30c20f533028aecb3b88a00294591b7bdbba17cc04b2239
+  metadata.gz: 1bb3ec6e7c643cc2ec118e5cb690525020ae8654009457b5d6f31c9bfd8e3de1ca4222820e92587fb409ed5479795e7f6f946aefe70b133c81d88ba0a3af6a92
+  data.tar.gz: 5c641bf5f8224c59afc03d5c1b2e1166fa5d12b55515b137382eb368fc2fb49b97388c3c05511aee9ffaaa0866941875b7a84a2c2f22204b5ed75aed73ac9869

data/lib/grape/activerecord/activerecord.rb

@@ -13,14 +13,11 @@ module Grape
       attr_accessor :seed_file
     end
 
-    # The current Rack environment
-    RACK_ENV = (ENV['RACK_ENV'] || 'development').to_sym
-
     # Connect to database with a Hash. Example:
     # {adapter: 'postgresql', host: 'localhost', database: 'db', username: 'user', password: 'pass', encoding: 'utf8', pool: 10, timeout: 5000}
     def self.database=(spec)
-      ::ActiveRecord::Base.configurations = {RACK_ENV => spec}.stringify_keys
-      ::ActiveRecord::Base.establish_connection(RACK_ENV)
+      ::ActiveRecord::Base.configurations = {rack_env => spec}.stringify_keys
+      ::ActiveRecord::Base.establish_connection(rack_env)
     end
 
     # Connect to database with a DB URL. Example: "postgres://user:pass@localhost/db"
@@ -32,7 +29,12 @@ module Grape
     def self.database_file=(path)
       raise "#{path} does not exist!" unless File.file? path
       ::ActiveRecord::Base.configurations = YAML.load(ERB.new(File.read(path)).result) || {}
-      ::ActiveRecord::Base.establish_connection(RACK_ENV)
+      ::ActiveRecord::Base.establish_connection(rack_env)
+    end
+
+    # The current Rack environment
+    def self.rack_env
+      (ENV['RACK_ENV'] || 'development').to_sym
     end
   end
 end

data/lib/grape/activerecord/rake.rb

@@ -1,4 +1,4 @@
-require 'grape/activerecord'
+require 'grape/activerecord/activerecord'
 load "active_record/railties/databases.rake"
 require "grape/activerecord/rake/activerecord_#{ActiveRecord::VERSION::MAJOR}"
 load "grape/activerecord/tasks.rake"

data/lib/grape/activerecord/rake/activerecord_4.rb

@@ -4,7 +4,7 @@ Rake::Task.define_task('db:_load_config') do
 
   ActiveRecord::Tasks::DatabaseTasks.tap do |config|
     config.root = Rake.application.original_dir
-    config.env = Grape::ActiveRecord::RACK_ENV.to_s
+    config.env = Grape::ActiveRecord.rack_env.to_s
     config.db_dir = Grape::ActiveRecord.db_dir
     config.migrations_paths = Array(Grape::ActiveRecord.migrations_paths)
     config.fixtures_path = Grape::ActiveRecord.fixtures_path

data/lib/grape/activerecord/version.rb

@@ -1,6 +1,6 @@
 module Grape
   module ActiveRecord
     # Gem version
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape