optimacms 0.1.32 → 0.1.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc806b4a41b68c9af3375d1ccd5d69a5e5b44c73
-  data.tar.gz: ddeae6d99a20118381e1e1108b19222b2e0aff79
+  metadata.gz: af38a4fa9a81bdada06d16f387634f6909d3fe0e
+  data.tar.gz: c89c6bbb8a8437d4a4462078f9025acf6c57a48b
 SHA512:
-  metadata.gz: 15eeca877804476cae12e48b78f4d31a155d833acffceb0ebe5c87e5e03ccb16540063bb2ffcfe92ac627b13944928bd0dfc3d01382ee4ac4b8a9ddc40a902c3
-  data.tar.gz: a37d0ee3e40e5b14381284e3a8a2eff9469bbf3bf79bc80cbb7737e3d86f5a0cfc88d3423b60c3ad3a340a9f8ee85b09f50e81f8fdd7683fc59e5748452b5e0b
+  metadata.gz: 9453f80617abf58a68fb85d1ef11dc62d10db2345c45e2687460b4844b9f292fe6b0c3b8a50773b6d285616e0acaa15bcd2c80d798c6be615254518e2bf5ccff
+  data.tar.gz: 70f282bca6e3df8361a0532c9d4e8601ba8f1a09ebd9445dadaa45acd58f952f9eb7427b0a095d76f290f7e0d45a6365a16cfe0e1602f3ab59edf547431c2817

data/app/controllers/optimacms/admin/templates_controller.rb

@@ -71,7 +71,7 @@ module Optimacms
     end
 
     def new
-      @item = model.new({:tpl_format=>Optimacms::Template::FORMAT_DEFAULT, :type_id=>TemplateType::TYPE_PAGE})
+      @item = model.new({:tpl_format=>Optimacms::Template::EXTENSION_DEFAULT, :type_id=>TemplateType::TYPE_PAGE})
       item_init_parent
       @item.set_basedirpath_from_parent
 
@@ -80,7 +80,6 @@ module Optimacms
 
 
     def create
-      #item_params[:type_id] = TemplateType::TYPE_PAGE
       @item = model.new(item_params)
       @res = @item.save
 
@@ -131,7 +130,7 @@ module Optimacms
 
 
     def newattach
-      @item = model.new({:tpl_format=>Optimacms::Template::FORMAT_DEFAULT})
+      @item = model.new({:tpl_format=>Optimacms::Template::EXTENSION_DEFAULT})
       item_init_parent
       @item.set_basedirpath_from_parent
 

data/app/helpers/optimacms/application_helper.rb

@@ -30,44 +30,46 @@ module Optimacms
     end
 
     def block(name)
-          x = Dir.pwd
-          #y = File.expand_path File.dirname(__FILE__)
-          d = File.dirname(@optimacms_tpl)
+      x = Dir.pwd
+      #y = File.expand_path File.dirname(__FILE__)
+      d = File.dirname(@optimacms_tpl)
 
+      # extensions
+      extensions = ['', '.html.haml', '.html.erb', '.html']
 
-          # try1 - in the current folder
-          f = File.join(Dir.pwd, 'app', 'views', d, name+'.html')
-          return render file: f if File.exists? f
 
-          #
-          names = []
-          names << [d, name+".html"]
-          names << ["", name+".html"]
+      # try. HTML file in the current folder
+      f = File.join(Dir.pwd, 'app', 'views', d, name+'.html')
+      return render file: f if File.exists? f
 
-          #
-          parts = name.split /\//
+      #
+      names = []
 
-          parts[-1] = '_'+parts[-1]
-          name2 = parts.join('/')
+      #
+      parts = name.split /\//
 
-          names << [d, name2+".html"]
-          names << ["", name2+".html"]
+      parts[-1] = '_'+parts[-1]
+      name2 = parts.join('/')
 
-          # try 2
-          names.each do |p|
-            f = File.join(Dir.pwd, 'app', 'views', p[0], p[1])
-            (return render file: f)      if File.exists? f
+      #
+      names << [d, name]
+      names << ["", name]
 
-            f = File.join(Dir.pwd, 'app', 'views', p[0], p[1]+".haml")
-            (return render file: f)      if File.exists? f
+      names << [d, name2]
+      names << ["", name2]
 
-            f = File.join(Dir.pwd, 'app', 'views', p[0], p[1]+".erb")
-            (return render file: f)      if File.exists? f
-          end
 
-          # default render
-          return render f
+      # try 2
+      names.each do |p|
+        extensions.each do |ext|
+          f = File.join(Dir.pwd, 'app', 'views', p[0], p[1]+ext)
+          (return render file: f)      if File.exists? f
         end
+      end
+
+      # default render
+      return render name
+    end
     
     
     def site_page_path(h)

data/app/models/optimacms/template.rb

@@ -2,11 +2,10 @@ module Optimacms
   class Template < ActiveRecord::Base
     self.table_name = 'cms_templates'
 
