optimacms 0.1.54 → 0.1.55

data/app/controllers/optimacms/dev_controller.rb

@@ -1,40 +1,40 @@
-module Optimacms
-  class DevController < ApplicationController
-
-    before_filter :check_env
-
-    def check_env
-      return false unless Rails.env.development?
-    end
-
-    def file
-      from = 'D:/mmx/projects/www/myrails/cms/site/test/dummy/public/files/1/cat_red.jpg'
-      to = 'D:/mmx/projects/www/myrails/cms/site/test/dummy/public/files/1/supercat.jpg'
-
-      f = 'D:/mmx/projects/www/myrails/cms/site/test/dummy/public/uploads/funny-cats-and-kittens-wallpapers-12.jpg'
-
-
-      #FileUtils.move(from, to)
-
-      require 'pathname'
-      p = Pathname.new(f)
-      p.unlink
-
-      #FileUtils.rm(f)
-    end
-
-    def addadminuser
-      return
-
-      row = Optimacms::CmsAdminUser.new
-      row.email = 'admin@example.com'
-      row.password = 'password'
-
-      row.save
-    end
-  end
-
-
-
-end
-
+module Optimacms
+  class DevController < ApplicationController
+
+    before_filter :check_env
+
+    def check_env
+      return false unless Rails.env.development?
+    end
+
+    def file
+      from = 'D:/mmx/projects/www/myrails/cms/site/test/dummy/public/files/1/cat_red.jpg'
+      to = 'D:/mmx/projects/www/myrails/cms/site/test/dummy/public/files/1/supercat.jpg'
+
+      f = 'D:/mmx/projects/www/myrails/cms/site/test/dummy/public/uploads/funny-cats-and-kittens-wallpapers-12.jpg'
+
+
+      #FileUtils.move(from, to)
+
+      require 'pathname'
+      p = Pathname.new(f)
+      p.unlink
+
+      #FileUtils.rm(f)
+    end
+
+    def addadminuser
+      return
+
+      row = Optimacms::CmsAdminUser.new
+      row.email = 'admin@example.com'
+      row.password = 'password'
+
+      row.save
+    end
+  end
+
+
+
+end
+

data/app/controllers/optimacms/elfinder_controller.rb

@@ -1,39 +1,39 @@
-require 'el_finder/action'
-
-module Optimacms
-  class ElfinderController < ApplicationController
-    skip_before_filter :verify_authenticity_token, :only => ['elfinder']
-
-    def index
-       render :layout => false
-    end
-
-    def elfinder
-      dirpath = Optimacms.files_dir_path
-      rootpath = File.join(Rails.public_path, dirpath)
-      rooturl = '/'+dirpath
-
-      h, r = ElFinder::Connector.new(
-        :root => rootpath,
-        :url => rooturl,
-        :perms => {
-           #/^(Welcome|README)$/ => {:read => true, :write => false, :rm => false},
-           '.' => {:read => true, :write => true, :rm => true}, # '.' is the proper way to specify the home/root directory.
-           #/^test$/ => {:read => true, :write => true, :rm => false},
-           #'logo.png' => {:read => true},
-           #/\.png$/ => {:read => false} # This will cause 'logo.png' to be unreadable.
-           # Permissions err on the safe side. Once false, always false.
-        },
-        :thumbs => true
-      ).run(params)
-
-      headers.merge!(h)
-
-      if r.empty?
-        (render :nothing => true) and return
-      end
-
-      render :json => r, :layout => false
-    end
-  end
-end
+require 'el_finder/action'
+
+module Optimacms
+  class ElfinderController < ApplicationController
+    skip_before_filter :verify_authenticity_token, :only => ['elfinder']
+
+    def index
+       render :layout => false
+    end
+
+    def elfinder
+      dirpath = Optimacms.files_dir_path
+      rootpath = File.join(Rails.public_path, dirpath)
+      rooturl = '/'+dirpath
+
+      h, r = ElFinder::Connector.new(
+        :root => rootpath,
+        :url => rooturl,
+        :perms => {
+           #/^(Welcome|README)$/ => {:read => true, :write => false, :rm => false},
+           '.' => {:read => true, :write => true, :rm => true}, # '.' is the proper way to specify the home/root directory.
+           #/^test$/ => {:read => true, :write => true, :rm => false},
+           #'logo.png' => {:read => true},
+           #/\.png$/ => {:read => false} # This will cause 'logo.png' to be unreadable.
+           # Permissions err on the safe side. Once false, always false.
+        },
+        :thumbs => true
+      ).run(params)
+
+      headers.merge!(h)
+
+      if r.empty?
+        (render :nothing => true) and return
+      end
+
+      render :json => r, :layout => false
+    end
+  end
+end

data/app/controllers/optimacms/page_base_controller.rb

