data_migrate 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05611c746ae2e5d48980688858030777fa42be22
-  data.tar.gz: 91ff5dcbff3883ccaa5e946f30d8d0ecdffa4736
+  metadata.gz: 49cdd9dd0bf6956f0581db3174d7c120cdeab467
+  data.tar.gz: ebb746af559056f2d7f8e59bb3d8d77766c9add4
 SHA512:
-  metadata.gz: 9e6a7d555fefb315e9e07d565b188be657c0b2a43a3e6046a55da2c00e0e482d53cc6c03e2daaac79ccaf56374b307bfd067d622b4bbb9739f42316524c99f54
-  data.tar.gz: a51a6a6249723966aa25e8f0307c27bf49cf3d86282f95d32cba7c6b2b0feccb97a9ea156a8c201bed6f216dffd3359b7f9fde67dbd4a966cf55ce065ef82ba7
+  metadata.gz: c88fab2799838783cfa4bd3fc44f33e6d90b4366a795baa1bfcee172b581bd270b7b6cad77695deaf21f2a431717b5e5904689c8a8d6c21fcfedeae8dd6c694a
+  data.tar.gz: a26cb2fdca59ee696f5821c48039ed8531252f543e0135bf41171a089d40a1a65578497ca0fc95b2760be4bd7816745a7ca053c2d3dfd4349d26a6188bbbb745

data/.gitignore

@@ -1,3 +1,5 @@
 
 /.rvmrc
 *.gem
+*.lock
+gemfiles/.bundle

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format d
+

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+rvm:
+  - 2.0.0-p648
+  - 2.1.10
+  - 2.2.6
+  - 2.3.4
+script: bundle exec rspec
+gemfile:
+  - gemfiles/rails_4.0.gemfile
+  - gemfiles/rails_4.1.gemfile
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+matrix:
+  exclude:
+    - rvm: 2.0.0-p648
+      gemfile: gemfiles/rails_5.0.gemfile
+    - rvm: 2.1.10
+      gemfile: gemfiles/rails_5.0.gemfile

data/Appraisals

@@ -0,0 +1,17 @@
+appraise 'rails-4.0' do
+  gem 'rails', '4.0.13'
+end
+
+appraise 'rails-4.1' do
+  gem 'rails', '4.1.16'
+end
+
+appraise 'rails-4.2' do
+  gem 'rails', '4.2.8'
+  # Nokogiri 1.7+ requires Ruby 2.1+
+  gem 'nokogiri', '1.6.8.1'
+end
+
+appraise 'rails-5.0' do
+  gem 'rails', '5.0.3'
+end

