spectacles 6.0.0 → 7.1.0

data/lib/spectacles/schema_statements/postgresql_adapter.rb

@@ -1,21 +1,21 @@
-require 'spectacles/schema_statements/abstract_adapter'
+require "spectacles/schema_statements/abstract_adapter"
 
 module Spectacles
   module SchemaStatements
     module PostgreSQLAdapter
       include Spectacles::SchemaStatements::AbstractAdapter
 
-      def views(name = nil) #:nodoc:
+      def views(name = nil) # :nodoc:
         q = <<-SQL
-              SELECT t.table_name, t.table_type
-                FROM information_schema.tables AS t
-          INNER JOIN pg_class AS c ON c.relname = t.table_name
-               WHERE t.table_schema = ANY(current_schemas(false))
-                 AND t.table_type = 'VIEW'
+              SELECT t.table_name
+                FROM information_schema.views AS t
+          INNER JOIN pg_class AS c ON c.relname = t.table_name AND c.relnamespace = to_regnamespace(t.table_schema)::oid
+               WHERE t.table_schema = ANY(current_schemas(true))
+                 AND table_schema NOT IN ('information_schema', 'pg_catalog')
                  AND pg_catalog.pg_get_userbyid(c.relowner) = #{quote(database_username)}
         SQL
 
-        execute(q, name).map { |row| row['table_name'] }
+        execute(q, name).map { |row| row["table_name"] }
       end
 
       def view_build_query(view, name = nil)
@@ -46,7 +46,7 @@ module Spectacles
              AND relkind = 'm';
         SQL
 
-        execute(query, name).map { |row| row['relname'] }
+        execute(query, name).map { |row| row["relname"] }
       end
 
       # Returns a tuple [string, hash], where string is the query used
@@ -59,8 +59,7 @@ module Spectacles
            WHERE a.relname=#{quote(view)}
              AND b.matviewname=a.relname
         SQL
-
-        row = result[0]
+        row = result.to_a[0]
 
         storage = row["reloptions"]
         tablespace = row["tablespace"]
@@ -68,37 +67,37 @@ module Spectacles
         definition = row["definition"].strip.sub(/;$/, "")
 
         options = {}
-        options[:data] = false if ispopulated == 'f' || ispopulated == false
+        options[:data] = false if ispopulated == "f" || ispopulated == false
         options[:storage] = parse_storage_definition(storage) if storage.present?
         options[:tablespace] = tablespace if tablespace.present?
 
         [definition, options]
       end
 
-      def create_materialized_view_statement(view_name, query, options={})
+      def create_materialized_view_statement(view_name, query, options = {})
         columns = if options[:columns]
-            "(" + options[:columns].map { |c| quote_column_name(c) }.join(",") + ")"
-          else
-            ""
-          end
+          "(" + options[:columns].map { |c| quote_column_name(c) }.join(",") + ")"
+        else
+          ""
+        end
 
-        storage = if options[:storage] && options[:storage].any?
-            "WITH (" + options[:storage].map { |key, value| "#{key}=#{value}" }.join(", ") + ")"
-          else
-            ""
-          end
+        storage = if options[:storage]&.any?
+          "WITH (" + options[:storage].map { |key, value| "#{key}=#{value}" }.join(", ") + ")"
+        else
+          ""
+        end
 
         tablespace = if options[:tablespace]
-            "TABLESPACE #{quote_table_name(options[:tablespace])}"
-          else
-            ""
-          end
+          "TABLESPACE #{quote_table_name(options[:tablespace])}"
+        else
+          ""
+        end
 
         with_data = if options.fetch(:data, true)
-            "WITH DATA"
-          else
-            "WITH NO DATA"
-          end
+          "WITH DATA"
+        else
+          "WITH NO DATA"
+        end
 
         <<-SQL.squish
           CREATE MATERIALIZED VIEW #{quote_table_name(view_name)}
@@ -145,10 +144,9 @@ module Spectacles
         storage = storage.first if storage.is_a?(Array)
 
         storage = storage.gsub(/^{|}$/, "")
