refinerycms-pages 3.0.6 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f503f368f89b0578401ea340bd135e5aac4a4ef
-  data.tar.gz: f6ea7967a335cf7107ad792f37f87b60f3116968
+  metadata.gz: 4ba7a91ac45acb1e48cc5552edecedafaf35e30a
+  data.tar.gz: 82266071f24ad8859480269962de199aea2516ea
 SHA512:
-  metadata.gz: 805867400c5c99ff7402ca86e747509a179fceadd081a31518b43706e995b4bfe44a08b2c0c5f9ae4742f4ef1c8dfcb53959d38677f96078ca6ae22c675b79f6
-  data.tar.gz: ef16b436cbc796b1a697c0fdf5e18ce92a26d8869b519ed0de0be351c430ff60a703fee797f209104ddda6a1b061860bd98563eab08921bcb9671a707c9304d9
+  metadata.gz: f21a83919c3e2a0dade0799322ff27500354576e3fc4021d88c0744980c88016e792819f1fcb528fd69859cd138eb1fb043a19b7807926f01138aa11225baff2
+  data.tar.gz: b62a810e695b50cfb8669ffa5cf0678673d47dce17d26afa045a1d0d815dc22202ef5c7e11d66d0074b50820f081738972e23c09b5a3b8d9a4713510c5ab8eed

checksums.yaml.gz.sig

