optimacms 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf64180dc36b5fa4e9f0a965d4876c3e60f1fcae
-  data.tar.gz: e39f18d55e0174be134dd5e2f2a5c1b9e721c551
+  metadata.gz: 7bef3151c386d3f2010aea623879adb69f327323
+  data.tar.gz: 3d58922701c88a7eede7cc0776f3fa29ab02083e
 SHA512:
-  metadata.gz: df4dd642f28cab6fe0d854709362d6be529489d671669cb4e64ac771c626811f8920b1f87024a7a918f4370522f82da2f7c2c2d3bd8f523edb6277cd60f72e7d
-  data.tar.gz: df03a2f62ed057ed1a5727650df97b5224d4a981e0b5551a9a702a4724158f85d98036d5185670219fadaa851f93c71a74cdaaad4b155c7cf3ccd5e5f597946f
+  metadata.gz: 0bd6252d6156aa11a7c2b673d06363110f8cea9942469dc0fd8eb1060400ec1db2e9a3eadbaded4333be11ffb8248e3de0381bf50efff0b04d1901d354c3f055
+  data.tar.gz: 9aef72234c545d6ec4c78bc131bc6f5bfad98c5c30f590a265e60d536e193d4dc9792cf9da931265f3df19bc87ba9c86c0d4f02df70fb4909492011d070a416d

data/config/routes.rb

@@ -1,7 +1,7 @@
 Optimacms::Engine.routes.draw do
 
   # admin
-  scope '/cmsadmin', module: "admin" do
+  scope '/'+Optimacms.admin_namespace, module: "admin" do
     #devise_for :users, { class_name: "Optimacms::User", module: :devise }
 
     get '/' => 'dashboard#index', as: :dashboard

data/lib/optimacms/devise.rb

@@ -7,7 +7,7 @@ module Optimacms
     def self.config
       {
           class_name: "Optimacms::CmsAdminUser",
-          path: '/cmsadmin',
+          path: '/'+Optimacms.main_namespace+'/'+Optimacms.admin_namespace,
           #path: ActiveAdmin.application.default_namespace || "/",
           controllers: Optimacms::Devise.controllers,
           path_names: { sign_in: 'login', sign_out: "logout" },

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/optimacms.rb

@@ -9,4 +9,17 @@ module Optimacms
   end
 
 
+  #
+  mattr_accessor :main_namespace
+  def main_namespace
+    @@main_namespace || ''
+  end
+
+
+  #
+  mattr_accessor :admin_namespace
+  def admin_namespace
+    @@admin_namespace || 'admin'
+  end
+
 end

data/spec/dummy/app/views/home/index.html.haml

@@ -1,6 +1,6 @@
 %h2 Admin
 %ul
-  %li= link_to '/cmsadmin', '/cmsadmin'
+  %li= link_to 'admin area', '/'+Optimacms.main_namespace+'/'+Optimacms.admin_namespace
 
 %h2 Users
 %ul
@@ -16,4 +16,4 @@
   %li= link_to '/newsitem-1.html', '/newsitem-1.html'
   %li= link_to '/services.html', '/services.html'
   %li= link_to '/service-education.html', '/service-education.html'
-  %li= link_to '/service-hosting.html', '/service-hosting.html'
+  %li= link_to '/service-hosting.html', '/service-hosting.html'

data/spec/dummy/config/database.yml

@@ -19,7 +19,11 @@ default: &default
 
 development:
   <<: *default
-  database: my_cms
+  host: <%= Rails.application.secrets.db_host %>
+  database: <%= Rails.application.secrets.db %>
+  username: <%= Rails.application.secrets.db_user %>
+  password: <%= Rails.application.secrets.db_password %>
+
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".

data/spec/dummy/config/initializers/optimacms.rb

@@ -1 +1,4 @@
-Optimacms.files_dir_path = 'img'
+Optimacms.main_namespace = '' # blank or any like 'cms'
+Optimacms.admin_namespace = 'admin'
+
+Optimacms.files_dir_path = 'img'

data/spec/dummy/config/routes.rb

@@ -11,7 +11,7 @@ Rails.application.routes.draw do
 
 
   # extend admin area
-  scope '/cmsadmin', module: "optimacms" do
+  scope '/'+Optimacms.main_namespace+'/'+Optimacms.admin_namespace, module: "optimacms" do
     namespace :admin do
       resources :news do
         collection do
@@ -23,7 +23,7 @@ Rails.application.routes.draw do
 
 
   # the last!!!
-  mount Optimacms::Engine => "/"
+  mount Optimacms::Engine => '/'+Optimacms.main_namespace
 
   #
   root to: 'home#index'

data/spec/dummy/config/secrets.yml

@@ -13,6 +13,12 @@
 development:
   secret_key_base: e135e2b53ab10b0afff68c3f7f0d96e491146342113ab6e1c38409af772139d5317e3da8946ef9f6e6474eb937bc86c11ffe8406c2f9c2369fb6ec1a5b9c4d3b
 
+  db: my_cms
+  db_host: devapi.gex
+  db_user: dev_gex
+  db_password: Galactic1
+
+
 test:
   secret_key_base: 8ab08b04db9f09047e4333306df25eab59472443ee5574b8fd0feb8873b17f97afe924e3380ad50f6197718707d8c474cd7578bd9deb6f708b83072e5e89226f
 

data/spec/dummy/db/schema.rb

@@ -11,12 +11,12 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150610225422) do
+ActiveRecord::Schema.define(version: 20150513224341) do
 
   create_table "cms_languages", force: :cascade do |t|
     t.string  "title",     limit: 250
     t.string  "lang",      limit: 4
