optimacms 0.1.55 → 0.1.56

data/lib/optimacms/mycontroller.rb

@@ -1,82 +1,84 @@
-module Optimacms
-  module Mycontroller
-    extend ActiveSupport::Concern
-
-
-    included do
-      helper_method :site_page_path
-    end
-
-    def my_set_render
-      @is_optimacms = true
-
-    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
-        #(render :text => "hello", :layout => @optimacms_layout) and return
-
-        # http://stackoverflow.com/questions/21129587/ruby-on-rails-how-to-render-file-as-plain-text-without-any-html
-        #render :plain will set the content type to text/plain
-        #render :html will set the content type to text/html
-        #render :body will not set the content type header.
-        # render text: "some text". :plain does not work.
-      end
-
-      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
-    end
-
-    def my_set_meta(meta)
-      @optimacms_meta_title = meta[:title]
-      @optimacms_meta_keywords = meta[:keywords]
-      @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
-
-      #
-      res = PageServices::PageRouteService.make_url url, p
-
-      '/'+res
-    end
-
-  end
-end
-
+module Optimacms
+  module Mycontroller
+    extend ActiveSupport::Concern
+
+
+    included do
+      helper_method :site_page_path
+    end
+
+    def my_set_render
+      @is_optimacms = true
+
+    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
+        #(render :text => "hello", :layout => @optimacms_layout) and return
+
+        # http://stackoverflow.com/questions/21129587/ruby-on-rails-how-to-render-file-as-plain-text-without-any-html
+        #render :plain will set the content type to text/plain
+        #render :html will set the content type to text/html
+        #render :body will not set the content type header.
+        # render text: "some text". :plain does not work.
+      end
+
+      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
+    end
+
+    def my_set_meta(meta)
+      @optimacms_meta_title = meta[:title]
+      @optimacms_meta_keywords = meta[:keywords]
+      @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
+
+      #
+      res = PageServices::PageRouteService.make_url url, p
+
+      return nil if res.nil?
+
+      '/'+res
+    end
+
+  end
+end
+

data/lib/optimacms/page_services/page_data.rb

@@ -1,97 +1,97 @@
-module Optimacms
-  module PageServices
-    # data used for processing page
-    class PageData
-      attr_accessor :page # page object
-      #, :params
-      attr_accessor :url, :url_vars
-      attr_accessor :lang
-      attr_accessor :controller, :action
-      attr_accessor :layout
-      attr_accessor :template
-
-      #
-      attr_reader :compiled_view_path
-
-      include PageProcessService
-
-      def controller_class
-        Object.const_get controller.to_s.camelize+'Controller'
-      end
-
-      def url_vars
-        @url_vars || {}
-      end
-
-      def lang
-        # TODO: calc lang
-
-        # from url
-        lang_url = url_vars.fetch(:lang, '')
-
-        return lang_url unless lang_url.blank?
-
-
-        I18n.locale
-      end
-
-      def layout
-        page.layout
-      end
-
-      def template
-        page.template
-      end
-
-      def meta
-        page_lang = page.is_translated ? lang : ''
-        row = page.translations.where(:lang=>page_lang).first
-
-        return nil if row.nil?
-
-        {:title=>row.meta_title, :keywords=>row.meta_keywords, :description=>row.meta_description}
-      end
-
-      def view_content
-        return '' if template.basepath.nil?
-
-        f = template.fullpath
-        return '' if !File.exists? f
-        File.read(f)
-      end
-
-      def view_filename
-        #Rails.root.to_s + '/app/views/'+view_path
-        page.template.fullpath
-      end
-
-      def compiled_view_filename
-        dir_cache+'/'+@compiled_view_basename
-      end
-
-
-      def compiled_view_path
-        dirname_views+'/'+@compiled_view_basename
-      end
-
-      def dirname_views
-        'optimacms/cache'
-      end
-
-      def dir_cache
-        # TODO: get from settings
-        Rails.root.to_s+'/app/views/'+dirname_views
-      end
-
-
-      def generate_content
-        @compiled_view_basename = generate_view_name
-        Optimacms::Fileutils::Fileutils::create_dir_if_not_exists compiled_view_filename
-
-        text = compile_content view_content
-        save_text_to_compiled_view text
-      end
-
-    end
-  end
-end
+module Optimacms
+  module PageServices
+    # data used for processing page
+    class PageData
+      attr_accessor :page # page object
+      #, :params
+      attr_accessor :url, :url_vars
+      attr_accessor :lang
+      attr_accessor :controller, :action
+      attr_accessor :layout
+      attr_accessor :template
+
+      #
+      attr_reader :compiled_view_path
+
+      include PageProcessService
+
+      def controller_class
+        Object.const_get controller.to_s.camelize+'Controller'
+      end
+
+      def url_vars
+        @url_vars || {}
+      end
+
+      def lang
+        # TODO: calc lang
+
+        # from url
+        lang_url = url_vars.fetch(:lang, '')
+
+        return lang_url unless lang_url.blank?
+
+
+        I18n.locale
+      end
+
+      def layout
+        page.layout
+      end
+
+      def template
+        page.template
+      end
+
+      def meta
+        page_lang = page.is_translated ? lang : ''
+        row = page.translations.where(:lang=>page_lang).first
+
+        return nil if row.nil?
+
+        {:title=>row.meta_title, :keywords=>row.meta_keywords, :description=>row.meta_description}
+      end
+
+      def view_content
+        return '' if template.basepath.nil?
+
+        f = template.fullpath
+        return '' if !File.exists? f
+        File.read(f)
+      end
+
+      def view_filename
+        #Rails.root.to_s + '/app/views/'+view_path
+        page.template.fullpath
+      end
+
+      def compiled_view_filename
+        dir_cache+'/'+@compiled_view_basename
+      end
+
+
+      def compiled_view_path
+        dirname_views+'/'+@compiled_view_basename
+      end
+
+      def dirname_views
+        'optimacms/cache'
+      end
+
+      def dir_cache
+        # TODO: get from settings
+        Rails.root.to_s+'/app/views/'+dirname_views
+      end
+
+
+      def generate_content
+        @compiled_view_basename = generate_view_name
+        Optimacms::Fileutils::Fileutils::create_dir_if_not_exists compiled_view_filename
+
+        text = compile_content view_content
+        save_text_to_compiled_view text
+      end
+
+    end
+  end
+end