-    FORMAT_DEFAULT = 'html'
-    EXTENSIONS = {'html'=>'html', 'erb'=>'html.erb', 'haml'=>'html.haml'}
+    EXTENSION_DEFAULT = 'html'
+    EXTENSIONS = {'blank'=>'', 'html'=>'html', 'erb'=>'html.erb', 'haml'=>'html.haml'}
 
 
-    #belongs_to :folder, :foreign_key => 'parent_id', :class_name => 'Template'
     belongs_to :type, :foreign_key => 'type_id', :class_name => 'TemplateType'
 
     before_validation :_before_validation
@@ -47,6 +46,16 @@ module Optimacms
     end
 
 
+    ### settings
+
+    def self.base_dir
+      Rails.root.to_s + '/app/views/'
+    end
+
+
+
+
+
     ### properties
 
     def parent_title
@@ -55,13 +64,26 @@ module Optimacms
 
 
     def has_code?
-      ['haml', 'erb'].include?(self.tpl_format)
+      ['haml', 'erb', 'blank'].include?(self.tpl_format)
     end
 
     def is_folder?
       self.is_folder
     end
 
+    def is_layout?
+      return self.type_id==TemplateType::TYPE_LAYOUT
+    end
+
+    def is_type_page?
+      return self.type_id==TemplateType::TYPE_PAGE
+    end
+
+    def is_type_partial?
+      return self.type_id==TemplateType::TYPE_PARTIAL
+    end
+
+
 
     ##### search
 
@@ -93,7 +115,7 @@ module Optimacms
 
     def path(lang='')
       return nil if self.basename.nil?
-      self.basedirpath+self.basename+Template.content_filename_lang_postfix(lang)+'.'+Template.content_filename_ext(self.tpl_format)
+      self.basedirpath + filename_base + Template.filename_lang_postfix(lang) + Template.filename_ext_with_dot(self.tpl_format)
     end
 
     def fullpath(lang='')
@@ -158,23 +180,36 @@ module Optimacms
      end
 
 
-    ### settings and helpers
+    ### helpers for path
 
-    def self.base_dir
-      Rails.root.to_s + '/app/views/'
+    # base filename depending on  type
+    # for page = name
+    # for partial = _name
+    def filename_base
+      return '_'+self.basename if self.is_type_partial?
+
+      self.basename
     end
 
-    def self.content_filename_lang_postfix(lang)
+
+    def self.filename_lang_postfix(lang)
       return '' if lang==''
       return '.'+lang
     end
 
-    def self.content_filename_ext(format)
+    def self.filename_ext(format)
       EXTENSIONS[format]
     end
 
+    def self.filename_ext_with_dot(format)
+      ext = filename_ext(format)
+      ext = '.'+ext unless ext.blank?
+      ext
+    end
+
+
+    ### operations with path
 
-    ###
     def set_basepath
       if self.parent.nil?
         self.basepath = self.basename
@@ -219,6 +254,8 @@ module Optimacms
       end
     end
 
+
+
     #### callbacks
 
     def _before_validation

data/app/models/optimacms/template_type.rb

@@ -4,9 +4,15 @@ module Optimacms
 
     TYPE_LAYOUT = 1
     TYPE_PAGE = 2
+    TYPE_PARTIAL = 3
+    TYPE_BLOCKVIEW = 4
 
+    #
     has_many :templates
 
+
+    # properties
+
     def to_s
       title
     end

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

@@ -19,14 +19,15 @@
       = hidden_field_tag :modal, @modal
 
       -#= f.input :parent_id, as: :hidden
-      = f.input :type_id, as: :hidden
-      = f.input :type, disabled: true, label: 'Type'
+      -#= f.input :type_id, as: :hidden
+      -#= f.input :type, disabled: true, label: 'Type'
 
       = f.input :title, label: "Title"
 
       = f.input :basedirpath, readonly: false, label: 'Folder', hint: "ex: news/"
       = f.input :basename, label: "Name", :hint=>'ex: index, show'
 
+      = f.input :type_id, label: "Type", :collection=>Optimacms::TemplateType.all
       = f.input :tpl_format, label: "Format", :collection=>Optimacms::Template::EXTENSIONS.keys
 
       = f.input :is_translated, label: "Translate?"

data/lib/optimacms/version.rb

@@ -1,3 +1,3 @@
 module Optimacms
-  VERSION = "0.1.32"
+  VERSION = "0.1.34"
 end

data/test/dummy/app/views/temp/_h1.html

@@ -0,0 +1 @@
+<p>partial HTML</p>

data/test/dummy/app/views/temp/_part1.html.haml

@@ -0,0 +1 @@
+text in partial - part1.html.haml

data/test/dummy/app/views/temp/p1.html.haml

@@ -0,0 +1,6 @@
+include html:
+
+= block 'temp/h1'
+
+include haml:
+= block 'temp/part1'

data/test/dummy/app/views/temp/sitemap.xml.builder

@@ -0,0 +1 @@
+xml.build