rivet_cms 0.1.1.pre → 0.1.2.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4ab85871fd2fb7a01b149fb1d70b99e7683c87d22e028c337c3029257162dfa
-  data.tar.gz: 7854daa20f72debd1f2efc10bb9f0593b7d4912629dad6ae0accb8ee04e32b88
+  metadata.gz: 876703a8ca3148fbd0c7c01cbee963fc854e37c1efbc94375205c7a22d7cc78b
+  data.tar.gz: 369344dbf9c17af9ad639509a7cb78121314f1a26f80844ba16bce5b59d6311f
 SHA512:
-  metadata.gz: 73eedb4dbfb8dd8e456ac72c43cf7040965a0a2ce4418a4220ff54f60b6f054c203eeb3b5ffdd098812e836f707138006a47c349c30b36101a76f8646fad382e
-  data.tar.gz: 818fe99cd5bcc199bbcc53763bceb1c4f460dce246dedf0aad1636fd3add63c3627abd3ccc57f37722448bef7f1f17a156b5dc37d677b2470bb335ce63d0920e
+  metadata.gz: b19547659ff8ee822a41c7a4e28d4de0e8f9a8767e2576e4334f5bde2245e6b10c7d677fa1ae238ffac55b7d68d0eff0575eef87c26504ccbf9bc5dd4feae965
+  data.tar.gz: 8447100f98fa858d23667c2d686c357fa630a08d974a6595c9da4833eb4c2e8313cbcd2453ca5df686eddd6f6c6bd493fb2afd5cf9fea0f0f9282744c254d17d

data/README.md

