refinerycms-core 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a20d663ffc6f652d81ddf1ce4dcc13ac4d0a5a9c
-  data.tar.gz: 16de7b94f2a07e6f925d864cb1ab0fa7311731ba
+  metadata.gz: 5b4a8adbdc868b1a05d524a24e5cfc6b6742004c
+  data.tar.gz: ed062b6ec449a4c2e27e14c6fe52299740d04411
 SHA512:
-  metadata.gz: 5a57be898709a95a2456d8733ad3d3df6154d4be1789284acb28ce46a13985954ec5b884c0578b63d370c261d952a5318ee1a14ea7036d81b12a7ac718769e7b
-  data.tar.gz: 76d7f8f346a17a94a3d192719b6e2fca477a3e86bba55f4a01449210dd9d4e0494146b632e3bf4a28a6c1b8de7ba402f0de66a7a4cb56d8afa4d31f7ec191527
+  metadata.gz: 094c812cf2973fb866be1a7bfad33a813da1d95cb3ff0882e56a4e8b40f1b4d6510f44e5a408f791dca9960f43f3f52fc28fe3c509eaa3afce71e948289c4c50
+  data.tar.gz: 23e55f338fe65c9469d0b617ef52344305ddc01a17371ab2b0f65cc91dca2d814f4bf861e5565aab2f5fd937bc668f1145411cfbb4e984a652ad111e572fd2ce

data/app/assets/stylesheets/refinery/_colours.scss

@@ -12,7 +12,7 @@ $icon_preview_colour: $icon_default_colour;
 $icon_locale_colour:  #b7e3fc;    // pale blue
 $icon_done_colour:    #00a017;  //
 $info_icon_blue:      #316CC8;
-
+$icon_warning_colour:   #FF6600; // orange
 
 $action_background_colour: lighten($icon_locale_colour,10%);
 $action_border_colour: $icon_locale_colour;

data/app/assets/stylesheets/refinery/_icons.scss

@@ -61,6 +61,7 @@
 .switch_view_list_icon {@include icon('list')}
 .upload_icon          {@include icon('upload');}
 .user_comment_icon    {@include icon('comment-o');}
+.warning_icon         {@include icon('warning', $icon_warning_colour)}
 
 .hidden_icon  {display:none}
 .unhidden_icon {display: inline-block}
@@ -83,3 +84,4 @@
 // don't want underlines on icons
 #content a[class$='icon'] {border-bottom: none}
 #content a[class$='icon']:hover {border-bottom: none}
+

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