-        storage.split(/,/).inject({}) do |hash, item|
-          key, value = item.strip.split(/=/)
+        storage.split(",").each_with_object({}) do |item, hash|
+          key, value = item.strip.split("=")
           hash[key.to_sym] = value
-          hash
         end
       end
 

data/lib/spectacles/schema_statements/sqlite3_adapter.rb

@@ -1,38 +1,23 @@
-require 'spectacles/schema_statements/abstract_adapter'
+require "spectacles/schema_statements/abstract_adapter"
 
 module Spectacles
   module SchemaStatements
     module SQLite3Adapter
       include Spectacles::SchemaStatements::AbstractAdapter
 
-      # overrides the #tables method from ActiveRecord's SQLite3Adapter
-      # to return only tables, and not views.
-      def tables(name = nil, table_name = nil)
-        sql = <<-SQL
-          SELECT name
-          FROM sqlite_master
-          WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-        SQL
-        sql << " AND name = #{quote_table_name(table_name)}" if table_name
-
-        exec_query(sql, 'SCHEMA').map do |row|
-          row['name']
-        end
-      end
-
       def generate_view_query(*columns)
         <<-SQL
-          SELECT #{columns.join(',')}
+          SELECT #{columns.join(",")}
           FROM sqlite_master
           WHERE type = 'view'
         SQL
       end
 
-      def views #:nodoc:
+      def views # :nodoc:
         sql = generate_view_query(:name)
 
         exec_query(sql, "SCHEMA").map do |row|
-          row['name']
+          row["name"]
         end
       end
 
@@ -41,7 +26,7 @@ module Spectacles
         sql << " AND name = #{quote_table_name(table_name)}"
 
         row = exec_query(sql, "SCHEMA").first
-        row['sql'].gsub(/CREATE VIEW .*? AS/i, "")
+        row["sql"].gsub(/CREATE VIEW .*? AS/i, "")
       end
     end
   end

data/lib/spectacles/schema_statements/sqlserver_adapter.rb

@@ -1,22 +1,22 @@
-require 'spectacles/schema_statements/abstract_adapter'
+require "spectacles/schema_statements/abstract_adapter"
 
 module Spectacles
   module SchemaStatements
     module SQLServerAdapter
       include Spectacles::SchemaStatements::AbstractAdapter
-      
-      def views(name = nil) #:nodoc:
+
+      def views(name = nil) # :nodoc:
         select_values("SELECT table_name FROM information_schema.views", name)
       end
 
       def view_build_query(view, name = nil)
-        q =<<-ENDSQL
+        q = <<-ENDSQL
           SELECT view_definition FROM information_schema.views
           WHERE table_name = '#{view}'
         ENDSQL
 
         q = select_value(q, name) or raise "No view called #{view} found"
-        q.gsub(/CREATE VIEW .*? AS/i, "") 
+        q.gsub(/CREATE VIEW .*? AS/i, "")
       end
     end
   end

data/lib/spectacles/schema_statements/vertica_adapter.rb

@@ -1,23 +1,23 @@
-require 'spectacles/schema_statements/abstract_adapter'
+require "spectacles/schema_statements/abstract_adapter"
 
 module Spectacles
   module SchemaStatements
     module VerticaAdapter
       include Spectacles::SchemaStatements::AbstractAdapter
-      
+
       def views(name = nil)
         q = <<-SQL
           SELECT table_name FROM v_catalog.views
         SQL
-        
-        execute(q, name).map { |row| row['table_name'] }
+
+        execute(q, name).map { |row| row["table_name"] }
       end
 
       def view_build_query(view, name = nil)
         q = <<-SQL
           SELECT view_definition FROM v_catalog.views WHERE table_name = '#{view}'
         SQL
-        
+
         select_value(q, name) or raise "No view called #{view} found"
       end
     end

data/lib/spectacles/schema_statements.rb

@@ -1,7 +1,7 @@
-require 'spectacles/schema_statements/abstract_adapter'
+require "spectacles/schema_statements/abstract_adapter"
 
 module Spectacles
-  SUPPORTED_ADAPTERS = %w( Mysql Mysql2 PostgreSQL SQLServer SQLite SQLite3 Vertica )
+  SUPPORTED_ADAPTERS = %w[Mysql2 PostgreSQL SQLServer SQLite SQLite3 Vertica]
 
   def self.load_adapters
     SUPPORTED_ADAPTERS.each do |db|

