alchemy_cms 4.0.0.beta → 4.0.0.rc1

data/lib/alchemy/paths.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Provides admin interface routing configuration accessors.
 #
 # Alchemy has some defaults for admin path and admin constraints:

data/lib/alchemy/permissions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # ## Alchemy's permissions
   #

data/lib/alchemy/picture_attributes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # Provides methods to secure your picture attributes against DOS attacks.
   #

data/lib/alchemy/resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'active_support/core_ext'
 require 'active_support/inflector'

data/lib/alchemy/resources_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module ResourcesHelper
     # = Alchemy::ResourceHelper
@@ -70,21 +72,21 @@ module Alchemy
     # @return [String]
     #
     def render_attribute(resource, attribute, options = {})
-      options.reverse_merge!(truncate: 50)
-      value = resource.send(attribute[:name])
-      if (relation = attribute[:relation]) && value.present?
-        record = relation[:model_association].klass.find(value)
-        value = record.send(relation[:attr_method])
-      elsif attribute[:type] == :datetime && value.present?
-        value = l(value)
+      if attribute[:relation]
+        record = resource.send(attribute[:relation][:name])
+        value = record.present? ? record.send(attribute[:relation][:attr_method]) : Alchemy.t(:not_found)
+      elsif attribute[:type] == :datetime
+        value = l(resource.send(attribute[:name]))
+      else
+        value = resource.send(attribute[:name])
       end
+
+      options.reverse_merge!(truncate: 50)
       if options[:truncate]
-        value = value.to_s.truncate(options[:truncate])
+        value.to_s.truncate(options.fetch(:truncate, 50))
+      else
+        value
       end
-      value
-    rescue ActiveRecord::RecordNotFound => e
-      warning e
-      Alchemy.t(:not_found)
     end
 
     # Returns a options hash for simple_form input fields.

data/lib/alchemy/routing_constraints.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   # Routing constraints for Alchemy's strong catch all route.
   #

data/lib/alchemy/ssl_protection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module SSLProtection
     private

data/lib/alchemy/test_support/controller_requests.rb

@@ -1,3 +1,11 @@
+# *There is generally no need* to use this module. Instead, in
+# a functional/controller test against a Alchemy controller, just
+# use standard Rails functionality by including:
+#
+#   routes { Alchemy::Engine.routes }
+#
+# And then use standard Rails test `get`, `post` etc methods.
+#
 # Use this module to easily test Alchemy actions within Alchemy components
 # or inside your application to test routes for the mounted Alchemy engine.
 #
@@ -25,35 +33,47 @@
 #
 # Note: Based on Spree::TestingSupport::ControllerRequests. Thanks <3
 #
+# @deprecated Use Rails build in test request methods instead
+#
 module Alchemy
   module TestSupport
     module ControllerRequests
       extend ActiveSupport::Concern
 
       # Executes a request simulating GET HTTP method
+      # @deprecated Use Rails test `get` helper instead
       def alchemy_get(action, parameters = nil, session = nil, flash = nil)
         process_alchemy_action(action, parameters, session, flash, "GET")
       end
+      deprecate alchemy_get: :get, deprecator: Alchemy::Deprecation
 
       # Executes a request simulating POST HTTP method
+      # @deprecated Use Rails test `post` helper instead
       def alchemy_post(action, parameters = nil, session = nil, flash = nil)
         process_alchemy_action(action, parameters, session, flash, "POST")
       end
+      deprecate alchemy_post: :post, deprecator: Alchemy::Deprecation
 
       # Executes a request simulating PUT HTTP method
+      # @deprecated Use Rails test `put` helper instead
       def alchemy_put(action, parameters = nil, session = nil, flash = nil)
         process_alchemy_action(action, parameters, session, flash, "PUT")
       end
+      deprecate alchemy_put: :put, deprecator: Alchemy::Deprecation
 
       # Executes a request simulating DELETE HTTP method
+      # @deprecated Use Rails test `delete` helper instead
       def alchemy_delete(action, parameters = nil, session = nil, flash = nil)
         process_alchemy_action(action, parameters, session, flash, "DELETE")
       end
+      deprecate alchemy_delete: :delete, deprecator: Alchemy::Deprecation
 
       # Executes a simulated XHR request
+      # @deprecated Use Rails test `xhr` helper instead
       def alchemy_xhr(method, action, parameters = nil, session = nil, flash = nil)
         process_alchemy_xhr_action(method, action, parameters, session, flash)
       end
+      deprecate alchemy_xhr: :xhr, deprecator: Alchemy::Deprecation
 
       private
 

data/lib/alchemy/test_support/essence_shared_examples.rb

@@ -250,27 +250,9 @@ shared_examples_for "an essence" do
   end
 
   context 'delegations' do