data/lib/optimacms/page_services/page_process_service.rb

@@ -1,32 +1,32 @@
-module Optimacms
-  module PageServices
-    module PageProcessService
-
-      def compile_content(page_content)
-        #res.gsub! /\{\{content\}\}/, page_content
-        res = page_content
-
-        res
-      end
-
-      def generate_view_name
-        uid =SecureRandom.uuid.to_s
-        id = uid.gsub /[^a-z\d]+/,''
-        f_path = id+'.html.erb'
-        #Digest::SHA1.hexdigest(Time.now.to_s)
-        #filename = dir_cache+'/'+f_path
-        f_path
-        #'pages/2.html.erb'
-      end
-
-      def save_text_to_compiled_view(text)
-        filename = compiled_view_filename
-        File.open(filename, "w+") do |f|
-          f.write(text)
-        end
-      end
-
-    end
-  end
-end
-
+module Optimacms
+  module PageServices
+    module PageProcessService
+
+      def compile_content(page_content)
+        #res.gsub! /\{\{content\}\}/, page_content
+        res = page_content
+
+        res
+      end
+
+      def generate_view_name
+        uid =SecureRandom.uuid.to_s
+        id = uid.gsub /[^a-z\d]+/,''
+        f_path = id+'.html.erb'
+        #Digest::SHA1.hexdigest(Time.now.to_s)
+        #filename = dir_cache+'/'+f_path
+        f_path
+        #'pages/2.html.erb'
+      end
+
+      def save_text_to_compiled_view(text)
+        filename = compiled_view_filename
+        File.open(filename, "w+") do |f|
+          f.write(text)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/optimacms/page_services/page_route_service.rb

@@ -1,157 +1,176 @@
-module Optimacms
-  module PageServices
-    class PageRouteService
-
-      def self.find_page_by_url(url, lang='')
-        where_base = 'is_folder = 0 AND enabled = 1 AND '
-        order = 'url_parts_count DESC, url_vars_count ASC'
-
-        if url.blank?
-          where = where_base + 'url = \'\''
-        else
-          #where = where_base + '\'' + url + '\' REGEXP parsed_url'
-          where = where_base + '\'' + url + '\''+ " REGEXP parsed_url"
-        end
-
-        # result
-        pagedata = PageData.new
-        pagedata.url = url
-
-        # try 1
-        rows = Page.where(where).order(order).all
-        pagedata.page = rows[0] if rows.count>0
-
-        # try 2
-        if pagedata.page.nil? && url.blank?
-          where = where_base + "url = '#{lang}'"
-          rows = Page.where(where).order(order).all
-
-          pagedata.page = rows[0] if row.count>0
-        end
-
-        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)
-        end
-
-
-        pagedata
-      end
-
-      def self.parse_controller_action(s)
-        m = s.match /^(\w+)#(\w+)$/
-        if m
-          [m[1], m[2]]
-        else
-          return nil
-        end
-      end
-
-
-      REGEX_VARIABLE = '[a-z\d\_]+'
-
-      def self.parse_url(url)
-        if url.blank?
-          return '^$'
-        end
-
-        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! '.', '[.]'
-
-
-          a << p
-        end
-
-        return '^'+url_parts.join('\/')+'$'
-      end
-
-      def self.count_url_parts(url)
-        url_parts = url.split '/'
-        n = url_parts.count
-
-        # 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 /\:#{REGEX_VARIABLE}/
-        m.count
-      end
-
-      def self.get_url_vars(url, page_row)
-        return {} if page_row.nil?
-        return {} if url.blank?
-
-        #parsed_url = page_row.parsed_url.sub '/', '\/'
-        parsed_url = page_row.parsed_url
-
-        #if (preg_match('/' . $parsed_url . '/', $url, $values_matches)) {
-        m_params_in_url = url.scan /#{parsed_url}/
-
-        return nil if m_params_in_url.empty?
-
-        values_matches = m_params_in_url[0]
-
-        # search for variables in URL
-        #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].to_sym] = val
-            end
-            #url_vars = array_combine($keys_matches, $values_matches);
-            return res
-          else
-            #user_error('Keys and values has different number of elements');
-            return {}
-          end
-
-        elsif m_params_in_url.count == 0
-          # 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
+module Optimacms
+  module PageServices
+    class PageRouteService
+
+      def self.find_page_by_url(url, lang='')
+        where_base = 'is_folder = 0 AND enabled = 1 AND '
+        order = 'url_parts_count DESC, url_vars_count ASC'
+
+        if url.blank?
+          where = where_base + 'url = \'\''
+        else
+          #where = where_base + '\'' + url + '\' REGEXP parsed_url'
+          where = where_base + '\'' + url + '\''+ " REGEXP parsed_url"
+        end
+
+        # result
+        pagedata = PageData.new
+        pagedata.url = url
+
+        # try 1
+        rows = Page.where(where).order(order).all
+        pagedata.page = rows[0] if rows.count>0
+
+        # try 2
+        if pagedata.page.nil? && url.blank?
+          where = where_base + "url = '#{lang}'"
+          rows = Page.where(where).order(order).all
+
+          pagedata.page = rows[0] if row.count>0
+        end
+
+        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)
+        end
+
+
+        pagedata
+      end
+
+      def self.parse_controller_action(s)
+        m = s.match /^(\w+)#(\w+)$/
+        if m
+          [m[1], m[2]]
+        else
+          return nil
+        end
+      end
+
+
+      REGEX_VARIABLE = '[a-z\d\_]+'
+
+      def self.parse_url(url)
+        if url.blank?
+          return '^$'
+        end
+
+        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! '.', '[.]'
+
+
+          a << p
+        end
+
+        return '^'+url_parts.join('\/')+'$'
+      end
+
+      def self.count_url_parts(url)
+        url_parts = url.split '/'
+        n = url_parts.count
+
+        # 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 /\:#{REGEX_VARIABLE}/
+        m.count
+      end
+
+      def self.get_url_vars(url, page_row)
+        return {} if page_row.nil?
+        return {} if url.blank?
+
+        #parsed_url = page_row.parsed_url.sub '/', '\/'
+        parsed_url = page_row.parsed_url
+
+        #if (preg_match('/' . $parsed_url . '/', $url, $values_matches)) {
+        m_params_in_url = url.scan /#{parsed_url}/
+
+        return nil if m_params_in_url.empty?
+
+        values_matches = m_params_in_url[0]
+
+        # search for variables in URL
+        #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].to_sym] = val
+            end
+            #url_vars = array_combine($keys_matches, $values_matches);
+            return res
+          else
+            #user_error('Keys and values has different number of elements');
+            return {}
+          end
+
+        elsif m_params_in_url.count == 0
+          # no variables found, and parsed_url has no variables => return empty []
+          return {}
+        else
+          # smth wrong
+          return {}
+        end
+
+      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] || '')
+        end
+
+        # 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