optimacms 0.1.36 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38988f238025c66a2d5ce6aa29d9aa44fa8c12f6
-  data.tar.gz: 2d52afa77828c9cf7eb7e479fed6ede2805dd630
+  metadata.gz: 14ffa7cfed12fdd6f77898fbc51997224a4a57ed
+  data.tar.gz: f49d1718710e782389f48f72d72cef36f5d1d458
 SHA512:
-  metadata.gz: 5807d02977790f7f5b462b7502b11dfffaea57f98c75d1e9fbbe684114af78e70a5e6618f04489dfdd12747221a12d9cd3a4aab9a6ed28a15c36bae5cc217237
-  data.tar.gz: 3a58168544a0d1d9f2f940aab414d93f2d56ff7dcc024d11d79cca73f07d539ea10ee8e4d85fbf1fe9350909b22c2071fdadac7d498fec31fbf94b6d1f719996
+  metadata.gz: f80a511b1ae9fde382b013a1300fc12f2fc0d709e8435b6253f726ab08ff490f9c441045d5fe4ad8fc8ba2ce968bd843a2b0a05c46ae8d05a6fa8687c439c9a5
+  data.tar.gz: 25174d8db9ad4e4ee057a7e97642621c3de656f4587fe9a253d7d0c77cea6a1ed007c2823213bcba8cecbeaa617d898015e37d6d72fb39ddd222132624c5b26f

data/Rakefile

@@ -14,14 +14,13 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 
 load 'rails/tasks/statistics.rake'
 
-
-
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
@@ -34,4 +33,5 @@ Rake::TestTask.new(:test) do |t|
 end
 
 
+
 task default: :test

data/app/controllers/optimacms/dev_controller.rb

@@ -28,7 +28,7 @@ module Optimacms
 
       row = Optimacms::CmsAdminUser.new
       row.email = 'admin@example.com'
-      row.password = 'admin'
+      row.password = 'password'
 
       row.save
     end

data/app/controllers/optimacms/pages_controller.rb

@@ -4,17 +4,21 @@
 module Optimacms
 
   class PagesController < Optimacms::ApplicationController
+    include Optimacms::Mycontroller
 
+=begin
     def my_set_render_template(tpl_view, tpl_layout)
       @optimacms_tpl = tpl_view
       @optimacms_layout = tpl_layout
     end
 
     def my_set_meta(meta)
+      #@optimacms_meta = meta
       @optimacms_meta_title = meta[:title]
       @optimacms_meta_keywords = meta[:keywords]
       @optimacms_meta_description = meta[:description]
     end
+=end
 
     def renderActionInOtherController(controller,action,params, tpl_view=nil, tpl_layout=nil)
         c = controller.new
@@ -77,7 +81,6 @@ module Optimacms
         my_set_meta @pagedata.meta
 
         render @optimacms_tpl, :layout=>@optimacms_layout
-
         #render :text => @content, :layout => @page.layout.name
         return
         respond_to do |format|
@@ -157,5 +160,8 @@ render<br>
 
     end
 
+    ### page URLs
+
+
   end
 end

data/app/helpers/optimacms/application_helper.rb

@@ -16,11 +16,12 @@ module Optimacms
     end
 
     def meta_tags(title=nil, keywords=nil, desc=nil)
-      title ||= @optimacms_meta_title
-      keywords ||= @optimacms_meta_keywords
-      desc ||= @optimacms_meta_description
+      title ||= eval('"'+@optimacms_meta_title+'"')
+      keywords ||= eval('"'+@optimacms_meta_keywords+'"')
+      desc ||= eval('"'+@optimacms_meta_description+'"')
 
