refinerycms-core 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0897da35906f4879a2c159afa3da72586925e4e
-  data.tar.gz: 8dcf3d5d5d3382e885b34586a6769b962770d9ff
+  metadata.gz: 54905bf441f5cec6679998d3159184707e4c0717
+  data.tar.gz: 206ca811bae7f8a983a61221ef7b8a05cb1997ec
 SHA512:
-  metadata.gz: 030d3b264a13d0bcebf4b38a37a02c69831df90a6ec505bee5a10a428fa5abca819a48e9a2b725ee6d740566a6b9d0716c4ca84ff3540f1facceffb8004e279f
-  data.tar.gz: 6b80a1fe886d0a20f011f0e20dc2ee00e59dfbb87245eebb8751b4f3d735991e5cb9a07dbe4504938135d900818f805fe21cd723cc6c191676971ecf46d4a591
+  metadata.gz: aa6b2fc6616687a2fdb4f2b38f532ed4977cc320c8f49886389e75f01e7faf65d473f4f17d7cbe5c8761bc141b86d9d57fe7a23293c755d1b1b5f806929607cf
+  data.tar.gz: ec0266f41d3096bc88da963561891dfa8060854b4804ff4080dacf71b31e55cdc19e903d972118a9222aefa67e7b525819338f6d2a8dbf4c6c5e1510cbbb0644

data.tar.gz.sig

@@ -1,3 +1 @@
-pĎh��AhkƔ��0L��S�y�����@��]����
-n�+�yw��\a^�~��nڴ�&�*}���d~>L�(����m+��^ +yx0��
-�f1�E���K����j�G�_eX	���C��h��q��
@H�w���t���g+i��ض��%���Ӽ�E
+)7'��Rĕ�k�D2�k����=����e���[��45V :}��!�Z
+���X�����8�-d

data/app/assets/javascripts/admin.js

@@ -2,6 +2,6 @@
 // Just mirror the options specified in your visual editor's config with the new
 // options here.  This will completely override anything specified in your visual
 // editor's boot process for that key, e.g. skin: 'something_else'
-if (typeof(custom_visual_editor_options) == "undefined") {
-  custom_visual_editor_options = {};
+if (typeof(custom_visual_editor_boot_options) == "undefined") {
+  var custom_visual_editor_boot_options = {};
 }

data/app/assets/javascripts/refinery/interface.js.coffee.erb

@@ -16,7 +16,7 @@
     $("html,body").animate scrollTop: $("#other_locales").parent().offset().top, 250
     e.preventDefault()
 
-  $("#existing_image img").load ->
+  $("#existing_image img").on 'load', ->
     margin_top = ($("#existing_image").height() - $("form.edit_image").height() + 8)
     $("form.edit_image .form-actions").css "margin-top": margin_top if margin_top > 0
 

data/app/helpers/refinery/site_bar_helper.rb

@@ -5,9 +5,9 @@ module Refinery
     def site_bar_switch_link
       link_to_if(admin?, t('.switch_to_your_website', site_bar_translate_locale_args),
                          refinery.root_path(site_bar_translate_locale_args),
-                         'data-no-turbolink' => true) do
+                         'data-turbolinks' => false) do
         link_to t('.switch_to_your_website_editor', site_bar_translate_locale_args),
-                Refinery::Core.backend_path, 'data-no-turbolink' => true
+                Refinery::Core.backend_path, 'data-turbolinks' => false
       end
     end
 
@@ -16,7 +16,7 @@ module Refinery
       link_to t('refinery.admin.pages.edit', site_bar_translate_locale_args),
               refinery.admin_edit_page_path(@page.nested_url,
               :switch_locale => (@page.translations.first.locale unless @page.translated_to_default_locale?)),
-              'data-no-turbolink' => true
+              'data-turbolinks' => false
     end
 
     def site_bar_translate_locale_args

data/app/views/refinery/sitemap/index.xml.builder

@@ -1,33 +1,39 @@
 xml.instruct!
 
 xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
-
   @locales.each do |locale|
     ::I18n.locale = locale
-    ::Refinery::Page.live.in_menu.includes(:parts).each do |page|
-     # exclude sites that are external to our own domain.
-     page_url = if page.url.is_a?(Hash)
-       # This is how most pages work without being overriden by link_url
-       page.url.merge({:only_path => false, locale: locale})
-     elsif page.url.to_s !~ /^http/
-       # handle relative link_url addresses.
-       raw_url = [request.protocol, request.host_with_port, page.url].join
-       if (@locales.size > 1) && defined?(RoutingFilter::RefineryLocales)
-         filter = RoutingFilter::RefineryLocales.new
-         filter.around_generate({}) do
-           raw_url
-         end
-       else
-         raw_url
-       end
-     end
 