@@ -1,6 +1,6 @@
-module Optimacms
-  class PageBaseController < ApplicationController
-
-  end
-end
-
+module Optimacms
+  class PageBaseController < ApplicationController
+
+  end
+end
+

data/app/controllers/optimacms/pages_controller.rb

@@ -1,167 +1,170 @@
-#require_dependency "../../lib/optimacms/page_services/page_route_service.rb"
-#require_dependency "../../lib/optimacms/page_services/page_process_service.rb"
-
-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
-        c.params = params
-
-
-        #c.process_action(action, request)
-        #c.dispatch(action, request)
-        #c.send 'index_page'
-
-        c.request = request
-        #c.request.path_parameters = params.with_indifferent_access
-        c.request.format = params[:format] || 'html'
-
-        c.action_name = action
-        c.response = ActionDispatch::Response.new
-
-        c.send 'my_set_render'
-        c.send 'my_set_render_template', tpl_view, tpl_layout
-        c.send 'my_set_meta', @pagedata.meta
-
-
-        #c.process_action(action)
-        c.dispatch(action, request)
-        #c.process_action(action, tpl_filename)
-
-        #app = "NewsController".constantize.action(action)
-        #app.process params
-
-        # result
-        #c
-
-        c.response.body
-
-        #app.response.body
-    end
-
-    def show
-      @path = params[:url]
-      @pagedata = PageServices::PageRouteService.find_page_by_url(@path, current_lang)
-
-      if @pagedata.page.nil?
-        not_found and return
-      end
-
-      # page mapped to controller
-      @pagedata.url_vars.each do |k,v|
-        params[k] = v
-      end
-
-
-
-      # process page
-      if @pagedata.page.content_page?
-        # content page
-        #@content = @pagedata.get_content(@page)
-        #@content = @page.content
-
-        my_set_render_template @pagedata.template.path, @pagedata.layout.basename
-        my_set_meta @pagedata.meta
-
-        render @optimacms_tpl, :layout=>@optimacms_layout
-        #render :text => @content, :layout => @page.layout.name
-        return
-        respond_to do |format|
-          format.html { render :text => @content }
-        end
-        return
-      else
-        #@pagedata.generate_content
-
-        #
-        #c = renderActionInOtherController(@pagedata.controller_class, @pagedata.action, params, @pagedata.compiled_view_path, @pagedata.layout.basename)
-        c = renderActionInOtherController(@pagedata.controller_class, @pagedata.action, params, @pagedata.template.path, @pagedata.layout.basename)
-
-        render text: c
-
-        return
-
-        # THE END
-
-        s = <<-eos
-From code
-<p>News on page</p>
-
-<p>page = <%=@pg%></p>
-
-<p>hello</p>
-
-<p>&nbsp;</p>
-
-<p>local page = <%=@pg%></p>
-
-news count = <%=News.all.count%>
-<br>
-render<br>
-<%=render 'pages/sub.html.erb'%>
-
-        eos
-
-        #s = File.read(Rails.root+'app/views/pages/news2.html.erb')
-
-        # save template content
-        tpl_view = 'pages/1.html.erb'
-        fnew = Rails.root+'app/views/'+tpl_view
-        File.open(fnew, "w+") do |f|
-          f.write(s)
-        end
-
-
-
-        #
-        template = ERB.new(s, 0, "%<>")
-
-        #vv = OpenStruct.new(pg: 75, last: 'Maragall')
-        #vv = OpenStruct.new(c.instance_values)
-        #ss = template.result(vv.instance_eval { binding })
-        #ss = template.result(c.instance_values.instance_eval { binding })
-        #ss = template.result(c.get_binding)
-        #ss = template.result(c.instance_values.binding())
-
-        #render :text=>ss
-        #render :text=>c
-
-        vars = {}
-        c.instance_values.each do |k,v|
-          vars[k.to_sym] = v
-        end
-
-        #render template: 'pages/1.html.erb', locals: vars
-
-        #render template: 'pages/news2.html.erb', locals: {pg: 4}
-        #render text: s, locals: {pg: 4}
-
-        #render :text => (render_to_string :template=>'pages/news2.html', :locals=> {pg: 4})
-        #render :text => (render_to_string 'pages/news2.html', locals: c.instance_values)
-        #render :text => renderActionInOtherController(@pagedata.controller_class, @pagedata.action, params)
-      end
-
-    end
-
-    ### page URLs
-
-
-  end
-end
+#require_dependency "../../lib/optimacms/page_services/page_route_service.rb"
+#require_dependency "../../lib/optimacms/page_services/page_process_service.rb"
+
+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
+        c.params = params
+
+
+        #c.process_action(action, request)
+        #c.dispatch(action, request)
+        #c.send 'index_page'
+
+        c.request = request
+        #c.request.path_parameters = params.with_indifferent_access
+        c.request.format = params[:format] || 'html'
+
+        c.action_name = action
+        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
+
+
+        #c.process_action(action)
+        c.dispatch(action, request)
+        #c.process_action(action, tpl_filename)
+
+        #app = "NewsController".constantize.action(action)
+        #app.process params
+
+        # result
+        #c
+
+        c.response.body
+
+        #app.response.body
+    end
+
+
+    def show
+      @path = params[:url]
+      @pagedata = PageServices::PageRouteService.find_page_by_url(@path, current_lang)
+
+      if @pagedata.page.nil?
+        not_found and return
+      end
+
+      # page mapped to controller
+      @pagedata.url_vars.each do |k,v|
+        params[k] = v
+      end
+
+
+
+      # process page
+      if @pagedata.page.content_page?
+        # content page
+        #@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
+
+        render @optimacms_tpl, :layout=>@optimacms_layout
+        #render :text => @content, :layout => @page.layout.name
+        return
+        respond_to do |format|
+          format.html { render :text => @content }
+        end
+        return
+      else
+        #@pagedata.generate_content
+
+        #
+        #c = renderActionInOtherController(@pagedata.controller_class, @pagedata.action, params, @pagedata.compiled_view_path, @pagedata.layout.basename)
+        c = renderActionInOtherController(@pagedata.controller_class, @pagedata.action, params, @pagedata.template.path, @pagedata.layout.basename)
+
+        render text: c
+
+        return
+
+        # THE END
+
+        s = <<-eos
+From code
+<p>News on page</p>
+
+<p>page = <%=@pg%></p>
+
+<p>hello</p>
+
+<p>&nbsp;</p>
+
+<p>local page = <%=@pg%></p>
+
+news count = <%=News.all.count%>
+<br>
+render<br>
+<%=render 'pages/sub.html.erb'%>
+
+        eos
+
+        #s = File.read(Rails.root+'app/views/pages/news2.html.erb')
+
+        # save template content
+        tpl_view = 'pages/1.html.erb'
+        fnew = Rails.root+'app/views/'+tpl_view
+        File.open(fnew, "w+") do |f|
+          f.write(s)
+        end
+
+
+
+        #
+        template = ERB.new(s, 0, "%<>")
+
+        #vv = OpenStruct.new(pg: 75, last: 'Maragall')
+        #vv = OpenStruct.new(c.instance_values)
+        #ss = template.result(vv.instance_eval { binding })
+        #ss = template.result(c.instance_values.instance_eval { binding })
+        #ss = template.result(c.get_binding)
+        #ss = template.result(c.instance_values.binding())
+
+        #render :text=>ss
+        #render :text=>c
+
+        vars = {}
+        c.instance_values.each do |k,v|
+          vars[k.to_sym] = v
+        end
+
+        #render template: 'pages/1.html.erb', locals: vars
+
+        #render template: 'pages/news2.html.erb', locals: {pg: 4}
+        #render text: s, locals: {pg: 4}
+
+        #render :text => (render_to_string :template=>'pages/news2.html', :locals=> {pg: 4})
+        #render :text => (render_to_string 'pages/news2.html', locals: c.instance_values)
+        #render :text => renderActionInOtherController(@pagedata.controller_class, @pagedata.action, params)
+      end
+
+    end
+
+    ### page URLs
+
+
+  end
+end

