pages_cms 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1d8e40a08b90874d9c0018904a0f35284ae192a
-  data.tar.gz: 49847e2314b9311a61a101a5a76a480816c5537c
+  metadata.gz: 83d9122d822001c70fd71c92536a9addfd33259e
+  data.tar.gz: 557bb0a3680f40ed83ebbd653c500ce5bd68401c
 SHA512:
-  metadata.gz: a37622ed0c4b48c01e1acc5060ad493993fda11fddc476d1bdbedb118c65f34bdcda7ad4bef13c9ab2d183e6dd46548278d6cedd063a08ccccfa4d7c45b21c17
-  data.tar.gz: 7275866ae92cb97f5f016e45818c4ddc69e9084069335c2f7f6b9c24e59276479e603881d2ee373de14f708cf91c6f4073e10de4796feb69b4d01194781206c7
+  metadata.gz: 89e20948af6c2393be3cb422b005c8c420c746c5d36b8daf7642e967f4aa5c1a265a0b720d36966b5daced25d13502a0cb519ad1dc370059e85b5c14a694f815
+  data.tar.gz: aedef50c6f1ea061287f904ffd16966efbf3801c57a01bbf487bbcbd0b4f30c75131f47e03f542ea9d06d13cacee1148cbfe3b7d867ec8bd8c204f360e38ed87

data/config/routes.rb

@@ -13,34 +13,25 @@ PagesCms::Engine.routes.draw do
     post '/pages/order'   => 'pages#order'
     post '/accounts/site' => 'accounts#site'
   end
-
-  # # mainly for deploying to heroku, keeps it from throwing an error before the db is deployed.
-  # def db_exists?
-  #   ActiveRecord::Base.connection
-  # rescue ActiveRecord::NoDatabaseError
-  #   false
-  # else
-  #   true
-  # end
-  # db_exists? &&
-
-  # draws all the routes for the CMS. The root account (raccount) is drawn last to avoid conflicts.
-  # :slug is the main way to identify the page, as well as the account.id.
-  if PagesCms.const_defined?('Account')
-    accounts = PagesCms::Account.where("mount_location != '/'")
-    raccount = PagesCms::Account.find_by(mount_location: '/')
-    if accounts
-      accounts.each do |account|
-        get "/#{account.mount_location}/:parent/:slug"  => 'pages#show', account: account.id
-        get "/#{account.mount_location}/:slug"          => 'pages#show', account: account.id
-        get "/#{account.mount_location}/"               => 'pages#home', account: account.id
+  begin
+    if PagesCms.const_defined?('Account')
+      accounts = PagesCms::Account.where("mount_location != '/'")
+      raccount = PagesCms::Account.find_by(mount_location: '/')
+      if accounts
+        accounts.each do |account|
+          get "/#{account.mount_location}/:parent/:slug"  => 'pages#show', account: account.id
+          get "/#{account.mount_location}/:slug"          => 'pages#show', account: account.id
+          get "/#{account.mount_location}/"               => 'pages#home', account: account.id
+        end
+      end
+      if raccount
+        get '/:parent/:slug'  => 'pages#show', account: raccount.id, root: true
+        get '/:slug'          => 'pages#show', account: raccount.id, root: true
+        get '/'               => 'pages#home', account: raccount.id, root: true, as: :root
       end
     end
-    if raccount
-      get '/:parent/:slug'  => 'pages#show', account: raccount.id, root: true
-      get '/:slug'          => 'pages#show', account: raccount.id, root: true
-      get '/'               => 'pages#home', account: raccount.id, root: true, as: :root
-    end
+  rescue Exception => e
+    nil
   end
 
 end

data/lib/pages_cms/version.rb

@@ -1,3 +1,3 @@
 module PagesCms
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pages_cms
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Colin Walker