optimacms 0.1.60 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4861e647ada267722d67aa45679626457ebc454
-  data.tar.gz: b8baf6d6bc098d55094df0508155a01385b5850d
+  metadata.gz: bf64180dc36b5fa4e9f0a965d4876c3e60f1fcae
+  data.tar.gz: e39f18d55e0174be134dd5e2f2a5c1b9e721c551
 SHA512:
-  metadata.gz: 00640f6c5a4a861dec892a7095994ecf4b90b9a3a4117bc43e58a296cb3302c25db2b84145f522ebeb51ac214f831a6b01b6c254142a17b2471ca26035015cb5
-  data.tar.gz: 8fbe2270703698e0e3c0f0d824f16f18ce31b9d182edb126a603c0eac9c3fb796d347ab57c4fb483a9a3539de98ede091c73f12e04878c7deeb97bbb66569f34
+  metadata.gz: df4dd642f28cab6fe0d854709362d6be529489d671669cb4e64ac771c626811f8920b1f87024a7a918f4370522f82da2f7c2c2d3bd8f523edb6277cd60f72e7d
+  data.tar.gz: df03a2f62ed057ed1a5727650df97b5224d4a981e0b5551a9a702a4724158f85d98036d5185670219fadaa851f93c71a74cdaaad4b155c7cf3ccd5e5f597946f

data/app/controllers/optimacms/dev_controller.rb

@@ -24,38 +24,13 @@ module Optimacms
     end
 
     def addadminuser
-      #return
+      return
 
-      row = Optimacms::CmsAdminUser.where(email: 'admin@example.com').first || Optimacms::CmsAdminUser.new
+      row = Optimacms::CmsAdminUser.new
       row.email = 'admin@example.com'
       row.password = 'password'
-      row.password_confirmation = row.password
 
