Merge pull request #3 from jamesramsay/google-yaml

Google yaml

Author: James Ramsay

.simplecov

@@ -0,0 +1,3 @@
+SimpleCov.start do
+  add_filter "/lib/google-yaml.rb"
+end

README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://img.shields.io/travis/jamesramsay/jekyll-app-engine/master.svg)](https://travis-ci.org/jamesramsay/jekyll-app-engine)
 [![Version](https://img.shields.io/gem/v/jekyll-app-engine.svg)](https://rubygems.org/gems/jekyll-app-engine)
+[![Coverage Status](https://img.shields.io/codecov/c/github/jamesramsay/jekyll-app-engine/master.svg)](https://codecov.io/github/jamesramsay/jekyll-app-engine)
 
 `jekyll-app-engine` makes it easy to deploy your jekyll site to Google App Engine by generating handlers for your `app.yaml`.
 

jekyll-app-engine.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "codecov"
 end

lib/google-yaml.rb

@@ -0,0 +1,42 @@
+# Google App Engine doesn't support achors and alias feature of YAML
+# Psych doesn't provide an option to disable achors/alias YAML features
+#
+# HACK: subclass the native YAMLTree, and bypass logic which checks for aliases
+# ../psych/vistors/yaml_tree.rb
+class GoogleYAMLTree < Psych::Visitors::YAMLTree
+  def accept target
+    # HACK: disabled alias lookup
+    # return any aliases we find
+    # if @st.key? target
+    #   oid         = @st.id_for target
+    #   node        = @st.node_for target
+    #   anchor      = oid.to_s
+    #   node.anchor = anchor
+    #   return @emitter.alias anchor
+    # end
+
+    if target.respond_to?(:to_yaml)
+      begin
+        loc = target.method(:to_yaml).source_location.first
+        if loc !~ /(syck\/rubytypes.rb|psych\/core_ext.rb)/
+          unless target.respond_to?(:encode_with)
+            if $VERBOSE
+              warn "implementing to_yaml is deprecated, please implement \"encode_with\""
+            end
+
+            target.to_yaml(:nodump => true)
+          end
+        end
+      rescue
+        # public_method or source_location might be overridden,
+        # and it's OK to skip it since it's only to emit a warning
+      end
+    end
+
+    if target.respond_to?(:encode_with)
+      dump_coder target
+    else
+      send(@dispatch_cache[target.class], target)
+    end
+  end
+end

lib/jekyll-app-engine.rb

@@ -1,35 +1,8 @@
 require 'fileutils'
+require 'google-yaml'
 
 module Jekyll
 
-  class GoogleYAMLTree < Psych::Visitors::YAMLTree
-    def accept target
-      if target.respond_to?(:to_yaml)
-        begin
-          loc = target.method(:to_yaml).source_location.first
-          if loc !~ /(syck\/rubytypes.rb|psych\/core_ext.rb)/
-            unless target.respond_to?(:encode_with)
-              if $VERBOSE
-                warn "implementing to_yaml is deprecated, please implement \"encode_with\""
-              end
-
-              target.to_yaml(:nodump => true)
-            end
-          end
-        rescue
-          # public_method or source_location might be overridden,
-          # and it's OK to skip it since it's only to emit a warning
-        end
-      end
-
-      if target.respond_to?(:encode_with)
-        dump_coder target
-      else
-        send(@dispatch_cache[target.class], target)
-      end
-    end
-  end
-
   class PageWithoutAFile < Page
     def read_yaml(*)
       @data ||= {}
@@ -89,6 +62,7 @@ def write
     end
 
     def app_yaml_content
+      # HACK: use sub-classed YAML implementation which disables anchors and aliases
       builder = GoogleYAMLTree.create
       builder << generate_app_engine_yaml
 
@@ -99,6 +73,34 @@ def app_yaml_content
       return app_yaml.output
     end
 
+    def page_types
+      page_types_array = [
+        {
+          "content_type" => "posts",
+          "content_collection" => @site.posts.docs
+        },
+        {
+          "content_type" => "pages",
+          "content_collection" => @site.pages
+        },
+        {
+          "content_type" => "static",
+          "content_collection" => @site.static_files
+        },
+      ]
+
+      @site.collections.each_pair do |label, collection|
+        unless label == "posts"
+          page_types_array << {
+            "content_type" => "collections",
+            "content_collection" => collection.docs
+          }
+        end
+      end
+
+      return page_types_array
+    end
+
     def generate_app_engine_yaml
       if source_partial_exists?
         app_yaml = YAML.load_file(source_path)
@@ -108,28 +110,23 @@ def generate_app_engine_yaml
 
       app_yaml["handlers"] ||= []
 
-      generate_handlers("posts", @site.posts.docs).each { |handler| app_yaml["handlers"] << handler }
-      generate_handlers("pages", @site.pages).each { |handler| app_yaml["handlers"] << handler }
-
-      @site.collections.each_pair do |label, collection|
-        unless label == "posts"
-          generate_handlers("collections", collection.docs).each { |handler| app_yaml["handlers"] << handler }
-        end
+      page_types.each do |content|
+        generate_handlers(content).each { |handler| app_yaml["handlers"] << handler }
       end
 
-      generate_handlers("static", @site.static_files).each { |handler| app_yaml["handlers"] << handler }
-
       return app_yaml
     end
 
-    def generate_handlers(content_type, collection)
+    def generate_handlers(content)
+      content_type = content["content_type"]
+      content_collection = content["content_collection"]
       handlers = []
 
       handler_template = @app_engine["handlers"][content_type] || {}
       if handler_template.kind_of?(Array) or handler_template.has_key?("url")
         handlers << handler_template
       else
-        collection.each do |doc|
+        content_collection.each do |doc|
           handler = {
             "url" => doc.url,
             "static_files" => doc.destination("").sub("#{Dir.pwd}/", ""),

spec/fixtures/_config.yml

@@ -17,10 +17,7 @@ app_engine:
     posts:
       http_headers:
         Link: "</static/css/style.css>; rel=preload; as=style"
-    statics:
-    - url: /images/
-      static_dir: _site/images
-      expiration: 4m
-    - url: /styles/
-      static_dir: _site/styles
-      expiration: 8m
+    collections:
+    - url: /my_collection/*
+      static_files: _site/my_collection/*
+      upload: _site/my_collection/*

spec/jekyll-app-engine_spec.rb

@@ -126,7 +126,7 @@
   # end
 
   it "includes the correct number of items" do
-    expect(handlers.length).to eql 18
+    expect(handlers.length).to eql 15
   end
 
   # context "with a baseurl" do

spec/spec_helper.rb

@@ -1,3 +1,10 @@
+require 'simplecov'
+
+if ENV['CI'] == 'true'
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end
+
 require 'jekyll'
 require File.expand_path('../lib/jekyll-app-engine', File.dirname(__FILE__))