@@ -26,3 +26,9 @@ Contribution directions go here.
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Acknowledgments
+
+This project includes code adapted from or inspired by:
+
+- [Spree Commerce](https://github.com/spree/spree) - Route handling pattern for extensible engines (MIT License)

data/config/routes.rb

@@ -1,58 +1,58 @@
-RivetCms::Routes.add_routes do
-  get '/', to: "dashboard#index"
+RivetCms::Engine.routes.draw do
+  RivetCms::Routes.add_routes do
+    get '/', to: "dashboard#index"
 
-  # Content Type Management
-  resources :content_types, path: 'content-types' do
-    resources :fields, except: [:show] do
-      collection do
-        post :update_positions
-      end
-      member do
-        patch :update_width
+    # Content Type Management
+    resources :content_types, path: 'content-types' do
+      resources :fields, except: [:show] do
+        collection do
+          post :update_positions
+        end
+        member do
+          patch :update_width
+        end
       end
+      resources :contents
     end
-    resources :contents
-  end
 
-  # Component Management
-  resources :components do
-    resources :fields, except: [:show] do
-      collection do
-        post :update_positions
+    # Component Management
+    resources :components do
+      resources :fields, except: [:show] do
+        collection do
+          post :update_positions
+        end
       end
     end
-  end
 
-  # API Documentation
-  namespace :api do
-    resource :docs, only: [:show]
-  end
+    # API Documentation
+    namespace :api do
+      resource :docs, only: [:show]
+    end
 
-  # Helper method to check if content type exists and matches the collection/single type
-  content_type_exists = ->(slug, is_collection) {
-    RivetCMS::ContentType.exists?(slug: slug, is_single: !is_collection)
-  }
+    # Helper method to check if content type exists and matches the collection/single type
+    content_type_exists = ->(slug, is_collection) {
+      RivetCMS::ContentType.exists?(slug: slug, is_single: !is_collection)
+    }
 
-  # API routes with versioning
-  namespace :api do
-    namespace :v1 do
-      # Dynamic routes for content types
-      get ':slug', to: 'content#index', constraints: ->(req) { content_type_exists.call(req.params[:slug], true) }
-      post ':slug', to: 'content#create', constraints: ->(req) { content_type_exists.call(req.params[:slug], true) }
-      get ':slug/:id', to: 'content#show', constraints: ->(req) { content_type_exists.call(req.params[:slug], true) }
-      put ':slug/:id', to: 'content#update', constraints: ->(req) { content_type_exists.call(req.params[:slug], true) }
-      patch ':slug/:id', to: 'content#update', constraints: ->(req) { content_type_exists.call(req.params[:slug], true) }
-      delete ':slug/:id', to: 'content#destroy', constraints: ->(req) { content_type_exists.call(req.params[:slug], true) }
+    # API routes with versioning
+    namespace :api do
+      namespace :v1 do
+        # Dynamic routes for content types
+        get ':slug', to: 'content#index', constraints: ->(req) { content_type_exists.call(req.params[:slug], true) }
+        post ':slug', to: 'content#create', constraints: ->(req) { content_type_exists.call(req.params[:slug], true) }
+        get ':slug/:id', to: 'content#show', constraints: ->(req) { content_type_exists.call(req.params[:slug], true) }
+        put ':slug/:id', to: 'content#update', constraints: ->(req) { content_type_exists.call(req.params[:slug], true) }
+        patch ':slug/:id', to: 'content#update', constraints: ->(req) { content_type_exists.call(req.params[:slug], true) }
+        delete ':slug/:id', to: 'content#destroy', constraints: ->(req) { content_type_exists.call(req.params[:slug], true) }
 
-      # Routes for single type content
-      get ':slug', to: 'single#show', constraints: ->(req) { content_type_exists.call(req.params[:slug], false) }
-      put ':slug', to: 'single#update', constraints: ->(req) { content_type_exists.call(req.params[:slug], false) }
-      patch ':slug', to: 'single#update', constraints: ->(req) { content_type_exists.call(req.params[:slug], false) }
-      post ':slug', to: 'single#update', constraints: ->(req) { content_type_exists.call(req.params[:slug], false) }
+        # Routes for single type content
+        get ':slug', to: 'single#show', constraints: ->(req) { content_type_exists.call(req.params[:slug], false) }
+        put ':slug', to: 'single#update', constraints: ->(req) { content_type_exists.call(req.params[:slug], false) }
+        patch ':slug', to: 'single#update', constraints: ->(req) { content_type_exists.call(req.params[:slug], false) }
+        post ':slug', to: 'single#update', constraints: ->(req) { content_type_exists.call(req.params[:slug], false) }
+      end
     end
   end
-end
 
-RivetCms::Engine.routes.draw do
   RivetCms::Routes.draw_routes
 end

data/lib/rivet_cms/routes.rb

@@ -1,39 +1,49 @@
+# Route handling pattern adapted from Spree Commerce
+# https://github.com/spree/spree/blob/839866a32845009d8a1fdf21cb7201e99f6ff49c/core/lib/spree/core/routes.rb
+# License: MIT - https://github.com/spree/spree/blob/main/LICENSE.md
+
 module RivetCms
   module Routes
     def self.draw_routes(&block)
       @rivet_routes ||= []
       @append_routes ||= []
 
-      # Evaluate the passed block first if given
+      # Evaluate an immediate block 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) }
+      # Evaluate stored main routes
+      @rivet_routes.each { |route_block| eval_block(&route_block) }
+
+      # Evaluate appended routes
+      @append_routes.each { |route_block| eval_block(&route_block) }
 
-      # Clear routes to prevent drawing twice
+      # Clear routes to avoid duplication on subsequent calls
       @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)
+      store_route(@rivet_routes, &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)
+      store_route(@append_routes, &block)
     end
 
     private
 
+    # Helper method for safely storing a route block in the given collection.
+    def self.store_route(collection, &block)
+      collection << block unless collection.include?(block)
+    end
+
+    # Evaluate a block within the context of the engine's routes.
     def self.eval_block(&block)
-      RivetCms::Engine.routes.send(:eval_block, block)
+      RivetCms::Engine.routes.draw do
+        instance_exec(&block)
+      end
     end
   end
-end 
+end

data/lib/rivet_cms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rivet_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.1.pre
+  version: 0.1.2.pre
 platform: ruby
 authors:
 - Nathan Williams