data/lib/spectacles/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Spectacles
-  VERSION = "6.0.0"
+  VERSION = "7.1.0"
 end

data/lib/spectacles/view.rb

@@ -7,7 +7,7 @@ module Spectacles
     end
 
     def self.view_exists?
-      self.connection.view_exists?(self.view_name)
+      connection.view_exists?(view_name)
     end
 
     class << self
@@ -15,11 +15,11 @@ module Spectacles
       alias_method :view_name, :table_name
     end
 
-    def ==(comparison_object)
+    def ==(other)
       super ||
-        comparison_object.instance_of?(self.class) &&
-        attributes.present? &&
-        comparison_object.attributes == attributes
+        other.instance_of?(self.class) &&
+          attributes.present? &&
+          other.attributes == attributes
     end
 
     def persisted?

data/lib/spectacles.rb

@@ -1,14 +1,16 @@
-require 'active_record'
-require 'active_support/core_ext'
-require 'spectacles/schema_statements'
-require 'spectacles/schema_dumper'
-require 'spectacles/view'
-require 'spectacles/materialized_view'
-require 'spectacles/version'
-require 'spectacles/configuration'
-require 'spectacles/abstract_adapter_override'
-
-require 'spectacles/railtie' if defined?(Rails)
+# frozen_string_literal: true
+
+require "active_record"
+require "active_support/core_ext"
+require "spectacles/schema_statements"
+require "spectacles/schema_dumper"
+require "spectacles/view"
+require "spectacles/materialized_view"
+require "spectacles/version"
+require "spectacles/configuration"
+require "spectacles/abstract_adapter_override"
+
+require "spectacles/railtie" if defined?(Rails)
 
 module Spectacles
   def self.configuration
@@ -34,4 +36,4 @@ ActiveRecord::SchemaDumper.class_eval do
   end
 end
 
-Spectacles::load_adapters
+Spectacles.load_adapters

metadata

@@ -1,55 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: spectacles
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.1.0
 platform: ruby
 authors:
 - Adam Hutchison, Brandon Dewitt
-autorequire:
-bindir: bin
+autorequire: 
+bindir: exe
 cert_chain: []
-date: 2022-02-21 00:00:00.000000000 Z
+date: 2024-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 7.1.0
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
-    - - "~>"
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -65,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -86,12 +88,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
-- LICENSE
+- ".rubocop.yml"
+- ".standard.yml"
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- LICENSE.txt
+- README.md
 - Rakefile
-- Readme.rdoc
 - lib/spectacles.rb
 - lib/spectacles/abstract_adapter_override.rb
 - lib/spectacles/configuration.rb
@@ -107,23 +110,14 @@ files:
 - lib/spectacles/schema_statements/vertica_adapter.rb
 - lib/spectacles/version.rb
 - lib/spectacles/view.rb
-- specs/adapters/mysql2_adapter_spec.rb
-- specs/adapters/postgresql_adapter_spec.rb
-- specs/adapters/sqlite3_adapter_spec.rb
-- specs/spec_helper.rb
-- specs/spectacles/abstract_adapter_override_spec.rb
-- specs/spectacles/schema_statements/abstract_adapter_spec.rb
-- specs/spectacles/view_spec.rb
-- specs/support/minitest_matchers.rb
-- specs/support/minitest_shared.rb
-- specs/support/schema_statement_examples.rb
-- specs/support/view_examples.rb
-- spectacles.gemspec
 homepage: http://github.com/liveh2o/spectacles
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  homepage_uri: http://github.com/liveh2o/spectacles
+  source_code_uri: http://github.com/liveh2o/spectacles
+  changelog_uri: http://github.com/liveh2o/spectacles/blob/main/CHANGELOG.md
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -131,16 +125,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.6
-signing_key:
+rubygems_version: 3.4.22
+signing_key: 
 specification_version: 4
-summary: Spectacles (derived from RailsSQLViews) adds database view functionality
-  to ActiveRecord.
+summary: Spectacles adds database view functionality to ActiveRecord.
 test_files: []

