activerecord_views 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9eded5dc204c84d1913a10b2c73a15b80ba1aeb4
-  data.tar.gz: 3cc3301d035582053ebc27c447d7a0eab65da7ba
+  metadata.gz: 1bc9898154793aaeadd3252f3ae9f691dd43669f
+  data.tar.gz: fdea9d04caa3e922a45725436532f9db48d175d8
 SHA512:
-  metadata.gz: 74a57fb79e1136a4f2a00977d98221bf032a42cff691ccba96bd12a36c243754e08298fed60e4678c9e053614bd09b552e7c0bbbfa8e66bdc9428ad1a20d8e26
-  data.tar.gz: a5c0e4987e1925e0cad58a2024262c41249601cc4e11cd40d4266eb8db490c03a2cd0ec7f1ffd87ec814b4a9084365653d871cf5f8668faa1e779c49e210bfb9
+  metadata.gz: 4658c236510c130b3f197beaf66d04f569c7b8fae0861e4ea32e4205172ea6c2213ea30ce13750025745dbe287bf714900e1b5e426ce5c439ad9a2ec3540933e
+  data.tar.gz: 47f78f0aaafcddf3186f1c3f7574d141e74955e2d211a1cdb406cf0e1382b8609f8214f2e1769ac84ac0562d781a01cad752073870f29fb9c3443e4498ef1e87

data/lib/active_record_views/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordViews
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/lib/tasks/active_record_views.rake

@@ -1,8 +1,18 @@
 Rake::Task['db:structure:dump'].enhance do
   if ActiveRecord::Base.connection.table_exists?('active_record_views')
     filename = ENV['DB_STRUCTURE'] || File.join(Rails.root, "db", "structure.sql")
-    config = current_config
-    set_psql_env(config)
+
+    if defined? ActiveRecord::Tasks::DatabaseTasks
+      tasks = ActiveRecord::Tasks::DatabaseTasks
+      config = tasks.current_config
+      tasks.send(:class_for_adapter, config.fetch('adapter')).new(config)
+      pg_tasks = tasks.send(:class_for_adapter, config.fetch('adapter')).new(config)
+      pg_tasks.send(:set_psql_env)
+    else
+      config = current_config
+      set_psql_env(config)
+    end
+
     system("pg_dump --data-only --table=active_record_views #{Shellwords.escape config['database']} >> #{Shellwords.escape filename}")
     raise 'active_record_views metadata dump failed' unless $?.success?
   end

data/spec/internal/Rakefile

@@ -0,0 +1,16 @@
+require 'bundler/setup'
+require 'combustion'
+
+Combustion::Database.instance_eval do
+  def setup
+    ActiveRecord::Base.configurations = YAML.load(ERB.new(File.read("#{Rails.root}/config/database.yml")).result)
+  end
+end
+
+Combustion.initialize! :active_record, :action_controller do
+  config.cache_classes = false
+  config.active_record.whitelist_attributes = true if Rails::VERSION::MAJOR < 4
+end
+
+load 'active_record/railties/databases.rake'
+Combustion::Application.load_tasks

data/spec/tasks_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'rake db:structure:dump' do
+  it 'copies over activerecord_views data' do
+    ActiveRecordViews.create_view ActiveRecord::Base.connection, 'test_view', 'TestView', 'SELECT 1'
+
+    FileUtils.rm_f 'spec/internal/db/structure.sql'
+    system("rake -f spec/internal/Rakefile db:structure:dump")
+    raise unless $?.success?
+
+    sql = File.read('spec/internal/db/structure.sql')
+    FileUtils.rm_f 'spec/internal/db/structure.sql'
+
+    expect(sql).to match /COPY active_record_views.+test_view\tTestView/m
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_views
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Jason Weathered
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -117,6 +117,7 @@ files:
 - spec/active_record_views_checksum_cache_spec.rb
 - spec/active_record_views_extension_spec.rb
 - spec/active_record_views_spec.rb
+- spec/internal/Rakefile
 - spec/internal/app/models/dependency_a.rb
 - spec/internal/app/models/dependency_b.rb
 - spec/internal/app/models/dependency_c.rb
@@ -133,6 +134,7 @@ files:
 - spec/internal/config/database.yml
 - spec/internal/db/schema.rb
 - spec/spec_helper.rb
+- spec/tasks_spec.rb
 homepage: http://github.com/jasoncodes/activerecord_views
 licenses:
 - MIT
@@ -161,6 +163,7 @@ test_files:
 - spec/active_record_views_checksum_cache_spec.rb
 - spec/active_record_views_extension_spec.rb
 - spec/active_record_views_spec.rb
+- spec/internal/Rakefile
 - spec/internal/app/models/dependency_a.rb
 - spec/internal/app/models/dependency_b.rb
 - spec/internal/app/models/dependency_c.rb
@@ -177,3 +180,4 @@ test_files:
 - spec/internal/config/database.yml
 - spec/internal/db/schema.rb
 - spec/spec_helper.rb
+- spec/tasks_spec.rb