data/app/controllers/optimacms/tinymce_assets_controller.rb

@@ -1,21 +1,21 @@
-class Optimacms::TinymceAssetsController < ApplicationController
-
-  def create
-    # Take upload from params[:file] and store it somehow...
-    # Optionally also accept params[:hint] and consume if needed
-
-    #params.require(:photo).permit(:title, :description, :photo)
-    #@item = model.build item_params
-
-    item = Optimacms::Mediafile.new(:photo=>params[:file])
-    res = item.save
-
-
-    render json: {
-      image: {
-        #url: view_context.image_url(item.photo_url)
-        url: item.photo.url
-      }
-    }, content_type: "text/html"
-  end
+class Optimacms::TinymceAssetsController < ApplicationController
+
+  def create
+    # Take upload from params[:file] and store it somehow...
+    # Optionally also accept params[:hint] and consume if needed
+
+    #params.require(:photo).permit(:title, :description, :photo)
+    #@item = model.build item_params
+
+    item = Optimacms::Mediafile.new(:photo=>params[:file])
+    res = item.save
+
+
+    render json: {
+      image: {
+        #url: view_context.image_url(item.photo_url)
+        url: item.photo.url
+      }
+    }, content_type: "text/html"
+  end
 end

data/app/helpers/optimacms/application_helper.rb

@@ -23,10 +23,27 @@ module Optimacms
       s.gsub /"/, '\"'
     end
 
+    def url_for(options = nil)
+      # 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?
+          return site_page_path(page_name, options)
+        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)