ecm_cms2 1.1.1 → 2.0.2

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

@@ -2,7 +2,7 @@ module Ecm
   module Cms
     module Importers
       class Navigation
-        def initialize(yaml, option = {})
+        def initialize(yaml, _option = {})
           @navigations = nil
           @yaml = YAML.load(yaml)
         end
@@ -20,11 +20,8 @@ module Ecm
           @navigations ||= build_navigations
         end
 
-        def yaml
-          @yaml
-        end
+        attr_reader :yaml
       end
     end
   end
 end
-

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

@@ -2,7 +2,7 @@ module Ecm
   module Cms
     module Importers
       class NavigationItem
-        def initialize(yaml, option = {})
+        def initialize(yaml, _option = {})
           @navigation_items = nil
           @yaml = YAML.load(yaml)
         end
@@ -15,7 +15,7 @@ module Ecm
 
         def create_navigation_items
           built_navigation_items = []
-          @yaml.each do |navigation_locale, navigation|     
+          @yaml.each do |navigation_locale, navigation|
             navigation.each do |navigation_name, navigation_items_attributes|
               n = find_or_create_navigation(navigation_locale, navigation_name)
               built_navigation_items << create_navigation_items_for_navigation(n, navigation_items_attributes)
@@ -30,7 +30,7 @@ module Ecm
             ni = create_navigation_item(navigation_item_attributes, navigation)
             built_navigation_items << ni
           end
-          return built_navigation_items
+          built_navigation_items
         end
 
         def create_navigation_item(navigation_item_attributes, navigation)
@@ -49,16 +49,13 @@ module Ecm
         end
 
         def find_or_create_navigation(navigation_locale, navigation_name)
-          navigation = Ecm::Cms::Navigation.where(:locale => navigation_locale, :name => navigation_name).first
-          navigation = Ecm::Cms::Navigation.create!(:locale => navigation_locale, :name => navigation_name) if navigation.nil?
+          navigation = Ecm::Cms::Navigation.where(locale: navigation_locale, name: navigation_name).first
+          navigation = Ecm::Cms::Navigation.create!(locale: navigation_locale, name: navigation_name) if navigation.nil?
           navigation
         end
 
-        def yaml
-          @yaml
-        end
+        attr_reader :yaml
       end
     end
   end
 end
-

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

@@ -2,7 +2,7 @@ module Ecm
   module Cms
     module Importers
       class Page
-        def initialize(yaml, option = {})
+        def initialize(yaml, _option = {})
           @pages = nil
           @yaml = YAML.load(yaml)
         end
@@ -21,8 +21,8 @@ module Ecm
         def extract_navigation_items(navigation_item_data)
           navigation_items = []
           navigation_item_data.each do |nid|
-            navigation = Ecm::Cms::Navigation.where(:locale => nid['navigation_locale'], :name => nid['navigation_name']).first
-            navigation_items << navigation.ecm_cms_navigation_items.where(:name => nid['name']).first if navigation.respond_to?(:ecm_cms_navigation_items)
+            navigation = Ecm::Cms::Navigation.where(locale: nid['navigation_locale'], name: nid['navigation_name']).first
+            navigation_items << navigation.ecm_cms_navigation_items.where(name: nid['name']).first if navigation.respond_to?(:ecm_cms_navigation_items)
           end
           navigation_items
         end
@@ -31,11 +31,8 @@ module Ecm
           @pages ||= build_pages
         end
 
-        def yaml
-          @yaml
-        end
+        attr_reader :yaml
       end
     end
   end
 end
-

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

@@ -20,12 +20,10 @@ module Ecm
         content_for_title = "<% content_for :title do %>#{record.title}<% end %>"
         content_for_meta_description = "<% content_for :meta_description do %>#{record.meta_description}<% end %>"
         output << content_for_title << content_for_meta_description
-        
-        unless record.body.nil?
-          output << record.body
-        end
 
-        return output
+        output << record.body unless record.body.nil?
+
+        output
       end
 
       def normalize_basename(basename)
@@ -42,4 +40,3 @@ module Ecm
     end
   end
 end
-

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

@@ -27,4 +27,3 @@ module Ecm
     end
   end
 end
-

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

@@ -27,4 +27,3 @@ module Ecm
     end
   end
 end
-

data/lib/ecm/cms/routing.rb

@@ -4,10 +4,9 @@ module Ecm
       def self.routes(router, options = {})
         options.reverse_merge!({})
 
-        router.get "/*page", :to => "ecm/cms/page#respond", :as => :page
-        router.get '/' => "ecm/cms/page#respond", :page => 'home' #, :as => :root
+        router.get '/*page', to: 'ecm/cms/page#respond', as: :page
+        router.get '/' => 'ecm/cms/page#respond', :page => 'home' # , :as => :root
       end
     end
   end
 end
-

data/lib/ecm/cms/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Cms
-    VERSION = "1.1.1"
+    VERSION = '2.0.2'
   end
 end

data/lib/ecm_cms2.rb

@@ -3,10 +3,10 @@ require 'ecm/cms/action_view/template_patch'
 require 'ecm/cms/action_view/template_renderer_patch'
 
 require 'awesome_nested_set'
