grape-activerecord 1.1.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f83ac0f6b25c75518fffd13df7a06930991b22f
-  data.tar.gz: ed53c8b92a279c6912fa916cb6ef3bae52d068ae
+  metadata.gz: 27a4153d9aa6bac32066254f76353d8608d5637d
+  data.tar.gz: 2d83a5e15433ca0ad19d360caa99b6150bb2f50e
 SHA512:
-  metadata.gz: d3abd75b1d54a68ff81293a2921756308c4540f0847c1373444bfabe88a92a7aafe366962b5b3ce65d759fd583e1423dff0410b4e8fa2408d22920d4d852329a
-  data.tar.gz: 3b124647b93b0f50c81da91a8fdb3beca20d67e7bfda176b4f4f46b7b7ddcfeeb706d0e0731296f80cd7b99e55cb0bf63f1937cc5bb55f1497e872d86c88c9cc
+  metadata.gz: 73c43881ff83cc9cdf96a171b3f1f3de3b156c739eac11f0405d1af12959b0cbdfe3f26e0d2a36a352285dc6f408a8ae3e2f19ddcc7d3c4892b6122e904e7c59
+  data.tar.gz: 5ba35e8d13f810a4ccf2aeec5184e67ab371ffc26b51b36d27873558241f2e6106adadcfd64f3253f21767dbecfd24021cd2de4f530df2bf1ab1aa781aa985bd

data/README.md

@@ -10,10 +10,11 @@ A simple way to use ActiveRecord with your Grape apps. The defaults are all very
 
 #### 2. Configure your database connection
 
-By default grape-activerecord looks for your database configuration in:
+After loading your gems, tell `Grape::ActiveRecord` about your database config using one of the following examples:
 
-* `config/database.yml` (see /examples for a sample file)
-* The `DATABASE_URL` environment variable (e.g. `postgres://user:pass@host/db`)
+    Grape::ActiveRecord.configure_from_file! "config/database.yml"
+    Grape::ActiveRecord.configure_from_url! ENV['DATABASE_URL'] # e.g. postgres://user:pass@host/db
+    Grape::ActiveRecord.configure_from_hash!(adapter: "postgresql", host: "localhost", database: "db", username: "user", password: "pass", encoding: "utf8", pool: 10, timeout: 5000)
 
 #### 3. Enable ActiveRecord connection management
 
@@ -41,17 +42,11 @@ Unlike in Rails, creating a new migration is also a rake task. Run `bundle exec
 
 ## Examples
 
-Look under /examples for some example apps.
+Look under /example for an example app.
 
 ## Advanced options
 
-You have a number of ways to tell ActiveRecord about your database. Use these options early in your app's boot process: somewhere between bundler and your app code. And make sure they make it into your `Rakefile` (maybe in `require_relative "app"` above.)
-
-    Grape::ActiveRecord.database_file = "elsewhere/db.yml"
-    Grape::ActiveRecord.database_url = "postgres://user:pass@host/db"
-    Grape::ActiveRecord.database = {adapter: "postgresql", host: "localhost", database: "db", username: "user", password: "pass", encoding: "utf8", pool: 10, timeout: 5000}
-
-You can configure custom locations for your db-related files like migrations, seeds, and fixtures. You should probably put these near the top of your `Rakefile`, before defining your tasks.
+The defaults for db-related files like migrations, seeds, and fixtures are the same as Rails. If you want to override them, use the following options in your `Rakefile`:
 
     Grape::ActiveRecord.db_dir = 'db'
     Grape::ActiveRecord.migrations_paths = ['db/migrate']

data/lib/grape/activerecord/activerecord.rb

@@ -15,18 +15,18 @@ module Grape
 
     # 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)
+    def self.configure_from_hash!(spec)
       ::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"
-    def self.database_url=(url)
-      self.database = ::ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(url).to_hash
+    def self.configure_from_url!(url)
+      configure_from_hash! ::ActiveRecord::ConnectionAdapters::ConnectionSpecification::ConnectionUrlResolver.new(url).to_hash
     end
 
     # Connect to database with a yml file. Example: "config/database.yml"
-    def self.database_file=(path)
+    def self.configure_from_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)

data/lib/grape/activerecord/defaults.rb

@@ -1,12 +1,6 @@
 ::ActiveRecord::Base.default_timezone = :utc
 ::ActiveRecord::Base.logger = Logger.new(STDOUT)
 
-if ENV['DATABASE_URL']
-  Grape::ActiveRecord.database_url = ENV['DATABASE_URL']
-elsif File.file? 'config/database.yml'
-  Grape::ActiveRecord.database_file = 'config/database.yml'
-end
-
 Grape::ActiveRecord.db_dir = 'db'
 Grape::ActiveRecord.migrations_paths = %w(db/migrate)
 Grape::ActiveRecord.fixtures_path = 'test/fixtures'

data/lib/grape/activerecord/rake.rb

@@ -1,4 +1,4 @@
-require 'grape/activerecord/activerecord'
+require 'grape/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

@@ -1,5 +1,4 @@
 Rake::Task.define_task('db:_load_config') do
-  require 'grape/activerecord'
   ActiveRecord::Base.logger = nil
 
   ActiveRecord::Tasks::DatabaseTasks.tap do |config|

data/lib/grape/activerecord/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape