jekyll-fridge 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fdfe9c140fa6bd4f3418b042de123efed99986a
-  data.tar.gz: 0bcb35479db90058493b4a2025cf665e87c0b5c6
+  metadata.gz: e661154f081ee273810962e171ab0201c0ff8e08
+  data.tar.gz: e1852fd206f96a8340bbba235dc699e21e9221c3
 SHA512:
-  metadata.gz: dbfc97e00a29be571b84eb6bd67382e15178e29039fca4b2ea50ab64d9d681b9388e12e3bfd94c7758451ce2643f3e362a076bfc00f5560a2960818708386c55
-  data.tar.gz: f027e6a4b7f0be2de2c7f804e12ea66407cf3c945ae38bb35627f87470d741738178fa8df3115bf55a9edf5e51ca511b241de52e87c5d08c33025f87a1b67a92
+  metadata.gz: d1a1368960fc9036b3a55241bd0494e48ce688300a0b77b8b723c22addb0335962f93da735cabb26452ee68e6e92139a564d7b1d994f6cd4c1e3e447e3561c16
+  data.tar.gz: 1d6e6d66dda67d40c2d9462eea37e69a51f608ac48d6fce908c2fe17d766c7eb8d6cc19bfcf7f4ead04db9d849903181278c27fcef7dc59f5dfa63a74b16ad9d

data/jekyll-fridge.gemspec

@@ -5,7 +5,7 @@ require 'jekyll-fridge/version'
 Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.0'
   spec.add_dependency 'jekyll', '>= 3.0'
-  spec.add_dependency 'fridge_api', '~> 0.2.3'
+  spec.add_dependency 'fridge_api', '~> 0.3'
   spec.authors = ["Mike Kruk"]
   spec.email = ['mike@ripeworks.com']
   spec.summary = %q{Jekyll plugin for building sites using Fridge content}

data/lib/jekyll-fridge/fridge_filters.rb

@@ -0,0 +1,45 @@
+module Jekyll
+  module FridgeFilters
+    # Filter for fetching assets
+    # Writes static file to asset_dir and returns absolute file path
+    def fridge_asset(input)
+      return input unless input
+      if input.respond_to?('first')
+        input = input.first['name']
+      end
+      site = @context.registers[:site]
+      asset_dir = site.config['fridge'].config['asset_dir']
+      dest_path = File.join(site.dest, asset_dir, input)
+      path = File.join(asset_dir, input)
+
+      # Check if file already exists
+      if site.keep_files.index(path) != nil
+        return "/#{path}"
+      end
+
+      asset = site.config['fridge'].client.get("content/upload/#{input}")
+      return input unless asset
+
+      # play for keeps
+      # this is so jekyll won't clean up the file
+      site.keep_files << path
+
+      # write file to destination
+      FileUtils.mkdir_p(File.dirname(dest_path))
+      File.write(dest_path, asset)
+      "/#{path}"
+    end
+
+    def fridge_choices(input)
+      arr = input.is_a?(String) ? input.lines : input
+      arr.map do |line|
+        key, value = line.split ":"
+        value = key if value.nil? || !value
+        { "key" => key.strip, "value" => value.strip }
+      end
+    end
+  end
+
+  Liquid::Template.register_filter(Jekyll::FridgeFilters)
+end
+

data/lib/jekyll-fridge/fridge_page.rb

@@ -0,0 +1,56 @@
+module Jekyll
+  class FridgePage < Page
+    def initialize(site, base, dir, content, config)
+      @site = site
+      @base = base
+      @dir = dir
+      @name = "index.html"
+
+      self.process(@name)
+      if content.attrs.has_key?(:template)
+        self.read_yaml_from_string(content.template)
+      else
+        self.read_yaml(File.join(base, '_layouts'), config['layout'])
+      end
+
+      self.data[config['type']] = Jekyll::Fridge::Model.new(content)
+      self.data['title'] = content.title
+    end
+
+    def read_yaml_from_string(str)
+      begin
+        self.content = str
+        if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
+          self.content = $POSTMATCH
+          self.data = SafeYAML.load($1)
+        end
+      rescue SyntaxError => e
+        Jekyll.logger.warn "YAML Exception reading custom layout: #{e.message}"
+      end
+
+      self.data ||= {}
+    end
+  end
+
+  class FridgePageGenerator < Generator
+    safe true
+    priority :lowest
+
+    def generate(site)
+      client = site.config['fridge']
+      site.config['fridge_collections'].each do |type, options|
+        options = {
+          'type' => type,
+          'query' => "content?type=#{type}",
+          'path' => type,
+          'layout' => "#{type}.html"
+        }.merge(options || {})
+
+        client.get(options['query']).each do |document|
+          slug = document.slug == 'index' ? '' : document.slug
+          site.pages << FridgePage.new(site, site.source, File.join(options['path'], slug), document, options)
+        end
+      end
+    end
+  end
+end

data/lib/jekyll-fridge/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Fridge
-    VERSION = "0.2.1".freeze
+    VERSION = "1.0.0".freeze
   end
 end

