ecm_cms 0.0.11.pre → 0.0.13.pre

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2012 Roberto Vasquez Angel
+Copyright 2013 Roberto Vasquez Angel
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

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

@@ -8,7 +8,8 @@ class Ecm::Cms::PageController < ApplicationController
   # avoid error 500 on missing template
   rescue_from ActionView::MissingTemplate do
     respond_to do |format|
-      format.html { render(:file => "#{Rails.root}/public/404.html", :layout => false, :status => 404) }
+      # format.html { render(:file => "#{Rails.root}/public/404.html", :layout => false, :status => 404) }
+      format.html { render(:file => "#{Rails.root}/public/404", :formats => [:html], :status => 404, :layout => false) }
       format.xml  { head :not_found }
       format.any  { head :not_found }
     end

data/config/locales/ecm.cms.de.yml

@@ -10,7 +10,7 @@ de:
   resources:
     ecm_cms_folders: ordner
     ecm_cms_navigations: navigationen
-    ecm_cms_navigation_items: navigationenseintraege
+    ecm_cms_navigation_items: navigationseintraege
     ecm_cms_pages: seiten
     ecm_cms_partials: fragmente
     ecm_cms_templates: vorlagen    

data/lib/ecm/cms/active_admin/ecm_cms_partials.rb

@@ -35,8 +35,6 @@ ActiveAdmin.register Ecm::Cms::Partial do
 
   sidebar Ecm::Cms::Partial.human_attribute_name(:details), :only => :show do
     attributes_table_for ecm_cms_partial do
-p ecm_cms_partial.inspect
-      # row :folder
       row :pathname
       row :filename
       row :created_at

data/lib/ecm/cms/importers/navigation_item.rb

@@ -7,18 +7,32 @@ module Ecm
           @yaml = YAML.load(yaml)
         end
 
+        def navigation_items
+          @navigation_items ||= create_navigation_items
+        end
+
+        private
+
         def create_navigation_items
           built_navigation_items = []
           @yaml.each do |navigation_locale, navigation|
-            navigation.each do |navigation_name, navigation_items|
+p navigation_locale
+p navigation          
+            navigation.each do |navigation_name, navigation_items_attributes|
               n = find_or_create_navigation(navigation_locale, navigation_name)
-              navigation_items.each do |navigation_item_attributes|
-                ni = create_navigation_item(navigation_item_attributes, n)
-                built_navigation_items << ni
-              end
+              built_navigation_items << create_navigation_items_for_navigation(n, navigation_items_attributes)
             end if navigation_locale.respond_to?(:each)
           end if @yaml.respond_to?(:each)
-          built_navigation_items
+          built_navigation_items.flatten
+        end
+
+        def create_navigation_items_for_navigation(navigation, navigation_items_attributes)
+          built_navigation_items = []
+          navigation_items_attributes.each do |navigation_item_attributes|
+            ni = create_navigation_item(navigation_item_attributes, navigation)
+            built_navigation_items << ni
+          end
+          return built_navigation_items
         end
 
         def create_navigation_item(navigation_item_attributes, navigation)
@@ -42,10 +56,6 @@ module Ecm
           navigation
         end
 
-        def navigation_items
-          @navigation_items ||= create_navigation_items
-        end
-
         def yaml
           @yaml
         end

data/lib/ecm/cms/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Cms
-    VERSION = "0.0.11.pre"
+    VERSION = "0.0.13.pre"
   end  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ecm_cms
 version: !ruby/object:Gem::Version 
-  hash: 961916008
+  hash: 961916016
   prerelease: 7
   segments: 
   - 0
   - 0
-  - 11
+  - 13
   - pre
-  version: 0.0.11.pre
+  version: 0.0.13.pre
 platform: ruby
 authors: 
 - Roberto Vasquez Angel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-28 00:00:00 Z
+date: 2013-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -316,21 +316,23 @@ dependencies:
   type: :development
   version_requirements: *id021
 - !ruby/object:Gem::Dependency 
-  name: ffaker
+  name: rb-inotify
   prerelease: false
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 47
         segments: 
         - 0
-        version: "0"
+        - 8
+        - 8
+        version: 0.8.8
   type: :development
   version_requirements: *id022
 - !ruby/object:Gem::Dependency 
-  name: forgery
+  name: guard-rspec
   prerelease: false
   requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
@@ -343,40 +345,10 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id023
-- !ruby/object:Gem::Dependency 
-  name: rb-inotify
-  prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 9
-        - 0
-        version: 0.9.0
-  type: :development
-  version_requirements: *id024
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
-  prerelease: false
-  requirement: &id025 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id025
 - !ruby/object:Gem::Dependency 
   name: guard-bundler
   prerelease: false
-  requirement: &id026 !ruby/object:Gem::Requirement 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -386,7 +358,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id026
+  version_requirements: *id024
 description: CMS Module for active admin.
 email: 
 - roberto@vasquez-angel.de