comfortable_mexican_sofa 1.12.8 → 1.12.9

data/config/locales/pt-BR.yml

@@ -208,9 +208,6 @@ pt-BR:
           index:
             title: Arquivos
             new_link: Enviar Novo Arquivo
-            edit: Editar
-            delete: Excluir
-            are_you_sure: Tem certeza?
             button: Enviar Arquivos
           new:
             title: Novo Arquivo
@@ -226,6 +223,8 @@ pt-BR:
           page_form:
             are_you_sure: Tem certeza?
           file:
+            edit: Editar
+            delete: Excluir
             are_you_sure: Tem certeza?
 
         categories:

data/config/locales/ru.yml

@@ -208,9 +208,6 @@ ru:
           index:
             title: Файлы
             new_link: Загрузить новый файл
-            edit: Редактировать
-            delete: Удалить
-            are_you_sure: Вы уверены?
             button: Загрузить файлы
           new:
             title: Новый файл
@@ -226,6 +223,8 @@ ru:
           page_form:
             are_you_sure: Вы уверены?
           file:
+            edit: Редактировать
+            delete: Удалить
             are_you_sure: Вы уверены?
 
         categories:

data/config/locales/sv.yml

@@ -208,9 +208,6 @@ sv:
           index:
             title: Filer
             new_link: Ladda upp en ny fil
-            edit: Ända
-            delete: Delete
-            are_you_sure: Är du säker?
             button: Ladda upp filer
           new:
             title: Ny Fil
@@ -226,6 +223,8 @@ sv:
           page_form:
             are_you_sure: Är du säker?
           file:
+            edit: Ända
+            delete: Delete
             are_you_sure: Är du säker?
 
         categories:

data/config/locales/uk.yml

@@ -208,9 +208,6 @@ uk:
           index:
             title: Файли
             new_link: Завантажити новий файл
-            edit: Редагувати
-            delete: Видалити
-            are_you_sure: Ви впевнені?
             button: Завантажити файли
           new:
             title: Новий файл
@@ -226,6 +223,8 @@ uk:
           page_form:
             are_you_sure: Ви впевнені?
           file:
+            edit: Редагувати
+            delete: Видалити
             are_you_sure: Ви впевнені?
 
         categories:

data/config/locales/zh-CN.yml

@@ -208,9 +208,6 @@ zh-CN:
           index:
             title: 文件
             new_link: 上传新文件
-            edit: 编辑
-            delete: 删除
-            are_you_sure: 确定删除该文件吗？
             button: 上传文件
           new:
             title: 新文件
@@ -226,6 +223,8 @@ zh-CN:
           page_form:
             are_you_sure: 确定删除该文件吗？
           file:
+            edit: 编辑
+            delete: 删除
             are_you_sure: 确定删除该文件吗？
 
         categories:

data/config/locales/zh-TW.yml

@@ -27,8 +27,8 @@ zh-TW:
       comfy/cms/page:
         label: 頁面名稱
         layout_id: 佈局
-        slug: Slug
-        full_path: Full path
+        slug: 路徑名
+        full_path: 完整路徑
         parent_id: 上級
         target_page_id: 跳轉至
         content: 內容
@@ -53,7 +53,7 @@ zh-TW:
       cms:
         base:
           site_not_found: 沒有該站點
-          fixtures_enabled: CMS夾具已經啟用，在此處的所有修改將被忽略。
+          fixtures_enabled: CMS 樣板已經啟用，在此處的所有修改將被忽略。
 
           sites: 站點
           layouts: 佈局
@@ -82,7 +82,7 @@ zh-TW:
             title: 編輯站點
           form:
             create: 創建站點
-            cancel: Cancel
+            cancel: 取消
             update: 更新站點
             is_mirrored: 鏡像
 
@@ -147,14 +147,14 @@ zh-TW:
             select_target_page: 沒有跳轉
             preview: 預覽
             create: 創建頁面
-            cancel: Cancel
+            cancel: 取消
             update: 更新頁面
             is_published: 發佈
-            choose_link: Select page...
+            choose_link: 選擇頁面...
           form_blocks:
             no_tags: |-
-              佈局中沒有定義內容標籤。<br/>
-              編輯內容使其包含一個頁面或者field標籤。例如： <code>{{cms:page:content}}</code>
+              佈局中沒有定義內容標記。<br/>
+              編輯內容使其包含一個頁面或者欄位標記。例如： <code>{{cms:page:content}}</code>
 
         snippets:
           created: 片段創建成功
@@ -178,7 +178,7 @@ zh-TW:
               <<: *revision
           form:
             create: 創建片段
-            cancel: Cancel
+            cancel: 取消
             update: 更新片段
 
         revisions:
