alula 0.4.18 → 0.4.19

data/lib/alula/config.rb

@@ -83,6 +83,16 @@ module Alula
       # Plugins
       plugins: {},
       
+      # Cookie consent
+      cookieconsent: {
+        consenttype: "implicit",
+        style: "light",
+        bannerPosition: "push",
+        onlyshowbanneronce: true,
+        privacysettingstab: false,
+        ipinfodbkey: "",
+      },
+      
       # Deployment options
       deployment: { "package" => {}},
       

data/lib/alula/core_ext/tag.rb

@@ -1,5 +1,5 @@
 require 'liquid'
-require 'dimensions'
+require 'mini_exiftool'
 
 module Alula
   module LiquidExt
@@ -57,11 +57,6 @@ module Alula
         return Hashie::Mash.new if file.nil?
         
         info = MiniExiftool.new File.join self.context.storage.path(:public), file
-        # # info = Dimensions.dimensions(File.join(self.context.storage.path(:public), file))
-        # info ||= begin
-        #   _info = MiniExiftool.new File.join(self.context.storage.path(:public), file)
-        #   [_info.imagewidth, _info.imageheight, _info.copyrightnotice]
-        # end
         Hashie::Mash.new({
           width: info.imagewidth,
           height: info.imageheight,

data/lib/alula/generators/archive.rb

@@ -35,6 +35,7 @@ module Alula
           generator: self,
           posts: archive[:content],
           title: archive[:title],
+          priority: 0.2,
           description: archive[:description],
           name: name,
           slug: name,

data/lib/alula/generators/feedbuilder.rb

@@ -52,7 +52,6 @@ module Alula
       Alula::Plugin.addon(:head, ->(context) {
         "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"#{context.url_for(@feed_page.url(context.locale))}\">"
       })
-      # -# %link{rel: "alternate", type: "application/rss+xml", title: "RSS", href: "/feed.xml"}
     end
   end
 end

data/lib/alula/generators/sitemap.rb

@@ -15,7 +15,7 @@ module Alula
             content.languages.collect{|lang| {
               url: content.url(lang),
               lastmod: content.last_modified,
-              priority: content.generator.nil? ? 0.5 : 0.3,
+              priority: content.generator.nil? ? 1.0 : !content.metadata.priority.nil? ? content.metadata.priority : 0.3,
             }
           }
         }.flatten

data/lib/alula/plugin.rb

@@ -1,8 +1,16 @@
 module Alula
   class Plugin
-    def self.register(name, klass); plugins[name.to_s] = klass; end
-    def self.plugins; @@plugins ||= {}; end
-    def plugins; self.class.plugins; end
+    def self.register(name, klass)
+      plugins[name.to_s] = klass
+    end
+    
+    def self.plugins
+      @@plugins ||= {}
+    end
+    
+    def plugins
+      self.class.plugins
+    end
     
     def self.load(name, options)
       if plugins[name] and !(!!options == options and !options)
@@ -23,25 +31,52 @@ module Alula
       addons[type].unshift content_or_block
     end
     
-    def self.script(type, content_or_block)
+    def self.script(placement, content_or_block)
+      name = caller_name
+      
+      if self.cookieconsent?(name)
+        self.cookieconsented(name)
+      end
+      
       script = <<-EOS
-      <script type="#{self.cookieconsent? ? "text/plain" : "text/javascript"}" #{self.cookieconsent? ? "style=\"cc-onconsent-analytics\"" : ""}>
+      <script type="#{self.cookieconsent?(name) ? "text/plain" : "text/javascript"}" #{self.cookieconsent?(name) ? "style=\"cc-onconsent-#{@@cookieconsent[name].to_s}\"" : ""}>
       EOS
       if content_or_block.kind_of?(Proc)
         scpt = ->(context) { script + content_or_block.call(context) + "</script>" }
       else
         scpt = script + content_or_block + "</script>"
       end
+
+      self.addon(placement, scpt)
+    end
+    
+    def self.needs_cookieconsent(type = 'analytics')
+      name = caller_name
       
-      addons[type] << scpt
+      @@cookieconsent ||= {}
+      @@cookieconsent[name] = type
     end
     
-    def self.needs_cookieconsent
-      @@cookieconsent = true
+    def self.cookieconsent?(name = nil)
+      if name.nil?
+        @@cookieconsent.kind_of?(Hash)
+      else
+        @@cookieconsent.kind_of?(Hash) and @@cookieconsent.key?(name)
+      end
     end
     
-    def self.cookieconsent?
-      @@cookieconsent == true
+    def self.cookieconsented(name)
+      @@cookieconsented ||= {}
+      @@cookieconsented[name] = true
+    end
+    
+    def self.cookieconsent_types
+      @@cookieconsented ||= {}
+      if @@cookieconsented.kind_of?(Hash)
+        @@cookieconsented.keys
+      else
+        []
+      end
     end
     
     def self.script_load_mode=(mode)
@@ -56,5 +91,10 @@ module Alula
     def self.script_load_mode
       @@script_load_mode ||= :async
     end
+    
+    private
+    def self.caller_name
+      caller[1].gsub(/.*\/(.*)\.\w+:\d+.*/, '\1').downcase
+    end
   end
 end

data/lib/alula/site.rb

@@ -131,10 +131,6 @@ module Alula
       # Set up default head addons
       Alula::Plugin.addon(:head, "<meta name=\"generator\" content=\"Alula #{Alula::VERSION::STRING}\">")
       Alula::Plugin.addon(:head, ->(context){"<link rel=\"icon\" type=\"image/png\" href=\"#{context.asset_url('favicon.png')}\">"})
-      
-      # Set up footer addons (disclaimer, copyright)
-      Alula::Plugin.addon(:footer, ->(context){ "<p class=\"disclaimer\">#{context.site.config.disclaimer(context.locale)}</p>" }) if self.config.disclaimer
-      Alula::Plugin.addon(:footer, ->(context){ "<p class=\"copyright\">#{context.site.config.copyright(context.locale)}</p>" }) if self.config.copyright
     end
     
     # Compiles a site to static website
@@ -326,7 +322,7 @@ module Alula
         end
         
         # Vendored
-        io.puts " *= require cookieconsent" if Alula::Plugin.cookieconsent?
+        io.puts " *= require cookieconsent" unless Alula::Plugin.cookieconsent_types.empty?
 
         # Blog customization
         @storage.custom(/stylesheets\/.*.css.*$/).each do |name, item|
@@ -336,7 +332,7 @@ module Alula
         
         io.puts "*/"
       end
-      # Add stlesheet to template
+      # Add stylesheet to template
       Alula::Plugin.prepend_addon(:head, ->(context){ context.stylesheet_link("style") })
       
       # Generate javascript
@@ -353,7 +349,7 @@ module Alula
 
         # Vendored
         io.puts " *= require lazyload" if self.config.attachments.image.lazyload
-        io.puts " *= require cookieconsent" if Alula::Plugin.cookieconsent?
+        io.puts " *= require cookieconsent" unless Alula::Plugin.cookieconsent_types.empty?
 
         # Customisation
         @storage.custom(/javascripts\/.*.js.*$/).each do |name, item|

data/lib/alula/version.rb

@@ -2,7 +2,7 @@ module Alula
   module VERSION
     MAJOR = 0
     MINOR = 4
-    PATCH = 18
+    PATCH = 19
     PRE   = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alula
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.4.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie