cmor_cms 0.0.59.pre → 0.0.60.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e185b056371db7d645ccb896b3a87ca63aa61427fa0bf4d27f4f8b3ae2c9cee4
-  data.tar.gz: b7942385f07c0dbbce28f8b129229635ab4c00af1e8ed6d92d8c29322409ffaa
+  metadata.gz: bbc08f4ce3bcb2c2753ba1939cd871591a64716629711206892a911489bddf9e
+  data.tar.gz: 9c2b42cc5b4df4a2ccdb7ed61f5619c570091951f981586ec0a49c07787b01a5
 SHA512:
-  metadata.gz: 8d976aee1a3eab730e130b8a842123d80c44342b265cdf989ac6752847a6615fa8a117393abf47db4e954f9bf64a1ce86ed6a2572957ee3846f646c0ad128979
-  data.tar.gz: cf09c9a732f6fdd53213e84fa1d220e2056985ba11fb682bb5e996fb0f5ce616db7359db10f1cf1612d9c2a55b8ad2c9d6bbfd268a081093cbfde22d25bfe4a2
+  metadata.gz: 1263916512e708c1897e1db50a83c4bea1dd34217852a1b3c13aa8dc1b559a9ea99a2ca3c0675aa573d82b085febe6486bae9198cd7e83f149c4d41663cf8089
+  data.tar.gz: 8e71a0b45c061464471062def6d22d2a950978c29127956fc49042c070e2842626d4925cf158b04a1255dba3a695d1abda1677c612c3594d0cb44b1c7c6fd6cb

data/app/resolvers/cmor/cms/database_resolver.rb

@@ -11,40 +11,79 @@ module Cmor
       end
 
       # instance methods go here
-      def find_templates(name, prefix, partial, details, outside_app_allowed = false)
-        return [] unless resolve(partial)
+      if Rails.version < '6.0'
+        def find_templates(name, prefix, partial, details, outside_app_allowed = false)
+          return [] unless resolve(partial)
+
+          conditions = {
+            pathname: assert_slashs(prefix.to_s),
+            basename: normalize_basename(name),
+            locale: normalize_array(details[:locale]).first,
+            format: normalize_array(details[:formats]).first,
+            handler: normalize_array(details[:handlers])
+          }
+
+          format = conditions.delete(:format)
+          locale = conditions.delete(:locale)
+
+          query  = template_class.constantize.where(conditions)
 
-        conditions = {
-          pathname: assert_slashs(prefix.to_s),
-          basename: normalize_basename(name),
-          locale: normalize_array(details[:locale]).first,
-          format: normalize_array(details[:formats]).first,
-          handler: normalize_array(details[:handlers])
-        }
+          # 1) Only include published templates
+          query = query.published
 
-        format = conditions.delete(:format)
-        locale = conditions.delete(:locale)
+          # 2) Check for templates with the given format or format is nil
+          query = query.where(["format = ? OR format = '' OR format IS NULL", format])
 
-        query  = template_class.constantize.where(conditions)
+          # 3) Ensure templates with format come first
+          query = query.order('format DESC')
 
-        # 1) Only include published templates
-        query = query.published
+          # 4) Check for templates with the given locale or locale is nil
+          query = query.where(["locale = ? OR locale = '' OR locale IS NULL", locale])
 
-        # 2) Check for templates with the given format or format is nil
-        query = query.where(["format = ? OR format = '' OR format IS NULL", format])
+          # 5) Ensure templates with locale come first
+          query = query.order('locale DESC')
 
-        # 3) Ensure templates with format come first
-        query = query.order('format DESC')
+          # 6) Now trigger the query passing on conditions to initialization
+          query.map do |record|
+            initialize_template(record, details)
+          end
+        end
+      else
+        def find_templates(name, prefix, partial, details, locals)
+          return [] unless resolve(partial)
+
+          conditions = {
+            pathname: assert_slashs(prefix.to_s),
+            basename: normalize_basename(name),
+            locale: normalize_array(details[:locale]).first,
+            format: normalize_array(details[:formats]).first,
+            handler: normalize_array(details[:handlers])
+          }
 
-        # 4) Check for templates with the given locale or locale is nil
-        query = query.where(["locale = ? OR locale = '' OR locale IS NULL", locale])
+          format = conditions.delete(:format)
+          locale = conditions.delete(:locale)
 
-        # 5) Ensure templates with locale come first
-        query = query.order('locale DESC')
+          query  = template_class.constantize.where(conditions)
 
-        # 6) Now trigger the query passing on conditions to initialization
-        query.map do |record|
-          initialize_template(record, details)
+          # 1) Only include published templates
+          query = query.published
+
+          # 2) Check for templates with the given format or format is nil
+          query = query.where(["format = ? OR format = '' OR format IS NULL", format])
+
+          # 3) Ensure templates with format come first
+          query = query.order('format DESC')
+
+          # 4) Check for templates with the given locale or locale is nil
+          query = query.where(["locale = ? OR locale = '' OR locale IS NULL", locale])
+
+          # 5) Ensure templates with locale come first
+          query = query.order('locale DESC')
+
+          # 6) Now trigger the query passing on conditions to initialization
+          query.map do |record|
+            initialize_template(record, details, locals)
+          end
         end
       end
 