data/lib/jekyll-fridge.rb

@@ -1,42 +1,17 @@
 require 'fridge_api'
 require 'ostruct'
+require 'jekyll-fridge/fridge_page'
+require 'jekyll-fridge/fridge_filters'
 
 module Jekyll
 
-  # Recursively convert hash keys to strings
-  def self.stringify_keys_deep(h)
-    case h
-    when Hash
-      Hash[
-        h.map do |k, v|
-          [ k.respond_to?(:to_s) ? k.to_s : k, self.stringify_keys_deep(v) ]
-        end
-      ]
-    when Sawyer::Resource
-      if self.is_fridge_object?(h)
-        Model.new(FridgeApi::Model.new(h.to_h))
-      else
-        self.stringify_keys_deep(h.to_h)
-      end
-    when Enumerable
-      h.map { |v| self.stringify_keys_deep(v) }
-    else
-      h
-    end
-  end
-
-  # check if an object is fridge-like
-  def self.is_fridge_object?(obj)
-    obj.respond_to?("key?") && (obj.key?(:id) && obj.key?(:document_definition_id))
-  end
-
-  class Fridge < Generator
+  class FridgeGenerator < Generator
     safe true
     priority :high
 
     def generate(site)
       # Reset cache if client already exists
-      if site.config['fridge'].kind_of?(Client)
+      if site.config['fridge'].kind_of?(Fridge::Client)
         site.config['fridge'].reset!()
         return
       end
@@ -50,173 +25,157 @@ module Jekyll
       api_config['asset_dir'] ||= 'assets'
 
       # set site.fridge as plugin entry
-      site.config['fridge'] = Client.new api_config
+      site.config['fridge'] = Fridge::Client.new api_config
     end
   end
 
-  class Client < Liquid::Drop
-
-    attr_reader :client, :config
-
-    def initialize(config)
-      @client = FridgeApi.client({
-        :client_id => config['client_id'],
-        :client_secret => config['client_secret']
-      })
-      @config = config.delete_if { |k, v| k.to_s.match(/secret/) || v.to_s.match(/sk/) }
-      reset!()
+  module Fridge
+    # Recursively convert hash keys to strings
+    def self.stringify_keys_deep(h)
+      case h
+      when Hash
+        Hash[
+          h.map do |k, v|
+            [ k.respond_to?(:to_s) ? k.to_s : k, self.stringify_keys_deep(v) ]
+          end
+        ]
+      when Sawyer::Resource
+        if self.is_fridge_object?(h)
+          Model.new(FridgeApi::Model.new(h.to_h))
+        else
+          self.stringify_keys_deep(h.to_h)
+        end
+      when Enumerable
+        h.map { |v| self.stringify_keys_deep(v) }
+      else
+        h
+      end
     end
 
-    def get(path)
-      return @cache[path] if @cache.has_key?(path)
-      @cache[path] = @client.get(path)
+    # check if an object is fridge-like
+    def self.is_fridge_object?(obj)
+      obj.respond_to?("key?") && (obj.key?(:id) && obj.key?(:document_definition_id))
     end
 
-    def reset!
-      @cache = Hash.new
-    end
+    class Client < Liquid::Drop
+      attr_reader :client, :config
 
-    def before_method(method)
-      # try content type
-      type = get("types/#{method}")
-      if type && type.kind_of?(FridgeApi::Model)
-        return Jekyll.stringify_keys_deep(type.attrs.merge({
-          'content' => ContentDrop.new(self, "content", "type=#{type.slug}")
-        }))
+      def initialize(config)
+        @client = FridgeApi.client({
+          :client_id => config['client_id'],
+          :client_secret => config['client_secret']
+        })
+        @config = config.delete_if { |k, v| k.to_s.match(/secret/) || v.to_s.match(/sk/) }
+        reset!()
       end
 
-      # try user role
-      role = get("roles/#{method}")
-      if role && role.kind_of?(FridgeApi::Model)
-        return Jekyll.stringify_keys_deep(role.attrs.merge({
-          'users' => ContentDrop.new(self, "users", "role=#{role.slug}")
-        }))
+      def get(path)
+        return @cache[path] if @cache.has_key?(path)
+        @cache[path] = @client.get(path)
       end
 
-      nil
-    end
-
-    def content
-      ContentDrop.new(self, "content")
-    end
-
-    def collections
-      ContentDrop.new(self, "collections")
-    end
-
-    def settings
-      ContentDrop.new(self, "settings")
-    end
+      def reset!
+        @cache = Hash.new
+      end
 
-    def types
-      ContentDrop.new(self, "types")
-    end
+      def before_method(method)
+        # try content type
+        type = get("types/#{method}")
+        if type && type.kind_of?(FridgeApi::Model)
+          return Jekyll::Fridge.stringify_keys_deep(type.attrs.merge({
+            'content' => ContentDrop.new(self, "content", "type=#{type.slug}")
+          }))
+        end
 