data/.gitignore

@@ -1,8 +0,0 @@
-.DS_Store
-*.gem
-.bundle
-.rvmrc
-Gemfile.lock
-pkg/*
-specs/*.db
-coverage

data/.travis.yml

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

data/Gemfile

@@ -1,20 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in spectacles.gemspec
-gemspec
-
-platforms :jruby do
-  gem "activerecord-jdbcmysql-adapter"
-  gem "activerecord-jdbcpostgresql-adapter"
-  gem "activerecord-jdbcsqlite3-adapter"
-end
-
-platforms :ruby do
-  gem "mysql2"
-  gem "pg"
-  gem "sqlite3"
-end
-
-group :test do
-  gem 'simplecov', :require => false
-end

data/LICENSE

@@ -1,20 +0,0 @@
-The MIT License (MIT)
-
-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
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Readme.rdoc

@@ -1,120 +0,0 @@
-{<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 (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.
-
-It currently works with the SQLite, MySQL, MySQL2, PostgreSQL, and Vertica drivers.
-
-= Using Spectacles
-  Install it
-    gem install spectacles        # => OR include it in your Gemfile
-
-== Migrations
-
-Create a migration from an query string:
-
-  create_view :product_users do
-    "SELECT name AS product_name, first_name AS username FROM
-    products JOIN users ON users.id = products.user_id"
-  end
-
-
-Create a migration from an ARel object:
-
-  create_view :product_users do
-    Product.select("products.name AS product_name).
-      select("users.first_name AS username").
-      join(:users)
-  end
-
-== Models
-
-  class ProductUser < Spectacles::View
-    # Add relationships
-
-    # Use scopes
-
-    # Your fancy methods
-  end
-
-== Materialized Views
-
-*This feature is only supported for PostgreSQL backends.*
-These are essentially views that cache their result set. In this way
-they are kind of a cross between tables (which persist data) and views
-(which are windows onto other tables).
-
-  create_materialized_view :product_users do
-    <<-SQL.squish
-      SELECT name AS product_name, first_name AS username
-        FROM products
-        JOIN users ON users.id = products.user_id
-    SQL
-  end
-
-  class ProductUser < Spectacles::MaterializedView
-    # just like Spectacles::View
-  end
-
-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
-the +Spectacles::MaterializedView+ subclass:
-
-  User.create(first_name: "Bob", email: "bob@example.com")
-  ProductUser.refresh!
-
-Also, you can specify a few different options to +create_materialized_view+
-to affect how the new view is created:
-
-* +:force+ - if +false+ (the default), the create will fail if a
-  materialized view with the given name already exists. If +true+,
-  any materialized view with that name will be dropped before the
-  create runs.
-
-    create_materialized_view :product_users, force: true do
-      # ...
-    end
-
-* +:data+ - if +true+ (the default), the view is immediately populated
-  with the corresponding data. If +false+, the view will be empty initially,
-  and must be populated by invoking the +#refresh!+ method.
-
-    create_materialized_view :product_users, data: false do
-      # ...
-    end
-
-* +:columns+ - an optional array of names to give the columns in the view.
-  By default, columns in the view will use the names given in the query.
-
-    create_materialized_view :product_users, columns: %i(product_name username) do
-      <<-SQL.squish
-        SELECT products.name, users.first_name
-          FROM products
-          JOIN users ON users.id = products.user_id
-      SQL
-    end
-
-* +:tablespace+ - an optional identifier (string or symbol) indicating
-  which namespace the materialized view ought to be created in.
-
-    create_materialized_view :product_users, tablespace: "awesomesauce" do
-      # ...
-    end
-
-* +:storage+ - an optional hash of (database-specific) storage parameters to
-  optimize how the materialized view is stored. (See
-  http://www.postgresql.org/docs/9.4/static/sql-createtable.html#SQL-CREATETABLE-STORAGE-PARAMETERS
-  for details.)
-
-    create_materialized_view :product_users, storage: { fillfactor: 70 } do
-      # ...
-    end
-
-= License
-
-Spectacles is licensed under MIT license (Read the LICENSE file for full license)

data/specs/adapters/mysql2_adapter_spec.rb

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