ecm_cms 0.0.5.pre → 0.0.6.pre

data/app/controllers/ecm/cms/page_controller.rb

@@ -3,7 +3,7 @@ class Ecm::Cms::PageController < ApplicationController
   include RailsTools::I18nController
   
   # add the page resolver
-  append_view_path Ecm::Cms::PageResolver.instance unless view_paths.include?(Ecm::Cms::PageResolver.instance)
+  include Ecm::Cms::ControllerExtensions::PageResolver
 
   def respond
     render :template => params[:page]

data/lib/ecm/cms/controller_extensions/page_resolver.rb

@@ -0,0 +1,13 @@
+module Ecm
+  module Cms
+    module ControllerExtensions
+      module PageResolver
+        def self.included(base)
+          # add the page resolver
+          base.append_view_path ::Ecm::Cms::PageResolver.instance unless base.view_paths.include?(::Ecm::Cms::PageResolver.instance)
+        end
+      end
+    end
+  end
+end
+

data/lib/ecm/cms/controller_extensions/partial_resolver.rb

@@ -0,0 +1,13 @@
+module Ecm
+  module Cms
+    module ControllerExtensions
+      module PartialResolver
+        def self.included(base)
+          # add the partial resolver
+          base.append_view_path ::Ecm::Cms::PartialResolver.instance unless base.view_paths.include?(::Ecm::Cms::PartialResolver.instance)
+        end
+      end
+    end
+  end
+end
+

data/lib/ecm/cms/controller_extensions/template_resolver.rb

@@ -0,0 +1,13 @@
+module Ecm
+  module Cms
+    module ControllerExtensions
+      module TemplateResolver
+        def self.included(base)
+          # add the template resolver
+          base.append_view_path ::Ecm::Cms::TemplateResolver.instance unless base.view_paths.include?(::Ecm::Cms::TemplateResolver.instance)
+        end
+      end
+    end
+  end
+end
+

data/lib/ecm/cms/database_template.rb

@@ -16,8 +16,10 @@ module Ecm
         base.after_save :clear_resolver_cache
 
         # validations
+        # base.validates :basename, :presence => true,
+        #                           :uniqueness => { :scope => [:ecm_cms_folder_id , :locale] }
         base.validates :basename, :presence => true,
-                                  :uniqueness => { :scope => [:ecm_cms_folder_id , :locale] }
+                                  :uniqueness =>  { :scope => [ :pathname, :locale, :format, :handler ] }
         base.validates :handler, :inclusion => ActionView::Template::Handlers.extensions.map(&:to_s)
         base.validates :locale, :inclusion => I18n.available_locales.map(&:to_s),
                                 :allow_nil => true,

data/lib/ecm/cms/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Cms
-    VERSION = "0.0.5.pre"
+    VERSION = "0.0.6.pre"
   end  
 end

data/lib/ecm_cms.rb

@@ -20,6 +20,10 @@ require 'ecm/cms/resolvers/ecm/cms/page_resolver'
 require 'ecm/cms/resolvers/ecm/cms/template_resolver'
 require 'ecm/cms/resolvers/ecm/cms/partial_resolver'
 
+require 'ecm/cms/controller_extensions/page_resolver'
+require 'ecm/cms/controller_extensions/partial_resolver'
+require 'ecm/cms/controller_extensions/template_resolver'
+
 ::ActionView::Template.register_template_handler :textile, ::ActionView::Template::Handlers::Textile.new
 
 module Ecm

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ecm_cms
 version: !ruby/object:Gem::Version 
-  hash: 961915984
+  hash: 961915996
   prerelease: 6
   segments: 
   - 0
   - 0
-  - 5
+  - 6
   - pre
-  version: 0.0.5.pre
+  version: 0.0.6.pre
 platform: ruby
 authors: 
 - Roberto Vasquez Angel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-06 00:00:00 Z
+date: 2012-12-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -419,6 +419,9 @@ files:
 - lib/ecm/cms/engine.rb
 - lib/ecm/cms/version.rb
 - lib/ecm/cms/routing.rb
+- lib/ecm/cms/controller_extensions/page_resolver.rb
+- lib/ecm/cms/controller_extensions/template_resolver.rb
+- lib/ecm/cms/controller_extensions/partial_resolver.rb
 - lib/ecm/cms/importers/navigation_item.rb
 - lib/ecm/cms/importers/navigation.rb
 - lib/ecm/cms/importers/page.rb