-    def users
-      ContentDrop.new(self, "users")
-    end
+        # try user role
+        role = get("roles/#{method}")
+        if role && role.kind_of?(FridgeApi::Model)
+          return Jekyll::Fridge.stringify_keys_deep(role.attrs.merge({
+            'users' => ContentDrop.new(self, "users", "role=#{role.slug}")
+          }))
+        end
 
-  end
+        nil
+      end
 
-  class ContentDrop < Liquid::Drop
-    include Enumerable
+      def content
+        ContentDrop.new(self, "content")
+      end
 
-    def initialize(client, base, query = "", data = nil)
-      @client = client
-      @base = base
-      @query = query
-      @data = data
-    end
+      def collections
+        ContentDrop.new(self, "collections")
+      end
 
-    def before_method(method)
-      # check for single content item
-      item = @client.get("#{@base}/#{method}?#{@query}")
-      return Model.new(item) if item && item.kind_of?(FridgeApi::Model)
+      def settings
+        ContentDrop.new(self, "settings")
+      end
 
-      # filter by content type
-      if @base == "content" && @query.empty?
-        types = @client.get("#{@base}?type=#{method}")
-        return ContentDrop.new(@client, @base, "type=#{method}", types) if types
+      def types
+        ContentDrop.new(self, "types")
       end
 
-      # filter by user role
-      if @base == "users" && @query.empty?
-        roles = @client.get("#{@base}?role=#{method}")
-        return ContentDrop.new(@client, @base, "role=#{method}", roles) if roles
+      def users
+        ContentDrop.new(self, "users")
       end
 
-      nil
     end
 
-    def each &block
-      @data ||= @client.get("#{@base}?#{@query}")
-      @data.each do |v|
-        m = Model.new v
-        if block_given?
-          block.call m
-        else
-          yield m
-        end
-      end
-    end
+    class ContentDrop < Liquid::Drop
+      include Enumerable
 
-  end
+      def initialize(client, base, query = "", data = nil)
+        @client = client
+        @base = base
+        @query = query
+        @data = data
+      end
 
-  class Model
-    def initialize(model)
-      @model = model
-    end
+      def before_method(method)
+        # check for single content item
+        item = @client.get("#{@base}/#{method}?#{@query}")
+        return Model.new(item) if item && item.kind_of?(FridgeApi::Model)
 
-    def inspect
-      @data
-    end
+        # filter by content type
+        if @base == "content" && @query.empty?
+          types = @client.get("#{@base}?type=#{method}")
+          return ContentDrop.new(@client, @base, "type=#{method}", types) if types
+        end
 
-    def to_liquid
-      @data ||= Jekyll.stringify_keys_deep(@model.attrs)
-    end
-  end
+        # filter by user role
+        if @base == "users" && @query.empty?
+          roles = @client.get("#{@base}?role=#{method}")
+          return ContentDrop.new(@client, @base, "role=#{method}", roles) if roles
+        end
 
-  module FridgeFilters
-    # Filter for fetching assets
-    # Writes static file to asset_dir and returns absolute file path
-    def fridge_asset(input)
-      return input unless input
-      if input.respond_to?('first')
-        input = input.first['name']
+        nil
       end
-      site = @context.registers[:site]
-      asset_dir = site.config['fridge'].config['asset_dir']
-      dest_path = File.join(site.dest, asset_dir, input)
-      path = File.join(asset_dir, input)
 
-      # Check if file already exists
-      if site.keep_files.index(path) != nil
-        return "/#{path}"
+      def each &block
+        @data ||= @client.get("#{@base}?#{@query}")
+        @data.each do |v|
+          m = Model.new v
+          if block_given?
+            block.call m
+          else
+            yield m
+          end
+        end
       end
+    end
 
-      asset = site.config['fridge'].client.get("content/upload/#{input}")
-      return input unless asset
-
-      # play for keeps
-      # this is so jekyll won't clean up the file
-      site.keep_files << path
+    class Model
+      def initialize(model)
+        @model = model
+      end
 
-      # write file to destination
-      FileUtils.mkdir_p(File.dirname(dest_path))
-      File.write(dest_path, asset)
-      "/#{path}"
-    end
+      def inspect
+        @data
+      end
 
-    def fridge_choices(input)
-      arr = input.is_a?(String) ? input.lines : input
-      arr.map do |line|
-        key, value = line.split ":"
-        value = key if value.nil? || !value
-        { "key" => key.strip, "value" => value.strip }
+      def to_liquid
+        @data ||= Jekyll::Fridge.stringify_keys_deep(@model.attrs)
       end
     end
   end
-
 end
 
-Liquid::Template.register_filter(Jekyll::FridgeFilters)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-fridge
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Mike Kruk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-19 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.3'
 description: Jekyll plugin for building sites using Fridge content
 email:
 - mike@ripeworks.com
@@ -64,6 +64,8 @@ files:
 - Rakefile
 - jekyll-fridge.gemspec
 - lib/jekyll-fridge.rb
+- lib/jekyll-fridge/fridge_filters.rb
+- lib/jekyll-fridge/fridge_page.rb
 - lib/jekyll-fridge/version.rb
 homepage: https://github.com/fridge-cms/jekyll-fridge
 licenses: