activerecord_views 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0fea356d1e38741b89df29e6dd55820c727990e
-  data.tar.gz: eb072ae4e60465e088d82dc5901e953ad9553442
+  metadata.gz: a3665d75c1a7665c0c436548c6aef0b045cf65a6
+  data.tar.gz: 411bd452c4ffc8afaf05e9a06ea2bf708e2c6b54
 SHA512:
-  metadata.gz: 62c41e131f1fe0469325f60791695f5effbc68fd5c210106e8eb9da2987790648fcd1c6d55cc63c85ad8aa562cb30f1440018aa3c70096ddf7b8b1bd5873321e
-  data.tar.gz: 453782f417e2fb7d265b91a4012c0770395a3ef697cf23a867ccc4aa98bc5c719ae371011335b228fd1a7ea671300f9d2fdfe46a57d84a3735758136fb5e8901
+  metadata.gz: '0693473e52cbd7add2dfc0ba7d95c700e877b39ab8cb97f0a38eba7be10424e788534788ab1d48f37b1066e75a16bfc82c4ee06c018eb6fc3ccc138a861fa623'
+  data.tar.gz: 8f7940ea28efbee5f26fdd0ec6273b0fa665bc876c5634d6bdc37e7633ea7e86b1572079b1b52098e2163da385cdf187326bba53992c0799b966697ebc44f82c

data/lib/active_record_views/extension.rb

@@ -5,8 +5,8 @@ module ActiveRecordViews
     extend ActiveSupport::Concern
 
     def self.currently_migrating?
-      if defined?(Rake) && Rake.method_defined?(:application)
-        Rake.application.top_level_tasks.include?('db:migrate')
+      if defined?(Rake) && Rake.respond_to?(:application)
+        Rake.application.top_level_tasks.any? { |task_name| task_name =~ /^db:migrate($|:)/ }
       end
     end
 
@@ -23,12 +23,7 @@ module ActiveRecordViews
         sql ||= begin
           sql_path = ActiveRecordViews.find_sql_file(self.name.underscore)
           ActiveRecordViews.register_for_reload self, sql_path
-
-          if sql_path.end_with?('.erb')
-            ERB.new(File.read(sql_path)).result
-          else
-            File.read(sql_path)
-          end
+          ActiveRecordViews.read_sql_file(sql_path)
         end
 
         ActiveRecordViews.create_view self.connection, self.table_name, self.name, sql, self.view_options

data/lib/active_record_views/registered_view.rb

@@ -18,7 +18,7 @@ module ActiveRecordViews
 
     def reload!
       if File.exist? sql_path
-        ActiveRecordViews.create_view model_class.connection, model_class.table_name, model_class.name, File.read(sql_path), model_class.view_options
+        ActiveRecordViews.create_view model_class.connection, model_class.table_name, model_class.name, ActiveRecordViews.read_sql_file(sql_path), model_class.view_options
       else
         ActiveRecordViews.drop_view model_class.connection, model_class.table_name
       end

data/lib/active_record_views/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordViews
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

data/lib/active_record_views.rb

@@ -28,6 +28,14 @@ module ActiveRecordViews
     raise "could not find #{name}.sql"
   end
 
+  def self.read_sql_file(sql_path)
+    if sql_path.end_with?('.erb')
+      ERB.new(File.read(sql_path)).result
+    else
+      File.read(sql_path)
+    end
+  end
+
   def self.without_transaction(connection)
     in_transaction = if connection.respond_to? :transaction_open?
       connection.transaction_open?

data/lib/tasks/active_record_views.rake

@@ -13,6 +13,7 @@ Rake::Task['db:structure:dump'].enhance do
       set_psql_env(config)
     end
 
+    require 'shellwords'
     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?
 

data/spec/active_record_views_extension_spec.rb

@@ -59,6 +59,31 @@ describe ActiveRecordViews::Extension do
       test_request # trigger cleanup
     end
 
+    it 'reloads the database view when external ERB SQL file is modified' do
+      ['foo 42', 'bar 42'].each do |sql|
+        expect(ActiveRecordViews).to receive(:create_view).with(
+          anything,
+          'modified_erb_file_test_models',
+          'ModifiedErbFileTestModel',
+          sql,
+          {}
+        ).once.ordered
+      end
+
+      with_temp_sql_dir do |temp_dir|
+        sql_file = File.join(temp_dir, 'modified_erb_file_test_model.sql.erb')
+        update_file sql_file, 'foo <%= 2*3*7 %>'
+
+        class ModifiedErbFileTestModel < ActiveRecord::Base
+          is_view
+        end
+
+        update_file sql_file, 'bar <%= 2*3*7 %>'
+        test_request
+      end
+      test_request # trigger cleanup
+    end
+
     it 'drops the view if the external SQL file is deleted' do
       with_temp_sql_dir do |temp_dir|
         sql_file = File.join(temp_dir, 'deleted_file_test_model.sql')

data/spec/internal/Rakefile

@@ -2,7 +2,7 @@ require 'bundler/setup'
 require 'combustion'
 
 Combustion::Database.instance_eval do
-  def setup
+  def setup(options)
     ActiveRecord::Base.configurations = YAML.load(ERB.new(File.read("#{Rails.root}/config/database.yml")).result)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_views
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Jason Weathered
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2017-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Automatic database view creation for ActiveRecord