dimples 12.0.0 → 13.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fcf6e00b6b3aa4b7096a9d7e52d403b5bc6bdd0f4564139d1d625fc6a95f7f6
-  data.tar.gz: 7f794a7c556717f7096e18cc82b5d4c0fb64ae36c426c0720bf10dff7538c6c5
+  metadata.gz: 3b1507135dbcefde4af262ac48bc5b5fb34fb70d6ee8907f79fd65c53baccf37
+  data.tar.gz: e78540206127d0891cbbb3d6c04f21cf9ebbd98205f7c742feb8a0ee337245ed
 SHA512:
-  metadata.gz: 15291e14e987e06abd9d4ff514eef20129b7f177f7d3b7016238739060b1de8d33f314cbf02a171974cc43fe2fbbbfd85dcdb478b9bdd868d88132dc998a5033
-  data.tar.gz: f7e89be6177ecd1464258e7414445caf79e609c55ca74ddc8458165a53d2008b61b1da49a3d6ff25b105229a8685b80d6d9020999df832d4eacb866edea6c457
+  metadata.gz: 5bb98fd65d3c953670d26c2b932d295c7ac478b77c1fa12f655104acc5350c51f8b85daa83efadc64fadf5a2c1f4cf3606a9b9ef80bdb2cd4ee3fc657e2420d1
+  data.tar.gz: ad6d763c238811a49d755b69d23fbbdf3f332b08594602fbc3fbf7bc0b468346720bf01dee04e00241178d052d8ba57e0f8a147742bb04ba19c76e0ef6511cad

data/lib/dimples/entry.rb

@@ -31,6 +31,10 @@ module Dimples
       matches = contents.match(FRONT_MATTER_PATTERN)
       if matches
         @metadata.merge!(YAML.safe_load(matches[1], symbolize_names: true, permitted_classes: [Date]))
+        @metadata.transform_values! do |value|
+          value.is_a?(Hash) ? Context.from_hash(value) : value
+        end
+
         @contents = matches.post_match.strip
       else
         @contents = contents
@@ -56,7 +60,7 @@ module Dimples
       type = self.class.to_s.split('::')[-1].downcase.to_sym
 
       payload[:site] ||= site
-      payload[type] = @metadata
+      payload[type] = self
 
       body = render(payload: payload)
       template = self.template

data/lib/dimples/pager.rb

@@ -53,7 +53,7 @@ module Dimples
     end
 
     def current_page_path
-      @current_page == 1 ? @url : File.join(@url, "page_#{@current_page}")
+      @current_page == 1 ? @url : File.join(@url, "pages", current_page.to_s)
     end
 
     def current_page_url
@@ -91,14 +91,14 @@ module Dimples
     def metadata
       {
         posts: posts_at(current_page),
-        pagination: {
+        pagination: Context.from_hash(
           current_page: @current_page,
           page_count: @page_count,
           post_count: @posts.count,
           previous_page: @previous_page,
           next_page: @next_page,
           urls: urls
-        }
+        )
       }
     end
   end

data/lib/dimples/template.rb

@@ -12,7 +12,16 @@ module Dimples
     def render(payload: nil)
       payload ||= {}
 
-      instance_variable_set("@this", Context.from_hash(payload.merge(metadata)))
+      @entries.each { |key| remove_instance_variable(key) } unless @entries.nil?
+      @entries = []
+
+      payload.each do |key, value|
+        key = "@#{key}".to_sym
+
+        instance_variable_set(key, value)
+        @entries.append(key)
+      end
+
       ERB.new(contents).result(binding)
     end
   end

data/lib/dimples/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dimples
-  VERSION = '12.0.0'
+  VERSION = '13.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 12.0.0
+  version: 13.0.0
 platform: ruby
 authors:
 - Daniel Bogan