@@ -71,13 +110,12 @@ module Cmor
           ::ActionView::Template.new(source, identifier, handler, details)
         end
       else
-        def initialize_template(record, details)
+        def initialize_template(record, details, locals)
           source       = build_source(record)
           identifier   = "#{record.class} - #{record.id} - #{record.pathname}#{record.basename}"
           handler      = ::ActionView::Template.registered_template_handler(record.handler)
           virtual_path = "#{record.pathname}#{record.basename}"
           layout = record.layout if record.respond_to?(:layout) && record.layout.present?
-          locals       = []
 
           # 5) Check for the record.format, if none is given, try the template
           # handler format and fallback to the one given on conditions

data/app/services/cmor/cms/add_homepages_service.rb

@@ -63,6 +63,7 @@ module Cmor::Cms
           page.basename         = 'home'
           page.locale           = locale
           page.handler          = 'textile'
+          page.published        = true
         end
         if page.save
           @created_pages << page

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

@@ -18,16 +18,24 @@ module Cmor
         end
 
         def generate_routes
+          if Rails.application.routes.url_helpers.respond_to?(:root_path)
+            routes_source = 'routes_without_root.source'
+          else
+            routes_source = 'routes.source'
+          end
+
           inject_into_file 'config/routes.rb', before: "\nend" do
-            File.read(File.join(File.expand_path('../templates', __FILE__), 'routes.source'))
+            File.read(File.join(File.expand_path('../templates', __FILE__), routes_source))
           end
         end
 
-        # def add_homepages
-        #   if yes? "Do you want to add homepages?"
-        #     AddHomepagesService.call
-        #   end
-        # end
+        def add_homepages
+          begin
+            AddHomepagesService.call(locales: [I18n.locale])
+          rescue ActiveRecord::StatementInvalid => e
+            puts "[Cmor::Cms] Could not generate homepage: #{e.message}"
+          end
+        end
       end
     end
   end

data/lib/generators/cmor/cms/install/templates/routes.source

@@ -1,4 +1,11 @@
 
   mount Cmor::Cms::Engine, at: '/' # This one is greedy and has to go last!
 
+  # Cmor::Cms adds a root route to redirect the root of your application
+  # to the default locale.
+  #
+  # For example if your default locale is en and you access www.example.com
+  # it redirects to www.example.com/en. At /en the request is handled by
+  # by Cmor::Cms.
+  #
   root to: redirect("/#{I18n.locale}")

data/lib/generators/cmor/cms/install/templates/routes_without_root.source

@@ -0,0 +1,14 @@
+
+  mount Cmor::Cms::Engine, at: '/' # This one is greedy and has to go last!
+
+  # Cmor::Cms adds a root route to redirect the root of your application
+  # to the default locale.
+  #
+  # For example if your default locale is en and you access www.example.com
+  # it redirects to www.example.com/en. At /en the request is handled by
+  # by Cmor::Cms.
+  #
+  # WARNING: As you already have a root route this default was not added.
+  # Please review your routing.
+  #
+  # root to: redirect("/#{I18n.locale}")

data/lib/tasks/cmor_cms_tasks.rake

@@ -6,10 +6,15 @@ namespace :cmor do
       Cmor::Cms::ImportPartialsService.call(args)
     end
 
-    desc 'Adds homepages for all (or given) locales'
+    desc 'Adds homepages for all (or given) locales (Specify locales like this: rails cmor:cms:add_homepages["en de"])'
     task :add_homepages, [:locales] => [:environment] do |_t, args|
       args.with_defaults(locales: I18n.available_locales)
-      Cmor::Cms::AddHomepagesService.call(args)
+      options = args.to_h
+      if options[:locales].is_a?(String)
+        options[:locales] = options[:locales].split.map(&:to_sym) & I18n.available_locales
+      end
+
+      Cmor::Cms::AddHomepagesService.call(options)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cmor_cms
 version: !ruby/object:Gem::Version
-  version: 0.0.59.pre
+  version: 0.0.60.pre
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.59.pre
+        version: 0.0.60.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.59.pre
+        version: 0.0.60.pre
 - !ruby/object:Gem::Dependency
   name: cmor_core_frontend
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.59.pre
+        version: 0.0.60.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.59.pre
+        version: 0.0.60.pre
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -499,6 +499,7 @@ files:
 - lib/generators/cmor/cms/install/install_generator.rb
 - lib/generators/cmor/cms/install/templates/initializer.rb
 - lib/generators/cmor/cms/install/templates/routes.source
+- lib/generators/cmor/cms/install/templates/routes_without_root.source
 - lib/tasks/cmor_cms_tasks.rake
 - spec/factories/cmor/cms/content_block.rb
 - spec/factories/cmor/cms/content_box.rb