grape-activerecord 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d4ebcdc246743c4619c07e314e4db8552433f42
-  data.tar.gz: fee817f385ea83bc205c46dd07f7d91ae43aa0bf
+  metadata.gz: dda6f32c7861757fc813a1a09390b99fb0354606
+  data.tar.gz: cc923f413df377a6f44c82fa7fc9fbc6a5d1d08d
 SHA512:
-  metadata.gz: 1e88f06e2b181780f1d5ccd1847496a806079574bd37e7de641d2fa34f4ff60b9b244f953f100dc03f9ed5a69957b73971ee25c9e7bd13b3de6893a0f7cb2561
-  data.tar.gz: aeb141d99831ffe715b4db460fd1e4e3dc3b7fa7f828a85672717da695d2ee8ef1ce82fed5d6986699bf367d3314cbfd2eb0e91e2b9be42135f86976c18f8e7e
+  metadata.gz: e4463aec84606f0dd2f2b4455f3c845b97e10c9d3204ad5a5d4fe6475883574645ecc16070a61a7fd718e65c39bb30cd56179af42bc4af0b0c257973a15b6915
+  data.tar.gz: a477c9daa699ab0cbfd7b3378bfa905f199f903b269c0f4ea9c09876ff808e668ba2444ec684604c693fc87be520a59ba7fefff8ecdd774d9c88def1b0ef7551

data/README.md

@@ -1,66 +1,3 @@
 # grape-activerecord
 
