refinerycms-core 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cfeccfe7c982914de37055f1d395281d606928e
-  data.tar.gz: 640d01d3135651beff7a231eb0312b4095213bee
+  metadata.gz: adbd3f63f80baf489856f00ec935d06a59cb0fce
+  data.tar.gz: 457664b2fd40bc63f46e1ab98d4ce0a830855869
 SHA512:
-  metadata.gz: c190927ef64bcfa73d7c5b647bb15a2442852c4c4ebbded6ff3f0c07cf57f5c95f1c33899d87c6402a390b1af5e19cfcde68d6da9e3ed32e08c558716a51ce4e
-  data.tar.gz: 20f898b43e26b8f10991547cd6428596bee477fe4e35812dd257efb5e605c5d520468e433027718d7c0ee9cf978026c96f29955eb8a4c9469daf4aee6b1e3865
+  metadata.gz: dc9c1743465da2e3295fff503291fea1254bbe309885a7c4fd71202aaaa9e98ba117eff44b3def07f2f6f974c1fdeab05eb769bb87ab83880429fcbdce704d72
+  data.tar.gz: d3f318e1d7ee93b01297f7272ee9e4aba64a2831ce7d4d39e88863aea7aed76dcec1af7ce98c99787a2d04068c1f210ce24d18dfe372eec5e214892a016fa102

checksums.yaml.gz.sig

@@ -0,0 +1,2 @@
+%p+*�^;�᷋�K��+�� �(�NGL��A��(ƴ�xE@�,	e�3�����V8�Y����Wa.y�[�#}І���=�Ey�����c�BO1Gg�����
���A!�qh�"b=�j��|��_�X�ߠ�_#oamn�SκH�maC8���?�%	*O�ډ�8
ݕ����89nwI��"~'=�ylb��|��� U����d2��**���E�
+�gw;G��_lzzt�;E��r5�q�$��z{��

data/app/assets/javascripts/refinery/{core.js → core.js.erb}

@@ -1,11 +1,12 @@
 $(document).ready(function(){
   // focus first field in an admin form.
   $('form input[type=text]:first').focus();
-
-  init_flash_messages();
 });
 
 init_flash_messages = function() {
+  $('#flash_container .flash').append(
+    "<button id='flash_close'><%= I18n.t('refinery.message.close') %></button>"
+  );
 
   $('#flash_container').on('click', '#flash_close', function(e) {
     $('#flash').hide();

data/app/assets/stylesheets/refinery/sections/_layout.scss

@@ -197,10 +197,14 @@ noscript .flash.flash_alert a:hover {
   display: inline;
   font-weight: bold;
 }
-.flash a#flash_close {
-  position: absolute;
-  right: 9px;
-  top: 7px;
+.flash #flash_close {
+  background: none;
+  border: none;
+  color: #41403C;
+  cursor: pointer;
+  float: right;
+  font-size: 1em;
+  margin-top: 3px;
 }
 #content .visual_editor_box a,
 #content .ui-tabs a {
@@ -1512,6 +1516,7 @@ a.information:hover {
   text-transform: uppercase;
   white-space: nowrap;
   background-color: #bfbfbf;
+  margin-right: 0.25em;
   &.important{
     background-color: #c43c35;
   }

data/app/views/refinery/_content_page.html.erb

@@ -3,3 +3,4 @@
       :can_use_fallback => !local_assigns[:show_empty_sections] && !local_assigns[:remove_automatic_sections]
     }) %>
 <%= render '/refinery/draft_page_message' if @page && @page.draft? -%>
+<%= render '/refinery/skip_to_first_child_page_message' if @page && @page.skip_to_first_child? -%>

data/app/views/refinery/_message.html.erb

@@ -1,7 +1,5 @@
 <% flash.each do |key, value| %>
 <div id='flash' class="flash flash_<%= key %>">
   <%= value %>
-  <%= link_to t(".close#{'_this_message' if key.to_s == "message"}"), "",
-              :id => "flash_close" %>
 </div>
 <% end %>

data/app/views/refinery/_skip_to_first_child_page_message.html.erb

@@ -0,0 +1,3 @@
+<aside class='page_skip_to_first_child'>
+  <%= t('.skip_to_first_child') %>
+</aside>

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

@@ -8,10 +8,18 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
      # 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})
+       page.url.merge({:only_path => false, locale: locale})
      elsif page.url.to_s !~ /^http/
        # handle relative link_url addresses.
-       [request.protocol, request.host_with_port, page.url].join
+       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.

data/config/locales/en.yml

@@ -73,6 +73,8 @@ en:
       close_this_message: Close this message
     draft_page_message:
       not_live: This page is NOT live for public viewing.
+    skip_to_first_child_page_message:
+      skip_to_first_child: "This page uses the option \"Skip to first child\" and will never be displayed to visitors."
     footer:
       copyright: "Copyright © %{year} %{site_name}"
     no_script:

data/config/locales/ru.yml

@@ -41,6 +41,8 @@ ru:
         remove_current: Удалить текущее изображение
         change: Нажмите здесь, чтобы выбрать изображение
         show: Показать
+      locale_picker:
+        language: Язык
       resource_picker:
         download_current: Скачать текущий файл
         opens_in_new_window: Откроется в новом окне
@@ -53,11 +55,12 @@ ru:
         results_for_html: "Результаты поиска для &#8216;<em>%{query}</em>&#8217;"
         no_results: Ничего не найдено
         cancel_search: Отмена поиска
+        search_input_notice: ''
         input:
           placeholder: "Поиск&8230;"
           help: Введите строку содержащую то, что вы ищете, минимум 3 символа.
       delete:
-        message: Вы уверены, что хотите удалить '%{title}'?
+        message: "Вы уверены, что хотите удалить '%{title}'?"
       error_messages:
         problems_in_following_fields: Обнаружены проблемы со следующими полями
       help: Помощь
@@ -70,6 +73,8 @@ ru:
       close_this_message: Закрыть это сообщение
     draft_page_message:
       not_live: Эта страница не предназначена для публичного просмотра.
+    skip_to_first_child_page_message:
+      skip_to_first_child: "Для этой странице активирована опция \"Пропуск страницы верхнего уровня\", и она никогда не будет показана посетителям."
     footer:
       copyright: © %{site_name}, %{year}
     no_script:

data/lib/generators/refinery/cms/cms_generator.rb

@@ -75,33 +75,25 @@ end}  end
     end
 
     def append_heroku_gems!
-      append_file 'Gemfile', %Q{
+      production_gems = [
+        "gem 'dragonfly-s3_data_store'",
+        "gem 'rails_12factor'",
+        "gem 'puma'"
+      ]
+      production_gems << "gem 'pg'" unless destination_gemfile_has_postgres?
+
+      append_file "Gemfile", %Q{
 # The Ruby version is specified here so that Heroku uses the right version.
 ruby #{ENV['RUBY_VERSION'].inspect}
 
 # The Heroku gem allows you to interface with Heroku's API
 gem 'heroku'
 
+# Gems that have been added for Heroku support
 group :production do
-  # Dragonfly's S3 Data Store extension allows you to use S3 assets (added for Heroku)
-  gem 'dragonfly-s3_data_store'
-
-  # Gems that are recommended for using Heroku:
-  gem 'rails_12factor'
-  gem 'puma'
-}
-      # If postgres is not the database in use, Heroku still needs it.
-      if destination_path.join('Gemfile').file? && destination_path.join('Gemfile').read !~ %r{gem ['"]pg['"]}
-        append_file 'Gemfile', %q{
-  # Postgres support (added for Heroku)
-  gem 'pg'
-}
-      end
-
-      append_file 'Gemfile', %q{
+  {{production_gems}}
 end
-
-} # close the production group that was opened for dragonfly, and pg.
+}.sub("{{production_gems}}", production_gems.join("\n  "))
     end
 
     def bundle!
@@ -229,6 +221,11 @@ end
       self.options = force_options
     end
 
+    def destination_gemfile_has_postgres?
+      destination_path.join('Gemfile').file? &&
+        destination_path.join('Gemfile').read =~ %r{gem ['"]pg['"]}
+    end
+
     def heroku?
       options[:heroku].present?
     end

data/lib/generators/refinery/engine/templates/config/locales/ru.yml

@@ -0,0 +1,28 @@
+ru:
+  refinery:
+    plugins:
+      <%= plural_name %>:
+        title: <%= plural_name.titleize %>
+    <%= namespacing.underscore %>:
+      admin:
+        <%= plural_name %>:
+          actions:
+            create_new: Добавить <%= singular_name.titleize %>
+            reorder: Изменить порядок <%= singular_name.titleize.pluralize %>
+            reorder_done: Закончить изменять порядок <%= singular_name.titleize.pluralize %>
+          records:
+            title: <%= plural_name.titleize %>
+            sorry_no_results: "Извините, поиск не дал результатов."
+            no_items_yet: Записей "<%= singular_name.titleize.pluralize %>" не найдено. Нажмите "Добавить <%= singular_name.titleize %>" чтобы создать <%= singular_name.titleize.downcase %>.
+          <%= singular_name %>:
+            view_live_html: Просмотреть <%= singular_name.titleize.downcase %> вживую <br/><em>(в новом окне)</em>
+            edit: Редактировать <%= singular_name.titleize.downcase %>
+            delete: Удалить <%= singular_name.titleize.downcase %> навсегда
+      <%= plural_name %>:
+        show:
+          other: Другие <%= singular_name.titleize.pluralize %>
+  activerecord:
+    attributes:
+      'refinery/<%= namespacing.underscore %>/<%= singular_name %>':<% attributes.each do |a| %>
+        <%= a.name %>: <%= a.name.titleize -%>
+<% end -%>

data/lib/refinery/version.rb

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

data/refinerycms-core.gemspec

@@ -36,4 +36,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'jquery-ui-rails',             '~> 5.0.0'
   s.add_dependency 'decorators',                  '~> 2.0.0'
   s.add_dependency 'zilch-authorisation'
+
+  s.cert_chain  = [File.expand_path("../../certs/parndt.pem", __FILE__)]
+  if $0 =~ /gem\z/ && ARGV.include?("build") && ARGV.include?(__FILE__)
+    s.signing_key = File.expand_path("~/.ssh/gem-private_key.pem")
+  end
 end

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

@@ -4,11 +4,14 @@ require 'generators/refinery/cms/cms_generator'
 
 module Refinery
   describe CmsGenerator do
+    include GeneratorSpec::TestCase
     destination File.expand_path("../../../../../../tmp", __FILE__)
 
     before do
       prepare_destination
 
+      File.write "#{destination_root}/Gemfile", ""
+
       dir = "#{destination_root}/config/environments"
       FileUtils.mkdir_p(dir)
       File.write "#{dir}/development.rb", <<-SPEC
@@ -34,7 +37,7 @@ end
       SPEC
 
       copy_routes
-      run_generator %w[--skip-db --skip-migrations]
+      run_generator %w[--skip-db --skip-migrations --heroku]
     end
 
     specify do

data/spec/lib/refinery/plugins_spec.rb

@@ -101,7 +101,11 @@ module Refinery
 
     describe ".first_in_menu_with_url" do
       it "finds plugins that are landable" do
-        skip
+        first_in_menu_with_url = described_class.registered.in_menu.detect do |plugin|
+          plugin.url.present?
+        end
+
+        expect(described_class.registered.first_in_menu_with_url.title).to eq(first_in_menu_with_url.title)
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-core
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Philip Arndt
@@ -9,8 +9,30 @@ authors:
 - Rob Yurkowski
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDhjCCAm6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBNMQ0wCwYDVQQDDARnZW1z
+  MREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixkARkWBWFybmR0MRIwEAYK
+  CZImiZPyLGQBGRYCaW8wHhcNMTYwNjEwMDMwNjQyWhcNMTcwNjEwMDMwNjQyWjBN
+  MQ0wCwYDVQQDDARnZW1zMREwDwYKCZImiZPyLGQBGRYBcDEVMBMGCgmSJomT8ixk
+  ARkWBWFybmR0MRIwEAYKCZImiZPyLGQBGRYCaW8wggEiMA0GCSqGSIb3DQEBAQUA
+  A4IBDwAwggEKAoIBAQDMLLiiRX/NrRDQxcNO/bPNe51IhKeyACDjTTx0VGCG696t
+  qdD23FjUrAYuQTW5P7Auh9qdcCnvPHJSwf31m+EGTshy/hcNYz2k/mrbwAfdytv3
+  GAR+sFnMYtWvVQNeHBWXIaYMiSDP0WtbT6QqQx3SuA6ZpXNXD1dbm64MzHgMHqXP
+  uHnLf2s0VCnTLorPH2J6CO5Y+Sx+IBqJi9/nO2oEEIXQCQRLgRevHk+TovDisW5V
+  OMEPX7fo29R5J2T7mjkNLGJ5Ae1KiU9A60LsMco37HMWE8DM90pg1ues5tg6MfJT
+  yuX4N0rJWdIC5ciHDsyJ4pi21s8fdUulk0YmJALDAgMBAAGjcTBvMAkGA1UdEwQC
+  MAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSqXg48+kmcdOxIrkZhhgSV1flD1jAa
+  BgNVHREEEzARgQ9nZW1zQHAuYXJuZHQuaW8wGgYDVR0SBBMwEYEPZ2Vtc0BwLmFy
+  bmR0LmlvMA0GCSqGSIb3DQEBBQUAA4IBAQBSSS4nOXpPPMdAK4ApGHxbzS+/u77p
+  V8gLBJX4hKMpbMNmdI+n6YsqvG6kMljgYBamucfrAkKdmHWn9ydST3o8RQAcYxS8
+  bz49gD3c4Nm4P6eEVKFmebO9/MoiM7rMb0lk/xH1drtey/9ulohrg8Dz+BoQJ+9T
+  m2lJzojOU7w461lPVZtKlDlseu68KvEQ2AdUBBa1b6w3S/EFkcdhErOT7dyQpePI
+  +wsbjPvdIWsjWQMn6MasZYIVTnenwP2jg+z9HSNxW0NL2vZx8VabpsWGWfrb+koj
+  rE1h12GTgwaC3r9FOkdnSpClgPYAzTTCJ8kD74qO2zC9pGegrUXdWFM6
+  -----END CERTIFICATE-----
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-i18n
@@ -335,7 +357,7 @@ files:
 - app/assets/javascripts/refinery/admin.js.erb
 - app/assets/javascripts/refinery/ajaxy_pagination.js.coffee
 - app/assets/javascripts/refinery/application.js
-- app/assets/javascripts/refinery/core.js
+- app/assets/javascripts/refinery/core.js.erb
 - app/assets/javascripts/refinery/interface.js.coffee.erb
 - app/assets/javascripts/refinery/modal_dialogs.js.erb
 - app/assets/javascripts/refinery/nestedsortables.js
@@ -401,6 +423,7 @@ files:
 - app/views/refinery/_message.html.erb
 - app/views/refinery/_no_script.html.erb
 - app/views/refinery/_site_bar.html.erb
+- app/views/refinery/_skip_to_first_child_page_message.html.erb
 - app/views/refinery/admin/_continue_editing.html.erb
 - app/views/refinery/admin/_dialog_success.html.erb
 - app/views/refinery/admin/_error_messages.html.erb
@@ -504,6 +527,7 @@ files:
 - lib/generators/refinery/engine/templates/config/locales/it.yml
 - lib/generators/refinery/engine/templates/config/locales/nb.yml
 - lib/generators/refinery/engine/templates/config/locales/nl.yml
+- lib/generators/refinery/engine/templates/config/locales/ru.yml
 - lib/generators/refinery/engine/templates/config/locales/sk.yml
 - lib/generators/refinery/engine/templates/config/locales/tr.yml
 - lib/generators/refinery/engine/templates/config/locales/zh-CN.yml