seiten 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83d788eadd214b82c9e91e8da1a0d72d050a7d1bb46c635db58aefffd5f48712
-  data.tar.gz: 469118c143991e25fcb35e5f5e8d55e58a6255a412e5d5cc40aad031e99f8ff1
+  metadata.gz: f11b589f94032def9f0ef35b5fd457e1acb0f3508cf39f1ac63fb0338ee8217a
+  data.tar.gz: 71e0543f85e054dac2cf348e6e9ecf1eebde83d1659921dca8c4460a734665b6
 SHA512:
-  metadata.gz: 6e1a3a500817fed2ee4f2a9498f8369f0b721e7cc3ce34c4982578cc397f972bb783fa5b964fd9dcce40f0da64954903ac8f77d4fe1b2bb0120bddc9514f90ba
-  data.tar.gz: da0aeed08ad91cee1183e7a3266f213d047d84a1ebf0ac0c99f240504865ad31f38709e1e6d72ef0be5c37a3952b5df94dd68359b36a5a1051703742580c3897
+  metadata.gz: 186fe751f440f15e30944acc416a9dfac931bcf1afd0f65c4f58ba5b6e7c8a0ebd3fab9e8ad39260c39aebc26de7769cb5b829c4b05c7f35c30407806a97577a
+  data.tar.gz: 133f9dd5ac075f2805088865e309183c453a2e889b0cc090c970db1e94076e603f4a60a8f249685b97d674741b857a6e78112ce33f356c0e3aaaa64e73b1d8b5

data/lib/seiten/page.rb

@@ -2,7 +2,7 @@
 
 module Seiten
   class Page
-    attr_accessor :navigation_id, :id, :parent_id, :title, :slug, :refer, :data, :html_options
+    attr_accessor :navigation_id, :id, :parent_id, :title, :slug, :refer, :key, :data, :html_options
     attr_writer :layout
 
     # initialize Page object with attributes
@@ -13,6 +13,7 @@ module Seiten
       @title          = options[:title]
       @slug           = options[:slug]
       @refer          = options[:refer]
+      @key            = options[:key]&.to_s
       @layout         = options[:layout]
       @data           = options[:data].each_with_object({}){|(k,v), h| h[k.to_sym] = v} if options[:data]
       @data         ||= {}
@@ -71,6 +72,37 @@ module Seiten
       end
     end
 
+    # The page's place in its navigation tree: the index among its siblings, from the root down
+    # (e.g. [2, 0] for the first child of the third top-level page).
+    def position
+      @position ||= (parent ? parent.position : []) + [navigation.pages.where(parent_id: parent_id).index(self)]
+    end
+
+    # The same page in the navigation of the same name in another locale: the page at the same
+    # position, or, for a page with a `key`, the page with the same key. Nil when there is none.
+    def translation(locale)
+      locale = locale.to_s
+      return self if locale == navigation.locale
+
+      other = Seiten::Navigation.find_by(name: navigation.name, locale: locale)
+      return unless other
+
+      if key
+        other.pages.find_by(key: key)
+      else
+        page = other.pages.all.find { |candidate| candidate.position == position }
+        page unless page&.key
+      end
+    end
+
+    # This page in every locale that has it, by locale (including its own).
+    def translations
+      Seiten::Navigation.where(name: navigation.name).each_with_object({}) do |other, translations|
+        page = translation(other.locale)
+        translations[other.locale] = page if page
+      end
+    end
+
     # get children of page
     def children
       navigation.pages.where(parent_id: id)

data/lib/seiten/page_collection_builder.rb

@@ -27,7 +27,7 @@ module Seiten
         # Set refer
         if page["refer"]
           if page["refer"].is_a?(TrueClass)
-            page["refer"] = "/" + Seiten::SlugBuilder.call(page["nodes"].first, page["slug"])
+            page["refer"] = "/" + Seiten::SlugBuilder.call(page["nodes"].first, slug)
           end
           raise Errors::PageError, "The `refer` option must be `true` or an absolute or external path" if page["refer"] != true && page["refer"][0] != "/" && !(page["refer"].match(/^https?:\/\/.+/))
         else

data/lib/seiten/routes_helper.rb

@@ -15,7 +15,7 @@ class ActionDispatch::Routing::Mapper
       # NOTE: See https://github.com/rails/rails/issues/31228
       resource_options[:constraints] ||= ->(req) { req.path.exclude? 'rails/active_storage' }
 
-      get '(*slug)', resource_options
+      get '(*slug)', **resource_options
     end
   end
 end

data/lib/seiten/version.rb

@@ -1,3 +1,3 @@
 module Seiten
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/test/dummy/config/initializers/new_framework_defaults.rb

@@ -12,9 +12,5 @@ Rails.application.config.action_controller.per_form_csrf_tokens = false
 # Enable origin-checking CSRF mitigation. Previous versions had false.
 Rails.application.config.action_controller.forgery_protection_origin_check = false
 
-# Make Ruby 2.4 preserve the timezone of the receiver when calling `to_time`.
-# Previous versions had false.
-ActiveSupport.to_time_preserves_timezone = false
-
 # Require `belongs_to` associations by default. Previous versions had false.
 # Rails.application.config.active_record.belongs_to_required_by_default = false