scenic-cascade 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea827703e734f29926dce60d10c981aaf1f2c25da8e4aba28988e80899fdb6ad
-  data.tar.gz: 73cfb21d49275a218353d91090ea3e5b7b97c3d0d23b9a4900675c8f7625fcfb
+  metadata.gz: 9d210342197b949abc4156e8fcdc63ad74b04f1fde40fb207e35dc15b13e1efd
+  data.tar.gz: 60c19c6113bc29ebc57c068ef16d744661f33f9bdd06a763807b807e41d3f66f
 SHA512:
-  metadata.gz: fa06bc234127080963c60a281b5e5a0721c438377df3249c123816b7f9d41662f174b825d809435618f660bd742693a8a74cac8e105c170099723c837757c746
-  data.tar.gz: 25bc8589c1bfd12043e2ec95aa0c5a534b9608c3dd4e47008430a12b331f6bd096b8977968f985dce4692c01e3b56e1e157587852b78786d6406e613da0cf396
+  metadata.gz: 9040765c0fdadb9778139f634883a09466ddf80d8b63bf28c8b358150e0d4e6eb45556bb3d926c9e458c7e3fd8bf9deb7b8863d6a80694163f6b73643654ee09
+  data.tar.gz: 05ea8516e444b9c07cba0a8813af3985295897ce11c90790ca407eb5aa81d5d250e937d334269f5b87c797ee932a2ae7e1e09cff92d82c9a7041f89c35cbd06e

data/CHANGELOG.md