@@ -804,6 +804,7 @@ body.dialog form {
 .visual_editor_dialog_table {
   height: 250px;
 }
+.no_picked_image_selected {@include icon('warning', $icon_warning_colour)}
 .dialog {
   #dialog_main {
     float: left;

data/app/helpers/refinery/image_helper.rb

@@ -7,7 +7,7 @@ module Refinery
       content.gsub(%r{<img.+?src=['"](/system/images/.+?)/.+?/>}) do |img|
         begin
           sha = img.match(%r{/system/images/(.+?)/})[1]
-          job = Dragonfly::Job.deserialize sha, Dragonfly[:refinery_images]
+          job = Dragonfly::Job.deserialize sha, Dragonfly.app(:refinery_images)
 
           image_fu Image.where(:image_uid => job.uid).first, thumbnail
         rescue Dragonfly::Serializer::BadString

data/app/helpers/refinery/tag_helper.rb

@@ -5,7 +5,8 @@ module Refinery
 
     # Remember to wrap your block with <span class='label_with_help'></span> if you're using a label next to the help tag.
     def refinery_help_tag(title='Tip')
-      action_icon(:info, '#', title.html_safe? ? title : h(title), {tooltip: title})
+      title = title.html_safe? ? title : h(title)
+      action_icon(:info, '#', title, {tooltip: title})
     end
 
     # This is just a quick wrapper to render an image tag that lives inside refinery/icons.

data/app/helpers/refinery/translation_helper.rb

@@ -11,5 +11,8 @@ module Refinery
       val
     end
 
+    def translated_field(record, field)
+      Refinery::TranslatedFieldPresenter.new(record).call(field)
+    end
   end
 end

data/app/presenters/refinery/base_presenter.rb

@@ -15,7 +15,7 @@ module Refinery
     end
 
     def method_missing(method, *args)
-      if @model.respond_to? method
+      if @model.respond_to? method, include_all = true
         @model.send method
       elsif DEFAULT_FIELDS.has_key? method
         (value = DEFAULT_FIELDS[method]).is_a?(Proc) ? value.call(self) : value
@@ -24,8 +24,8 @@ module Refinery
       end
     end
 
-    def respond_to?(method)
-      super || @model.respond_to?(method) || DEFAULT_FIELDS.has_key?(method)
+    def respond_to?(method, include_all = false)
+      super || @model.respond_to?(method, include_all) || DEFAULT_FIELDS.has_key?(method)
     end
 
   end

data/app/presenters/refinery/translated_field_presenter.rb

@@ -0,0 +1,15 @@
+module Refinery
+  class TranslatedFieldPresenter
+    def initialize(record)
+      @record = record
+    end
+
+    def call(field)
+      record.send(field).presence ||
+        record.translations.detect {|t| t.send(field).present?}.send(field)
+    end
+
+    private
+    attr_accessor :record
+  end
+end

data/app/views/layouts/refinery/admin.html.erb

@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <%= render '/refinery/html_tag' %>
-  <% content_for :meta, "<meta refinerycms='#{Refinery.version}' />".html_safe %>
+  <% content_for :meta, tag(:meta, name: 'refinerycms', content: Refinery.version) %>
   <%= render 'refinery/admin/head' %>
   <body class="<%= action_name %> <%= I18n.locale %>">
     <%= render '/refinery/site_bar' %>

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

@@ -1,8 +1,8 @@
 <meta charset='<%= Rails.application.config.encoding %>' />
 <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
 <title><%= browser_title(yield(:title)) %></title>
-<%= raw %(<meta name="description" content="#{@meta.meta_description}" />) if @meta.meta_description.present? -%>
-<%= raw %(<link rel="canonical" href="#{request.protocol}#{request.host_with_port}#{@canonical}" />) if @canonical.present? -%>
+<%= tag(:meta, name: 'description', content: @meta.meta_description) if @meta.meta_description.present? -%>
+<%= tag(:link, href: request.protocol+request.host_with_port+@canonical, rel: 'canonical') if @canonical.present? -%>
 <%= csrf_meta_tags if Refinery::Core.authenticity_token_on_frontend -%>
 <%= yield :meta %>
 

data/config/locales/en.yml

@@ -37,7 +37,7 @@ en:
         delete: Remove
         close: Close
       image_picker:
-        none_selected: There is currently no image selected, please click here to add one.
+        none_selected: No image selected, please click here to add one.
         remove_current: Remove current image
         change: Click here to pick an image
         show: Show
@@ -55,6 +55,7 @@ en:
         results_for_html: "Search results for &#8216;<em>%{query}</em>&#8217;"
         no_results: 'Sorry, no results found'
         cancel_search: 'Cancel search'
+        search_input_notice: ''
         input:
           placeholder: "Search &#8230;"
           help: 'Enter a word or phrase you want to search for'

data/config/locales/nl.yml

@@ -41,6 +41,8 @@ nl:
         remove_current: "Huidige afbeelding verwijderen"
         change: Klik hier om een afbeelding te kiezen
         show: Tonen
+      locale_picker:
+        language: Taal
       resource_picker:
         download_current: "Huidig bestand downloaden"
         opens_in_new_window: Opent in een nieuw venster
@@ -52,6 +54,11 @@ nl:
         button_text: Zoeken
         results_for_html: "Zoekresultaten voor &#8216;<em>%{query}</em>&#8217;"
         no_results: "Excuses, geen resultaten gevonden"
+        cancel_search: 'Stop met zoeken'
+        search_input_notice: ''
+        input:
+          placeholder: "Zoek &#8230;"
+          help: 'Vul een woord ofz in in waar je op wil zoeken'
       delete:
         message: Weet u zeker dat u '%{title}' wilt verwijderen?
       error_messages:

data/lib/generators/refinery/engine/USAGE

@@ -20,5 +20,5 @@ Additional Supported Field Types
   resource        - link to a resource picker dialogue
 
 Examples:
-    rails generate refinery:engine product title:string description:text image:image brochure:resource
+    rails generate refinery:engine product title:string description:text image:image brochure:resource --authors 'John Jones'
     rails generate refinery:engine product title:string description:text image:image brochure:resource --i18n title description

data/lib/generators/refinery/engine/templates/app/views/refinery/namespace/admin/plural_name/_singular_name.html.erb

@@ -1,25 +1,29 @@
 <% title_attribute = (title = attributes.detect { |a| a.type.to_s == "string" }).present? ? title.name : 'title' -%>
 <li class='clearfix record <%%= cycle("on", "on-hover") %>' id="<%%= dom_id(<%= singular_name %>) -%>">
   <span class='title'>
-    <%%= <%= singular_name %>.<%= title_attribute %> %>
+    <% if localized? %><%%= translated_field(<%= singular_name %>, :<%= title_attribute %>) %><% else %><%%= <%= singular_name %>.<%= title_attribute %> %><% end %>
+  </span>
 <% if localized? %>
-    <%% if Refinery::I18n.frontend_locales.many? %>
-      <span class='preview'>
-        <%% <%= singular_name %>.translations.each do |translation| %>
-          <%% if translation.<%= title_attribute %>.present? %>
-            <%%= link_to refinery_icon_tag("flags/#{translation.locale}.png", :size => '16x11'),
-                         refinery.edit_<%= namespacing.underscore %>_admin_<%= singular_name %>_path(<%= singular_name %>, :switch_locale => translation.locale),
-                         :class => 'locale' %>
+  <%% if Refinery::I18n.frontend_locales.many? %>
+    <span class='locales'>
+      <%% <%= singular_name %>.translations.sort_by{ |t| Refinery::I18n.frontend_locales.index(t.locale)}.each do |translation| %>
+        <%% if translation.<%= title_attribute %>.present? %>
+          <%%= link_to refinery.edit_<%= namespacing.underscore %>_admin_<%= singular_name %>_path(<%= singular_name %>, :switch_locale => translation.locale),
+                      class: 'locale', title: translation.locale.upcase do %>
+
+            <div class="<%%=translation.locale %> locale_marker">
+              <%%= locale_text_icon(translation.locale.upcase) %>
+            </div>
           <%% end %>
         <%% end %>
-      </span>
-    <%% end %>
+      <%% end %>
+    </span>
+  <%% end %>
 <% end %>
-  </span>
+  <span class='preview'></span>
+
   <span class='actions'>
-    <% unless skip_frontend? %>
-      <%%= action_icon(:preview, refinery.<%= namespacing.underscore %>_<%= singular_name %>_path(<%= singular_name %>), t('.view_live_html')) %>
-    <%end %>
+    <% unless skip_frontend? %><%%= action_icon(:preview, refinery.<%= namespacing.underscore %>_<%= singular_name %>_path(<%= singular_name %>), t('.view_live_html')) %><%end %>
     <%%= action_icon(:edit,    refinery.edit_<%= namespacing.underscore %>_admin_<%= singular_name %>_path(<%= singular_name %>), t('.edit') ) %>
     <%%= action_icon(:delete,  refinery.<%= namespacing.underscore %>_admin_<%= singular_name %>_path(<%= singular_name %>), t('.delete'),
       { class: "cancel confirm-delete",

data/lib/generators/refinery/engine/templates/db/seeds.rb.erb

@@ -14,7 +14,7 @@ Refinery::I18n.frontend_locales.each do |lang|
     menu_match: "^#{url}(\/|\/.+?|)$"
   ) do |page|
     Refinery::Pages.default_parts.each_with_index do |part, index|
-      page.parts.build title: part, body: nil, position: index
+      page.parts.build title: part[:title], slug: part[:slug], body: nil, position: index
     end
   end if defined?(Refinery::Page)
 <% end -%>

data/lib/generators/refinery/engine/templates/refinerycms-extension_plural_name.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |s|
   s.description       = 'Ruby on Rails <%= extension_plural_name.titleize %> extension for Refinery CMS'
   s.date              = '<%= Time.now.strftime('%Y-%m-%d') %>'
   s.summary           = '<%= extension_plural_name.titleize %> extension for Refinery CMS'
+  s.authors           = <%= extension_authors %>
   s.require_paths     = %w(lib)
   s.files             = Dir["{app,config,db,lib}/**/*"] + ["readme.md"]
 

data/lib/generators/refinery/engine/templates/spec/spec_helper.rb

@@ -17,7 +17,6 @@ Rails.backtrace_cleaner.remove_silencers!
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
 end

data/lib/refinery.rb

@@ -2,6 +2,7 @@ require 'rails' # from railties
 require 'active_record'
 require 'action_controller'
 require 'rbconfig'
+require 'font-awesome-sass'
 
 module Refinery
   require 'refinery/errors'

data/lib/refinery/application_controller.rb

@@ -11,7 +11,7 @@ module Refinery
                          :current_refinery_user,
                          :authorisation_manager, :authorization_manager
 
-      base.protect_from_forgery # See ActionController::RequestForgeryProtection
+      base.protect_from_forgery with: :exception # See ActionController::RequestForgeryProtection
 
       base.send :include, Refinery::Crud # basic create, read, update and delete methods
 

data/lib/refinery/core/engine.rb

@@ -36,7 +36,7 @@ module Refinery
       # Wrap errors in spans
       config.to_prepare do
         ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
-          "<span class=\"fieldWithErrors\">#{html_tag}</span>".html_safe
+          ActionController::Base.helpers.content_tag(:span, html_tag, class: "fieldWithErrors")
         end
       end
 

data/lib/refinery/crud.rb

@@ -227,7 +227,7 @@ module Refinery
                     :create_or_update_successful,
                     :create_or_update_unsuccessful,
                     :merge_position_into_params!
-        )
+        ), __FILE__, __LINE__
 
         # Methods that are only included when this controller is searchable.
         if options[:searchable]
@@ -239,7 +239,7 @@ module Refinery
 
                 render_partial_response?
               end
-            )
+            ), __FILE__, __LINE__
           else
             module_eval %(
               def index
@@ -251,7 +251,7 @@ module Refinery
 
                 render_partial_response?
               end
-            )
+            ), __FILE__, __LINE__
           end
 
         else
@@ -262,14 +262,14 @@ module Refinery
 
                 render_partial_response?
               end
-            )
+            ), __FILE__, __LINE__
           else
             module_eval %(
               def index
                 find_all_#{plural_name}
                 render_partial_response?
               end
-            )
+            ), __FILE__, __LINE__
           end
 
         end
@@ -333,7 +333,7 @@ module Refinery
             end
 
             protected :after_update_positions
-          )
+          ), __FILE__, __LINE__
         end
 
         module_eval %(
@@ -351,7 +351,7 @@ module Refinery
               #{options[:searchable]}
             end
           end
-        )
+        ), __FILE__, __LINE__
 
       end
 

data/lib/refinery/extension_generation.rb

@@ -6,6 +6,7 @@ module Refinery
         argument :attributes, :type => :array, :default => [], :banner => "field:type field:type"
 
         class_option :namespace, :type => :string, :default => nil, :banner => 'NAMESPACE', :required => false
+        class_option :authors, :type => :array, :default => [], :banner => 'author author', :required => false, :desc => 'Indicates authors of this extension'
         class_option :extension, :type => :string, :default => nil, :banner => 'ENGINE', :required => false
         class_option :i18n, :type => :array, :default => [], :required => false, :banner => "field field", :desc => 'Indicates generated fields'
         class_option :install, :type => :boolean, :default => false, :required => false, :banner => nil, :desc => 'Bundles and runs the generated generator, rake db:migrate, rake db:seed for you'
@@ -33,6 +34,10 @@ module Refinery
       @extension_name ||= options[:extension].presence || singular_name
     end
 
+    def extension_authors
+      @extension_authors ||= options[:authors].presence
+    end
+
     def extension_class_name
       @extension_class_name ||= extension_name.camelize
     end

data/lib/refinery/version.rb

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

data/license.md

@@ -1,6 +1,6 @@
 # MIT License
  
-Copyright (c) 2005 [Resolve Digital](http://resolve.digital)
+Copyright (c) 2005 [Resolve Digital](https://resolve.digital)
  
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/refinerycms-core.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'truncate_html',               '~> 0.9'
   s.add_dependency 'will_paginate',               '~> 3.0.2'
   s.add_dependency 'sass-rails',                  '>= 4.0', '< 5.1'
+  s.add_dependency 'font-awesome-sass',           '>= 4.3.0', '< 5.0'
   s.add_dependency 'coffee-rails',                ['~> 4.0', '>= 4.0.0']
   s.add_dependency 'jquery-rails',                '>= 2.3.0'
   s.add_dependency 'jquery-ui-rails',             '~> 5.0.0'

data/spec/helpers/refinery/translation_helper_spec.rb

@@ -10,5 +10,34 @@ module Refinery
       end
     end
 
+    describe "#translated_field" do
+      let(:page) { FactoryGirl.build(:page) }
+
+      before do
+        Globalize.with_locale(:en) do
+          page.title = "draft"
+          page.save!
+        end
+
+        Globalize.with_locale(:lv) do
+          page.title = "melnraksts"
+          page.save!
+        end
+      end
+
+      context "when title is present" do
+        it "returns it" do
+          expect(helper.translated_field(page, :title)).to eq("draft")
+        end
+      end
+
+      context "when title for current locale isn't available" do
+        it "returns existing title from translations" do
+          Page.translation_class.where(locale: :en).first.destroy
+          expect(helper.translated_field(page, :title)).to eq("melnraksts")
+        end
+      end
+    end
+
   end
-end
+end

data/spec/lib/generators/refinery/engine/engine_generator_with_author_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+require 'generator_spec/test_case'
+require 'generators/refinery/engine/engine_generator'
+
+module Refinery
+  describe EngineGenerator do
+    include GeneratorSpec::TestCase
+    destination File.expand_path("../../../../../../tmp", __FILE__)
+
+    before do
+      prepare_destination
+      run_generator %w{ rspec_product_test title:string description:text image:image brochure:resource --authors Author1 Author2 }
+    end
+
+    it "uses reference columns for image and resource attributes" do
+      File.open("#{destination_root}/vendor/extensions/rspec_product_tests/refinerycms-rspec_product_tests.gemspec") do |file|
+        content = file.read
+        expect(content.include?('["Author1", "Author2"]')).to be_truthy
+      end
+    end
+
+    specify do
+      expect(destination_root).to have_structure {
+        directory "vendor" do
+          directory "extensions" do
+            directory "rspec_product_tests" do
+              directory "app" do
+                directory "controllers" do
+                  directory "refinery" do
+                    directory "rspec_product_tests" do
+                      directory "admin" do
+                        file "rspec_product_tests_controller.rb"
+                      end
+                      file "rspec_product_tests_controller.rb"
+                    end
+                  end
+                end
+                directory "models" do
+                  directory "refinery" do
+                    directory "rspec_product_tests" do
+                      file "rspec_product_test.rb"
+                    end
+                  end
+                end
+                directory "views" do
+                  directory "refinery" do
+                    directory "rspec_product_tests" do
+                      directory "admin" do
+                        directory "rspec_product_tests" do
+                          file "_form.html.erb"
+                          file "_sortable_list.html.erb"
+                          file "edit.html.erb"
+                          file "index.html.erb"
+                          file "new.html.erb"
+                          file "_rspec_product_test.html.erb"
+                        end
+                      end
+                      directory "rspec_product_tests" do
+                        file "index.html.erb"
+                        file "show.html.erb"
+                      end
+                    end
+                  end
+                end
+              end
+              directory "lib" do
+                file "refinerycms-rspec_product_tests.rb"
+              end
+              directory "spec" do
+                file "spec_helper.rb"
+              end
+              directory "tasks" do
+                file "testing.rake"
+                file "rspec.rake"
+              end
+              directory "config" do
+                directory "locales" do
+                  file "en.yml"
+                end
+                file "routes.rb"
+              end
+              file "Gemfile"
+              file "Rakefile"
+            end
+          end
+        end
+      }
+    end
+  end
+end