+require 'itsf_services'
 require 'redcloth'
 require 'simple-navigation'
 require 'simple-navigation-bootstrap'
-require 'active_admin-awesome_nested_set'
 
 require 'ecm/cms/engine'
 require 'ecm/cms/configuration'
@@ -33,4 +33,3 @@ module Ecm
     end
   end
 end
-

data/lib/generators/ecm/cms/install/install_generator.rb

@@ -2,14 +2,14 @@ module Ecm
   module Cms
     module Generators
       class InstallGenerator < Rails::Generators::Base
-        desc "Generates the intializer"
+        desc 'Generates the intializer'
+
+        source_root File.expand_path('../templates', __FILE__)
 
-        source_root File.expand_path('../templates', __FILE__) 
-        
         def generate_intializer
-          copy_file "ecm_cms.rb", "config/initializers/ecm_cms.rb"
-        end   
+          copy_file 'ecm_cms.rb', 'config/initializers/ecm_cms.rb'
+        end
       end
     end
   end
-end        
+end

data/lib/generators/ecm/cms/install/templates/ecm_cms.rb

@@ -2,15 +2,15 @@ Ecm::Cms.configure do |config|
   # Set the default handler for pages, partials and templates
   #
   # Default:   config.default_handlers = {
-  #              page:     :texterb,
-  #              partial:  :texterb,
-  #              template: :texterb
+  #              page:     :textile,
+  #              partial:  :textile,
+  #              template: :textile
   #            }
   #
   config.default_handlers = {
-    page:     :texterb,
-    partial:  :texterb,
-    template: :texterb
+    page:     :textile,
+    partial:  :textile,
+    template: :textile
   }
 
   # Set the base controller for the page controller

data/lib/generators/ecm/cms/locales/locales_generator.rb

@@ -1,38 +1,39 @@
+require 'rails/generators'
+
 module Ecm
   module Cms
     module Generators
       class LocalesGenerator < Rails::Generators::Base
-        desc "Copies the locale files to your application"
+        desc 'Copies the locale files to your application'
 
         source_root File.expand_path('../../../../../../config/locales', __FILE__)
 
         def generate_locales
-          copy_file "ecm.cms.en.yml", "config/locales/ecm.cms.en.yml"
-          copy_file "ecm.cms.de.yml", "config/locales/ecm.cms.de.yml"
+          copy_file 'ecm.cms.en.yml', 'config/locales/ecm.cms.en.yml'
+          copy_file 'ecm.cms.de.yml', 'config/locales/ecm.cms.de.yml'
 
-          copy_file "ecm.cms.content_box.en.yml", "config/locales/ecm.cms.content_box.en.yml"
-          copy_file "ecm.cms.content_box.de.yml", "config/locales/ecm.cms.content_box.de.yml"
+          copy_file 'ecm.cms.content_box.en.yml', 'config/locales/ecm.cms.content_box.en.yml'
+          copy_file 'ecm.cms.content_box.de.yml', 'config/locales/ecm.cms.content_box.de.yml'
 
-          copy_file "ecm.cms.navigation.en.yml", "config/locales/ecm.cms.navigation.en.yml"
-          copy_file "ecm.cms.navigation.de.yml", "config/locales/ecm.cms.navigation.de.yml"
+          copy_file 'ecm.cms.navigation.en.yml', 'config/locales/ecm.cms.navigation.en.yml'
+          copy_file 'ecm.cms.navigation.de.yml', 'config/locales/ecm.cms.navigation.de.yml'
 
-          copy_file "ecm.cms.navigation_item.en.yml", "config/locales/ecm.cms.navigation_item.en.yml"
-          copy_file "ecm.cms.navigation_item.de.yml", "config/locales/ecm.cms.navigation_item.de.yml"
+          copy_file 'ecm.cms.navigation_item.en.yml', 'config/locales/ecm.cms.navigation_item.en.yml'
+          copy_file 'ecm.cms.navigation_item.de.yml', 'config/locales/ecm.cms.navigation_item.de.yml'
 
-          copy_file "ecm.cms.page.en.yml", "config/locales/ecm.cms.page.en.yml"
-          copy_file "ecm.cms.page.de.yml", "config/locales/ecm.cms.page.de.yml"
+          copy_file 'ecm.cms.page.en.yml', 'config/locales/ecm.cms.page.en.yml'
+          copy_file 'ecm.cms.page.de.yml', 'config/locales/ecm.cms.page.de.yml'
 
-          copy_file "ecm.cms.page.content_block.en.yml", "config/locales/ecm.cms.page.content_block.en.yml"
-          copy_file "ecm.cms.page.content_block.de.yml", "config/locales/ecm.cms.page.content_block.de.yml"
+          copy_file 'ecm.cms.page.content_block.en.yml', 'config/locales/ecm.cms.page.content_block.en.yml'
+          copy_file 'ecm.cms.page.content_block.de.yml', 'config/locales/ecm.cms.page.content_block.de.yml'
 
-          copy_file "ecm.cms.partial.en.yml", "config/locales/ecm.cms.partial.en.yml"
-          copy_file "ecm.cms.partial.de.yml", "config/locales/ecm.cms.partial.de.yml"
+          copy_file 'ecm.cms.partial.en.yml', 'config/locales/ecm.cms.partial.en.yml'
+          copy_file 'ecm.cms.partial.de.yml', 'config/locales/ecm.cms.partial.de.yml'
 
-          copy_file "ecm.cms.template.en.yml", "config/locales/ecm.cms.template.en.yml"
-          copy_file "ecm.cms.template.de.yml", "config/locales/ecm.cms.template.de.yml"
+          copy_file 'ecm.cms.template.en.yml', 'config/locales/ecm.cms.template.en.yml'
+          copy_file 'ecm.cms.template.de.yml', 'config/locales/ecm.cms.template.de.yml'
         end
       end
     end
   end
 end
-

data/lib/tasks/ecm_cms_tasks.rake

@@ -1,10 +1,9 @@
 namespace :ecm do
   namespace :cms do
     desc 'Imports partials from app/views into the database'
-    task :import_partials, [:view_path] => [:environment] do |t, args|
-      args.with_defaults(:view_path => Rails.root.join(*%(app views)))
+    task :import_partials, [:view_path, :force] => [:environment] do |_t, args|
+      args.with_defaults(view_path: Rails.root.join(*%(app views)), force: false)
       Ecm::Cms::ImportPartialsService.call(args)
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_cms2
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-21 00:00:00.000000000 Z
+date: 2016-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,11 +24,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: active_admin-awesome_nested_set
+  name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -45,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_nested_set
+  name: draper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -59,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: draper
+  name: itsf_services
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -282,6 +276,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: active_admin-awesome_nested_set
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -314,16 +322,16 @@ dependencies:
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -394,7 +402,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: CMS Module for active admin.
+description: CMS base module for ruby on rails.
 email:
 - roberto@vasquez-angel.de
 executables: []
@@ -404,11 +412,17 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
+- app/admin/ecm_cms_content_box.rb
+- app/admin/ecm_cms_navigation_items.rb
+- app/admin/ecm_cms_navigations.rb
+- app/admin/ecm_cms_pages.rb
+- app/admin/ecm_cms_partials.rb
+- app/admin/ecm_cms_templates.rb
 - app/assets/javascripts/ecm_cms.js.coffee
 - app/assets/stylesheets/ecm_cms.css.less
 - app/controllers/ecm/cms/page_controller.rb
 - app/helpers/ecm/cms_helper.rb
-- app/models/concerns/ecm/cms/navigation_item/properties.rb
+- app/models/concerns/model/ecm/cms/navigation_item/properties_concern.rb
 - app/models/ecm/cms/content_box.rb
 - app/models/ecm/cms/folder.rb
 - app/models/ecm/cms/navigation.rb
@@ -417,6 +431,7 @@ files:
 - app/models/ecm/cms/page/content_block.rb
 - app/models/ecm/cms/partial.rb
 - app/models/ecm/cms/template.rb
+- app/services/ecm/cms/add_homepages_service.rb
 - app/services/ecm/cms/import_partials_service.rb
 - app/views/ecm/cms/_link_to_top.html.erb
 - config/locales/ecm.cms.content_box.de.yml
@@ -447,12 +462,6 @@ files:
 - lib/ecm/cms/action_view/template/handlers/textile.rb
 - lib/ecm/cms/action_view/template_patch.rb
 - lib/ecm/cms/action_view/template_renderer_patch.rb
-- lib/ecm/cms/active_admin/ecm_cms_content_box.rb
-- lib/ecm/cms/active_admin/ecm_cms_navigation_items.rb
-- lib/ecm/cms/active_admin/ecm_cms_navigations.rb
-- lib/ecm/cms/active_admin/ecm_cms_pages.rb
-- lib/ecm/cms/active_admin/ecm_cms_partials.rb
-- lib/ecm/cms/active_admin/ecm_cms_templates.rb
 - lib/ecm/cms/configuration.rb
 - lib/ecm/cms/controller_extensions/page_resolver.rb
 - lib/ecm/cms/controller_extensions/partial_resolver.rb
@@ -495,6 +504,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: CMS Module for active admin.
+summary: CMS base module for ruby on rails.
 test_files: []
-has_rdoc: 

data/app/models/concerns/ecm/cms/navigation_item/properties.rb

@@ -1,29 +0,0 @@
-require 'active_support/concern'
-
-module Ecm::Cms
-  module NavigationItem::Properties
-    extend ActiveSupport::Concern
-
-    included do
-      serialize :properties, OpenStruct
-      delegate *Configuration.navigation_item_properties, to: :li_attributes
-      delegate *Configuration.navigation_item_properties.collect { |a| "#{a}=".to_sym }, to: :li_attributes
-    end
-
-    def highlights_on
-      self.properties.highlights_on ||= nil
-    end
-
-    def highlights_on=(highlights_on)
-      properties.highlights_on = highlights_on
-    end
-
-    def li_attributes
-      self.properties.li_attributes ||= OpenStruct.new
-    end
-
-    def li_attributes=(li_attributes)
-      properties.li_attributes = li_attributes
-    end
-  end
-end