spectacles 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2c61cd91dee27e0e255cc4e1d98f493e6d94a12f
-  data.tar.gz: 1d95c23e8f0235f4468ec337632a79a7caed2fa2
+SHA256:
+  metadata.gz: 1c759a317da5654cfbfb8aadbabe40a10122b75fa2cd0a569b9d7cb6792b490a
+  data.tar.gz: a76b8d1e07255df03cfed644e868cc7bd4f153ce189e8e457fd2e155f09b5398
 SHA512:
-  metadata.gz: 289104b7bf5334b9af7861017d91c3ec7235af1ec01f038708dc9617ba0d3fe581ccb2972882332faf3035c3f56408c3148cdf81b64841b76d7fdfcbe696fbdb
-  data.tar.gz: ee5dbd357210a7f218b21b9811325904ece703065ae82968fe187a57532e0e2c2c367d6d8c18ae506ca9838df2a41a12bcf25f62f196b5aa02b64ba7e1320d27
+  metadata.gz: 25f113ee6cfc34e1989378d3710c899a340271a37879be95aea22817fbb86ad09c14fb978c90b20a0dd5476f895739fdc902d97b6b5a288a9ae012291736b2dd
+  data.tar.gz: d372e0d4dae6f83b2396f582012de107a39cdfd0d57acfb77974aa9d5b9297972eb111b6eb07862c0d34241075392daddc6ef3fdd47224b8b2b9f85035a5723a

data/.travis.yml

@@ -1,10 +1,14 @@
 language: ruby
+jdk:
+  - openjdk8
 rvm:
- - 2.2
- - 2.3
- - 2.4 
- - jruby
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+  - 2.6
+  - jruby
 cache: bundler
-branches:
- only:
- - master
+services:
+  - mysql
+  - postgresql

data/Gemfile

@@ -10,7 +10,6 @@ platforms :jruby do
 end
 
 platforms :ruby do
-  gem "mysql"
   gem "mysql2"
   gem "pg"
   gem "sqlite3"

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2012 Adam Hutchison, Brandon Dewitt
+Copyright (c) 2012-2019 Adam Hutchison, Brandon Dewitt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/Rakefile

@@ -2,7 +2,7 @@ require "bundler/gem_tasks"
 require 'rake/testtask'
 
 namespace :test do
-  adapters = [ :mysql, :mysql2, :postgresql, :sqlite3 ]
+  adapters = [ :mysql2, :postgresql, :sqlite3 ]
   task :all => [ :spectacles ] + adapters
 
   adapters.each do |adapter|

data/Readme.rdoc