@@ -7,6 +7,14 @@ and this project follows [Semantic Versioning](https://semver.org/spec/v2.0.0.ht
 
 ## [Unreleased]
 
+## [0.1.2] - 2026-11-01
+
+### Fixed
+
+- Select the latest existing dependent view definition when SQL version numbers have gaps.
+- Report noncanonical numeric view definition filenames instead of silently selecting an older definition.
+- Leave view definition files untouched when a dependent view has no Scenic definition.
+
 ## [0.1.1] - 2026-10-30
 
 ### Fixed
@@ -19,6 +27,7 @@ and this project follows [Semantic Versioning](https://semver.org/spec/v2.0.0.ht
 
 - Initial release of the cascading Scenic view migration generator.
 
-[Unreleased]: https://github.com/akiomik/scenic-cascade/compare/v0.1.1...HEAD
+[Unreleased]: https://github.com/akiomik/scenic-cascade/compare/v0.1.2...HEAD
+[0.1.2]: https://github.com/akiomik/scenic-cascade/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/akiomik/scenic-cascade/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/akiomik/scenic-cascade/releases/tag/v0.1.0

data/Gemfile

@@ -8,7 +8,8 @@ gemspec
 gem 'rake', '~> 13.0'
 
 # type checking
-gem 'steep', require: false
+# Steep 2.x drops Ruby 3.1, which remains in the CI matrix.
+gem 'steep', '~> 1.10', require: false
 
 # testing
 gem 'activerecord', '~> 7.1.0'

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    scenic-cascade (0.1.1)
+    scenic-cascade (0.1.2)
       scenic (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    abbrev (0.1.1)
     actionpack (7.1.6)
       actionview (= 7.1.6)
       activesupport (= 7.1.6)
@@ -58,7 +57,7 @@ GEM
     concurrent-ruby (1.3.7)
     connection_pool (2.4.1)
     crass (1.0.8)
-    csv (3.2.8)
+    csv (3.3.7)
     database_cleaner-active_record (2.1.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
@@ -68,8 +67,10 @@ GEM
     drb (2.2.0)
       ruby2_keywords
     erubi (1.12.0)
-    ffi (1.16.3)
-    fileutils (1.7.2)
+    ffi (1.17.4-aarch64-linux-musl)
+    ffi (1.17.4-arm64-darwin)
+    ffi (1.17.4-x86_64-linux-gnu)
+    fileutils (1.8.1)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     io-console (0.6.0)
@@ -77,8 +78,9 @@ GEM
       rdoc
       reline (>= 0.3.8)
     json (2.7.1)
-    language_server-protocol (3.17.0.3)
-    listen (3.8.0)
+    language_server-protocol (3.17.0.6)
+    listen (3.10.1)
+      logger
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.6.0)
@@ -86,7 +88,7 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     minitest (5.20.0)
-    mutex_m (0.2.0)
+    mutex_m (0.3.0)
     nokogiri (1.18.10-aarch64-linux-musl)
       racc (~> 1.4)
     nokogiri (1.18.10-arm64-darwin)
@@ -129,10 +131,11 @@ GEM
     rainbow (3.1.1)
     rake (13.1.0)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbs (3.3.2)
-      abbrev
+    rbs (3.10.4)
+      logger
+      tsort
     rdoc (6.6.3.1)
       psych (>= 4.0.0)
     regexp_parser (2.8.3)
@@ -201,31 +204,34 @@ GEM
       simplecov (~> 0.19)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    steep (1.6.0)
+    steep (1.10.0)
       activesupport (>= 5.1)
       concurrent-ruby (>= 1.1.10)
       csv (>= 3.0.9)
       fileutils (>= 1.1.0)
       json (>= 2.1.0)
-      language_server-protocol (>= 3.15, < 4.0)
+      language_server-protocol (>= 3.17.0.4, < 4.0)
       listen (~> 3.0)
       logger (>= 1.3.0)
+      mutex_m (>= 0.3.0)
       parser (>= 3.1)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (>= 3.1.0)
+      rbs (~> 3.9)
       securerandom (>= 0.1)
       strscan (>= 1.0.0)
-      terminal-table (>= 2, < 4)
+      terminal-table (>= 2, < 5)
+      uri (>= 0.12.0)
     stringio (3.2.0)
-    strscan (3.1.0)
-    terminal-table (3.0.2)
-      unicode-display_width (>= 1.1.1, < 3)
+    strscan (3.1.8)
+    terminal-table (4.0.0)
+      unicode-display_width (>= 1.1.1, < 4)
     thor (1.4.0)
     timeout (0.4.1)
     tsort (0.2.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
+    uri (1.1.2)
     webrick (1.8.2)
     zeitwerk (2.6.12)
 
@@ -250,7 +256,7 @@ DEPENDENCIES
   scenic-cascade!
   simplecov
   simplecov-cobertura (~> 3.2)
-  steep
+  steep (~> 1.10)
 
 BUNDLED WITH
    2.4.22

data/Steepfile

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
-target :lib
+target :lib do
+  signature 'sig'
+  check 'lib'
+end
 
 # target :test do
 #   signature "sig", "sig-private"

data/lib/generators/scenic/view/cascade/cascade_generator.rb

@@ -11,6 +11,11 @@ module Scenic
       class CascadeGenerator < Scenic::Generators::ViewGenerator
         source_root File.expand_path('templates', __dir__ || '.')
 
+        def create_view_definition
+          dependents unless destroying? || creating_new_view?
+          super
+        end
+
         def create_migration_file
           if creating_new_view? || destroying_initial_view?
             migration_template('db/migrate/create_view.rb.erb',
@@ -24,7 +29,8 @@ module Scenic
         private
 
         def dependents
-          return @dependents if @dependents.present?
+          cached_dependents = @dependents
+          return cached_dependents unless cached_dependents.nil?
 
           deps = Scenic::Cascade.view_dependents_of(plural_name, recursive: true)
           views = deps.map { |dep| view_with_version_for(dep) }
@@ -34,7 +40,10 @@ module Scenic
 
         def view_with_version_for(dep)
           name = dep.from.name
-          version = Scenic::Cascade.find_latest_definition_of(name).version.to_i
+          definition = Scenic::Cascade.find_definitions_of(name).last
+          raise ArgumentError, "Dependent view #{name} has no Scenic definition file" if definition.nil?
+
+          version = definition.version.to_i
           Scenic::Cascade::ViewWithVersion.new(name: name, version: version, materialized: dep.from.materialized?)
         end
       end

data/lib/scenic/cascade/definition_finder.rb

@@ -14,7 +14,13 @@ module Scenic
       # Provides class methods to injected class
       module ClassMethods
         def find_definitions_of(view_name)
-          go(view_name, 1)
+          first_path = Scenic::Definition.new(view_name, 1).full_path
+          directory = first_path.dirname
+          return [] unless directory.directory?
+
+          prefix = first_path.basename.to_s.sub(/\d+\.sql\z/, '')
+          directory.children.map { |path| definition_at(path, view_name, prefix) }
+                   .compact.sort_by { |definition| definition.version.to_i }
         end
 
         def find_latest_definition_of(view_name)
@@ -29,11 +35,16 @@ module Scenic
 
         private
 
-        def go(view_name, version)
-          definition = Scenic::Definition.new(view_name, version)
-          return [] unless File.exist?(definition.full_path)
+        def definition_at(path, view_name, prefix)
+          return unless path.file?
+
+          match = /\A#{Regexp.escape(prefix)}(?<version>\d+)\.sql\z/.match(path.basename.to_s)
+          return unless match && match[:version].to_i.positive?
+
+          definition = Scenic::Definition.new(view_name, match[:version].to_i)
+          return definition if definition.full_path == path
 
-          [definition, *go(view_name, version + 1)]
+          raise ArgumentError, "Noncanonical view definition #{path}; expected #{definition.full_path}"
         end
       end
     end

data/lib/scenic/cascade/version.rb

@@ -2,6 +2,6 @@
 
 module Scenic
   module Cascade
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

data/rbs_collection.lock.yaml

@@ -6,7 +6,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 73137fe17c719cf52eaf099d541c0fbd9192500e
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: actionview
@@ -14,47 +14,67 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 73137fe17c719cf52eaf099d541c0fbd9192500e
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activemodel
-  version: '6.0'
+  version: '7.1'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 73137fe17c719cf52eaf099d541c0fbd9192500e
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activerecord
-  version: '6.1'
+  version: '7.1'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 73137fe17c719cf52eaf099d541c0fbd9192500e
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: activesupport
-  version: '6.0'
+  version: '7.0'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 73137fe17c719cf52eaf099d541c0fbd9192500e
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: base64
+  version: '0.1'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: benchmark
   version: '0'
   source:
     type: stdlib
 - name: bigdecimal
-  version: '0'
+  version: '3.1'
   source:
-    type: stdlib
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: cgi
+  version: '0.5'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: concurrent-ruby
   version: '1.1'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 20e6e0f0685139dbd29df50e03367e222aa5d1b8
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: connection_pool
@@ -62,7 +82,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 20e6e0f0685139dbd29df50e03367e222aa5d1b8
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: date
@@ -73,6 +93,26 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: delegate
+  version: '0'
+  source:
+    type: stdlib
+- name: diff-lcs
+  version: '1.5'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: digest
+  version: '0'
+  source:
+    type: stdlib
+- name: erb
+  version: '0'
+  source:
+    type: stdlib
 - name: fileutils
   version: '0'
   source:
@@ -82,7 +122,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 73137fe17c719cf52eaf099d541c0fbd9192500e
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: io-console
@@ -94,25 +134,33 @@ gems:
   source:
     type: stdlib
 - name: minitest
-  version: '0'
+  version: '5.25'
   source:
-    type: stdlib
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: monitor
   version: '0'
   source:
     type: stdlib
 - name: mutex_m
-  version: '0'
+  version: 0.3.0
   source:
-    type: stdlib
+    type: rubygems
 - name: nokogiri
   version: '1.11'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 73137fe17c719cf52eaf099d541c0fbd9192500e
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
+- name: openssl
+  version: '0'
+  source:
+    type: stdlib
 - name: pathname
   version: '0'
   source:
@@ -125,12 +173,20 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: racc
+  version: '1.8'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 - name: rack
-  version: 2.2.2
+  version: '2.2'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 73137fe17c719cf52eaf099d541c0fbd9192500e
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rails-dom-testing
@@ -138,7 +194,15 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 20e6e0f0685139dbd29df50e03367e222aa5d1b8
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: rails-html-sanitizer
+  version: '1.6'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: railties
@@ -146,7 +210,7 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 73137fe17c719cf52eaf099d541c0fbd9192500e
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rake
@@ -154,23 +218,39 @@ gems:
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 20e6e0f0685139dbd29df50e03367e222aa5d1b8
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: rdoc
   version: '0'
   source:
     type: stdlib
+- name: securerandom
+  version: '0'
+  source:
+    type: stdlib
 - name: singleton
   version: '0'
   source:
     type: stdlib
+- name: socket
+  version: '0'
+  source:
+    type: stdlib
+- name: stringio
+  version: '0'
+  source:
+    type: stdlib
+- name: tempfile
+  version: '0'
+  source:
+    type: stdlib
 - name: thor
   version: '1.2'
   source:
     type: git
     name: ruby/gem_rbs_collection
-    revision: 20e6e0f0685139dbd29df50e03367e222aa5d1b8
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     remote: https://github.com/ruby/gem_rbs_collection.git
     repo_dir: gems
 - name: time
@@ -185,4 +265,24 @@ gems:
   version: '0'
   source:
     type: stdlib
+- name: tzinfo
+  version: '2.0'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
+- name: uri
+  version: '0'
+  source:
+    type: stdlib
+- name: zeitwerk
+  version: '2.8'
+  source:
+    type: git
+    name: ruby/gem_rbs_collection
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
+    remote: https://github.com/ruby/gem_rbs_collection.git
+    repo_dir: gems
 gemfile_lock_path: Gemfile.lock

data/rbs_collection.yaml

@@ -2,7 +2,9 @@
 sources:
   - name: ruby/gem_rbs_collection
     remote: https://github.com/ruby/gem_rbs_collection.git
-    revision: main
+    # To refresh upstream signatures, update this SHA, then run:
+    # bundle exec rbs collection update && bundle exec rbs collection install
+    revision: 9e17daa08b1710667699a208981cffd21dbf15f6
     repo_dir: gems
 
 # A directory to install the downloaded RBSs
@@ -13,10 +15,3 @@ gems:
   # It's unnecessary if you don't use rbs as a library.
   - name: rbs
     ignore: true
-  # Racc is not used directly, and its current signatures require a newer RBS parser.
-  - name: racc
-    ignore: true
-  # The CGI gem's signatures depend on StringIO signatures absent from RBS 3.3.2.
-  # CGI is not used by this library directly.
-  - name: cgi
-    ignore: true

data/sig/generators/scenic/view/cascade/cascade_generator.rbs

@@ -2,11 +2,15 @@ module Scenic
   module Generators
     module View
       class CascadeGenerator < Scenic::Generators::ViewGenerator
+        @dependents: Array[Scenic::Cascade::ViewWithVersion]?
+
+        def create_view_definition: -> void
         def create_migration_file: -> void
 
         private
 
         def dependents: -> Array[Scenic::Cascade::ViewWithVersion]
+        def view_with_version_for: (Scenic::Cascade::Dependency) -> Scenic::Cascade::ViewWithVersion
       end
     end
   end

data/sig/generators/scenic/view/view_generator.rbs

@@ -2,13 +2,18 @@ module Scenic
   module Generators
     class ViewGenerator
       def self.source_root: (String?) -> void
-      def plural_name: -> String
-      def plural_file_name: -> String
       def migration_template: (String, String) -> void
 
+      def create_view_definition: -> void
+      def version: -> Integer
+
+      private
+
+      def plural_name: -> String
+      def plural_file_name: -> String
       def creating_new_view?: -> bool
+      def destroying?: -> bool
       def destroying_initial_view?: -> bool
-      def version: -> String
     end
   end
 end

data/sig/scenic/cascade/definition_finder.rbs

@@ -7,7 +7,7 @@ module Scenic
 
         private
 
-        def go: (String, Integer) -> Array[Scenic::Definition]
+        def definition_at: (Pathname, String, String) -> Scenic::Definition?
       end
     end
   end

data/sig/scenic/cascade/view.rbs

@@ -7,10 +7,12 @@ module Scenic
 
     class View
       attr_reader name: String
+      @materialized: bool
 
       def initialize: (name: String, materialized: bool) -> void
 
       def materialized?: -> bool
+      def formatted_name: -> String
 
       def ==: (_ViewLike) -> bool
 

data/sig/scenic/cascade/view_with_version.rbs

@@ -12,6 +12,10 @@ module Scenic
       def initialize: (name: String, version: Integer, materialized: bool) -> void
 
       def ==: (_ViewWithVersionLike) -> bool
+
+      private
+
+      def formatted_version: -> String
     end
   end
 end

data/sig/scenic/cascade.rbs

@@ -2,7 +2,7 @@ module Scenic
   module Cascade
     VERSION: String
 
-    def self.find_definitions_of: (String) -> Scenic::Definition
+    def self.find_definitions_of: (String) -> Array[Scenic::Definition]
     def self.find_latest_definition_of: (String) -> Scenic::Definition
 
     def self.view_dependents_of: (String, ?recursive: bool) -> Array[Dependency]

data/sig/scenic/definition.rbs

@@ -1,5 +1,5 @@
 module Scenic
-  module Definition
+  class Definition
     def self.new: (String, Integer) -> Scenic::Definition
 
     def full_path: -> Pathname

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scenic-cascade
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Akiomi Kamakura