@@ -192,10 +192,10 @@ zh-TW:
             full_path: 全路徑
             slug: 嵌條
             update: 更新到該修訂版本
-            content: Content
-            changes: Changes
-            previous: Previous
-            current: Current
+            content: 內容
+            changes: 變更
+            previous: 先前
+            current: 現在
 
         files:
           created: 文件上傳成功
@@ -208,9 +208,6 @@ zh-TW:
           index:
             title: 文件
             new_link: 上傳新文件
-            edit: 編輯
-            delete: 刪除
-            are_you_sure: 確定刪除該文件嗎？
             button: 上傳文件
           new:
             title: 新文件
@@ -219,13 +216,15 @@ zh-TW:
           form:
             current_file: 當前文件
             create: 上傳文件
-            cancel: Cancel
+            cancel: 取消
             update: 更新文件
             delete: 刪除
             are_you_sure: 確定刪除該文件嗎？
           page_form:
             are_you_sure: 確定刪除該文件嗎？
           file:
+            edit: 編輯
+            delete: 刪除
             are_you_sure: 確定刪除該文件嗎？
 
         categories:

data/db/migrate/01_create_cms.rb

@@ -1,14 +1,7 @@
 class CreateCms < ActiveRecord::Migration
-  
+
   def self.up
-    
-    text_limit = case ActiveRecord::Base.connection.adapter_name
-      when 'PostgreSQL'
-        { }
-      else
-        { :limit => 16777215 }
-      end
-    
+
     # -- Sites --------------------------------------------------------------
     create_table :comfy_cms_sites do |t|
       t.string :label,        :null => false
@@ -20,7 +13,7 @@ class CreateCms < ActiveRecord::Migration
     end
     add_index :comfy_cms_sites, :hostname
     add_index :comfy_cms_sites, :is_mirrored
-    
+
     # -- Layouts ------------------------------------------------------------
     create_table :comfy_cms_layouts do |t|
       t.integer :site_id,     :null => false
@@ -28,16 +21,16 @@ class CreateCms < ActiveRecord::Migration
       t.string  :app_layout
       t.string  :label,       :null => false
       t.string  :identifier,  :null => false
-      t.text    :content,     text_limit
-      t.text    :css,         text_limit
-      t.text    :js,          text_limit
+      t.text    :content,     :limit => 16777215
+      t.text    :css,         :limit => 16777215
+      t.text    :js,          :limit => 16777215
       t.integer :position,    :null => false, :default => 0
       t.boolean :is_shared,   :null => false, :default => false
       t.timestamps
     end
     add_index :comfy_cms_layouts, [:parent_id, :position]
     add_index :comfy_cms_layouts, [:site_id, :identifier], :unique => true
-    
+
     # -- Pages --------------------------------------------------------------
     create_table :comfy_cms_pages do |t|
       t.integer :site_id,         :null => false
@@ -47,7 +40,7 @@ class CreateCms < ActiveRecord::Migration
       t.string  :label,           :null => false
       t.string  :slug
       t.string  :full_path,       :null => false
-      t.text    :content_cache,   text_limit
+      t.text    :content_cache,   :limit => 16777215
       t.integer :position,        :null => false, :default => 0
       t.integer :children_count,  :null => false, :default => 0
       t.boolean :is_published,    :null => false, :default => true
@@ -56,30 +49,30 @@ class CreateCms < ActiveRecord::Migration
     end
     add_index :comfy_cms_pages, [:site_id, :full_path]
     add_index :comfy_cms_pages, [:parent_id, :position]
-    
+
     # -- Page Blocks --------------------------------------------------------
     create_table :comfy_cms_blocks do |t|
       t.string     :identifier,  :null => false
-      t.text       :content,     text_limit
+      t.text       :content,     :limit => 16777215
       t.references :blockable, :polymorphic => true
       t.timestamps
     end
     add_index :comfy_cms_blocks, [:identifier]
     add_index :comfy_cms_blocks, [:blockable_id, :blockable_type]
-    
+
     # -- Snippets -----------------------------------------------------------
     create_table :comfy_cms_snippets do |t|
       t.integer :site_id,     :null => false
       t.string  :label,       :null => false
       t.string  :identifier,  :null => false
-      t.text    :content,     text_limit
+      t.text    :content,     :limit => 16777215
       t.integer :position,    :null => false, :default => 0
       t.boolean :is_shared,   :null => false, :default => false
       t.timestamps
     end
     add_index :comfy_cms_snippets, [:site_id, :identifier], :unique => true
     add_index :comfy_cms_snippets, [:site_id, :position]
-    
+
     # -- Files --------------------------------------------------------------
     create_table :comfy_cms_files do |t|
       t.integer :site_id,           :null => false
