rivet_cms 0.1.0.pre → 0.1.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80cc85ed4a64302837525fa46d4c3dfa9513929ca29318db4cf6136dcb3db358
-  data.tar.gz: ca6ee6f525a26a5a480d46bfc014dce6fac1636d6da125d8ad59d010d168759a
+  metadata.gz: f4ab85871fd2fb7a01b149fb1d70b99e7683c87d22e028c337c3029257162dfa
+  data.tar.gz: 7854daa20f72debd1f2efc10bb9f0593b7d4912629dad6ae0accb8ee04e32b88
 SHA512:
-  metadata.gz: 89e6857b0d727e9c83601f68186fe08344a17b73395372b30ed40b552252ecfecb5cc56e8a39cd0c332373ec4e8466fdb0cd46ee692851d516d8c3a23f91a2c2
-  data.tar.gz: 7412c588bac4bacf3841f220d55d1c1b5664c19b985f2a86ffe12fb8f7155ec409aa80097b18deeb8d3d4a4b234a2c77058053c675b090427873a6dd83f6a742
+  metadata.gz: 73eedb4dbfb8dd8e456ac72c43cf7040965a0a2ce4418a4220ff54f60b6f054c203eeb3b5ffdd098812e836f707138006a47c349c30b36101a76f8646fad382e
+  data.tar.gz: 818fe99cd5bcc199bbcc53763bceb1c4f460dce246dedf0aad1636fd3add63c3627abd3ccc57f37722448bef7f1f17a156b5dc37d677b2470bb335ce63d0920e

data/config/routes.rb

@@ -1,5 +1,5 @@
-RivetCms::Engine.register_routes do
-  get '/', to: "dashboard#index", as: :dashboard
+RivetCms::Routes.add_routes do
+  get '/', to: "dashboard#index"
 
   # Content Type Management
   resources :content_types, path: 'content-types' do
@@ -53,4 +53,6 @@ RivetCms::Engine.register_routes do
   end
 end
 
-RivetCms::Engine.draw_routes
+RivetCms::Engine.routes.draw do
+  RivetCms::Routes.draw_routes
+end

data/lib/rivet_cms/engine.rb

@@ -4,6 +4,7 @@ require "prefixed_ids"
 require "kaminari"
 require "turbo-rails"
 require "stimulus-rails"
+require "rivet_cms/routes"
 
 module RivetCms
   class Engine < ::Rails::Engine
@@ -21,35 +22,16 @@ module RivetCms
       g.factory_bot dir: 'spec/factories'
     end
 
-    class << self
-      # Accessor for the routes storage
-      def routes_storage
-        # Use a class-level instance variable with a default empty array
-        @routes_storage ||= []
-      end
-
-      # Register route definitions to be drawn later
-      # @param block [Proc] A block containing route definitions
-      def register_routes(&block)
-        routes_storage << block  # Add the block to the storage
-      end
-
-      # Draw all registered routes into the engine's RouteSet
-      def draw_routes
-        # Capture the routes in a local variable before entering the block
-        stored_routes = routes_storage
+    def self.add_routes(&block)
+      RivetCms::Routes.add_routes(&block)
+    end
 
-        # Use the engine's routes.draw method to provide the proper routing context
-        routes.draw do
-          # Iterate over the captured routes
-          stored_routes.each do |route_block|
-            instance_eval(&route_block)
-          end
-        end
+    def self.append_routes(&block)
+      RivetCms::Routes.append_routes(&block)
+    end
 
-        # Clear the routes to prevent re-drawing if called again
-        routes_storage.clear
-      end
+    def self.draw_routes(&block)
+      RivetCms::Routes.draw_routes(&block)
     end
   end
 end

data/lib/rivet_cms/routes.rb

@@ -0,0 +1,39 @@
+module RivetCms
+  module Routes
+    def self.draw_routes(&block)
+      @rivet_routes ||= []
+      @append_routes ||= []
+
+      # Evaluate the passed block first if given
+      eval_block(block) if block_given?
+
+      # Draw main routes
+      @rivet_routes.each { |r| eval_block(&r) }
+      
+      # Draw appended routes
+      @append_routes.each { |r| eval_block(&r) }
+
+      # Clear routes to prevent drawing twice
+      @rivet_routes = []
+      @append_routes = []
+    end
+
+    def self.add_routes(&block)
+      @rivet_routes ||= []
+      # Store the block unless it's already been added
+      @rivet_routes << block unless @rivet_routes.include?(block)
+    end
+
+    def self.append_routes(&block)
+      @append_routes ||= []
+      # Store the block unless it's already been added
+      @append_routes << block unless @append_routes.include?(block)
+    end
+
+    private
+
+    def self.eval_block(&block)
+      RivetCms::Engine.routes.send(:eval_block, block)
+    end
+  end
+end 

data/lib/rivet_cms/version.rb

@@ -1,3 +1,3 @@
 module RivetCms
-  VERSION = "0.1.0.pre"
+  VERSION = "0.1.1.pre"
 end

data/lib/rivet_cms.rb

@@ -1,7 +1,10 @@
 require "rivet_cms/version"
+require "rivet_cms/routes"
 require "rivet_cms/engine"
 
 module RivetCms
+  class Error < StandardError; end
+
   class << self
     def configuration
       @configuration ||= Configuration.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rivet_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.1.1.pre
 platform: ruby
 authors:
 - Nathan Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-28 00:00:00.000000000 Z
+date: 2025-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -199,6 +199,7 @@ files:
 - db/migrate/20250317194359_create_core_tables.rb
 - lib/rivet_cms.rb
 - lib/rivet_cms/engine.rb
+- lib/rivet_cms/routes.rb
 - lib/rivet_cms/version.rb
 - lib/tasks/rivet_cms_tasks.rake
 homepage: https://github.com/narch/rivet_cms