sequel-inline_schema 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f36b1a394db9b347d6cf2b6a265cc48d0f12892c6ac80ae9f4cea728a86fcd
-  data.tar.gz: be5fe9f645b1db9bc1b5d6837f1d5ad6fc40b212738b20289f7ef3f40f230f81
+  metadata.gz: 698af5cd91bac6d8f22da1c5b27c1fe9bee6de7783c50e8797e4d3b1c006b8f2
+  data.tar.gz: 82405a67152c84ce7f7deb29136d5be145032fc835b3f91f8b46c08c85a1d007
 SHA512:
-  metadata.gz: 1f11a1f9e6f3dd6b06a0376396975891d6f475eb67a5e5b6098aa3a7a21626ac017a942ca8a76db3add001c6271575e2777630b4dd374076944073710f9dbe4a
-  data.tar.gz: a3403f450e1da30e693473a62e4b264a5b93a1cb10307561273fe1a3b508e4881e9e04ec0c15250ec05d10ecca7024f462a8d777a011c9f5b3dabf8aa929d6b5
+  metadata.gz: 76370fa88d1c87fb2b3a2537c621c1b34ac3a15fa353b12db305e33af42e8c240ffa81eb97ab1b3a573d6aee3bf9f4aabccb554920fb832aa187208c926b2307
+  data.tar.gz: 50b13fe397a824b3d799b7d17fd4624cbb5b794ecfa01f75a4d7232a73aee349bba809f49f5a4092a9077f2630dea8f83dfa0428398b778670c3f14b668199a1

data/History.md

@@ -2,6 +2,13 @@
 
 ---
 
+## v0.3.2 [2020-02-11] Michael Granger <ged@faeriemud.org>
+
+Bugfixes:
+
+- Fixed view hooks and added specs.
+
+
 ## v0.3.1 [2020-02-11] Michael Granger <ged@faeriemud.org>
 
 Bugfixes:

data/lib/sequel/inline_schema.rb

@@ -7,7 +7,7 @@ require 'sequel/plugins/inline_schema'
 module Sequel::InlineSchema
 
 	# Package version
-	VERSION = '0.3.1'
+	VERSION = '0.3.2'
 
 	# Version control revision
 	REVISION = %q$Revision$

data/lib/sequel/plugins/inline_schema.rb

@@ -210,8 +210,11 @@ module Sequel::Plugins::InlineSchema
 			dataset = self.view_dataset or raise "No view declared for this model."
 			options = self.view_options.merge( options )
 
+			self.before_create_view
 			self.db.log_info "Creating view %s(%p): %s" % [ self.table_name, options, dataset.sql ]
 			self.db.create_view( self.table_name, dataset, options )
+			@db_schema = get_db_schema( true )
+			self.after_create_view
 		end
 
 
@@ -236,16 +239,16 @@ module Sequel::Plugins::InlineSchema
 
 
 		### Drop the view backing this model.
-		def drop_view
+		def drop_view( options={} )
 			self.before_drop_view
-			self.db.drop_view( self.table_name )
+			self.db.drop_view( self.table_name, self.view_options.merge(options) )
 			self.after_drop_view
 		end
 
 
 		### Drop the view if it already exists, otherwise do nothing.
-		def drop_view?
-			self.drop_view if self.view_exists?
+		def drop_view?( options={} )
+			self.drop_view( options ) if self.view_exists?
 		end
 
 
@@ -320,6 +323,18 @@ module Sequel::Plugins::InlineSchema
 		end
 
 
+		### View-drop hook; called before the backing view is dropped.
+		def before_drop_view
+			return true
+		end
+
+
+		### View-drop hook; called after the backing view is dropped.
+		def after_drop_view
+			return true
+		end
+
+
 		#
 		# Schema-state introspection
 		#

data/spec/sequel/plugins/inline_schema_spec.rb

@@ -34,7 +34,23 @@ describe Sequel::Plugins::InlineSchema do
 		mclass
 	end
 
-	let ( :view_dataset ) { model_class.dataset.group_and_count( :age ) }
+	let( :view_dataset ) { model_class.dataset.group_and_count( :age ) }
+
+	let( :view_class ) do
+		view_class = Class.new( Sequel::Model )
+		view_class.plugin( :inline_schema )
+		view_class.set_dataset( db[view] )
+		view_class.set_view_dataset { view_dataset.naked }
+		return view_class
+	end
+
+	let( :materialized_view_class ) do
+		materialized_view_class = Class.new( Sequel::Model )
+		materialized_view_class.plugin( :inline_schema )
+		materialized_view_class.set_dataset( db[view] )
+		materialized_view_class.set_view_dataset( materialized: true ) { view_dataset.naked }
+		return materialized_view_class
+	end
 
 	let( :valid_pg_attributes ) do
 		[
@@ -187,11 +203,6 @@ describe Sequel::Plugins::InlineSchema do
 
 
 	it "allows a model to create a view instead of a table" do
-		view_class = Class.new( Sequel::Model )
-		view_class.plugin( :inline_schema )
-		view_class.set_dataset( db[view] )
-		view_class.set_view_dataset { view_dataset.naked }
-
 		db.fetch = fake_db_fetcher
 		db.sqls.clear
 
@@ -204,11 +215,6 @@ describe Sequel::Plugins::InlineSchema do
 
 
 	it "allows a model to craete a materialized view instead of a table" do
-		materialized_view_class = Class.new( Sequel::Model )
-		materialized_view_class.plugin( :inline_schema )
-		materialized_view_class.set_dataset( db[view] )
-		materialized_view_class.set_view_dataset( materialized: true ) { view_dataset.naked }
-
 		db.fetch = fake_db_fetcher
 		db.sqls.clear
 
@@ -221,6 +227,30 @@ describe Sequel::Plugins::InlineSchema do
 	end
 
 
+	it "allows a model to drop its view" do
+		db.fetch = fake_db_fetcher
+		db.sqls.clear
+
+		view_class.drop_view
+
+		expect( db.sqls ).to include(
+			%{DROP VIEW "#{view}"}
+		)
+	end
+
+
+	it "allows a model to drop its materialized view" do
+		db.fetch = fake_db_fetcher
+		db.sqls.clear
+
+		materialized_view_class.drop_view
+
+		expect( db.sqls ).to include(
+			%{DROP MATERIALIZED VIEW "#{view}"}
+		)
+	end
+
+
 	describe "table-creation ordering" do
 
 		let( :fake_db_fetcher ) do
@@ -308,7 +338,7 @@ describe Sequel::Plugins::InlineSchema do
 	end
 
 
-	describe "hooks" do
+	describe "table hooks" do
 
 		let( :model_class ) do
 			class_obj = super()
@@ -439,5 +469,137 @@ describe Sequel::Plugins::InlineSchema do
 
 	end
 
+
+	describe "view hooks" do
+
+		let( :view_class ) do
+			class_obj = super()
+			class_obj.singleton_class.send( :attr_accessor, :called )
+			class_obj.called = {}
+			class_obj
+		end
+
+
+		it "calls a hook before creating the model's view" do
+			def view_class.before_create_view
+				self.called[ :before_create_view ] = true
+				super
+			end
+
+			view_class.create_view
+
+			expect( view_class.called ).to include( :before_create_view )
+		end
+
+
+		it "allows cancellation of create_view from the before_create_view hook" do
+			def view_class.before_create_view
+				self.called[ :before_create_view ] = true
+				cancel_action
+			end
+
+			expect {
+				view_class.create_view
+			}.to raise_error( Sequel::HookFailed, /hook failed/i )
+		end
+
+
+		it "allows cancellation of create_view with a message from the before_create_view hook" do
+			def view_class.before_create_view
+				self.called[ :before_create_view ] = true
+				cancel_action( "Wait, don't create yet!" )
+			end
+
+			expect {
+				view_class.create_view
+			}.to raise_error( Sequel::HookFailed, "Wait, don't create yet!" )
+		end
+
+
+		it "allows cancellation of create_view with a Symbol from the before_create_view hook" do
+			def view_class.before_create_view
+				self.called[ :before_create_view ] = true
+				cancel_action( :before_create_view )
+			end
+
+			expect {
+				view_class.create_view
+			}.to raise_error( Sequel::HookFailed, /before_create_view/ )
+		end
+
+
+		it "calls a hook after view creation" do
+			def view_class.after_create_view
+				super
+				self.called[ :after_create_view ] = true
+			end
+
+			view_class.create_view
+
+			expect( view_class.called ).to include( :after_create_view )
+		end
+
+
+		it "calls a hook before dropping the model's view" do
+			def view_class.before_drop_view
+				self.called[ :before_drop_view ] = true
+				super
+			end
+
+			view_class.drop_view
+
+			expect( view_class.called ).to include( :before_drop_view )
+		end
+
+
+		it "allows cancellation of drop_view from the before_drop_view hook" do
+			def view_class.before_drop_view
+				self.called[ :before_drop_view ] = true
+				cancel_action
+			end
+
+			expect {
+				view_class.drop_view
+			}.to raise_error( Sequel::HookFailed, /hook failed/i )
+		end
+
+
+		it "allows cancellation of drop_view with a message from the before_drop_view hook" do
+			def view_class.before_drop_view
+				self.called[ :before_drop_view ] = true
+				cancel_action( "Wait, don't drop yet!" )
+			end
+
+			expect {
+				view_class.drop_view
+			}.to raise_error( Sequel::HookFailed, "Wait, don't drop yet!" )
+		end
+
+
+		it "allows cancellation of drop_view with a Symbol from the before_drop_view hook" do
+			def view_class.before_drop_view
+				self.called[ :before_drop_view ] = true
+				cancel_action( :before_drop_view )
+			end
+
+			expect {
+				view_class.drop_view
+			}.to raise_error( Sequel::HookFailed, /before_drop_view/ )
+		end
+
+
+		it "calls a hook after a class's view is dropped" do
+			def view_class.after_drop_view
+				super
+				self.called[ :after_drop_view ] = true
+			end
+
+			view_class.drop_view
+
+			expect( view_class.called ).to include( :after_drop_view )
+		end
+
+	end
+
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel-inline_schema
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Michael Granger