-    t.boolean "enabled",   limit: 1,   default: true,              null: false
+    t.boolean "enabled",               default: true,              null: false
     t.string  "charset",   limit: 15,  default: "utf8_unicode_ci", null: false
     t.string  "locale",    limit: 255,                             null: false
     t.string  "lang_html", limit: 10,                              null: false
@@ -44,31 +44,30 @@ ActiveRecord::Schema.define(version: 20150610225422) do
     t.string   "parsed_url",        limit: 255
     t.integer  "parent_id",         limit: 4,   default: 0,     null: false
     t.string   "view_path",         limit: 255
-    t.boolean  "is_translated",     limit: 1,   default: false, null: false
+    t.boolean  "is_translated",                 default: false, null: false
     t.integer  "status",            limit: 4,   default: 0,     null: false
     t.integer  "pos",               limit: 4,   default: 0,     null: false
     t.string   "redir_url",         limit: 255
     t.integer  "template_id",       limit: 4
     t.integer  "layout_id",         limit: 4
     t.integer  "owner",             limit: 4
-    t.boolean  "is_folder",         limit: 1,   default: false, null: false
+    t.boolean  "is_folder",                     default: false, null: false
     t.string   "controller_action", limit: 255
     t.datetime "created_at",                                    null: false
     t.datetime "updated_at",                                    null: false
     t.integer  "enabled",           limit: 1,   default: 1,     null: false
   end
 
-  add_index "cms_pages", ["name"], name: "index_cms_pages_on_name", using: :btree
   add_index "cms_pages", ["parent_id"], name: "parent_id", using: :btree
   add_index "cms_pages", ["status"], name: "status", using: :btree
   add_index "cms_pages", ["url"], name: "url", using: :btree
 
   create_table "cms_pages_translation", force: :cascade do |t|
-    t.integer "item_id",           limit: 4,     default: 0, null: false
+    t.integer "item_id",           limit: 4,   default: 0, null: false
     t.integer "page_id",           limit: 4
-    t.string  "lang",              limit: 5,                 null: false
+    t.string  "lang",              limit: 5,               null: false
     t.string  "meta_title",        limit: 255
-    t.text    "meta_description",  limit: 65535
+    t.string  "meta_description",  limit: 255
     t.string  "meta_keywords",     limit: 255
     t.string  "template_filename", limit: 255
   end
@@ -86,11 +85,11 @@ ActiveRecord::Schema.define(version: 20150610225422) do
     t.integer  "type_id",       limit: 1
     t.string   "tpl_format",    limit: 255
     t.integer  "pos",           limit: 4
-    t.boolean  "is_translated", limit: 1,   default: false, null: false
+    t.boolean  "is_translated",             default: false, null: false
     t.datetime "created_at",                                null: false
     t.datetime "updated_at",                                null: false
-    t.boolean  "is_folder",     limit: 1,   default: false, null: false
-    t.boolean  "enabled",       limit: 1,   default: true,  null: false
+    t.boolean  "is_folder",                 default: false, null: false
+    t.boolean  "enabled",                   default: true,  null: false
     t.string   "ancestry",      limit: 255
   end
 
@@ -129,13 +128,6 @@ ActiveRecord::Schema.define(version: 20150610225422) do
   add_index "cms_users", ["email"], name: "index_optimacms_cms_users_on_email", unique: true, using: :btree
   add_index "cms_users", ["reset_password_token"], name: "index_optimacms_cms_users_on_reset_password_token", unique: true, using: :btree
 
-  create_table "news", force: :cascade do |t|
-    t.string   "title",       limit: 255
-    t.text     "description", limit: 65535
-    t.datetime "created_at",                null: false
-    t.datetime "updated_at",                null: false
-  end
-
   create_table "optimacms_articles", force: :cascade do |t|
     t.string   "title",      limit: 255
     t.text     "text",       limit: 65535
@@ -143,6 +135,24 @@ ActiveRecord::Schema.define(version: 20150610225422) do
     t.datetime "updated_at",               null: false
   end
 
+  create_table "optimacms_cms_users", force: :cascade do |t|
+    t.string   "email",                  limit: 255, default: "", null: false
+    t.string   "encrypted_password",     limit: 255, default: "", null: false
+    t.string   "reset_password_token",   limit: 255
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",          limit: 4,   default: 0,  null: false
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip",     limit: 255
+    t.string   "last_sign_in_ip",        limit: 255
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "optimacms_cms_users", ["email"], name: "index_optimacms_cms_users_on_email", unique: true, using: :btree
+  add_index "optimacms_cms_users", ["reset_password_token"], name: "index_optimacms_cms_users_on_reset_password_token", unique: true, using: :btree
+
   create_table "users", force: :cascade do |t|
     t.string   "email",                  limit: 255, default: "", null: false
     t.string   "encrypted_password",     limit: 255, default: "", null: false