Remove Element.available scope

app/models/alchemy/element.rb

@@ -103,7 +103,6 @@ class Element < BaseRecord
     scope :published, -> { where(public: true) }
     scope :hidden, -> { where(public: false) }
     scope :not_restricted, -> { joins(:page).merge(Page.not_restricted) }
-    scope :available, -> { published }
     scope :named, ->(names) { where(name: names) }
     scope :excluded, ->(names) { where.not(name: names) }
     scope :fixed, -> { where(fixed: true) }
@@ -178,8 +177,6 @@ def all_from_clipboard_for_parent_element(clipboard, parent_element)
 
         all_from_clipboard(clipboard).where(name: parent_element.definition["nestable_elements"])
       end
-
-      deprecate available: :published, deprecator: Alchemy::Deprecation
     end
 
     # Returns next public element from same page.

lib/alchemy/upgrader/tasks/add_page_versions.rb

@@ -15,10 +15,10 @@ def create_public_page_versions
             Alchemy::Page.transaction do
               page.versions.create!(
                 public_on: page.legacy_public_on,
-                public_until: page.legacy_public_until
+                public_until: page.legacy_public_until,
               ).tap do |version|
                 # We must not use .find_each here to not mess up the order of elements
-                page.draft_version.elements.not_nested.available.each do |element|
+                page.draft_version.elements.not_nested.published.each do |element|
                   Alchemy::Element.copy(element, page_version_id: version.id)
                 end
               end

lib/generators/alchemy/elements/templates/view.html.erb

@@ -19,7 +19,7 @@
     <%- end -%>
   <%- end -%>
   <%- if @element['nestable_elements'].present? -%>
-    <%%= render <%= @element_name %>.nested_elements.available %>
+    <%%= render <%= @element_name %>.nested_elements.published %>
   <%- end -%>
   <%%- end -%>
 <%%- end -%>

lib/generators/alchemy/elements/templates/view.html.haml

@@ -18,5 +18,5 @@
     <%- end -%>
   <%- end -%>
   <%- if @element['nestable_elements'].present? -%>
-    = render <%= @element_name -%>.nested_elements.available
+    = render <%= @element_name -%>.nested_elements.published
   <%- end -%>

lib/generators/alchemy/elements/templates/view.html.slim

@@ -18,5 +18,5 @@
     <%- end -%>
   <%- end -%>
   <%- if @element['nestable_elements'].present? -%>
-    = render <%= @element_name -%>.nested_elements.available
+    = render <%= @element_name -%>.nested_elements.published
   <%- end -%>

lib/tasks/alchemy/thumbnails.rake

@@ -46,7 +46,7 @@ namespace :alchemy do
       ingredient_pictures = Alchemy::Ingredients::Picture.
         joins(:element).
         preload({ related_object: :thumbs }).
-        merge(Alchemy::Element.available)
+        merge(Alchemy::Element.published)
 
       if ENV["ELEMENTS"].present?
         ingredient_pictures = ingredient_pictures.merge(

spec/models/alchemy/element_spec.rb

@@ -1138,13 +1138,4 @@ module Alchemy
       element.reload.destroy!
     end
   end
-
-  describe ".available" do
-    subject { Alchemy::Element.available }
-
-    it "is deprecated" do
-      expect(Alchemy::Deprecation).to receive(:warn)
-      subject
-    end
-  end
 end