alula 0.4.16 → 0.4.17

data/lib/alula/attachment_processor.rb

@@ -23,15 +23,15 @@ module Alula
         md5 = Digest::MD5.hexdigest(name)
         asset_hash = md5[0..3]
         asset_name = File.join(path + [asset_hash]) + File.extname(name)
-        until !mapping.key(asset_name) or mapping.key(asset_name) == name
+        until !mapping.key(asset_name) or mapping.key(asset_name) == name.downcase
           asset_hash = md5[0..(asset_hash.length)]
           asset_name = File.join(path + [asset_hash]) + File.extname(name)
         end
       
-        mapping[name] = asset_name
+        mapping[name.downcase] = asset_name
       end
       
-      mapping[name]
+      mapping[name.downcase]
     end
     
     def get(item)

data/lib/alula/core_ext/tag.rb

@@ -56,22 +56,27 @@ module Alula
         file = self.context.asset_path(attachment_path(source, type))
         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]
-        end
+        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[0],
-          height: info[1],
+          width: info.imagewidth,
+          height: info.imageheight,
+          rotation: info.rotation,
+          copyright: info.copyrightnotice,
+          filetype: info.filetype,
+          title: info.title,
+          caption: info.caption,
         })
       end
     end
     
     def attachment_path(source, type = nil)
       name = (type.nil?) ? source : File.join(type.to_s, source)
-      self.context.attachments.mapping[name]
+      self.context.attachments.mapping[name.downcase]
     end
     
     def attachment_url(source, type = nil)

data/lib/alula/core_ext/tags/image.rb

@@ -28,6 +28,11 @@ module Alula
       
       classes = opts.delete(:classes) || @options["classes"]
       
+      unless @options['alternative'] or @options['title']
+        @options['title'] = info(source, type).title
+        @options['alternative'] = info(source, type).title
+      end
+      
       tag = "<img"
       tag += " alt=\"#{@options["alternative"]}\"" if @options["alternative"]
       tag += " title=\"#{@options["title"]}\"" if @options["title"]

data/lib/alula/generators/sitemap.rb

@@ -33,11 +33,6 @@ module Alula
         layout: "sitemap",
       })
       self.site.content.pages << @sitemap_page
-      
-      # Add link to head
-      Alula::Plugin.addon(:head, ->(context) {
-        "<link rel=\"sitemap\" type=\"application/xml\" title=\"Sitemap\" href=\"#{context.url_for(@sitemap_page.url(context.locale))}\">"
-      })
     end
   end
 end

data/lib/alula/plugin.rb

@@ -1,5 +1,3 @@
-require 'hashie/mash'
-
 module Alula
   class Plugin
     def self.register(name, klass); plugins[name.to_s] = klass; end
@@ -13,9 +11,38 @@ module Alula
       end
     end
     
-    def self.addons; @@addons ||= Hash.new {|hash, key| hash[key] = []}; end
-    def self.addon(type, content_or_block); addons[type] << content_or_block; end
-    def self.prepend_addon(type, content_or_block); addons[type].unshift content_or_block; end
+    def self.addons
+      @@addons ||= Hash.new {|hash, key| hash[key] = []}
+    end
+    
+    def self.addon(type, content_or_block)
+      addons[type] << content_or_block
+    end
+    
+    def self.prepend_addon(type, content_or_block)
+      addons[type].unshift content_or_block
+    end
+    
+    def self.script(type, content_or_block)
+      script = <<-EOS
+      <script type="#{self.cookieconsent? ? "text/plain" : "text/javascript"}" #{self.cookieconsent? ? "style=\"cc-onconsent-analytics\"" : ""}>
+      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
+      
+      addons[type] << scpt
+    end
+    
+    def self.needs_cookieconsent
+      @@cookieconsent = true
+    end
+    
+    def self.cookieconsent?
+      @@cookieconsent == true
+    end
     
     def self.script_load_mode=(mode)
       @@script_load_mode = case mode

data/lib/alula/site.rb

@@ -323,6 +323,7 @@ module Alula
         end
         
         # Vendored
+        io.puts " *= require cookieconsent" if Alula::Plugin.cookieconsent?
 
         # Blog customization
         @storage.custom(/stylesheets\/.*.css.*$/).each do |name, item|
@@ -349,6 +350,7 @@ module Alula
 
         # Vendored
         io.puts " *= require lazyload" if self.config.attachments.image.lazyload
+        io.puts " *= require cookieconsent" if Alula::Plugin.cookieconsent?
 
         # 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 = 16
+    PATCH = 17
     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.16
+  version: 0.4.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie