jekyll-paspagon 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3473a67fa94697256aa751c4609966e8aecb4f17
-  data.tar.gz: 185620c215cd94724abaa23b9ad366e234b4f837
+  metadata.gz: eaafe762fcedbd097542c0fa0290e5beb71da952
+  data.tar.gz: f03219074db63e2337a6f62f7ad022a1bd33437b
 SHA512:
-  metadata.gz: bf302dad427027862b62b614a2ad63a49cf0fb74fdd4ac080cc1c5b6760526ba57410a60fa80222a01174b8fe80bbb24d56c911b83265ea22befc9f17cd4f8e4
-  data.tar.gz: 9a9013a868676403ba42f401ce05fb8b440edf2889d0622a685b228c4dcbead937998c56e932f8e32f532e0561aedf7b48ba18d3a945626f43ed6804e4ca5039
+  metadata.gz: 729648696853240d580a7345758c19f501b10f69c37394077c0f3e506cb1bae529a72b5952d507fb0e13be9d1a3dfecd22bae6f671f2077e5f9568fb3358bfd9
+  data.tar.gz: 183710d63a62d988f63d06db6f134ebf47a106b4fcc130b17ef9f3061a5ae21c314e34da2d54e293a2bf835a17f662a46f0dc03b2631bf0820fb5d1122eb2cef

data/README.md

@@ -18,10 +18,6 @@ group :jekyll_plugins do
 end
 ```
 
-### Configure S3 bucket
-
-Create a S3 bucket in the `s3-us-west-2` region (Oregon) and [grant Paspagon read access to it](http://paspagon.com/terms-seller/#step-1-grant-us-read-access-to-your-bucket), as described in Paspagon’s terms of service.
-
 ### Configure Paspagon
 
 To your `_config.yml`, add a section adhering to the following example:
@@ -68,6 +64,9 @@ defaults:
           paid_after: 15 # HTML version will be paid 15 days after publication.
         pdf:
           content_disposition: attachment
+          # If you don’t provide content type, the plugin will try to set a
+          # reasonable default for some popular formats, falling back to
+          # application/octet-stream if necessary.
           content_type: application/pdf
           paid_before: 2 # PDF version will be paid for the first two days.
         epub: {} # EPUB version will be paid from the beginning.
@@ -123,7 +122,7 @@ After doing the steps above, paid versions of your posts will be generated autom
 
 If you specify thresholds like `paid_before`, you will need to run `jekyll build` again after reaching them.
 
-You may override formats, buckets, prices and payment addresses for each post by putting the relevant data in the YAML front matter:
+You may override formats, assigned buckets, prices, payment addresses and link expiration times for each post by putting the relevant data in the YAML front matter:
 
 ```yaml
 layout: post
@@ -133,7 +132,7 @@ payment:
     USD: false
     XAU: 3
   address:
-    bitcoin: 1Foo
+    BTC: 1Foo
 bucket: foo
 formats:
   epub:
@@ -157,7 +156,7 @@ This command uploads missing or updated paid files to S3 and removes ones which
 
 ## Markdown compatibility
 
-jekyll-paspagon uses Pandoc to generate formats other than HTML. The default input format is `markdown_github-hard_line_breaks`. It may be impacted by some site settings like Kramdown’s `hard_wrap`, but the most reliable it to set it explicitly in `_config.yml`:
+jekyll-paspagon uses Pandoc to generate formats other than HTML. The default input format is `markdown_github-hard_line_breaks`. It may be impacted by some site settings like Kramdown’s `hard_wrap`, but the most reliable way of changing it is setting it explicitly in `_config.yml`:
 
 ```yaml
 pandoc:

data/lib/jekyll-paspagon/hooks.rb

@@ -62,13 +62,13 @@ Jekyll::Hooks.register :posts, :post_write do |post|
   unless post.data['excerpt_only']
     post.data['formats'].each do |format, format_config|
       puts("Generated #{format_config['path']}.") if maybe_generate_doc(post, format)
-      attrs = format_xattrs(format_config)
+      attrs = format_xattrs(format, format_config)
       sync_payment_attributes(format_config['path'], attrs)
     end
   end
 end
 
-def format_xattrs(format_config)
+def format_xattrs(format, format_config)
   attrs = {}
   format_config['prices'].each do |currency, price|
     attrs["user.x-amz-meta-price-#{currency}"] = price if price
@@ -78,10 +78,20 @@ def format_xattrs(format_config)
   end
   attrs['user.x-amz-meta-link-expiration-time'] = format_config['link_expiration_time'] if format_config['link_expiration_time']
   attrs['user.content-disposition'] = format_config['content_disposition'] if format_config['content_disposition']
-  attrs['user.content-type'] = format_config['content_type'] if format_config['content_type']
+  attrs['user.content-type'] = format_config['content_type'] || default_content_type(format)
   attrs
 end
 
+def default_content_type(format)
+  content_types =
+    {'epub' => 'application/epub+zip',
+     'html' => 'text/html',
+     'mobi' => 'application/x-mobipocket-ebook',
+     'pdf' => 'application/pdf'}
+  content_types.default = 'application/octet-stream'
+  content_types[format]
+end
+
 def sync_payment_attributes(path, attrs)
   xattr = Xattr.new(path)
   old = xattr.list.select { |a| a.start_with?('user.') }

data/lib/jekyll/commands/paspagon.rb

@@ -103,10 +103,14 @@ module Jekyll
             to_upload.each do |p|
               puts("Uploading #{p} to bucket #{bucket_name}…")
               xattr = Xattr.new(p)
-              metadata = xattr.as_json.select { |k, _| k.start_with?('user.') }.map { |k, v| [k.sub(/^user./, ''), v] }.to_h
-              bucket.put_object(body: File.open(p),
-                                metadata: metadata,
-                                key: p)
+              user_metadata = xattr.as_json.select { |k, _| k.start_with?('user.x-amz-meta-') }.map { |k, v| [k.sub(/^user./, ''), v] }.to_h
+              options =
+                {body: File.open(p),
+                 metadata: user_metadata,
+                 key: p}
+              options[:content_disposition] = xattr['user.content-disposition'] if xattr['user.content-disposition']
+              options[:content_type] = xattr['user.content-type'] if xattr['user.content-type']
+              bucket.put_object(options)
             end
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-paspagon
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Krzysztof Jurewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-xattr