-     # Add XML entry only if there is a valid page_url found above.
-     xml.url do
-       xml.loc refinery.url_for(page_url)
-       xml.lastmod page.updated_at.to_date
-     end if page_url.present? and page.show_in_menu?
+    ::Refinery::Page.live.in_menu.each do |page|
+      
+      # exclude sites that are external to our own domain.
+      if page.url.is_a?(Hash)
+        
+        # This is how most pages work without being overriden by link_url
+        page_url = page.url.merge({:only_path => false, locale: locale})
+      
+      elsif page.url.to_s !~ /^http/
+        
+        # handle relative link_url addresses.
+        raw_url = [request.protocol, request.host_with_port, page.url].join
+        
+        if (@locales.size > 1) && !page.url.start_with?("/#{locale}/") && defined?(RoutingFilter::RefineryLocales)
+          filter = RoutingFilter::RefineryLocales.new
+          filter.around_generate({}) do
+            raw_url
+          end
+        else
+          raw_url
+        end
+
+        page_url = raw_url
+      end
+
+      # Add XML entry only if there is a valid page_url found above.
+      xml.url do
+        xml.loc refinery.url_for(page_url)
+        xml.lastmod page.updated_at.to_date
+      end if page_url.present?
     end
   end
-
-end
+end

data/config/locales/ru.yml

@@ -57,7 +57,7 @@ ru:
         cancel_search: Отмена поиска
         search_input_notice: ''
         input:
-          placeholder: "Поиск&8230;"
+          placeholder: "Поиск …"
           help: Введите строку содержащую то, что вы ищете, минимум 3 символа.
       delete:
         message: "Вы уверены, что хотите удалить '%{title}'?"

data/lib/refinery/version.rb

@@ -2,7 +2,7 @@ module Refinery
   class Version
     @major = 3
     @minor = 0
-    @tiny  = 5
+    @tiny  = 6
     @build = nil
 
     class << self

data/spec/features/refinery/admin/xhr_paging_spec.rb

@@ -22,9 +22,9 @@ module Refinery
         expect(page).to have_css(%Q{img[alt="#{first_image.title}"]})
 
         # placeholder which would disappear in a full page refresh.
-        page.evaluate_script(
-          %{$('body').append('<i id="has_not_refreshed_entire_page"/>')}
-        )
+        page.evaluate_script("node = document.createElement('i');")
+        page.evaluate_script("node.id = 'has_not_refreshed_entire_page';")
+        page.evaluate_script("document.body.appendChild(node);")
 
         within '.pagination' do
           click_link '2'

data/spec/lib/generators/refinery/cms/cms_generator_spec.rb

@@ -55,11 +55,6 @@ end
               end
             end
           end
-          directory "views" do
-            directory "sitemap" do
-              file "index.xml.builder"
-            end
-          end
         end
         directory "config" do
           file "database.yml.mysql"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-core
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Philip Arndt
@@ -14,25 +14,25 @@ cert_chain:
   -----BEGIN CERTIFICATE-----
   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
-  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
+  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
-  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
+  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
-  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
+  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
   -----END CERTIFICATE-----
-date: 2016-11-23 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-i18n
@@ -486,7 +486,6 @@ files:
 - lib/generators/refinery/cms/templates/.gitignore
 - lib/generators/refinery/cms/templates/app/decorators/controllers/refinery/.keep
 - lib/generators/refinery/cms/templates/app/decorators/models/refinery/.keep
-- lib/generators/refinery/cms/templates/app/views/sitemap/index.xml.builder
 - lib/generators/refinery/cms/templates/config/database.yml.mysql
 - lib/generators/refinery/cms/templates/config/database.yml.postgresql
 - lib/generators/refinery/cms/templates/config/database.yml.sqlite3
@@ -646,7 +645,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: refinerycms
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Core extension for Refinery CMS

data/lib/generators/refinery/cms/templates/app/views/sitemap/index.xml.builder

@@ -1,25 +0,0 @@
-xml.instruct!
-
-xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
-
-  @locales.each do |locale|
-    ::I18n.locale = locale
-    ::Refinery::Page.live.in_menu.includes(:parts).each do |page|
-      # exclude sites that are external to our own domain.
-      page_url = if page.url.is_a?(Hash)
-        # This is how most pages work without being overriden by link_url
-        page.url.merge({:only_path => false})
-      elsif page.url.to_s !~ /^http/
-        # handle relative link_url addresses.
-        [request.protocol, request.host_with_port, page.url].join
-      end
-
-      # Add XML entry only if there is a valid page_url found above.
-      xml.url do
-        xml.loc url_for(page_url)
-        xml.lastmod page.updated_at.to_date
-      end if page_url.present? and page.show_in_menu?
-    end
-  end
-
-end