-      row.save!
-    end
-
-    def url1
-      v = '[a-z\d\_]+'
-
-      p = '(:pg)'
-      p.gsub! /(\(\:#{v}\))([-\.]|$)/, '([^/]+|)\2'
-
-      x = 0
-
-    end
-
-    def url2
-      u = "news/3"
-      r = /^news\/([^\/]+|)$/
-
-      if u =~ /^news(\/.*|)$/
-
-        x = $1
-        y = $2
-
-        z=0
-
-      end
+      row.save
     end
   end
 

data/app/controllers/optimacms/pages_controller.rb

@@ -37,7 +37,6 @@ module Optimacms
         c.response = ActionDispatch::Response.new
 
         c.send 'my_set_render'
-        c.send 'optimacms_set_pagedata', @pagedata
         c.send 'my_set_render_template', tpl_view, tpl_layout
         c.send 'my_set_meta', @pagedata.meta
 
@@ -57,7 +56,6 @@ module Optimacms
         #app.response.body
     end
 
-
     def show
       @path = params[:url]
       @pagedata = PageServices::PageRouteService.find_page_by_url(@path, current_lang)
@@ -79,7 +77,6 @@ module Optimacms
         #@content = @pagedata.get_content(@page)
         #@content = @page.content
 
-        optimacms_set_pagedata @pagedata
         my_set_render_template @pagedata.template.path, @pagedata.layout.basename
         my_set_meta @pagedata.meta
 

data/app/helpers/optimacms/application_helper.rb

@@ -23,32 +23,10 @@ module Optimacms
       s.gsub /"/, '\"'
     end
 
-    def url_for(options = nil)
-      #url_for
-      # page processed by CMS
-      if options.present? && options.kind_of?(Hash) && options[:controller]=='optimacms/pages' && options[:action]=='show'
-
-        # get current page name
-        page_name = options[:page_name] || controller.optimacms_pagedata.page.name
-        if page_name.present?
-          u = site_page_path(page_name, options)
-
-          if u.present?
-            return u
-          end
-        end
-      end
-
-      #
-      return super(options)
-    end
-
-
-
     def meta_tags(title=nil, keywords=nil, desc=nil)
-      #s = 'news "11"'
-      #s1 = s.gsub /"/, '\"'
-      #s2 = eval('"'+s1+'"')
+      s = 'news "11"'
+      s1 = s.gsub /"/, '\"'
+      s2 = eval('"'+s1+'"')
       title ||= eval_meta_string(fix_quotes(@optimacms_meta_title))
       keywords ||= eval_meta_string(@optimacms_meta_keywords)
       desc ||= eval_meta_string(@optimacms_meta_description)

data/config/routes.rb

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

data/db/migrate/20150220161150_add_attachment_photo_to_mediafiles.rb

@@ -0,0 +1,11 @@
+class AddAttachmentPhotoToMediafiles < ActiveRecord::Migration
+  def self.up
+    change_table :cms_mediafiles do |t|
+      t.attachment :photo
+    end
+  end
+
+  def self.down
+    remove_attachment :cms_mediafiles, :photo
+  end
+end

data/db/migrate/20150503213839_devise_create_optimacms_cms_users.rb

@@ -0,0 +1,42 @@
+class DeviseCreateOptimacmsCmsUsers < ActiveRecord::Migration
+  def change
+    create_table(:optimacms_cms_users) do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+
+      t.timestamps
+    end
+
+    add_index :optimacms_cms_users, :email,                unique: true
+    add_index :optimacms_cms_users, :reset_password_token, unique: true
+    # add_index :optimacms_cms_users, :confirmation_token,   unique: true
+    # add_index :optimacms_cms_users, :unlock_token,         unique: true
+  end
+end

data/db/migrate/20150610222026_change_meta_description_for_pages.rb

@@ -0,0 +1,13 @@
+class ChangeMetaDescriptionForPages < ActiveRecord::Migration
+  def up
+    change_table :cms_pages_translation do |t|
+      t.change :meta_description, :text
+    end
+  end
+
+  def down
+    change_table :cms_pages_translation do |t|
+      t.change :meta_description, :string
+    end
+  end
+end

data/db/migrate/20150610225422_add_index_name_to_pages.rb

@@ -0,0 +1,11 @@
+class AddIndexNameToPages < ActiveRecord::Migration
+
+  def up
+    add_index :cms_pages, :name
+
+  end
+
+  def down
+    remove_index :cms_pages, :name
+  end
+end

data/lib/optimacms/devise.rb

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

data/lib/optimacms/mycontroller.rb

@@ -12,10 +12,6 @@ module Optimacms
 
     end
 
-    def is_optimacms
-      @is_optimacms
-    end
-
     def default_render(*args)
       if self.controller_name!='pages' && !@optimacms_tpl.nil? && @is_optimacms
         render @optimacms_tpl, :layout=>@optimacms_layout and return
@@ -31,15 +27,6 @@ module Optimacms
       super
     end
 
-    def optimacms_pagedata
-      @pagedata
-    end
-
-    def optimacms_set_pagedata(_pagedata)
-      @pagedata = _pagedata
-
-    end
-
     def my_set_render_template(tpl_view, tpl_layout)
       @optimacms_tpl = tpl_view
       @optimacms_layout = tpl_layout
@@ -74,8 +61,6 @@ module Optimacms
       #
       res = PageServices::PageRouteService.make_url url, p
 
-      return nil if res.nil?
-
       '/'+res
     end
 

data/lib/optimacms/page_services/page_route_service.rb

@@ -63,15 +63,7 @@ module Optimacms
 
         url_parts = url.split '/'
         a = []
-        i_part = 0
-        n_parts = url_parts.count
-        is_last_optional = false
-
         url_parts.each do |part|
-          i_part+=1
-          is_last_optional = false
-
-
           # check for brackets inside brackets
           return nil if part =~ /\{[^{}]*[{}][^{}]*\}/
 
@@ -80,28 +72,6 @@ module Optimacms
 
           p = part
 
-
-          # variables inside (...) - optional
-
-          # last optional varible
-          if i_part==n_parts
-            # /^(:name)..$
-            # include last / as optional
-            p_before = p.clone
-            p.gsub! /^(\(\:#{REGEX_VARIABLE}\))([-\.]|$)/, '\/?([^/]+)*\2'
-            is_last_optional = true if p!=p_before
-          end
-
-          p.gsub! /(\(\:#{REGEX_VARIABLE}\))([-\.]|$)/, '([^/]+)*\2'
-
-          #if i_part>1
-            # add / to the beginning - / is optional too
-            #p.gsub! /(\(\:#{REGEX_VARIABLE}\))([-\.]|$)/, '([^/]+)*\2'
-          #else
-            # the first param
-            #p.gsub! /(\(\:#{REGEX_VARIABLE}\))([-\.]|$)/, '([^/]+)*\2'
-          #end
-
           # variables
           #p.gsub! /\{\$[^}]+\}/, '([^/]+)'
           p.gsub! /(\:#{REGEX_VARIABLE})([-\.]|$)/, '([^/]+)\2'
@@ -111,17 +81,11 @@ module Optimacms
           # replace '.'
           p.sub! '.', '[.]'
 
-          #
-          if i_part>1 && !is_last_optional
-            p = '/'+p
-          end
-
-
 
           a << p
         end
 
-        return '^'+a.join('')+'$'
+        return '^'+url_parts.join('\/')+'$'
       end
 
       def self.count_url_parts(url)
@@ -144,8 +108,7 @@ module Optimacms
         return {} if page_row.nil?
         return {} if url.blank?
 
-        #parsed_url = page_row.parsed_url.sub '/', '\/'
-        parsed_url = page_row.parsed_url
+        parsed_url = page_row.parsed_url.sub '/', '\/'
 
         #if (preg_match('/' . $parsed_url . '/', $url, $values_matches)) {
         m_params_in_url = url.scan /#{parsed_url}/
@@ -181,35 +144,13 @@ module Optimacms
 
       end
 
-      def self.make_url(u, params_extra={})
-        p = params_extra.keys.map{|x| x.to_sym}
-
-        p_used = []
-        res = u.gsub(/\:#{REGEX_VARIABLE}/) do |name|
-          p_used << name[1..-1].to_sym
-          (params_extra[name[1..-1].to_sym] || '')
+      def self.make_url(u, p={})
+        res = u.gsub(/\:#{REGEX_VARIABLE}/) do
+          |name| (p[name[1..-1].to_sym] || '')
         end
-
-        # remove ()
-        res.gsub! /[\(\)]/, ''
-
-        # add extra params
-        p_not_used =  p - p_used - [:controller, :action, :only_path, :url]
-
-        #
-        a_extra = []
-        p_not_used.each do |name|
-          a_extra << "#{name}=#{(params_extra[name] || '')}"
-        end
-        if a_extra.length>0
-          res = res + '?'+a_extra.join('&')
-        end
-
-        #
-        #res.gsub! /\?$/, ''
         res
       end
     end
 
   end
-end
+end

data/lib/optimacms/version.rb

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

data/lib/optimacms.rb

@@ -2,24 +2,11 @@ require 'devise'
 require "optimacms/engine"
 
 module Optimacms
-  #
   mattr_accessor :files_dir_path
+
   def files_dir_path
     @@files_dir_path || 'uploads'
   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/controllers/news_controller.rb

@@ -4,8 +4,6 @@ class NewsController < ApplicationController
 
   def index
 
-    x = params[:pg]
-
     @items = News.all
 
 

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

@@ -1,6 +1,6 @@
 %h2 Admin
 %ul
-  %li= link_to 'admin area', '/'+Optimacms.main_namespace+'/'+Optimacms.admin_namespace
+  %li= link_to '/cmsadmin', '/cmsadmin'
 
 %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,11 +19,7 @@ default: &default
 
 development:
   <<: *default
-  host: <%= Rails.application.secrets.db_host %>
-  database: <%= Rails.application.secrets.db %>
-  username: <%= Rails.application.secrets.db_user %>
-  password: <%= Rails.application.secrets.db_password %>
-
+  database: my_cms
 
 # 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,4 +1 @@
-Optimacms.main_namespace = '' # blank or any like 'cms'
-Optimacms.admin_namespace = 'admin'
-
-Optimacms.files_dir_path = 'img'
+Optimacms.files_dir_path = 'img'

data/spec/dummy/config/routes.rb

@@ -11,7 +11,7 @@ Rails.application.routes.draw do
 
 
   # extend admin area
-  scope '/'+Optimacms.main_namespace+'/'+Optimacms.admin_namespace, module: "optimacms" do
+  scope '/cmsadmin', 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 => '/'+Optimacms.main_namespace
+  mount Optimacms::Engine => "/"
 
   #
   root to: 'home#index'

data/spec/dummy/config/secrets.yml

@@ -13,12 +13,6 @@
 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/migrate/20150504000518_devise_create_users.rb

@@ -0,0 +1,42 @@
+class DeviseCreateUsers < ActiveRecord::Migration
+  def change
+    create_table(:users) do |t|
+      ## Database authenticatable
+      t.string :email,              null: false, default: ""
+      t.string :encrypted_password, null: false, default: ""
+
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+
+      ## Rememberable
+      t.datetime :remember_created_at
+
+      ## Trackable
+      t.integer  :sign_in_count, default: 0, null: false
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      # t.integer  :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
+
+
+      t.timestamps
+    end
+
+    add_index :users, :email,                unique: true
+    add_index :users, :reset_password_token, unique: true
+    # add_index :users, :confirmation_token,   unique: true
+    # add_index :users, :unlock_token,         unique: true
+  end
+end

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: 20150513224341) do
+ActiveRecord::Schema.define(version: 20150610225422) do
 
   create_table "cms_languages", force: :cascade do |t|
     t.string  "title",     limit: 250
     t.string  "lang",      limit: 4
-    t.boolean "enabled",               default: true,              null: false
+    t.boolean "enabled",   limit: 1,   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,30 +44,31 @@ ActiveRecord::Schema.define(version: 20150513224341) 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",                 default: false, null: false
+    t.boolean  "is_translated",     limit: 1,   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",                     default: false, null: false
+    t.boolean  "is_folder",         limit: 1,   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.string  "meta_description",  limit: 255
+    t.text    "meta_description",  limit: 65535
     t.string  "meta_keywords",     limit: 255
     t.string  "template_filename", limit: 255
   end
@@ -85,11 +86,11 @@ ActiveRecord::Schema.define(version: 20150513224341) do
     t.integer  "type_id",       limit: 1
     t.string   "tpl_format",    limit: 255
     t.integer  "pos",           limit: 4
-    t.boolean  "is_translated",             default: false, null: false
+    t.boolean  "is_translated", limit: 1,   default: false, null: false
     t.datetime "created_at",                                null: false
     t.datetime "updated_at",                                null: false
-    t.boolean  "is_folder",                 default: false, null: false
-    t.boolean  "enabled",                   default: true,  null: false
+    t.boolean  "is_folder",     limit: 1,   default: false, null: false
+    t.boolean  "enabled",       limit: 1,   default: true,  null: false
     t.string   "ancestry",      limit: 255
   end
 
@@ -128,6 +129,13 @@ ActiveRecord::Schema.define(version: 20150513224341) 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
@@ -135,24 +143,6 @@ ActiveRecord::Schema.define(version: 20150513224341) 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