-A simple way to use ActiveRecord with your Grape apps. The defaults are all very Railsy (`config/database.yml`, `db/seeds.rb`, `db/migrate`, etc.), but you can easily change them. Supports:
-
-* ActiveRecord 4
-* ActiveRecord 5 (new, possibly buggy; please submit a PR if you find something!)
-
-## How to use
-
-#### 1. Add it to your Gemfile
-
-    gem "grape-activerecord"
-
-#### 2. Configure your database connection
-
-After loading your gems, tell `Grape::ActiveRecord` about your database config using one of the following examples:
-
-    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)
-
-**Important note**: `configure_from_file!` won't work as expected if you have already `DATABASE_URL` set as part of your environment variables.
-This is because in ActiveRecord when that env variable is set it will merge its properties into the current connection configuration.
-
-#### 3. Enable ActiveRecord connection management
-
-This ActiveRecord middleware cleans up your database connections after each request. Add it to your `config.ru` file:
-
-    use ActiveRecord::ConnectionAdapters::ConnectionManagement
-
-#### 4. Import ActiveRecord tasks into your Rakefile
-
-This will give you most of the standard `db:` tasks you get in Rails. Add it to your `Rakefile`.
-
-    require "bundler/setup"
-    load "tasks/grape-activerecord.rake"
-
-    namespace :db do
-      # Some db tasks require your app code to be loaded, or at least your gems
-      task :environment do
-        require_relative "app"
-      end
-    end
-
-Unlike in Rails, creating a new migration is also a rake task. Run `bundle exec rake -T` to get a full list.
-
-    bundle exec rake db:create_migration NAME=create_widgets
-
-## Examples
-
-Look under /example for an example app.
-
-## Advanced options
-
-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']
-    Grape::ActiveRecord.fixtures_path = 'test/fixtures'
-    Grape::ActiveRecord.seed_file = 'seeds.rb'
-
-## License
-
-Licensed under the MIT License
-
-Copyright 2014 Jordan Hollinger
+**Moved to [otr-activerecord](https://github.com/jhollinger/otr-activerecord)**

data/lib/grape/activerecord.rb

@@ -1,7 +1,6 @@
-require 'active_record'
-require 'hashie-forbidden_attributes'
-require 'grape/activerecord/version'
-require 'grape/activerecord/activerecord'
-require 'grape/activerecord/compatibility_4'
-require 'grape/activerecord/compatibility_5'
-require 'grape/activerecord/defaults'
+# Shim for otr-activerecord
+require 'otr-activerecord'
+module Grape
+  ActiveRecord = OTR::ActiveRecord
+end
+$stderr.puts "WARNING: grape-activerecord is deprecated; please switch to otr-activerecord"

data/lib/tasks/grape-activerecord.rake

@@ -1,91 +1 @@
-require 'pathname'
-require 'fileutils'
-require 'active_support/core_ext/string/strip'
-require 'active_support/core_ext/string/inflections'
-require 'grape/activerecord'
-load 'active_record/railties/databases.rake'
-
-#
-# Configure and override the default activerecord db rake tasks
-#
-
-Rake::Task.define_task('db:_load_config') do
-  ::ActiveRecord::Base.logger = nil
-  ::ActiveRecord::Tasks::DatabaseTasks.tap do |config|
-    config.root = Rake.application.original_dir
-    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
-    config.database_configuration = ::ActiveRecord::Base.configurations
-    config.seed_loader = Object.new
-    config.seed_loader.instance_eval do
-      def load_seed
-        load "#{Grape::ActiveRecord.db_dir}/#{Grape::ActiveRecord.seed_file}"
-      end
-    end
-  end
-end
-
-Rake::Task['db:load_config'].clear
-Rake::Task.define_task('db:load_config') do
-  # Run the user's db:environment task first, so they have an opportunity to set a custom db config location
-  Rake::Task['db:environment'].invoke
-end
-
-Rake::Task.define_task('db:environment') do
-  # defined by user
-end
-
-# Load db config at the end of user-defined db:environment
-Rake::Task['db:environment'].enhance do
-  Rake::Task['db:_load_config'].invoke
-end
-
-Rake::Task['db:test:deprecated'].clear if Rake::Task.task_defined?('db:test:deprecated')
-
-#
-# Define grape-activerecord helper tasks
-#
-
-namespace :db do
-  namespace :test do
-    task :environment do
-      ENV['RACK_ENV'] = 'test'
-    end
-  end
-
-  desc "Create a migration (parameters: NAME, VERSION)"
-  task :create_migration do
-    unless ENV["NAME"]
-      puts "No NAME specified. Example usage: `rake db:create_migration NAME=create_widgets`"
-      exit 1
-    end
-
-    name = ENV["NAME"]
-    version = ENV["VERSION"] || Time.now.utc.strftime("%Y%m%d%H%M%S")
-
-    Grape::ActiveRecord._normalizer.migrations_paths.each do |directory|
-      next unless File.exists?(directory)
-      migration_files = Pathname(directory).children
-      if duplicate = migration_files.find { |path| path.basename.to_s.include?(name) }
-        puts "Another migration is already named \"#{name}\": #{duplicate}."
-        exit 1
-      end
-    end
-
-    filename = "#{version}_#{name}.rb"
-    dirname = Grape::ActiveRecord._normalizer.migrations_path
-    path = File.join(dirname, filename)
-
-    FileUtils.mkdir_p(dirname)
-    File.write path, <<-MIGRATION.strip_heredoc
-      class #{name.camelize} < #{Grape::ActiveRecord._normalizer.migration_base_class_name}
-        def change
-        end
-      end
-    MIGRATION
-
-    puts path
-  end
-end
+load 'tasks/otr-activerecord.rake'

metadata

@@ -1,64 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: grape-activerecord
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-31 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: grape
+  name: otr-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: hashie-forbidden_attributes
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-description: Extends Grape with simple ActiveRecord integration
+        version: '1.0'
+description: Extends Grape with simple ActiveRecord integration. MOVED TO otr-activerecord.
 email: jordan.hollinger@gmail.com
 executables: []
 extensions: []
@@ -67,18 +33,18 @@ files:
 - LICENSE
 - README.md
 - lib/grape/activerecord.rb
-- lib/grape/activerecord/activerecord.rb
-- lib/grape/activerecord/compatibility_4.rb
-- lib/grape/activerecord/compatibility_5.rb
-- lib/grape/activerecord/defaults.rb
-- lib/grape/activerecord/rake.rb
-- lib/grape/activerecord/version.rb
 - lib/tasks/grape-activerecord.rake
 homepage: https://github.com/jhollinger/grape-activerecord
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message: |
+  #
+  # DEPRECATION WARNING
+  # 'grape-activerecord' has been deprecated; 'otr-activerecord' has been installed instead.
+  # Please refer to the documentation for 'otr-activerecord' available at https://github.com/jhollinger/otr-activerecord
+  # Don't worry; it's nearly identical.
+  #
 rdoc_options: []
 require_paths:
 - lib
@@ -97,6 +63,6 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: ActiveRecord integration for Grape
+summary: ActiveRecord integration for Grape. MOVED TO otr-activerecord.
 test_files: []
 has_rdoc: 

data/lib/grape/activerecord/activerecord.rb

@@ -1,44 +0,0 @@
-require 'erb'
-
-# Grape and ActiveRecord integration
-module Grape
-  # Grape and ActiveRecord integration
-  module ActiveRecord
-    class << self
-      # Relative path to the "db" dir
-      attr_accessor :db_dir
-      # Relative path(s) to the migrations directory
-      attr_accessor :migrations_paths
-      # Relative path to the fixtures directory
-      attr_accessor :fixtures_path
-      # Name of the seeds file in db_dir
-      attr_accessor :seed_file
-      # Internal compatibility layer across different major versions of AR
-      attr_accessor :_normalizer
-    end
-
-    # 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.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.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.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)
-    end
-
-    # The current Rack environment
-    def self.rack_env
-      (ENV['RACK_ENV'] || ENV['RAILS_ENV'] || 'development').to_sym
-    end
-  end
-end

data/lib/grape/activerecord/compatibility_4.rb

@@ -1,30 +0,0 @@
-module Grape
-  module ActiveRecord
-    # Compatibility layer for ActiveRecord 4
-    class Compatibility4
-      attr_reader :major_version
-
-      # Compatibility layer for ActiveRecord 4
-      def initialize
-        @major_version = 4
-        ::ActiveRecord::Base.default_timezone = :utc
-        ::ActiveRecord::Base.logger = Logger.new(STDOUT)
-      end
-
-      # All db migration dir paths
-      def migrations_paths
-        OTR::ActiveRecord.migrations_paths
-      end
-
-      # The dir in which to put new migrations
-      def migrations_path
-        OTR::ActiveRecord.migrations_paths[0]
-      end
-
-      # Basename of migration classes
-      def migration_base_class_name
-        'ActiveRecord::Migration'
-      end
-    end
-  end
-end

data/lib/grape/activerecord/compatibility_5.rb

@@ -1,30 +0,0 @@
-module Grape
-  module ActiveRecord
-    # Compatibility layer for ActiveRecord 5
-    class Compatibility5
-      attr_reader :major_version
-
-      # Compatibility layer for ActiveRecord 5
-      def initialize
-        @major_version = 5
-        ::ActiveRecord::Base.default_timezone = :utc
-        ::ActiveRecord::Base.logger = Logger.new(STDOUT)
-      end
-
-      # All db migration dir paths
-      def migrations_paths
-        OTR::ActiveRecord.migrations_paths
-      end
-
-      # The dir in which to put new migrations
-      def migrations_path
-        OTR::ActiveRecord.migrations_paths[0]
-      end
-
-      # Basename of migration classes
-      def migration_base_class_name
-        'ActiveRecord::Migration[5.0]'
-      end
-    end
-  end
-end

data/lib/grape/activerecord/defaults.rb

@@ -1,8 +0,0 @@
-Grape::ActiveRecord.db_dir = 'db'
-Grape::ActiveRecord.migrations_paths = %w(db/migrate)
-Grape::ActiveRecord.fixtures_path = 'test/fixtures'
-Grape::ActiveRecord.seed_file = 'seeds.rb'
-Grape::ActiveRecord._normalizer = case ::ActiveRecord::VERSION::MAJOR
-                                  when 4 then Grape::ActiveRecord::Compatibility4.new
-                                  when 5 then Grape::ActiveRecord::Compatibility5.new
-                                  end

data/lib/grape/activerecord/rake.rb

@@ -1,2 +0,0 @@
-$stderr.puts "WARNING: loading 'grape/activerecord/rake' in your Rakefile is deprecated; do 'load \"tasks/grape-activerecord.rake\"' instead"
-load "tasks/grape-activerecord.rake"

data/lib/grape/activerecord/version.rb

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