@@ -96,17 +89,17 @@ class CreateCms < ActiveRecord::Migration
     add_index :comfy_cms_files, [:site_id, :file_file_name]
     add_index :comfy_cms_files, [:site_id, :position]
     add_index :comfy_cms_files, [:site_id, :block_id]
-    
+
     # -- Revisions -----------------------------------------------------------
     create_table :comfy_cms_revisions, :force => true do |t|
       t.string    :record_type, :null => false
       t.integer   :record_id,   :null => false
-      t.text      :data,        text_limit
+      t.text      :data,        :limit => 16777215
       t.datetime  :created_at
     end
     add_index :comfy_cms_revisions, [:record_type, :record_id, :created_at],
       :name => 'index_cms_revisions_on_rtype_and_rid_and_created_at'
-    
+
     # -- Categories ---------------------------------------------------------
     create_table :comfy_cms_categories, :force => true do |t|
       t.integer :site_id,          :null => false
@@ -115,7 +108,7 @@ class CreateCms < ActiveRecord::Migration
     end
     add_index :comfy_cms_categories, [:site_id, :categorized_type, :label], :unique => true,
       :name => 'index_cms_categories_on_site_id_and_cat_type_and_label'
-    
+
     create_table :comfy_cms_categorizations, :force => true do |t|
       t.integer :category_id,       :null => false
       t.string  :categorized_type,  :null => false
@@ -124,7 +117,7 @@ class CreateCms < ActiveRecord::Migration
     add_index :comfy_cms_categorizations, [:category_id, :categorized_type, :categorized_id], :unique => true,
       :name => 'index_cms_categorizations_on_cat_id_and_catd_type_and_catd_id'
   end
-  
+
   def self.down
     drop_table :comfy_cms_sites
     drop_table :comfy_cms_layouts

data/db/upgrade_migrations/08_upgrade_to_1_12_0.rb

@@ -65,11 +65,11 @@ class UpgradeTo1120 < ActiveRecord::Migration
     rename_table :comfy_cms_blocks,           :cms_blocks
     rename_table :comfy_cms_snippets,         :cms_snippets
     rename_table :comfy_cms_files,            :cms_files
-    rename_index :cms_revisions,
+    rename_index :comfy_cms_revisions,
       'index_cms_revisions_on_record_type_id_and_created',
       'index_cms_revisions_on_record_type_and_record_id_and_created_at'
     rename_table :comfy_cms_revisions,        :cms_revisions
-    rename_index :cms_categories,
+    rename_index :comfy_cms_categories,
       'index_cms_categories_on_site_id_and_cat_type_and_label',
       'index_cms_categories_on_site_id_and_categorized_type_and_label'
     rename_table :comfy_cms_categories,       :cms_categories

data/lib/comfortable_mexican_sofa.rb

@@ -10,6 +10,7 @@ require_relative 'comfortable_mexican_sofa/routing'
 require_relative 'comfortable_mexican_sofa/access_control/admin_authentication'
 require_relative 'comfortable_mexican_sofa/access_control/admin_authorization'
 require_relative 'comfortable_mexican_sofa/access_control/public_authentication'
+require_relative 'comfortable_mexican_sofa/access_control/public_authorization'
 require_relative 'comfortable_mexican_sofa/render_methods'
 require_relative 'comfortable_mexican_sofa/view_hooks'
 require_relative 'comfortable_mexican_sofa/form_builder'

data/lib/comfortable_mexican_sofa/access_control/admin_authentication.rb

@@ -2,8 +2,9 @@ module ComfortableMexicanSofa::AccessControl
   module AdminAuthentication
     # Set username and password in config/initializers/comfortable_mexican_sofa.rb
     # Like this:
-    #   ComfortableMexicanSofa::AccessControl::AdminAuthentication = 'myname'
-    #   ComfortableMexicanSofa::AccessControl::AdminAuthentication = 'mypassword'
+    #   ComfortableMexicanSofa::AccessControl::AdminAuthentication.username = 'myname'
+    #   ComfortableMexicanSofa::AccessControl::AdminAuthentication.password = 'mypassword'
+
 
     mattr_accessor  :username,
                     :password

data/lib/comfortable_mexican_sofa/access_control/public_authorization.rb

@@ -0,0 +1,8 @@
+module ComfortableMexicanSofa::AccessControl
+  module PublicAuthorization
+    # By default there's no authorization of any kind
+    def authorize
+      true
+    end
+  end
+end

data/lib/comfortable_mexican_sofa/configuration.rb

@@ -18,6 +18,9 @@ class ComfortableMexicanSofa::Configuration
   # Module that will handle authentication for public pages
   attr_accessor :public_auth
 