-    let(:page)    { create(:alchemy_page, :restricted) }
-    let(:element) { create(:alchemy_element, name: 'headline', create_contents_after_create: true, page: page) }
-    let(:content) { element.contents.find_by(essence_type: 'Alchemy::EssenceText') }
-    let(:essence) { content.essence }
-
-    it "delegates restricted? to page" do
-      expect(page.restricted?).to be(true)
-      expect(essence.restricted?).to be(true)
-    end
-
-    it "delegates trashed? to element" do
-      element.update!(position: nil)
-      expect(element.trashed?).to be true
-      expect(essence.trashed?).to be true
-    end
-
-    it "delegates public? to element" do
-      element.update!(public: false)
-      expect(element.public?).to be false
-      expect(essence.public?).to be false
-    end
+    it { should delegate_method(:restricted?).to(:page) }
+    it { should delegate_method(:trashed?).to(:element) }
+    it { should delegate_method(:public?).to(:element)  }
   end
 
   describe 'essence relations' do

data/lib/alchemy/tinymce.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Tinymce
     mattr_accessor :languages, :plugins

data/lib/alchemy/touching.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Alchemy
   module Touching
     # Touches the timestamps and userstamps

data/lib/alchemy/upgrader/three_point_four.rb

@@ -2,9 +2,26 @@ require_relative 'tasks/install_asset_manifests'
 
 module Alchemy
   class Upgrader::ThreePointFour < Upgrader
-    def self.install_asset_manifests
-      desc 'Install asset manifests into `vendor/assets`'
-      Alchemy::Upgrader::Tasks::InstallAssetManifests.new.install
+    class << self
+      def install_asset_manifests
+        desc 'Install asset manifests into `vendor/assets`'
+        Alchemy::Upgrader::Tasks::InstallAssetManifests.new.install
+      end
+
+      def alchemy_3_4_todos
+        notice = <<-NOTE
+
+        Time-based publishing
+        ---------------------
+
+        Alchemy now uses time-based publishing on the page models. Gems that
+        rely on the #public method will break. If you are using an older version
+        of `alchemy-pg_search`, you should now upgrade to a more recent version.
+
+        Ref: https://github.com/AlchemyCMS/alchemy-pg_search/pull/8
+        NOTE
+        todo notice, 'Alchemy v3.4 changes'
+      end
     end
   end
 end

data/lib/alchemy/userstamp.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Adds the model stamper ability to the provided user class
 #
 # It only adds it, if the user model is a active_record model.

data/lib/alchemy/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Alchemy
-  VERSION = "4.0.0.beta"
+  VERSION = "4.0.0.rc1"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -32,6 +32,7 @@ require_relative 'alchemy/cache_digests/template_tracker'
 require_relative 'alchemy/config'
 require_relative 'alchemy/configuration_methods'
 require_relative 'alchemy/controller_actions'
+require_relative 'alchemy/deprecation'
 require_relative 'alchemy/errors'
 require_relative 'alchemy/essence'
 require_relative 'alchemy/filetypes'

data/lib/tasks/alchemy/upgrade.rake

@@ -9,7 +9,7 @@ namespace :alchemy do
     'alchemy:upgrade:3.1:todo',
     'alchemy:upgrade:3.2:run', 'alchemy:upgrade:3.2:todo',
     'alchemy:upgrade:3.3:run', 'alchemy:upgrade:3.3:todo',
-    'alchemy:upgrade:3.4:run',
+    'alchemy:upgrade:3.4:run', 'alchemy:upgrade:3.4:todo',
     'alchemy:upgrade:3.5:run', 'alchemy:upgrade:3.5:todo'
   ] do
     Alchemy::Upgrader.display_todos
@@ -154,6 +154,10 @@ namespace :alchemy do
       task install_asset_manifests: [:environment] do
         Alchemy::Upgrader::ThreePointFour.install_asset_manifests
       end
+
+      task :todo do
+        Alchemy::Upgrader::ThreePointFour.alchemy_3_4_todos
+      end
     end
 
     desc 'Upgrade Alchemy to v3.5'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -49,14 +49,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -776,6 +776,7 @@ files:
 - bin/spring
 - config/alchemy/config.yml
 - config/alchemy/modules.yml
+- config/brakeman.ignore
 - config/initializers/assets.rb
 - config/initializers/dragonfly.rb
 - config/initializers/mime_types.rb
@@ -817,6 +818,7 @@ files:
 - lib/alchemy/config.rb
 - lib/alchemy/configuration_methods.rb
 - lib/alchemy/controller_actions.rb
+- lib/alchemy/deprecation.rb
 - lib/alchemy/engine.rb
 - lib/alchemy/errors.rb
 - lib/alchemy/essence.rb
@@ -988,7 +990,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 4