ordinary_cms 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e8be57f35af38ec9d9336a78a8b95b1607d18e1
-  data.tar.gz: 500cb6c610d312808d05a3e3a6f4f53ff9e79ac2
+  metadata.gz: 6147aefcc03052efd7d81cbeec60cce328e33fe2
+  data.tar.gz: 6e1603255fadaf7beb11e378ef9ca9fbaad19782
 SHA512:
-  metadata.gz: 7cc1bbd964323b868e4b9992e6e2325c09756dc54cff5a3e78fe24796617132aa90143698ccd906c5f765e4828bfb94b5f20ce5e8c6a1850f84c1ab0502f9430
-  data.tar.gz: 94ca55d089e73e495c864411de79d8d0310d270d373efc1e9fd6f88394eec3dc1299f3287f394875f252e94facf06cd2385ff1ec0dec1b0d22e5e91afe0a7de0
+  metadata.gz: 2c71c8e4076e2240351a0b1e2a9cd23754dde1284e3620fe9a7b4e5a8362bb310f6253f5d72f46fc006869928e6723eedecc2ffc5b1c311bd0240b5fcb73e300
+  data.tar.gz: 1efad14dd7592dc8ef4c9c901e26b89aaac22751a09f1b959dde60ca59eaa3f8004194632562763552ef61ca1a320f701bf32b0cf20feafa4585b79538d761a5

data/app/controllers/ordinary_cms/concerns/smart_pages_render.rb

@@ -0,0 +1,9 @@
+module OrdinaryCms
+  module SmartPagesRender
+    extend ActiveSupport::Concern
+
+    def smart_render(page_name)
+      render template_exists?("ordinary_cms/pages/#{page_name}") ? "ordinary_cms/pages/#{page_name}" : 'ordinary_cms/pages/show'
+    end
+  end
+end

data/app/controllers/ordinary_cms/pages_controller.rb

@@ -1,12 +1,14 @@
 require_dependency "ordinary_cms/application_controller"
-
+require_dependency 'ordinary_cms/concerns/smart_pages_render'
 module OrdinaryCms
   class PagesController < ApplicationController
+    include SmartPagesRender
+
     before_action :set_page, only: [:show, :update]
     before_action ActiveAdmin.application.authentication_method, only: :update
 
     def show
-      request.subdomain
+      smart_render(@page.name)
     end
 
     def update

data/app/controllers/ordinary_cms/root_controller.rb

@@ -1,8 +1,12 @@
+require_dependency "ordinary_cms/application_controller"
+require_dependency 'ordinary_cms/concerns/smart_pages_render'
+
 module OrdinaryCms
   class RootController < ApplicationController
+    include SmartPagesRender
     def show
       @page = Page.find_by root: true
-      render 'ordinary_cms/pages/show'
+      smart_render 'root'
     end
   end
 end

data/lib/ordinary_cms/version.rb

@@ -1,3 +1,3 @@
 module OrdinaryCms
-  VERSION = "0.1.2"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ordinary_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - max-konin
@@ -95,6 +95,7 @@ files:
 - app/assets/javascripts/ordinary_cms/application.js
 - app/assets/stylesheets/ordinary_cms/application.css
 - app/controllers/ordinary_cms/application_controller.rb
+- app/controllers/ordinary_cms/concerns/smart_pages_render.rb
 - app/controllers/ordinary_cms/pages_controller.rb
 - app/controllers/ordinary_cms/root_controller.rb
 - app/helpers/ordinary_cms/application_helper.rb