iron-cms 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdbdcd75d63988db324f7cd3520ff66b7327aa366a8316e82ca0a48fc02f5830
-  data.tar.gz: 55f750ec5c956ea41834df8c10fec16aa12e99e01224ab6c9fc142f2c76843d0
+  metadata.gz: d9abaa273ecae6889ecd0cef2c07e13acd8f114fcb837c1d1a258b3b3fcafba0
+  data.tar.gz: c53c056bb26a8008e997e511271861eaccf4201cea3fef1cc7ebfb078fc9c9ee
 SHA512:
-  metadata.gz: 0b5f6d0e3e5c7114cea52af8687af60ef66afd906025c5fc4a394fa6c5a3ecdbc029117028a1c938c6f02fe6e9a4530083cf36c281e2b37723395604e7aea274
-  data.tar.gz: 9437328b4b67b083d7c57938acfcb8b5f5d7a082e831b21890eff4afd2c3dc2b051dadb1b0def5eaa26b5192fbc8aadff9f1cc60e5fafc99b79033a63ca57eac
+  metadata.gz: 707eff365a47620389245b3e52afb2b5a6595aa2b3f625d3bda7adb0babc12005cdc5f46d3c23f057b19f1aed2a74930627b980f62cccfc4cd9eca3acbe6d553
+  data.tar.gz: f37858c8de836880cbbe9af192cf28aed93986bb245e397f98428ef6201da3682c049e2f29738cb1e4b4c94000fb77395683efc75503f29c69d59d172f62d94e

data/app/controllers/concerns/iron/web_page.rb

@@ -12,7 +12,9 @@ module Iron
     end
 
     def set_entry
-      @entry = @content_type.entries.find_by!(route: params[:route])
+      @entry = @content_type.entries.find_by(route: params[:route])
+
+      raise ActiveRecord::RecordNotFound unless @entry&.published_in?(Current.locale)
     end
   end
 end

data/app/models/iron/entry/presentable.rb

@@ -11,7 +11,7 @@ module Iron
         result._metadata = OpenStruct.new(
           locale: locale,
           web: OpenStruct.new(
-            title: web_title,
+            title: web_title(locale: locale),
             path: path
           )
         )

data/app/models/iron/entry/web_publishable.rb

@@ -19,26 +19,40 @@ module Iron
       route == ""
     end
 
-    def web_title
+    def web_title(locale: Locale.default)
       return nil unless content_type.web_page_title_field_definition
 
       title_field = fields.find_by(
         definition: content_type.web_page_title_field_definition,
-        locale: Iron::Locale.default
+        locale: locale
       ) || fields.detect { |f|
         f.definition_id == content_type.web_page_title_field_definition_id &&
-        f.locale == Iron::Locale.default
+        f.locale_id == locale&.id
       }
 
       title_field&.value
     end
 
+    def published_in?(locale)
+      return false unless content_type.web_publishing_enabled?
+
+      if content_type.web_page_title_field_definition
+        web_title(locale: locale).present?
+      else
+        translated_in?(locale)
+      end
+    end
+
     def path
       content_type.path_for(self) if content_type.web_publishing_enabled?
     end
 
     private
 
+      def translated_in?(locale)
+        fields.where(locale: locale, parent: nil).exists?
+      end
+
       def should_generate_route?
         content_type.web_publishing_enabled? && route.nil?
       end

data/lib/generators/iron/pages/templates/pages_controller.rb

@@ -5,7 +5,7 @@ class PagesController < ApplicationController
     @content_type = Iron::ContentType.web_published.find_by_handle!(params[:content_type])
     @entry = @content_type.entries.find_by(route: params[:route])
 
-    raise ActiveRecord::RecordNotFound unless @entry
+    raise ActiveRecord::RecordNotFound unless @entry&.published_in?(Iron::Current.locale)
 
     render "templates/#{@content_type.handle}"
   rescue ActionView::MissingTemplate

data/lib/iron/published_page_constraint.rb

@@ -0,0 +1,33 @@
+module Iron
+  class PublishedPageConstraint
+    def matches?(request)
+      matches_locale?(request) && has_published_entry?(request)
+    end
+
+    private
+
+      def matches_locale?(request)
+        locale = request.params[:locale]
+        return true if locale.blank?
+        return false if locale.start_with?("rails")
+        Iron::Locale.pluck(:code).include?(locale)
+      end
+
+      def has_published_entry?(request)
+        content_type_handle = request.params[:content_type]
+        route = request.params[:route].presence || ""
+
+        content_type = Iron::ContentType.find_by!(handle: content_type_handle)
+
+        if entry = content_type.entries.find_by(route: route)
+          entry.published_in?(requested_locale(request))
+        else
+          false
+        end
+      end
+
+      def requested_locale(request)
+        Iron::Locale.detect(request) || Iron::Locale.default
+      end
+  end
+end

data/lib/iron/routing.rb

@@ -1,3 +1,5 @@
+require "iron/published_page_constraint"
+
 module Iron
   module Routing
     def iron_pages
@@ -37,30 +39,4 @@ module Iron
       end
     end
   end
-
-
-  class PublishedPageConstraint
-    def matches?(request)
-      matches_locale?(request) && has_published_entry?(request)
-    end
-
-    private
-
-      def matches_locale?(request)
-        locale = request.params[:locale]
-        return true if locale.blank?
-        return false if locale.start_with?("rails")
-        Iron::Locale.pluck(:code).include?(locale)
-      end
-
-      def has_published_entry?(request)
-        content_type_handle = request.params[:content_type]
-        route = request.params[:route].presence || ""
-        # For v1 we won't handle localization, we need to figure out how to localize routes
-        # locale = Iron::Locale.detect(request) || Iron::Locale.default
-
-        content_type = Iron::ContentType.find_by!(handle: content_type_handle)
-        content_type.entries.exists?(route: route)
-      end
-  end
 end

data/lib/iron/version.rb

@@ -1,3 +1,3 @@
 module Iron
-  VERSION = "0.18.0"
+  VERSION = "0.18.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron-cms
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Massimo De Marchi
@@ -686,6 +686,7 @@ files:
 - lib/iron/lexorank/rankable.rb
 - lib/iron/lexorank/rebalance_rank_job.rb
 - lib/iron/lexorank/utils.rb
+- lib/iron/published_page_constraint.rb
 - lib/iron/routing.rb
 - lib/iron/sdk.rb
 - lib/iron/version.rb