@@ -1,2 +1,2 @@
-�ĔD�M�a��v	��8�~5�M�,�����M��`͍a������W�
-tl:
+zdv.��	p
+=��WK	�+x��	D���g�?�4	�(�J&!�i���������>��˘���+ȁ:����k^3��cG���dJw)�v��F�E|�e������3���ߒ�L
u�>t�'��F��-uHLL�<]�j�E���e&�Q\M�Y�ɑH�P-��*�ׇ|��ԃL�*���Q��R�ʦ �)BKKI��I׋Z1�ɶ�ΰ�>�r�O�?T�<�$��������9��8M�+Ĕ3�F/�/

data/app/controllers/refinery/admin/page_parts_controller.rb

@@ -15,9 +15,9 @@ module Refinery
         page = part.page
         if part.destroy
           page.reposition_parts!
-          render :text => "'#{part.title}' deleted."
+          render plain: t('refinery.crudify.destroyed', what: "'#{part.title}'")
         else
-          render :text => "'#{part.title}' not deleted."
+          render plain: t('refinery.crudify.not_destroyed', what: "'#{part.title}'")
         end
       end
 

data/app/helpers/refinery/admin/pages_helper.rb

@@ -54,14 +54,6 @@ module Refinery
 
         meta_information
       end
-
-      # We show the title from the next available locale
-      # if there is no title for the current locale
-      def page_title_with_translations(page)
-        Refinery.deprecate('page_title_with_translations', when: '3.1', replacement: 'translated_field')
-        page.title.presence || page.translations.detect { |t| t.title.present?}.title
-      end
-
     end
   end
 end

data/app/models/refinery/page.rb

@@ -10,6 +10,13 @@ module Refinery
 
     translates :title, :menu_title, :custom_slug, :slug, :include => :seo_meta
 
+    attribute :title
+    attribute :menu_title
+    attribute :custom_slug
+    attribute :slug
+
+    after_save { translations.collect(&:save) }
+
     class Translation
       is_seo_meta
 
@@ -137,11 +144,10 @@ module Refinery
         dialog ? Pages.pages_per_dialog : Pages.pages_per_admin_index
       end
 
-      def rebuild_with_slug_nullification!
-        rebuild_without_slug_nullification!
+      def rebuild!
+        super
         nullify_duplicate_slugs_under_the_same_parent!
       end
-      alias_method_chain :rebuild!, :slug_nullification
 
       protected
 
@@ -320,11 +326,6 @@ module Refinery
       end
     end
 
-    def part_with_title(part_title)
-      Refinery.deprecate("Refinery::Page#part_with_title", when: "3.1", replacement: "part_with_slug")
-      part_with_slug(part_title.to_s.parameterize.underscore)
-    end
-
     # Protects generated slugs from title if they are in the list of reserved words
     # This applies mostly to plugin-generated pages.
     # This only kicks in when Refinery::Pages.marketable_urls is enabled.

data/app/models/refinery/page_part.rb

@@ -11,12 +11,14 @@ module Refinery
 
     translates :body
 
+    attribute :body
+
     def to_param
       "page_part_#{slug.downcase.gsub(/\W/, '_')}"
     end
 
     def body=(value)
-      super
+      write_attribute(:body, value)
 
       normalise_text_fields
     end
@@ -28,16 +30,11 @@ module Refinery
       )
     end
 
-    def title_matches?(other_title)
-      Refinery.deprecate("Refinery::PagePart#title_matches?", when: "3.1", replacement: "slug_matches?")
-      slug_matches?(other_title.to_s.parameterize.underscore)
-    end
-
     protected
 
     def normalise_text_fields
-      if body? && body !~ %r{^<}
-        self.body = "<p>#{body.gsub("\r\n\r\n", "</p><p>").gsub("\r\n", "<br/>")}</p>"
+      if read_attribute(:body).present? && read_attribute(:body) !~ %r{^<}
+        write_attribute(:body, "<p>#{read_attribute(:body).gsub("\r\n\r\n", "</p><p>").gsub("\r\n", "<br/>")}</p>")
       end
     end
 

data/app/presenters/refinery/pages/menu_presenter.rb

@@ -10,7 +10,7 @@ module Refinery
       include ActionView::Helpers::UrlHelper
       include ActiveSupport::Configurable
 
-      config_accessor :roots, :menu_tag, :list_tag, :list_item_tag, :css, :dom_id,
+      config_accessor :roots, :menu_tag, :menu_role, :list_tag, :list_item_tag, :css, :dom_id,
                       :max_depth, :active_css, :selected_css, :first_css, :last_css, :list_tag_css,
                       :link_tag_css
       self.dom_id = 'menu'
@@ -42,7 +42,7 @@ module Refinery
 
       private
       def render_menu(items)
-        content_tag(menu_tag, :id => dom_id, :class => css) do
+        content_tag(menu_tag, id: dom_id, class: css, role: menu_role) do
           render_menu_items(items)
         end
       end
@@ -77,11 +77,6 @@ module Refinery
         item.has_children? && item.descendants.any?(&method(:selected_item?))
       end
 
-      def selected_item_or_descendant_item_selected?(item)
-        Refinery.deprecate('Refinery::Pages::MenuPresenter#selected_item_or_descendant_item_selected?', when: '3.1')
-        selected_item?(item) || descendant_item_selected?(item)
-      end
-
       # Determine whether the supplied item is the currently open item according to Refinery.
       def selected_item?(item)
         # Ensure we match the path without the locale, if present.

data/config/locales/da.yml

@@ -40,6 +40,7 @@ da:
           view_live_html: Vis siden live <br/><em>(åbner i et nyt vindue)</em>
           hidden: skjult
           draft: kladde
+          redirected: Videresendt
         form:
           preview: Preview
           preview_changes: Se dine ændringer før du udgiver dem

data/db/migrate/20100913234708_create_refinerycms_pages_schema.rb

@@ -1,4 +1,4 @@
-class CreateRefinerycmsPagesSchema < ActiveRecord::Migration
+class CreateRefinerycmsPagesSchema < ActiveRecord::Migration[4.2]
   def up
     create_table :refinery_page_parts do |t|
       t.integer  :refinery_page_id

data/db/migrate/20140105190324_add_custom_slug_to_refinery_pages.rb

@@ -1,4 +1,4 @@
-class AddCustomSlugToRefineryPages < ActiveRecord::Migration
+class AddCustomSlugToRefineryPages < ActiveRecord::Migration[4.2]
   def up
     if page_column_names.exclude?('custom_slug')
       add_column :refinery_pages, :custom_slug, :string

data/db/migrate/20150130044643_add_slug_to_refinery_page_parts.rb

@@ -1,4 +1,4 @@
-class AddSlugToRefineryPageParts < ActiveRecord::Migration
+class AddSlugToRefineryPageParts < ActiveRecord::Migration[4.2]
   def change
     rename_column :refinery_page_parts, :title, :slug
     add_column :refinery_page_parts, :title, :string

data/db/migrate/20150720155305_update_slug_and_title_in_refinery_page_parts.rb

@@ -1,4 +1,4 @@
-class UpdateSlugAndTitleInRefineryPageParts < ActiveRecord::Migration
+class UpdateSlugAndTitleInRefineryPageParts < ActiveRecord::Migration[4.2]
   def change
     begin
       ::Refinery::PagePart.all.each do |pp|

data/db/migrate/20151103211604_fix_slug_format_in_refinery_page_parts.rb

@@ -1,4 +1,4 @@
-class FixSlugFormatInRefineryPageParts < ActiveRecord::Migration
+class FixSlugFormatInRefineryPageParts < ActiveRecord::Migration[4.2]
   def change
     begin
       ::Refinery::PagePart.all.each do |pp|

data/db/migrate/20170703015418_remove_translated_columns_to_refinery_pages.rb

@@ -0,0 +1,6 @@
+class RemoveTranslatedColumnsToRefineryPages < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :refinery_pages, :custom_slug
+    remove_column :refinery_pages, :slug
+  end
+end

data/db/migrate/20170703020017_remove_translated_columns_to_refinery_page_parts.rb

@@ -0,0 +1,5 @@
+class RemoveTranslatedColumnsToRefineryPageParts < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :refinery_page_parts, :body
+  end
+end

data/lib/refinery/pages/configuration.rb

@@ -39,22 +39,8 @@ module Refinery
       def layout_template_whitelist
         Array(config.layout_template_whitelist).map(&:to_s)
       end
-
-      def default_parts
-        if config.default_parts.all? { |v| v.is_a? String }
-          new_syntax = config.default_parts.map do |part|
-            { title: part, slug: part.downcase.gsub(" ", "_") }
-          end
-          Refinery.deprecate(
-            "Change Refinery::Pages.default_parts= from #{config.default_parts.inspect} to #{new_syntax.inspect}",
-            when: "3.2.0"
-          )
-          new_syntax
-        else
-          config.default_parts
-        end
-      end
     end
+
     self.use_layout_templates = false
     self.page_title = {
       :chain_page_title => false,

data/lib/refinery/pages/engine.rb

@@ -25,11 +25,11 @@ module Refinery
         Refinery.include_once(Refinery::AdminController, Refinery::Pages::Admin::InstanceMethods)
       end
 
-      initializer "refinery.pages append marketable routes", :after => :set_routes_reloader_hook do
+      initializer "refinery.pages append marketable routes"  do
         append_marketable_routes if Refinery::Pages.marketable_urls
       end
 
-      initializer "add marketable route parts to reserved words", :after => :set_routes_reloader_hook do
+      initializer "add marketable route parts to reserved words" do
         add_route_parts_as_reserved_words if Refinery::Pages.marketable_urls
       end
 
@@ -41,6 +41,7 @@ module Refinery
 
       config.after_initialize do
         Refinery.register_extension(Refinery::Pages)
+        Rails.application.reload_routes!
       end
 
       protected
@@ -49,14 +50,13 @@ module Refinery
         Refinery::Core::Engine.routes.append do
           get '*path', :to => 'pages#show', :as => :marketable_page
         end
-        Rails.application.routes_reloader.reload!
       end
 
       # Add any parts of routes as reserved words.
       def add_route_parts_as_reserved_words
         ActiveSupport.on_load(:active_record) do
           # do not add routes with :allow_slug => true
-          included_routes = Rails.application.routes.named_routes.routes.reject{ |name, route| route.defaults[:allow_slug] }
+          included_routes = Rails.application.routes.named_routes.to_a.reject{ |name, route| route.defaults[:allow_slug] }
           route_paths = included_routes.map { |name, route| route.path.spec }
           route_paths.reject! { |path| path.to_s =~ %r{^/(rails|refinery)}}
           Refinery::Pages.friendly_id_reserved_words |= route_paths.map { |path|

data/refinerycms-pages.gemspec

@@ -20,13 +20,14 @@ Gem::Specification.new do |s|
   s.test_files        = `git ls-files -- spec/*`.split("\n")
 
   s.add_dependency 'friendly_id',                 ['>= 5.1.0', '< 5.3']
-  s.add_dependency 'globalize',                   ['>= 4.0.0', '< 5.2']
-  s.add_dependency 'awesome_nested_set',          '~> 3.0.0'
-  s.add_dependency 'seo_meta',                    '~> 2.0.0.rc.1'
+  s.add_dependency 'globalize',                   ['>= 5.1.0.beta1', '< 5.2']
+  s.add_dependency 'activemodel-serializers-xml', '~> 1.0', '>= 1.0.1'
+  s.add_dependency 'awesome_nested_set',          '~> 3.1', '>= 3.1.0'
+  s.add_dependency 'seo_meta',                    '~> 3.0', '>= 3.0.0'
   s.add_dependency 'refinerycms-core',            version
   s.add_dependency 'babosa',                      '!= 0.3.6'
-  s.add_dependency 'speakingurl-rails',           '~> 8.0.0'
-  s.add_dependency 'diffy',                       '~> 3.1.0'
+  s.add_dependency 'speakingurl-rails',           '~> 8.0', '>= 8.0.0'
+  s.add_dependency 'diffy',                       '~> 3.1', '>= 3.1.0'
 
   s.required_ruby_version = Refinery::Version.required_ruby_version
 

data/spec/controllers/refinery/pages_controller_spec.rb

@@ -16,7 +16,7 @@ module Refinery
 
     describe "#show" do
       it "renders show template" do
-        get :show, :path => "test"
+        get :show, params: {path: "test"}
         expect(response).to render_template("show")
       end
     end

data/spec/models/refinery/page_meta_data_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 module Refinery
   describe Page do
     let(:page_title) { 'RSpec is great for testing too' }
-    let(:page) { subject.class.new(:title => page_title, :deletable => true)}
+    let(:page) { subject.class.create(title: page_title, deletable: true)}
 
     context 'responds to' do
       it 'meta_description' do

data/spec/presenters/refinery/pages/menu_presenter_spec.rb

@@ -63,10 +63,26 @@ module Refinery
           Refinery::Menu.new(FactoryGirl.create(:page, :title => "Refinery CMS"))
         }
         let(:menu_presenter) { MenuPresenter.new(menu_items, view) }
-        it "returns menu items wrapped in html" do
-          expect(menu_presenter.to_html).to xml_eq(
-            %Q{<nav class="menu clearfix" id="menu"><ul class="nav"><li class="first last"><a href="/refinery-cms">Refinery CMS</a></li></ul></nav>}
-          )
+        
+        context "wrapped in html" do
+          it "returns menu items" do
+            expect(menu_presenter.to_html).to xml_eq(
+              %Q{<nav class="menu clearfix" id="menu"><ul class="nav"><li class="first last"><a href="/refinery-cms">Refinery CMS</a></li></ul></nav>}
+            )
+          end
+
+          context "with role set to navigation" do
+            let(:menu_presenter_with_role) { 
+              menu_presenter.menu_role = 'navigation'
+              menu_presenter
+            }
+
+            it "returns menu items wrapped in html with role set to navigation" do
+              expect(menu_presenter_with_role.to_html).to xml_eq(
+                %Q{<nav class="menu clearfix" id="menu" role="navigation"><ul class="nav"><li class="first last"><a href="/refinery-cms">Refinery CMS</a></li></ul></nav>}
+              )
+            end
+          end
         end
 
         context "takes mount point into account" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-pages
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 4.0.0
 platform: ruby
 authors:
 - Philip Arndt
@@ -32,7 +32,7 @@ cert_chain:
   jOQmH9VbgbfUrXYM1YOKdlwW5sPR1f4PKLDlvEE+bppIUgKOgLOIv3i7KwrGvFOq
   5r7Wz/HY31SM47mkK21saPJG4NvUFEycf0wlpzP657Pl9aVo47aKKbxX
   -----END CERTIFICATE-----
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_id
@@ -60,7 +60,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.1.0.beta1
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.2'
@@ -70,52 +70,84 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 5.1.0.beta1
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: activemodel-serializers-xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: seo_meta
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc.1
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc.1
+        version: '3.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: babosa
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +167,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 8.0.0
   type: :runtime
@@ -142,6 +177,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '8.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 8.0.0
 - !ruby/object:Gem::Dependency
@@ -149,6 +187,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
@@ -156,6 +197,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
 description: The default content extension of Refinery CMS. This extension handles
@@ -240,6 +284,8 @@ files:
 - db/migrate/20150130044643_add_slug_to_refinery_page_parts.rb
 - db/migrate/20150720155305_update_slug_and_title_in_refinery_page_parts.rb
 - db/migrate/20151103211604_fix_slug_format_in_refinery_page_parts.rb
+- db/migrate/20170703015418_remove_translated_columns_to_refinery_pages.rb
+- db/migrate/20170703020017_remove_translated_columns_to_refinery_page_parts.rb
 - db/seeds.rb
 - lib/generators/refinery/pages/pages_generator.rb
 - lib/generators/refinery/pages/templates/config/initializers/refinery/pages.rb.erb
@@ -294,7 +340,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="