+  # Module that will handle authorization against public resources
+  attr_accessor :public_authorization
+
   # When arriving at /cms-admin you may chose to redirect to arbirtary path,
   # for example '/cms-admin/users'
   attr_accessor :admin_route_redirect
@@ -82,6 +85,7 @@ class ComfortableMexicanSofa::Configuration
     @admin_auth           = 'ComfortableMexicanSofa::AccessControl::AdminAuthentication'
     @admin_authorization  = 'ComfortableMexicanSofa::AccessControl::AdminAuthorization'
     @public_auth          = 'ComfortableMexicanSofa::AccessControl::PublicAuthentication'
+    @public_authorization = 'ComfortableMexicanSofa::AccessControl::PublicAuthorization'
     @seed_data_path       = nil
     @admin_route_redirect = ''
     @enable_sitemap       = true

data/lib/comfortable_mexican_sofa/engine.rb

@@ -17,6 +17,10 @@ require 'plupload-rails'
 
 module ComfortableMexicanSofa
   class Engine < ::Rails::Engine
-    # ...
+    config.to_prepare do
+      Dir.glob(Rails.root + "app/decorators/comfortable_mexican_sofa/*_decorator*.rb").each do |c|
+        require_dependency(c)
+      end
+    end
   end
 end

data/lib/comfortable_mexican_sofa/fixture/file.rb

@@ -4,29 +4,29 @@ module ComfortableMexicanSofa::Fixture::File
       Dir["#{self.path}[^_]*"].each do |file_path|
         filename = ::File.basename(file_path)
         file = self.site.files.where(:file_file_name => filename).first || self.site.files.new
-        
+
         # setting attributes
         categories = []
         if File.exists?(attrs_path = File.join(self.path, "_#{filename}.yml"))
           if fresh_fixture?(file, attrs_path)
             attrs = get_attributes(attrs_path)
-            
-            block = if (attrs['page'] && attrs['block']) && (page = self.site.pages.find_by_slug(attrs['page']))
+
+            block = if (attrs['page'] && attrs['block']) && (page = self.site.pages.find_by_full_path(attrs['page']))
               page.blocks.find_by_identifier(attrs['block'])
             end
-            
+
             file.label        = attrs['label']
             file.description  = attrs['description']
             categories        = attrs['categories']
             file.block        = block
           end
         end
-        
+
         # setting actual file
         if fresh_fixture?(file, file_path)
           file.file = open(file_path)
         end
-        
+
         if file.changed? || self.force_import
           if file.save
             save_categorizations!(file, categories)
@@ -35,49 +35,49 @@ module ComfortableMexicanSofa::Fixture::File
             ComfortableMexicanSofa.logger.warn("[FIXTURES] Failed to import File \n#{file.errors.inspect}")
           end
         end
-        
+
         self.fixture_ids << file.id
       end
-      
+
       # cleaning up
       self.site.files.where('id NOT IN (?) AND block_id IS NULL', fixture_ids).each{ |s| s.destroy }
     end
   end
-  
+
   class Exporter < ComfortableMexicanSofa::Fixture::Exporter
     def export!
       prepare_folder!(self.path)
-      
+
       self.site.files.each do |file|
         file_path = File.join(self.path, file.file_file_name)
         block = file.block
-        page = block.present?? block.page : nil
-        
+        page = block.present?? block.blockable : nil
+
         # writing attributes
         open(::File.join(self.path, "_#{file.file_file_name}.yml"), 'w') do |f|
           f.write({
             'label'       => file.label,
             'description' => file.description,
             'categories'  => file.categories.map{|c| c.label},
-            'page'        => page.present? ? page.slug : nil,
-            'block'       => block.present? ? block.identifier : nil
+            'page'        => page.present?? page.full_path : nil,
+            'block'       => block.present?? block.identifier : nil
           }.to_yaml)
         end
-        
+
         # writing content
         data_path = file.file.options[:storage] == :filesystem ?
           file.file.path :
           file.file.url
-        
-        unless ::File.exists?(data_path)
+
+        begin
+          open(::File.join(self.path, ::File.basename(file_path)), 'wb') do |f|
+            open(data_path) { |src| f.write(src.read) }
+          end
+        rescue Errno::ENOENT, OpenURI::HTTPError
           ComfortableMexicanSofa.logger.warn("[FIXTURES] No physical File \t #{file.file_file_name}")
           next
         end
-          
-        open(::File.join(self.path, ::File.basename(file_path)), 'wb') do |f|
-          open(data_path) { |src| f.write(src.read) }
-        end
-        
+
         ComfortableMexicanSofa.logger.info("[FIXTURES] Exported File \t #{file.file_file_name}")
       end
     end