-      return %(<title>#{title}</title>
+
+    return %(<title>#{title}</title>
 <meta name="keywords" content="#{keywords}"/>
 <meta name="description" content="#{desc}"/>
       ).html_safe
@@ -71,15 +72,7 @@ module Optimacms
       return render name
     end
     
-    
-    def site_page_path(h)
-      if h.is_a? String
-        cms.cms_page_path(h+'.html')
-      elsif h.is_a? Hash
-        cms.cms_page_path(h[:page]+'.html')
-      end
 
-    end
     
   end
 end

data/app/models/optimacms/template.rb

@@ -290,10 +290,12 @@ module Optimacms
       if self.is_folder
         oldpath = self.folder_fullpath
 
-        self.make_basepath
+        self.set_basepath
 
         # rename dir on disk
         if self.basename_changed?
+          raise "cannot change folder path"
+
           require 'fileutils'
           newpath = self.folder_fullpath
 
@@ -303,6 +305,9 @@ module Optimacms
           end
 
           FileUtils.mv oldpath, newpath
+
+          # TODO: change paths for child templates
+
         end
 
       else

data/app/views/optimacms/admin/app_sys/index.html.haml

@@ -1,2 +1,9 @@
-%h2 Restart app
-=link_to 'Restart', restart_app_sys_path, :class=>'btn btn-primary btn-sm'
+%h2 Operations
+=link_to 'Restart', restart_app_sys_path, :class=>'btn btn-primary btn-sm'
+
+%h2 Sync
+
+
+%h2 Backups
+
+%h2 System info

data/app/views/optimacms/admin/pages/index.html.haml

@@ -66,8 +66,10 @@
             =item.template.title
           %br
           =item.template.basepath
-        - else
+        - elsif !item.is_folder
           N/A
+        - else
+           
 
       %td
         =link_to 'Edit', (item.is_folder? ? editfolder_page_path(item) : edit_page_path(item))

data/app/views/optimacms/admin/templates/editfolder.html.haml

@@ -20,11 +20,11 @@
 
       = f.input :title, label: "Title"
 
-      - if @item.parent_id>0
+      - if @item.parent
         Folder:
         =@item.folder.basepath
 
-      = f.input :basename, label: "Name", :hint=>'ex: news'
+      = f.input :basename, label: "Name", :hint=>'ex: news', :readonly => (@item.id ? true : false)
 
       = f.button :submit_cancel, 'Save', :cancel=>@url_back
 

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/engine.rb

@@ -25,6 +25,12 @@ module Optimacms
     #config.autoload_paths += Dir["#{config.root}/lib/**/*.rb"]
 
 
+    config.generators do |g|
+      g.test_framework :rspec
+      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+    end
+
+
     config.before_initialize do
       ActiveSupport.on_load :action_controller do
         include Optimacms::Mycontroller

data/lib/optimacms/mycontroller.rb

@@ -1,10 +1,11 @@
 module Optimacms
   module Mycontroller
-    #extend ActiveSupport::Concern
+    extend ActiveSupport::Concern
 
-    #included do
-    #  before_filter :my_set_render
-    #end
+
+    included do
+      helper_method :site_page_path
+    end
 
     def my_set_render
       @is_optimacms = true
@@ -37,6 +38,30 @@ module Optimacms
       @optimacms_meta_description = meta[:description]
     end
 
+    def site_page_path(name, p={})
+      get_page_path(name, p)
+    end
+
+    def get_page_path(page_name, p={})
+      # get from cache
+      @cache_page_urls ||= {}
+      url = @cache_page_urls.fetch(page_name.to_s, nil)
+
+      if url.nil?
+        page = Page.find_by_name(page_name)
+        url = page.url if page
+      end
+
+      return nil if url.nil?
+
+      # set to cache
+      @cache_page_urls ||= {}
+      @cache_page_urls[page_name.to_s] = url
+
+      #
+      PageServices::PageRouteService.make_url url, p
+    end
+
   end
 end
 

data/lib/optimacms/page_services/page_route_service.rb

@@ -32,10 +32,12 @@ module Optimacms
         return pagedata if pagedata.page.nil?
 
 
+        # params from url
+        pagedata.url_vars = get_url_vars(pagedata.url, pagedata.page)
+
         # controller
         if pagedata.page.controller_action.present?
           pagedata.controller, pagedata.action = parse_controller_action(pagedata.page.controller_action)
-          pagedata.url_vars = get_url_vars(pagedata.url, pagedata.page)
         end
 
 
@@ -52,6 +54,8 @@ module Optimacms
       end
 
 
+      REGEX_VARIABLE = '[a-z\d\_]+'
+
       def self.parse_url(url)
         if url.blank?
           return '^$'
@@ -60,40 +64,43 @@ module Optimacms
         url_parts = url.split '/'
         a = []
         url_parts.each do |part|
-          # Проверяем, нет ли вложенных фигурных скобок
+          # check for brackets inside brackets
           return nil if part =~ /\{[^{}]*[{}][^{}]*\}/
 
-          # Проверяем, нет ли одиночных фигурных скобок или знака $ без скобки или знака { без $
+          # check if any single brackets or symbol $ without brackets or bracket without $
           return nil if part =~ /(\{[^}]*$|^[^{]*\}|[^{]\$|\{[^\$])/
 
-          # Экранируем служебные символы
-          # Точку заменяем на символьный класс вместо простого экранирования т.к. это надежнее.
-          # Например, одинарное экранирование пропадает при записи в базу
           p = part
+
+          # variables
+          #p.gsub! /\{\$[^}]+\}/, '([^/]+)'
+          p.gsub! /(\:#{REGEX_VARIABLE})([-\.]|$)/, '([^/]+)\2'
+
+
+          # escape system symbols
+          # replace '.'
           p.sub! '.', '[.]'
 
-          # Заменяем переменные на шаблон
-          #p.gsub! /\{\$[^}]+\}/, '([^\/]+)'
-          p.gsub! /\{\$[^}]+\}/, '([^/]+)'
 
           a << p
         end
 
-        return '^'+url_parts.join('\/')
+        return '^'+url_parts.join('\/')+'$'
       end
 
       def self.count_url_parts(url)
         url_parts = url.split '/'
         n = url_parts.count
 
-        # Если после последнего / ничего нет, уменьшаем количество частей URL на 1
+        # if nothing after the last /
         n-=1 if url_parts.last == ''
 
         n
       end
 
       def self.count_url_vars(url)
-        m = url.scan /\{\$[^}]+\}/
+        #m = url.scan /\{\$[^}]+\}/
+        m = url.scan /\:#{REGEX_VARIABLE}/
         m.count
       end
 
@@ -111,14 +118,14 @@ module Optimacms
         values_matches = m_params_in_url[0]
 
         # search for variables in URL
-        #if (preg_match_all('/\{\$([^}\/]+)\}/', $page_row['url'], $keys_matches))
-        keys_matches = page_row.url.scan /\{\$([^}\/]+)\}/
+        #keys_matches = page_row.url.scan /\{\$([^}\/]+)\}/
+        keys_matches = page_row.url.scan /\:(#{REGEX_VARIABLE})/
         if !keys_matches.empty?
           keys_matches = keys_matches.map{|r| r[0]}
           if keys_matches.count == values_matches.count
             res = {}
             values_matches.each_with_index do |val, key|
-              res[keys_matches[key]] = val
+              res[keys_matches[key].to_sym] = val
             end
             #url_vars = array_combine($keys_matches, $values_matches);
             return res
@@ -128,17 +135,22 @@ module Optimacms
           end
 
         elsif m_params_in_url.count == 0
-          # Если переменные не найдены, но и в parsed_url не было переменных - возвращаем пустой массив
+          # no variables found, and parsed_url has no variables => return empty []
           return []
         else
-          # что-то не так
+          # smth wrong
           return []
         end
 
       end
 
+      def self.make_url(u, p={})
+        res = u.gsub(/\:#{REGEX_VARIABLE}/) do
+          |name| (p[name[1..-1].to_sym] || '')
+        end
+        res
+      end
     end
 
-
   end
 end

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.36"
+  VERSION = "0.1.38"
 end

data/{test → spec}/dummy/app/assets/javascripts/application.js

@@ -1,15 +1,15 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require jquery
-//= require jquery_ujs
-//= require bootstrap
+// This is a manifest file that'll be compiled into application.js, which will include all the files
+// listed below.
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or any plugin's vendor/assets/javascripts directory can be referenced here using a relative path.
+//
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// compiled file.
+//
+// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
+// about supported directives.
+//
+//= require jquery
+//= require jquery_ujs
+//= require bootstrap

data/{test → spec}/dummy/app/controllers/news_controller.rb

@@ -9,6 +9,10 @@ class NewsController < ApplicationController
 
   end
 
+  def show
+    @item = News.find params['id']
+  end
+
   def index_page(tpl_filename=nil)
 
     @items = News.all

data/{test → spec}/dummy/app/views/home/index.html.haml

@@ -13,4 +13,7 @@
   %li= link_to '/text1.html', '/text1.html'
   %li= link_to '/news.html', '/news.html'
   %li= link_to '/news-p2.html', '/news-p2.html'
-  %li= link_to '/newsitem-5.html', '/newsitem-5.html'
+  %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'

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

@@ -0,0 +1,13 @@
+%h1 News
+
+page = #{@pg}
+- @items.each do |item|
+  %h3= item.title
+  = item.description
+
+
+%h3 urls
+
+%ul
+  %li=link_to 'News index', site_page_path('news')
+  %li=link_to 'News #1', site_page_path('news_item', id: 1)

data/spec/dummy/app/views/news/show.html.haml

@@ -0,0 +1,7 @@
+%hr
+=link_to "Back to news", site_page_path('news')
+%br
+
+%h1 #{@item.title}
+
+id: #{@item.id}

data/{test → spec}/dummy/app/views/pages/about.html.erb

@@ -7,6 +7,6 @@ About
 111
 
 <br>
-root: <%=root_path%>
+
 <p>
 here

data/{test → spec}/dummy/app/views/services/index.html.haml

@@ -1,7 +1,7 @@
 %h1 Услуги
 
 home 
-=home_path
+=link_to 'Home link', root_path
 
 =block 'index_top'
 

data/spec/dummy/app/views/services/service.html.haml

@@ -0,0 +1,3 @@
+%h1 Service
+
+name: #{params[:name]}

data/spec/dummy/app/views/temp/t1.html.haml

@@ -0,0 +1,14 @@
+text here
+t1
+
+yes
+
+yes
+
+%h2 URLs
+
+=link_to 'about', site_page_path('about')
+%br
+=link_to 'about again', site_page_path('about')
+%br
+=link_to 'news item #1', site_page_path('news_item', :id=>1)