data/Changelog.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+## 3.1.0
+
+Rails 5.0 support thanks to
+[jturkel](https://github.com/jturkel) and [gacha](https://github.com/gacha)
+
 ## 3.0.1
 
 ([gacha](https://github.com/gacha)) Capistrano fixes

data/Gemfile.rails5

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in data_migrate.gemspec
+gemspec
+gem 'rails', '~> 5.0.0'

data/README.md

@@ -3,6 +3,8 @@ Data Migrate
 
 - [![Version](http://img.shields.io/gem/v/data_migrate.svg?style=flat-square)](https://rubygems.org/gems/data_migrate)
 - [![License](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](http://opensource.org/licenses/MIT)
+- [![Travis](https://img.shields.io/travis/ilyakatz/data-migrate.svg)](https://travis-ci.org/ilyakatz/data-migrate)
+
 
 Run data migrations alongside schema migrations.
 
@@ -11,8 +13,7 @@ migrations, except they should be reserved for data migrations. For
 instance, if you realize you need to titleize all your titles, this
 is the place to do it.
 
-Why should I use this?
-----------------------
+# Why should I use this?
 
 Its seems when a project hits a certain size, I get to manipulate data
 outside the application itself.  Changing defaults, new validations,
@@ -53,8 +54,7 @@ change their scripts to `db:migrate:with_data`.  Of course you want to
 test your migration, so you have the choice of `db:migrate:with_data` or
 `data:migrate` to just capture that data change.
 
-What's it do?
--------------
+## What's it do?
 
 Data migrations are stored in `db/data`. They act like schema
 migrations, except they should be reserved for data migrations. For
@@ -63,14 +63,13 @@ is the place to do it. Running any of the provided rake tasks also
 creates a data schema table to mirror the usual schema migrations
 table to track all the goodness.
 
-Rails Support
---------------------
+## Rails Support
 
 Rails 3.1: Version 1.2 supports Rails 3.1.0 and higher **but** is no longer maintained.
 
 Rails 4: Version 2.0 supports Rails 4.0 and higher
 
-Rails 5: Not tested
+Rails 5.0: Supported
 
 ### Important note
 
@@ -81,8 +80,7 @@ the gem wrote data migration versions into
 
 This may cause some unintended consequences. See [#22](https://github.com/ilyakatz/data-migrate/issues/22)
 
-Installation
-------------
+## Installation
 Add the gem to your project
 
     # Gemfile
@@ -96,8 +94,7 @@ is to mirror the way the standard 'db' rake tasks work. If you've
 installed previous to v1.1.0, you'll want to delete the
 'create\_data\_migrations_table' migration.
 
-Usage
------
+## Usage
 
 ### Generating Migrations
 
@@ -131,8 +128,7 @@ With 'up' and 'down', you can specify the option 'BOTH', which defaults to false
 
 `rake db:migrate:status:with_data` provides and additional column to indicate which type of migration.
 
-Capistrano Support
-------------------
+## Capistrano Support
 
 The gem comes with a capistrano task that can be used instead of `capistrano/rails/migrations`.
 
@@ -144,9 +140,18 @@ require 'capistrano/data_migrate'
 
 From now on capistrano will run `rake db:migrate:with_data` in every deploy.
 
+### Contributing
+
+## Testing
+
+Run tests for a specific version of Rails
+
+```
+appraisal rails-4.2 rspec
+appraisal rails-5.0 rspec
+```
 
-Thanks
-------
+## Thanks
 [Andrew J Vargo](http://github.com/ajvargo) Andrew was the original creator and maintainer of this project!
 
 [Jeremy Durham](http://jeremydurham.com/) for fleshing out the idea with me, and providing guidance.

data/data_migrate.gemspec

@@ -15,7 +15,16 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "data_migrate"
 
-  s.add_dependency('rails', '>= 4.0')
+  s.add_dependency('rails', '>= 4.0', '< 5.1')
+  s.add_development_dependency "appraisal"
+  s.add_development_dependency "rake"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec-core"
+  s.add_development_dependency "pry"
+  s.add_development_dependency "rb-readline"
+  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "timecop"
+
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/gemfiles/rails_4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "4.0.13"
+
+gemspec path: "../"

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "4.1.16"
+
+gemspec path: "../"

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "4.2.8"
+gem "nokogiri", "1.6.8.1"
+
+gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "5.0.3"
+
+gemspec path: "../"

data/lib/data_migrate.rb

@@ -1,4 +1,8 @@
 require File.join(File.dirname(__FILE__), 'data_migrate', 'data_migrator')
 require File.join(File.dirname(__FILE__), 'data_migrate', 'data_schema_migration')
-require File.join(File.dirname(__FILE__), 'data_migrate', 'migration')
+if Rails::VERSION::MAJOR >= 5
+  require File.join(File.dirname(__FILE__), 'data_migrate', 'migration_five')
+else
+  require File.join(File.dirname(__FILE__), 'data_migrate', 'migration')
+end
 require File.join(File.dirname(__FILE__), 'data_migrate', 'railtie')

data/lib/data_migrate/data_migrator.rb

@@ -16,7 +16,7 @@ module DataMigrate
 
     class << self
       def get_all_versions(connection = ActiveRecord::Base.connection)
-        if connection.table_exists?(schema_migrations_table_name)
+        if table_exists?(connection, schema_migrations_table_name)
           # Certain versions of the gem wrote data migration versions into
           # schema_migrations table. After the fix, it was corrected to write into
           # data_migrations. However, not to break anything we are going to
@@ -41,12 +41,18 @@ module DataMigrate
       end
 
       def assure_data_schema_table
-        config = ActiveRecord::Base.configurations[Rails.env || 'development'] || ENV["DATABASE_URL"]
-        ActiveRecord::Base.establish_connection(config)
+        ActiveRecord::Base.establish_connection(db_config)
         sm_table = DataMigrate::DataMigrator.schema_migrations_table_name
 
-        unless ActiveRecord::Base.connection.table_exists?(sm_table)
-          ActiveRecord::Base.connection.create_table(sm_table, :id => false) do |schema_migrations_table|
+        unless table_exists?(ActiveRecord::Base.connection, sm_table)
+          create_table(sm_table)
+        end
+      end
+
+      private
+
+      def create_table(sm_table)
+        ActiveRecord::Base.connection.create_table(sm_table, :id => false) do |schema_migrations_table|
             schema_migrations_table.column :version, :string, :null => false
           end
 
@@ -57,9 +63,22 @@ module DataMigrate
           ActiveRecord::Base.connection.add_index sm_table, :version,
             :unique => true,
             :name => index_name
+      end
+
+      def table_exists?(connection, table_name)
+        # Avoid the warning that table_exists? prints in Rails 5.0 due a change in behavior between
+        # Rails 5.0 and Rails 5.1 of this method with respect to database views.
+        if ActiveRecord.version >= Gem::Version.new('5.0') && ActiveRecord.version < Gem::Version.new('5.1')
+          connection.data_source_exists?(table_name)
+        else
+          connection.table_exists?(schema_migrations_table_name)
         end
       end
 
+      def db_config
+        ActiveRecord::Base.configurations[Rails.env || 'development'] || ENV["DATABASE_URL"]
+      end
+
     end
   end
 end

data/lib/data_migrate/migration_five.rb

@@ -0,0 +1,26 @@
+module DataMigrate
+  class MigrationFive < ::ActiveRecord::Migration[5.0]
+
+    class << self
+      def check_pending!(connection = ::ActiveRecord::Base.connection)
+        raise ActiveRecord::PendingMigrationError if DataMigrator::Migrator.needs_migration?(connection)
+      end
+
+      def migrate(direction)
+        new.migrate direction
+      end
+
+      def table_name
+        ActiveRecord::Base.table_name_prefix + 'data_migrations' + ActiveRecord::Base.table_name_suffix
+      end
+
+      def index_name
+        "#{table_name_prefix}unique_data_migrations#{table_name_suffix}"
+      end
+    end
+
+    def initialize(name = self.class.name, version = nil)
+      super(name, version)
+    end
+  end
+end

data/lib/data_migrate/railtie.rb

@@ -1,5 +1,5 @@
 module DataMigrate
-  class Railtie < Rails::Railtie
+  class Railtie < ::Rails::Railtie
     generators = config.respond_to?(:app_generators) ? config.app_generators : config.generators
 
     rake_tasks do

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-    VERSION = '3.0.1'.freeze
+    VERSION = '3.1.0'.freeze
 end

data/lib/generators/data_migration/data_migration_generator.rb

@@ -33,6 +33,14 @@ module DataMigrate
           @table_name       = $2.pluralize
         end
       end
+
+      def migration_base_class_name
+        if ActiveRecord.version >= Gem::Version.new('5.0')
+          "ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]"
+        else
+          'ActiveRecord::Migration'
+        end
+      end
     end
   end
 end

data/lib/generators/data_migration/templates/data_migration.rb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < <%= migration_base_class_name %>
   def self.up
   end
 

data/spec/data_migrate/data_migrator_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper'
+
+describe DataMigrate::DataMigrator do
+  let(:subject) { DataMigrate::DataMigrator }
+  let(:db_config) {
+    {
+      adapter: "sqlite3",
+      database: "spec/db/test.db"
+    }
+  }
+
+  describe :assure_data_schema_table do
+    before do
+      expect(subject).to receive(:db_config) { db_config }.at_least(:once)
+      ActiveRecord::Base.establish_connection(db_config)
+    end
+
+    after do
+      ActiveRecord::Migration.drop_table("data_migrations")
+    end
+
+    it do
+      expect(
+        ActiveRecord::Base.connection.table_exists?("data_migrations")
+      ).to eq false
+      subject.assure_data_schema_table
+      expect(
+        ActiveRecord::Base.connection.table_exists?("data_migrations")
+      ).to eq true
+    end
+  end
+
+  describe :schema_migrations_table_name do
+    it "returns correct table name" do
+      expect(subject.schema_migrations_table_name).to eq("data_migrations")
+    end
+  end
+
+  describe :migrations_path do
+    it "returns correct migrations path" do
+      expect(subject.migrations_path).to eq("db/data")
+    end
+  end
+
+end

data/spec/data_migrate/data_schema_migration_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe DataMigrate::DataSchemaMigration do
+  let(:subject) { DataMigrate::DataSchemaMigration }
+  describe :table_name do
+    it "returns correct table name" do
+      expect(subject.table_name).to eq("data_migrations")
+    end
+  end
+
+  describe :index_name do
+    it "returns correct index name" do
+      expect(subject.index_name).to eq("unique_data_migrations")
+    end
+  end
+end

data/spec/data_migrate/migration.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+if Rails::VERSION::MAJOR >= 5
+  subject = DataMigrate::MigrationFive
+else
+  subject = DataMigrate::Migration
+end
+
+describe subject do
+  it "uses correct table name" do
+    expect(subject.table_name).to eq("data_migrations")
+  end
+
+  it "uses correct index name" do
+    expect(subject).to receive(:table_name_prefix) { "" }
+    expect(subject).to receive(:table_name_suffix) { "" }
+    expect(subject.index_name).to eq("unique_data_migrations")
+  end
+end

data/spec/generators/data_migration/data_migration_generator_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+require 'rails/generators'
+require 'rails/generators/migration'
+require 'generators/data_migration/data_migration_generator'
+
+describe DataMigrate::Generators::DataMigrationGenerator do
+  let(:subject) { DataMigrate::Generators::DataMigrationGenerator }
+  describe :next_migration_number do
+    it "next migration" do
+      Timecop.freeze("2016-12-03 22:15:26 -0800") do
+        expect(ActiveRecord::Base).to receive(:timestamped_migrations) { true }
+        expect(subject.next_migration_number(1)).to eq("20161204061526")
+      end
+    end
+  end
+
+  describe :migration_base_class_name do
+    let(:subject) { DataMigrate::Generators::DataMigrationGenerator.new(['my_migration']) }
+    it "returns the correct base class name" do
+      if ActiveRecord.version >= Gem::Version.new('5.0')
+        expect(subject.send(:migration_base_class_name)).to eq("ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]")
+      else
+        expect(subject.send(:migration_base_class_name)).to eq('ActiveRecord::Migration')
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'rspec'
+require 'rails'
+require 'data_migrate'
+require 'pry'
+require 'timecop'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -9,22 +9,140 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-15 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '5.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rake tasks to migrate data alongside schema changes.
 email:
 - ajvargo@computer.org
@@ -33,25 +151,40 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
+- .rspec
+- .travis.yml
+- Appraisals
 - Changelog.md
 - Gemfile
+- Gemfile.rails5
 - LICENSE
 - README.md
 - Rakefile
 - data_migrate.gemspec
+- gemfiles/rails_4.0.gemfile
+- gemfiles/rails_4.1.gemfile
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
 - lib/capistrano/data_migrate.rb
 - lib/capistrano/data_migrate/migrate.rb
 - lib/data_migrate.rb
 - lib/data_migrate/data_migrator.rb
 - lib/data_migrate/data_schema_migration.rb
 - lib/data_migrate/migration.rb
+- lib/data_migrate/migration_five.rb
 - lib/data_migrate/railtie.rb
 - lib/data_migrate/version.rb
 - lib/generators/data_migrate.rb
 - lib/generators/data_migration/data_migration_generator.rb
 - lib/generators/data_migration/templates/data_migration.rb
 - lib/generators/data_migration/templates/migration.rb
+- spec/data_migrate/data_migrator_spec.rb
+- spec/data_migrate/data_schema_migration_spec.rb
+- spec/data_migrate/migration.rb
+- spec/db/test.db
+- spec/generators/data_migration/data_migration_generator_spec.rb
+- spec/spec_helper.rb
 - tasks/.gitkeep
 - tasks/databases.rake
 homepage: https://github.com/ilyakatz/data-migrate
@@ -67,18 +200,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: data_migrate
-rubygems_version: 2.2.3
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Rake tasks to migrate data alongside schema changes.
-test_files: []
+test_files:
+- spec/data_migrate/data_migrator_spec.rb
+- spec/data_migrate/data_schema_migration_spec.rb
+- spec/data_migrate/migration.rb
+- spec/db/test.db
+- spec/generators/data_migration/data_migration_generator_spec.rb
+- spec/spec_helper.rb