jekyll-fridge 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9081a77458add57311274073f377c82b4b394cf9
-  data.tar.gz: b242f5a441c319ebd9472ad7b81db0de68864f52
+  metadata.gz: 81f6909ad7b58d27eddb11bec7371d63319a28a3
+  data.tar.gz: d0ce811768e014f6e948a2c5138d1debc8536637
 SHA512:
-  metadata.gz: b10865777684c65a02732e8b350a7e011e00fe7d67a4cdeebf07adee678944cbe20a6e988bce6878eab8479a0205efb86dcc686fa393bfadc0e499f56b5a7469
-  data.tar.gz: dbfb86e2302e5e259ad8d9606182c73dadfbed254974a7e3413e5e5da467cb1d43c6ab3879f4d49e5e9ef1fb46c82e84db27bc969949bd687e82cc7b2febf63d
+  metadata.gz: 3f15ac1806475945017cbda46420ea126dcf07a4cec6fa069e0dcbc840186c68a7b26f8862923e436a328e11a4da5d8892e80ef61ba290e12473b741f9580d37
+  data.tar.gz: b3022125a424b8b30ba9e47ee02a84373256388aa86fda754585ca5c91974078a34fd3a110395dede55a78e46ed923c5beb22b385d5c9c4f46053ba637aef694

data/lib/jekyll-fridge/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Fridge
-    VERSION = "0.0.8".freeze
+    VERSION = "0.1.0".freeze
   end
 end

data/lib/jekyll-fridge.rb

@@ -32,9 +32,15 @@ module Jekyll
 
   class Fridge < Generator
     safe true
-    priority :low
+    priority :high
 
     def generate(site)
+      # Reset cache if client already exists
+      if site.config['fridge'].kind_of?(Client)
+        site.config['fridge'].reset!()
+        return
+      end
+
       # get api configuration from _config.yml
       #
       # fridge:
@@ -58,22 +64,32 @@ module Jekyll
         :client_secret => config['client_secret']
       })
       @config = config.delete_if { |k, v| k.to_s.match(/client/) }
+      reset!()
+    end
+
+    def get(path)
+      return @cache[path] if @cache.has_key?(path)
+      @cache[path] = @client.get(path)
+    end
+
+    def reset!
+      @cache = Hash.new
     end
 
     def before_method(method)
       # try content type
-      type = @client.get("types/#{method}")
+      type = get("types/#{method}")
       if type && type.kind_of?(FridgeApi::Model)
         return Jekyll.stringify_keys_deep(type.attrs.merge({
-          'content' => ContentDrop.new(@client, "content", "type=#{type.slug}")
+          'content' => ContentDrop.new(self, "content", "type=#{type.slug}")
         }))
       end
 
       # try user role
-      role = @client.get("roles/#{method}")
+      role = get("roles/#{method}")
       if role && role.kind_of?(FridgeApi::Model)
         return Jekyll.stringify_keys_deep(role.attrs.merge({
-          'users' => ContentDrop.new(@client, "users", "role=#{role.slug}")
+          'users' => ContentDrop.new(self, "users", "role=#{role.slug}")
         }))
       end
 
@@ -81,23 +97,23 @@ module Jekyll
     end
 
     def content
-      ContentDrop.new(@client, "content")
+      ContentDrop.new(self, "content")
     end
 
     def collections
-      ContentDrop.new(@client, "collections")
+      ContentDrop.new(self, "collections")
     end
 
     def settings
-      ContentDrop.new(@client, "settings")
+      ContentDrop.new(self, "settings")
     end
 
     def types
-      ContentDrop.new(@client, "types")
+      ContentDrop.new(self, "types")
     end
 
     def users
-      ContentDrop.new(@client, "users")
+      ContentDrop.new(self, "users")
     end
 
   end
@@ -165,15 +181,22 @@ module Jekyll
     # Writes static file to asset_dir and returns absolute file path
     def fridge_asset(input)
       return input unless input
-      input = input.first if input.respond_to?("first")
+      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
 
-      path = File.join(asset_dir, input)
       # play for keeps
       # this is so jekyll won't clean up the file
       site.keep_files << path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-fridge
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Mike Kruk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler