Merge pull request #1652 from tvdeyen/remove-deprecated-essence-helpers

Remove deprecated render_essence_* helpers

app/helpers/alchemy/admin/essences_helper.rb

@@ -3,35 +3,6 @@
 module Alchemy
   module Admin
     module EssencesHelper
-      include Alchemy::EssencesHelper
-      include Alchemy::Admin::ContentsHelper
-
-      # Renders the Content editor partial from the given Content.
-      def render_essence_editor(content)
-        render_essence(content, :editor)
-      end
-      deprecate :render_essence_editor, deprecator: Alchemy::Deprecation
-
-      # Renders the Content editor partial found in views/contents/ for the content with name inside the passed Element.
-      # For options see -> render_essence
-      #
-      # Content creation on the fly:
-      #
-      # If you update the elements.yml file after creating an element this helper displays a error message with an option to create the content.
-      #
-      def render_essence_editor_by_name(element, name)
-        if element.blank?
-          return warning('Element is nil', Alchemy.t(:no_element_given))
-        end
-        content = element.content_by_name(name)
-        if content.nil?
-          render_missing_content(element, name)
-        else
-          render_essence_editor(content)
-        end
-      end
-      deprecate :render_essence_editor_by_name, deprecator: Alchemy::Deprecation
-
       # Returns all public pages from current language as an option tags string suitable or the Rails +select_tag+ helper.
       #
       # @param [Array]
@@ -53,13 +24,6 @@ def pages_for_select(pages = nil, selected = nil, prompt = "Choose page", page_a
         options_for_select(values, selected.to_s)
       end
 
-      # Renders the missing content partial
-      #
-      def render_missing_content(element, name)
-        render 'alchemy/admin/contents/missing', {element: element, name: name}
-      end
-      deprecate :render_missing_content, deprecator: Alchemy::Deprecation
-
       # Renders a thumbnail for given EssencePicture content with correct cropping and size
       def essence_picture_thumbnail(content)
         picture = content.ingredient

app/helpers/alchemy/elements_helper.rb

@@ -6,7 +6,6 @@ module Alchemy
   # The most important helper for frontend developers is the {#render_elements} helper.
   #
   module ElementsHelper
-    include Alchemy::EssencesHelper
     include Alchemy::UrlHelper
     include Alchemy::ElementsBlockHelper
 

spec/dummy/app/views/alchemy/elements/_news.html.erb

@@ -1,11 +1,11 @@
-<div class="news" id="<%= element_dom_id(news) %>" <%= element_preview_code(news) -%>>
-    <div class="date">
-        <%= render_essence_view_by_name(news, 'date', :date_format => "%d.%m.%Y") %>
-    </div>
-    <h2>
-        <%= render_essence_view_by_name(news, 'news_headline') %>
-    </h2>
-    <div class="body">
-        <%= render_essence_view_by_name(news, 'body') %>
-    </div>
-</div>
+<%= element_view_for(news) do |el| %>
+  <div class="date">
+    <%= el.render :date, date_format: "%d.%m.%Y" %>
+  </div>
+  <h2>
+    <%= el.render :news_headline %>
+  </h2>
+  <div class="body">
+    <%= el.render :body %>
+  </div>
+<% end %>

spec/helpers/alchemy/admin/essences_helper_spec.rb

@@ -9,49 +9,6 @@
     create(:alchemy_element, :with_contents, name: 'article')
   end
 
-  describe 'essence rendering' do
-    before do
-      if element
-        element.content_by_name('intro').essence.update(body: 'hello!')
-      end
-    end
-
-    describe '#render_essence_editor' do
-      it "should render an essence editor" do
-        content = element.content_by_name('intro')
-        expect(helper.render_essence_editor(content)).
-          to match(/input.+type="text".+value="hello!/)
-      end
-    end
-
-    describe '#render_essence_editor_by_name' do
-      subject { render_essence_editor_by_name(element, content) }
-
-      let(:content) { 'intro' }
-
-      it "renders an essence editor by given name" do
-        is_expected.to match(/input.+type="text".+value="hello!/)
-      end
-
-      context 'when element is nil' do
-        let(:element) { nil }
-
-        it "displays a warning" do
-          is_expected.to have_selector(".warning.message")
-          is_expected.to have_content("No element given.")
-        end
-      end
-
-      context 'when content is not found on element' do
-        let(:content) { 'sputz' }
-
-        it "displays a warning" do
-          is_expected.to have_selector(".content_editor.missing")
-        end
-      end
-    end
-  end
-
   describe '#pages_for_select' do
     let(:contact_form) do
       create(:alchemy_element, :with_contents, name: 'contactform')