jekyll-paspagon 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d9c1cbf4a393ffc471f25e509d78e1ac3a681f3
-  data.tar.gz: eed3f8f170893e1f48ee441e495356d838b3f845
+  metadata.gz: ed2906a3b3c966f623b2ee0af8c6fa8c8c0acbf1
+  data.tar.gz: 77ba587dc6f6bd3fc2762832c6074adabe057b62
 SHA512:
-  metadata.gz: 9c7badcc45eba408df2b4e04576837e25c2d9bcda364026acb2350b9114e6709d9aac523a0c5d5302964205a5f80b14483e82c3632dd91b2387b51ecd2521e9c
-  data.tar.gz: a5c921004ed08b4f81802c8ddc9f1e494f048386507971d2f27c4f3ab02e710c7c6687ac1a40dfda3236968c588046865d6fbd0319bae49fa55b5a816a08de16
+  metadata.gz: a930f7f04a920f492f04f404ea0e2ab16f81ac1811a6f79879de60de4ad26269b6a2880d38b82d2d2b410c426b486801ebfa5319fbf53e1935cc4a73ad109814
+  data.tar.gz: 6295693d3e6ffd335cef73d5a002fa1c44f25d9696c7210119519f2e0e474ffbb9bbe08ae6412e93f829e1dd0066365103df6cbd188f6a9f5649f331ed465944

data/README.md

@@ -74,7 +74,7 @@ defaults:
       bucket: your-bucket-name
 ```
 
-Caveat: “default” values in Jekyll are actually not default values that can be simply overridden. Instead they get “deep merged” into post variables. If you want to unset a specific nested value in the `formats` hash, set it to `null`.
+Caveat: “default” values in Jekyll are actually not default values that can be simply overridden. Instead they get “deep merged” into post variables. If you want to unset a specific nested value inside the `formats` hash, set it to `false`.
 
 ### Change post template
 
@@ -130,7 +130,7 @@ layout: post
 title: Foo
 payment:
   price:
-    USD: null
+    USD: false
     XAU: 3
   address:
     bitcoin: 1Foo
@@ -139,9 +139,9 @@ formats:
   epub:
     paid_after: 15
   pdf:
-    # Setting this to null means that a post will be paid from the beginning.
+    # Setting this to false means that a post will be paid from the beginning.
     # If you want a format to be free instead, set this to 0.
-    paid_before: null
+    paid_before: false
   azw3: {}
 ```
 

data/lib/jekyll-paspagon/config.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+require 'fileutils'
 
 class PaspagonConfig
   attr_reader :buckets, :formats, :full_config
@@ -40,7 +41,9 @@ class PaspagonConfig
     @buckets.each do |bucket_name, bucket_hash|
       bucket_config = bucket_hash.update('accept-terms' => @full_config['accept-terms'])
       ini = hash_to_ini bucket_config
-      dest = File.join(bucket_dest_dir(bucket_name), 'paspagon.ini')
+      bucket_dest_dir = bucket_dest_dir(bucket_name)
+      FileUtils.mkdir_p(bucket_dest_dir)
+      dest = File.join(bucket_dest_dir, 'paspagon.ini')
       ini_hash = Digest::SHA256.digest(ini)
       next if File.exist?(dest) && Digest::SHA256.file(dest).digest == ini_hash
       File.open(dest, 'wb') do |f|

data/lib/jekyll-paspagon/hooks.rb

@@ -11,7 +11,7 @@ Jekyll::Hooks.register :site, :pre_render do |site|
     post.data['formats'] ||= {}
     # Jekyll does not do a simple merge of default values with post values, so
     # we cannot unset default formats in an ordinary way. Instead, we reject null values.
-    post.data['formats'].reject! { |_, v| !v }
+    post.data['formats'] = post.data['formats'].reject { |_, v| !v }
     prices = post.data['price'] || {}
     addresses = post.data['address'] || {}
     link_expiration_time = post.data['link-expiration-time'] || nil
@@ -50,7 +50,7 @@ Jekyll::Hooks.register :site, :pre_render do |site|
          'prices' => prices,
          'name' => format.upcase,
          'addresses' => addresses}
-      post.data['formats'][format].merge! format_info
+      post.data['formats'][format] = post.data['formats'][format].merge(format_info)
       post.data['format_array'] = post.data['formats'].map { |_, v| v }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-paspagon
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Krzysztof Jurewicz