@@ -1,6 +1,8 @@
+{<img src="https://travis-ci.org/liveh2o/spectacles.svg?branch=master" alt="Build Status" />}[https://travis-ci.org/liveh2o/spectacles] {<img src="https://badge.fury.io/rb/spectacles.svg" alt="Gem Version" />}[https://badge.fury.io/rb/spectacles]
+
 = Spectacles
 
-Spectacles adds database view functionality to ActiveRecord. It is heavily inspired by Rails SQL Views (http://github.com/aeden/rails_sql_views/) and built from the ground-up to work with Rails 3.2+.
+Spectacles adds database view functionality to ActiveRecord. It is heavily inspired by Rails SQL Views (created by https://github.com/aeden but no longer maintained) and built from the ground up to work with Rails 3.2+.
 
 Spectacles provides the ability to create views in migrations using a similar format to creating tables. It also provides an abstract view class that inherits from ActiveRecord::Base that can be used to create view-backed models.
 
@@ -57,7 +59,7 @@ they are kind of a cross between tables (which persist data) and views
     # just like Spectacles::View
   end
 
-Because these materialized views cache a snapshot of the data as it
+Because materialized views cache a snapshot of the data as it
 exists at a point in time (typically when the view was created), you
 need to manually _refresh_ the view when new data is added to the
 original tables. You can do this with the +#refresh!+ method on
@@ -115,4 +117,4 @@ to affect how the new view is created:
 
 = License
 
-Spectacles is licensed under MIT license (Read lib/spectactles.rb for full license)
+Spectacles is licensed under MIT license (Read the LICENSE file for full license)

data/lib/spectacles/materialized_view.rb

@@ -3,15 +3,23 @@ module Spectacles
     self.abstract_class = true
 
     def self.new(*)
-      raise NotImplementedError
+      raise NotImplementedError, "#{self} is an abstract class and cannot be instantiated."
     end
 
     def self.materialized_view_exists?
       self.connection.materialized_view_exists?(self.view_name)
     end
 
-    def self.refresh!
-      self.connection.refresh_materialized_view(self.view_name)
+    def self.refresh!(concurrently: false)
+      if concurrently
+        self.connection.refresh_materialized_view_concurrently(self.view_name)
+      else
+        self.connection.refresh_materialized_view(self.view_name)
+      end
+    end
+
+    def self.refresh_concurrently!
+      refresh!(concurrently: true)
     end
 
     class << self

data/lib/spectacles/schema_statements/abstract_adapter.rb

@@ -19,8 +19,8 @@ module Spectacles
       end
 
       def create_view_statement(view_name, create_query)
-        query = "CREATE VIEW ? AS #{create_query}"
-        query_array = [query, view_name.to_s]
+        #query = "CREATE VIEW ? AS #{create_query}"
+        #query_array = [query, view_name.to_s]
 
         #return ActiveRecord::Base.__send__(:sanitize_sql_array, query_array)
         "CREATE VIEW #{view_name} AS #{create_query}"
@@ -32,8 +32,8 @@ module Spectacles
       end
 
       def drop_view_statement(view_name)
-        query = "DROP VIEW IF EXISTS ? "
-        query_array = [query, view_name.to_s]
+        #query = "DROP VIEW IF EXISTS ? "
+        #query_array = [query, view_name.to_s]
 
         #return ActiveRecord::Base.__send__(:sanitize_sql_array, query_array)
         "DROP VIEW IF EXISTS #{view_name} "
@@ -74,6 +74,10 @@ module Spectacles
       def refresh_materialized_view(view_name)
         raise NotImplementedError, "Override refresh_materialized_view for your db adapter in #{self.class}"
       end
+
+      def refresh_materialized_view_concurrently(view_name)
+        raise NotImplementedError, "Override refresh_materialized_view_concurrently for your db adapter in #{self.class}"
+      end
     end
   end
 end

data/lib/spectacles/schema_statements/mysql2_adapter.rb

@@ -1,9 +1,47 @@
-require 'spectacles/schema_statements/mysql_adapter'
-
 module Spectacles
   module SchemaStatements
     module Mysql2Adapter
-      include Spectacles::SchemaStatements::MysqlAdapter
+      include Spectacles::SchemaStatements::AbstractAdapter
+
+      # overrides the #tables method from ActiveRecord's MysqlAdapter
+      # to return only tables, and not views.
+      def tables(name = nil, database = nil, like = nil)
+        database = database ? quote_table_name(database) : "DATABASE()"
+        by_name = like ? "AND table_name LIKE #{quote(like)}" : ""
+
+        sql = <<-SQL.squish
+          SELECT table_name, table_type
+            FROM information_schema.tables
+           WHERE table_schema = #{database}
+             AND table_type = 'BASE TABLE'
+             #{by_name}
+        SQL
+
+        execute_and_free(sql, 'SCHEMA') do |result|
+          rows_from(result).map(&:first)
+        end
+      end
+
+      def views(name = nil) #:nodoc:
+        result = execute("SHOW FULL TABLES WHERE TABLE_TYPE='VIEW'")
+
+        rows_from(result).map(&:first)
+      end
+
+      def view_build_query(view, name = nil)
+        result = execute("SHOW CREATE VIEW #{view}", name)
+        algorithm_string = rows_from(result).first[1]
+
+        algorithm_string.gsub(/CREATE .*? (AS)+/i, "")
+      rescue ActiveRecord::StatementInvalid => e
+        raise "No view called #{view} found, #{e}"
+      end
+
+    private
+
+      def rows_from(result)
+        result.respond_to?(:rows) ? result.rows : result
+      end
     end
   end
 end

data/lib/spectacles/schema_statements/postgresql_adapter.rb

@@ -68,7 +68,7 @@ module Spectacles
         definition = row["definition"].strip.sub(/;$/, "")
 
         options = {}
-        options[:data] = false if ispopulated == 'f'
+        options[:data] = false if ispopulated == 'f' || ispopulated == false
         options[:storage] = parse_storage_definition(storage) if storage.present?
         options[:tablespace] = tablespace if tablespace.present?
 
@@ -135,6 +135,10 @@ module Spectacles
         execute "REFRESH MATERIALIZED VIEW #{quote_table_name(view_name)}"
       end
 
+      def refresh_materialized_view_concurrently(view_name)
+        execute "REFRESH MATERIALIZED VIEW CONCURRENTLY #{quote_table_name(view_name)}"
+      end
+
       def parse_storage_definition(storage)
         # JRuby 9000 returns storage as an Array, whereas
         # MRI returns a string.

data/lib/spectacles/schema_statements/sqlite3_adapter.rb

@@ -21,7 +21,7 @@ module Spectacles
       end
 
       def generate_view_query(*columns)
-        sql = <<-SQL
+        <<-SQL
           SELECT #{columns.join(',')}
           FROM sqlite_master
           WHERE type = 'view'

data/lib/spectacles/version.rb

@@ -1,3 +1,3 @@
 module Spectacles
-  VERSION = "1.2.0"
+  VERSION = "2.0.0"
 end

data/lib/spectacles/view.rb

@@ -3,8 +3,7 @@ module Spectacles
     self.abstract_class = true
 
     def self.new(*)
-      warn "DEPRECATION WARNING: #{self} is an abstract class and should not be instantiated. In v1.0, calling `#{self}.new` will raise a NotImplementedError."
-      super # raise NotImplementedError, "#{self} is an abstract class and can not be instantiated."
+      raise NotImplementedError, "#{self} is an abstract class and cannot be instantiated."
     end
 
     def self.view_exists?

data/specs/adapters/mysql2_adapter_spec.rb

@@ -6,7 +6,7 @@ describe "Spectacles::SchemaStatements::Mysql2Adapter" do
     :host => "localhost",
     :username => "root"
   }
-  
+
   configure_database(config)
   recreate_database("spectacles_test")
   load_schema

data/specs/adapters/postgresql_adapter_spec.rb

@@ -25,44 +25,44 @@ describe "Spectacles::SchemaStatements::PostgreSQLAdapter" do
 
   describe "#view_build_query" do
     it "should escape double-quotes returned by Postgres" do
-      test_base.view_build_query(:new_product_users).must_match(/\\"/)
+      _(test_base.view_build_query(:new_product_users)).must_match(/\\"/)
     end
   end
 
   describe "#materialized_views" do
     it "should support materialized views" do
-      test_base.supports_materialized_views?.must_equal true
+      _(test_base.supports_materialized_views?).must_equal true
     end
   end
 
   describe "#create_materialized_view_statement" do
     it "should work with no options" do
       query = test_base.create_materialized_view_statement(:view_name, "select_query_here")
-      query.must_match(/create materialized view view_name as select_query_here with data/i)
+      _(query).must_match(/create materialized view view_name as select_query_here with data/i)
     end
 
     it "should allow column names to be specified" do
       query = test_base.create_materialized_view_statement(:view_name, "select_query_here",
         columns: %i(first second third))
-      query.must_match(/create materialized view view_name \(first,second,third\) as select_query_here with data/i)
+      _(query).must_match(/create materialized view view_name \(first,second,third\) as select_query_here with data/i)
     end
 
     it "should allow storage parameters to be specified" do
       query = test_base.create_materialized_view_statement(:view_name, "select_query_here",
         storage: { bats_in_belfry: true, max_wingspan: 15 })
-      query.must_match(/create materialized view view_name with \(bats_in_belfry=true, max_wingspan=15\) as select_query_here with data/i)
+      _(query).must_match(/create materialized view view_name with \(bats_in_belfry=true, max_wingspan=15\) as select_query_here with data/i)
     end
 
     it "should allow tablespace to be specified" do
       query = test_base.create_materialized_view_statement(:view_name, "select_query_here",
         tablespace: :the_final_frontier)
-      query.must_match(/create materialized view view_name tablespace the_final_frontier as select_query_here with data/i)
+      _(query).must_match(/create materialized view view_name tablespace the_final_frontier as select_query_here with data/i)
     end
 
     it "should allow empty view to be created" do
       query = test_base.create_materialized_view_statement(:view_name, "select_query_here",
         data: false)
-      query.must_match(/create materialized view view_name as select_query_here with no data/i)
+      _(query).must_match(/create materialized view view_name as select_query_here with no data/i)
     end
   end
 end

data/specs/spec_helper.rb

@@ -50,4 +50,4 @@ def recreate_database(database)
   ActiveRecord::Base.connection.drop_database(database) rescue nil
   ActiveRecord::Base.connection.create_database(database)
   ActiveRecord::Base.establish_connection(@database_config.merge(:database => database))
-end
+end

data/specs/spectacles/abstract_adapter_override_spec.rb

@@ -9,6 +9,6 @@ describe "loading an adapter" do
     end
     load File.join(__dir__, '../../lib/spectacles/abstract_adapter_override.rb')
     Class.new(ActiveRecord::ConnectionAdapters::AbstractAdapter)
-    ActiveRecord::ConnectionAdapters::AbstractAdapter.instance_variable_get("@_spectacles_inherited_called").must_equal true
+    _(ActiveRecord::ConnectionAdapters::AbstractAdapter.instance_variable_get("@_spectacles_inherited_called")).must_equal true
   end
 end

data/specs/spectacles/schema_statements/abstract_adapter_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
 
-describe Spectacles::SchemaStatements::AbstractAdapter do 
+describe Spectacles::SchemaStatements::AbstractAdapter do
   class TestBase
     extend Spectacles::SchemaStatements::AbstractAdapter
 
     def self.materialized_views
+      @materialized_views ||= nil
       @materialized_views || super
     end
 
@@ -17,64 +18,64 @@ describe Spectacles::SchemaStatements::AbstractAdapter do
   end
 
   describe "#create_view" do
-    it "throws error when block not given and no build_query" do 
-      lambda { TestBase.create_view(:view_name) }.must_raise(RuntimeError)
+    it "throws error when block not given and no build_query" do
+      _(lambda { TestBase.create_view(:view_name) }).must_raise(RuntimeError)
     end
   end
 
-  describe "#views" do 
-    it "throws error when accessed on AbstractAdapter" do 
-      lambda { TestBase.views }.must_raise(RuntimeError)
+  describe "#views" do
+    it "throws error when accessed on AbstractAdapter" do
+      _(lambda { TestBase.views }).must_raise(RuntimeError)
     end
   end
 
   describe "#supports_materialized_views?" do
     it "returns false when accessed on AbstractAdapter" do
-      TestBase.supports_materialized_views?.must_equal false
+      _(TestBase.supports_materialized_views?).must_equal false
     end
   end
 
   describe "#materialized_views" do
     it "throws error when accessed on AbstractAdapter" do
-      lambda { TestBase.materialized_views }.must_raise(NotImplementedError)
+      _(lambda { TestBase.materialized_views }).must_raise(NotImplementedError)
     end
   end
 
   describe "#materialized_view_exists?" do
     it "is true when materialized_views includes the view" do
       TestBase.with_materialized_views(%w(alpha beta gamma)) do
-        TestBase.materialized_view_exists?(:beta).must_equal true
+        _(TestBase.materialized_view_exists?(:beta)).must_equal true
       end
     end
 
     it "is false when materialized_views does not include the view" do
       TestBase.with_materialized_views(%w(alpha beta gamma)) do
-        TestBase.materialized_view_exists?(:delta).must_equal false
+        _(TestBase.materialized_view_exists?(:delta)).must_equal false
       end
     end
   end
 
   describe "#materialized_view_build_query" do
     it "throws error when accessed on AbstractAdapter" do
-      lambda { TestBase.materialized_view_build_query(:books) }.must_raise(NotImplementedError)
+      _(lambda { TestBase.materialized_view_build_query(:books) }).must_raise(NotImplementedError)
     end
   end
 
   describe "#create_materialized_view" do
     it "throws error when accessed on AbstractAdapter" do
-      lambda { TestBase.create_materialized_view(:books) }.must_raise(NotImplementedError)
+      _(lambda { TestBase.create_materialized_view(:books) }).must_raise(NotImplementedError)
     end
   end
 
   describe "#drop_materialized_view" do
     it "throws error when accessed on AbstractAdapter" do
-      lambda { TestBase.drop_materialized_view(:books) }.must_raise(NotImplementedError)
+      _(lambda { TestBase.drop_materialized_view(:books) }).must_raise(NotImplementedError)
     end
   end
 
   describe "#refresh_materialized_view" do
     it "throws error when accessed on AbstractAdapter" do
-      lambda { TestBase.refresh_materialized_view(:books) }.must_raise(NotImplementedError)
+      _(lambda { TestBase.refresh_materialized_view(:books) }).must_raise(NotImplementedError)
     end
   end
 

data/specs/spectacles/view_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe Spectacles::View do
   it "is an abstract class" do
-    Spectacles::View.abstract_class?.must_be true
+    _(Spectacles::View.abstract_class?).must_be true
   end
-end
+end

data/specs/support/schema_statement_examples.rb

@@ -1,65 +1,66 @@
-require 'spec_helper'
-
 shared_examples_for "an adapter" do |adapter|
   shared_base = Class.new do
     extend Spectacles::SchemaStatements.const_get(adapter)
     def self.quote_table_name(name); name; end
     def self.quote_column_name(name); name; end
-    def self.execute(query); query; end 
+    def self.execute(query); query; end
   end
 
-  describe "ActiveRecord::SchemaDumper#dump" do 
+  describe "ActiveRecord::SchemaDumper#dump" do
     before(:each) do
       ActiveRecord::Base.connection.drop_view(:new_product_users)
 
-      ActiveRecord::Base.connection.create_view(:new_product_users) do 
+      ActiveRecord::Base.connection.create_view(:new_product_users) do
         "SELECT name AS product_name, first_name AS username FROM
         products JOIN users ON users.id = products.user_id"
       end
 
       if ActiveRecord::Base.connection.supports_materialized_views?
-        ActiveRecord::Base.connection.create_materialized_view(:materialized_product_users, force: true) do 
+        ActiveRecord::Base.connection.drop_materialized_view(:materialized_product_users)
+        ActiveRecord::Base.connection.drop_materialized_view(:empty_materialized_product_users)
+
+        ActiveRecord::Base.connection.create_materialized_view(:materialized_product_users, force: true) do
           "SELECT name AS product_name, first_name AS username FROM
           products JOIN users ON users.id = products.user_id"
         end
 
         ActiveRecord::Base.connection.add_index :materialized_product_users, :product_name
 
-        ActiveRecord::Base.connection.create_materialized_view(:empty_materialized_product_users, storage: { fillfactor: 50 }, data: false, force: true) do 
+        ActiveRecord::Base.connection.create_materialized_view(:empty_materialized_product_users, storage: { fillfactor: 50 }, data: false, force: true) do
           "SELECT name AS product_name, first_name AS username FROM
           products JOIN users ON users.id = products.user_id"
         end
       end
     end
 
-    it "should return create_view in dump stream" do 
+    it "should return create_view in dump stream" do
       stream = StringIO.new
       ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-      stream.string.must_match(/create_view/)
+      _(stream.string).must_match(/create_view/)
     end
 
     if ActiveRecord::Base.connection.supports_materialized_views?
-      it "should return create_materialized_view in dump stream" do 
+      it "should return create_materialized_view in dump stream" do
         stream = StringIO.new
         ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-        stream.string.must_match(/create_materialized_view/)
+        _(stream.string).must_match(/create_materialized_view/)
       end
 
-      it 'should return add_index in dump stream' do
+      it "should return add_index in dump stream" do
         stream = StringIO.new
         ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-        stream.string.must_match(/add_index/)
+        _(stream.string).must_match(/add_index/)
       end
 
       it "should include options for create_materialized_view" do
         stream = StringIO.new
         ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-        stream.string.must_match(/create_materialized_view.*fillfactor: 50/)
-        stream.string.must_match(/create_materialized_view.*data: false/)
+        _(stream.string).must_match(/create_materialized_view.*fillfactor: 50/)
+        _(stream.string).must_match(/create_materialized_view.*data: false/)
       end
     end
 
-    it "should rebuild views in dump stream" do 
+    it "should rebuild views in dump stream" do
       stream = StringIO.new
       ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
 
@@ -79,10 +80,10 @@ shared_examples_for "an adapter" do |adapter|
 
       eval(stream.string)
 
-      ActiveRecord::Base.connection.views.must_include('new_product_users')
+      _(ActiveRecord::Base.connection.views).must_include('new_product_users')
 
       if ActiveRecord::Base.connection.supports_materialized_views?
-        ActiveRecord::Base.connection.materialized_views.must_include('materialized_product_users')
+        _(ActiveRecord::Base.connection.materialized_views).must_include('materialized_product_users')
       end
     end
   end
@@ -90,41 +91,41 @@ shared_examples_for "an adapter" do |adapter|
   describe "#create_view" do
     let(:view_name) { :view_name }
 
-    it "throws error when block not given and no build_query" do 
-      lambda { shared_base.create_view(view_name) }.must_raise(RuntimeError)
+    it "throws error when block not given and no build_query" do
+      _(lambda { shared_base.create_view(view_name) }).must_raise(RuntimeError)
     end
 
     describe "view_name" do
-      it "takes a symbol as the view_name" do 
-        shared_base.create_view(view_name.to_sym, Product.all).must_match(/#{view_name}/)
+      it "takes a symbol as the view_name" do
+        _(shared_base.create_view(view_name.to_sym, Product.all)).must_match(/#{view_name}/)
       end
 
-      it "takes a string as the view_name" do 
-        shared_base.create_view(view_name.to_s, Product.all).must_match(/#{view_name}/)
+      it "takes a string as the view_name" do
+        _(shared_base.create_view(view_name.to_s, Product.all)).must_match(/#{view_name}/)
       end
     end
 
-    describe "build_query" do 
-      it "uses a string if passed" do 
+    describe "build_query" do
+      it "uses a string if passed" do
         select_statement = "SELECT * FROM products"
-        shared_base.create_view(view_name, select_statement).must_match(/#{Regexp.escape(select_statement)}/)
+        _(shared_base.create_view(view_name, select_statement)).must_match(/#{Regexp.escape(select_statement)}/)
       end
 
-      it "uses an Arel::Relation if passed" do 
+      it "uses an Arel::Relation if passed" do
         select_statement = Product.all.to_sql
-        shared_base.create_view(view_name, Product.all).must_match(/#{Regexp.escape(select_statement)}/)
+        _(shared_base.create_view(view_name, Product.all)).must_match(/#{Regexp.escape(select_statement)}/)
       end
     end
 
-    describe "block" do 
-      it "can use an Arel::Relation from the yield" do 
+    describe "block" do
+      it "can use an Arel::Relation from the yield" do
         select_statement = Product.all.to_sql
-        shared_base.create_view(view_name) { Product.all }.must_match(/#{Regexp.escape(select_statement)}/)
+        _(shared_base.create_view(view_name) { Product.all }).must_match(/#{Regexp.escape(select_statement)}/)
       end
 
-      it "can use a String from the yield" do 
+      it "can use a String from the yield" do
         select_statement = "SELECT * FROM products"
-        shared_base.create_view(view_name) { "SELECT * FROM products" }.must_match(/#{Regexp.escape(select_statement)}/)
+        _(shared_base.create_view(view_name) { "SELECT * FROM products" }).must_match(/#{Regexp.escape(select_statement)}/)
       end
     end
   end
@@ -133,55 +134,72 @@ shared_examples_for "an adapter" do |adapter|
     let(:view_name) { :view_name }
 
     describe "view_name" do
-      it "takes a symbol as the view_name" do 
-        shared_base.drop_view(view_name.to_sym).must_match(/#{view_name}/)
+      it "takes a symbol as the view_name" do
+        _(shared_base.drop_view(view_name.to_sym)).must_match(/#{view_name}/)
       end
 
-      it "takes a string as the view_name" do 
-        shared_base.drop_view(view_name.to_s).must_match(/#{view_name}/)
+      it "takes a string as the view_name" do
+        _(shared_base.drop_view(view_name.to_s)).must_match(/#{view_name}/)
       end
     end
   end
 
+  describe "#tables" do
+    it "returns an array of all table names" do
+      _(ActiveRecord::Base.connection.tables).must_include("products")
+      _(ActiveRecord::Base.connection.tables).must_include("users")
+    end
+
+    it "does not include the names of the views" do
+      _(ActiveRecord::Base.connection.tables).wont_include("new_product_users")
+    end
+  end
+
+  describe "#views" do
+    it "returns an array of all views" do
+      _(ActiveRecord::Base.connection.views).must_include("new_product_users")
+    end
+  end
+
   if shared_base.supports_materialized_views?
     describe "#create_materialized_view" do
       let(:view_name) { :view_name }
 
       it "throws error when block not given and no build_query" do
-        lambda { shared_base.create_materialized_view(view_name) }.must_raise(RuntimeError)
+        _(lambda { shared_base.create_materialized_view(view_name) }).must_raise(RuntimeError)
       end
 
       describe "view_name" do
         it "takes a symbol as the view_name" do
-          shared_base.create_materialized_view(view_name.to_sym, Product.all).must_match(/#{view_name}/)
+          _(shared_base.create_materialized_view(view_name.to_sym, Product.all)).must_match(/#{view_name}/)
         end
 
         it "takes a string as the view_name" do
-          shared_base.create_materialized_view(view_name.to_s, Product.all).must_match(/#{view_name}/)
+          _(shared_base.create_materialized_view(view_name.to_s, Product.all)).must_match(/#{view_name}/)
         end
       end
 
       describe "build_query" do
         it "uses a string if passed" do
           select_statement = "SELECT * FROM products"
-          shared_base.create_materialized_view(view_name, select_statement).must_match(/#{Regexp.escape(select_statement)}/)
+          _(shared_base.create_materialized_view(view_name, select_statement)).must_match(/#{Regexp.escape(select_statement)}/)
         end
 
         it "uses an Arel::Relation if passed" do
           select_statement = Product.all.to_sql
-          shared_base.create_materialized_view(view_name, Product.all).must_match(/#{Regexp.escape(select_statement)}/)
+          _(shared_base.create_materialized_view(view_name, Product.all)).must_match(/#{Regexp.escape(select_statement)}/)
         end
       end
 
       describe "block" do
         it "can use an Arel::Relation from the yield" do
           select_statement = Product.all.to_sql
-          shared_base.create_materialized_view(view_name) { Product.all }.must_match(/#{Regexp.escape(select_statement)}/)
+          _(shared_base.create_materialized_view(view_name) { Product.all }).must_match(/#{Regexp.escape(select_statement)}/)
         end
 
         it "can use a String from the yield" do
           select_statement = "SELECT * FROM products"
-          shared_base.create_materialized_view(view_name) { "SELECT * FROM products" }.must_match(/#{Regexp.escape(select_statement)}/)
+          _(shared_base.create_materialized_view(view_name) { "SELECT * FROM products" }).must_match(/#{Regexp.escape(select_statement)}/)
         end
       end
     end
@@ -191,11 +209,11 @@ shared_examples_for "an adapter" do |adapter|
 
       describe "view_name" do
         it "takes a symbol as the view_name" do
-          shared_base.drop_materialized_view(view_name.to_sym).must_match(/#{view_name}/)
+          _(shared_base.drop_materialized_view(view_name.to_sym)).must_match(/#{view_name}/)
         end
 
         it "takes a string as the view_name" do
-          shared_base.drop_materialized_view(view_name.to_s).must_match(/#{view_name}/)
+          _(shared_base.drop_materialized_view(view_name.to_s)).must_match(/#{view_name}/)
         end
       end
     end
@@ -205,18 +223,18 @@ shared_examples_for "an adapter" do |adapter|
 
       describe "view_name" do
         it "takes a symbol as the view_name" do
-          shared_base.refresh_materialized_view(view_name.to_sym).must_match(/#{view_name}/)
+          _(shared_base.refresh_materialized_view(view_name.to_sym)).must_match(/#{view_name}/)
         end
 
         it "takes a string as the view_name" do
-          shared_base.refresh_materialized_view(view_name.to_s).must_match(/#{view_name}/)
+          _(shared_base.refresh_materialized_view(view_name.to_s)).must_match(/#{view_name}/)
         end
       end
     end
   else
     describe "#materialized_views" do
       it "should not be supported by #{adapter}" do
-        lambda { shared_base.materialized_views }.must_raise(NotImplementedError)
+        _(lambda { shared_base.materialized_views }).must_raise(NotImplementedError)
       end
     end
   end

data/specs/support/view_examples.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 shared_examples_for "a view model" do
   ActiveRecord::Base.connection.create_view(:new_product_users) do
     "SELECT name AS product_name, first_name AS username FROM
@@ -12,18 +10,22 @@ shared_examples_for "a view model" do
 
   describe "Spectacles::View" do
     describe "inherited class" do
-      it "can has scopes" do
+      before(:each) do
         User.destroy_all
         Product.destroy_all
         @john = User.create(:first_name => 'John', :last_name => 'Doe')
         @john.products.create(:name => 'Rubber Duck', :value => 10)
+      end
+
+      let(:new_product_user) { NewProductUser.duck_lovers.load.first }
 
-        NewProductUser.duck_lovers.load.first.username.must_be @john.first_name
+      it "can have scopes" do
+        _(new_product_user.username).must_be @john.first_name
       end
 
       describe "an instance" do
         it "is readonly" do
-          NewProductUser.new.readonly?.must_be true
+          _(new_product_user.readonly?).must_be true
         end
       end
     end
@@ -48,12 +50,12 @@ shared_examples_for "a view model" do
         MaterializedProductUser.refresh!
       end
 
-      it "can has scopes" do
-        MaterializedProductUser.duck_lovers.load.first.username.must_be @john.first_name
+      it "can have scopes" do
+        _(MaterializedProductUser.duck_lovers.load.first.username).must_be @john.first_name
       end
 
       it "is readonly" do
-        MaterializedProductUser.first.readonly?.must_be true
+        _(MaterializedProductUser.first.readonly?).must_be true
       end
     end
   end

data/spectacles.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email       = ["liveh2o@gmail.com, brandonsdewitt@gmail.com"]
   gem.homepage    = "http://github.com/liveh2o/spectacles"
   gem.summary     = %q{Spectacles (derived from RailsSQLViews) adds database view functionality to ActiveRecord.}
-  gem.description = %q{Spectacles adds database view functionality to ActiveRecord. Current supported adapters include Postgres, SQLite and Vertica (MySQL is close).}
+  gem.description = %q{Spectacles adds database view functionality to ActiveRecord. Current supported adapters include Postgres, SQLite, Vertica, and MySQL.}
   gem.license     = 'MIT'
 
   gem.files         = `git ls-files`.split($\)
@@ -21,9 +21,9 @@ Gem::Specification.new do |gem|
   ##
   # Dependencies
   #
-  gem.required_ruby_version = ">= 2.0.0"
-  gem.add_dependency "activerecord", ">= 3.2.0"
-  gem.add_dependency "activesupport", ">= 3.2.0"
+  gem.required_ruby_version = ">= 2.2.0"
+  gem.add_dependency "activerecord", ">= 3.2.0", "< 6.0"
+  gem.add_dependency "activesupport", ">= 3.2.0", "< 6.0"
 
   ##
   # Development dependencies

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spectacles
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Adam Hutchison, Brandon Dewitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -31,6 +37,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -38,6 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +79,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Spectacles adds database view functionality to ActiveRecord. Current
-  supported adapters include Postgres, SQLite and Vertica (MySQL is close).
+  supported adapters include Postgres, SQLite, Vertica, and MySQL.
 email:
 - liveh2o@gmail.com, brandonsdewitt@gmail.com
 executables: []
@@ -89,7 +101,6 @@ files:
 - lib/spectacles/schema_statements.rb
 - lib/spectacles/schema_statements/abstract_adapter.rb
 - lib/spectacles/schema_statements/mysql2_adapter.rb
-- lib/spectacles/schema_statements/mysql_adapter.rb
 - lib/spectacles/schema_statements/postgresql_adapter.rb
 - lib/spectacles/schema_statements/sqlite3_adapter.rb
 - lib/spectacles/schema_statements/sqlserver_adapter.rb
@@ -97,7 +108,6 @@ files:
 - lib/spectacles/version.rb
 - lib/spectacles/view.rb
 - specs/adapters/mysql2_adapter_spec.rb
-- specs/adapters/mysql_adapter_spec.rb
 - specs/adapters/postgresql_adapter_spec.rb
 - specs/adapters/sqlite3_adapter_spec.rb
 - specs/spec_helper.rb
@@ -121,15 +131,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Spectacles (derived from RailsSQLViews) adds database view functionality

data/lib/spectacles/schema_statements/mysql_adapter.rb

@@ -1,39 +0,0 @@
-require 'spectacles/schema_statements/abstract_adapter'
-
-module Spectacles
-  module SchemaStatements
-    module MysqlAdapter
-      include Spectacles::SchemaStatements::AbstractAdapter
-
-      # overrides the #tables method from ActiveRecord's MysqlAdapter
-      # to return only tables, and not views.
-      def tables(name = nil, database = nil, like = nil)
-        database = database ? quote_table_name(database) : "DATABASE()"
-        by_name  = like ? "AND table_name LIKE #{quote(like)}" : ""
-
-        sql = <<-SQL.squish
-          SELECT table_name, table_type
-            FROM information_schema.tables
-           WHERE table_schema = #{database}
-             AND table_type = 'BASE TABLE'
-             #{by_name}
-        SQL
-
-        execute_and_free(sql, 'SCHEMA') do |result|
-          result.collect(&:first)
-        end
-      end
-
-      def views(name = nil) #:nodoc:
-        execute("SHOW FULL TABLES WHERE TABLE_TYPE='VIEW'").map { |row| row[0] }
-      end
-
-      def view_build_query(view, name = nil)
-        row = execute("SHOW CREATE VIEW #{view}", name).first
-        return row[1].gsub(/CREATE .*? (AS)+/i, "")
-      rescue ActiveRecord::StatementInvalid => e
-        raise "No view called #{view} found"
-      end
-    end
-  end
-end

data/specs/adapters/mysql_adapter_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe "Spectacles::SchemaStatements::MysqlAdapter" do
-  config = {
-    :adapter => "mysql",
-    :host => "localhost",
-    :username => "root"
-  }
-  configure_database(config)
-  recreate_database("spectacles_test")
-  load_schema
-
-  it_behaves_like "an adapter", "MysqlAdapter"
-  it_behaves_like "a view model"
-end