alula 0.4.15 → 0.4.16

data/lib/alula/config.rb

@@ -127,7 +127,8 @@ module Alula
         "image" => {
           "size"           => "800x600",
           "thumbnail"      => "300x300",
-          "thumbnail_mode" => :square,
+          "thumbnail_mode" => :aspect,
+          "image_mode"     => :aspect,
           "keep_tags"      => ["CopyrightNotice", "Title", "DateTimeOriginal"],
           "hires"          => true,
           "lazyload"       => true,

data/lib/alula/contents/item.rb

@@ -5,6 +5,7 @@ require 'kramdown'
 require 'stringex'
 require 'shellwords'
 require 'htmlentities'
+require 'nokogiri'
 
 module Alula
   class Content
@@ -202,6 +203,23 @@ module Alula
       end
       
       # Accessors
+      def description(locale = nil)
+        @description[(locale || self.current_locale || self.site.config.locale)] ||= begin
+          @metadata.description(locale) || begin
+            doc = Nokogiri::HTML(self.body(locale))
+            words = doc.text.split(' ')
+            summary = words.inject("") do |summary, word|
+              if (summary + " #{word}").length < 152
+                summary += "#{word} "
+              else
+                summary += "..." unless summary[/\.\.\.$/]
+              end
+              summary
+            end
+          end
+        end
+      end
+      
       def current_locale
         @@current_locale ||= nil
       end
@@ -319,6 +337,7 @@ module Alula
         flush_render
         @markdown = {}
         @body = {}
+        @description = {}
       end
       
       def flush_render

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

@@ -16,7 +16,7 @@ module Alula
     def content
       hires = hires_url(@source, :image)
       tag = "<a href=\"#{attachment_url(@source, :image)}\""
-      tag += " data-hires=\"#{hires}\"" if context.site.config.attachments["image"]["hires"] and hires and self.context.item.metadata.renderer.class.to_s != "Alula::Generator::FeedBuilder"
+      tag += " data-hires=\"#{hires}\"" if context.site.config.attachments["image"]["hires"] and hires and !self.context.item.metadata.renderer.class.to_s[/FeedBuilder/]
       tag += ">"
       tag += imagetag(@source, :thumbnail)
       tag += "</a>"
@@ -32,13 +32,13 @@ module Alula
       tag += " alt=\"#{@options["alternative"]}\"" if @options["alternative"]
       tag += " title=\"#{@options["title"]}\"" if @options["title"]
       tag += " class=\"#{classes.join(" ")}\""
-      if context.site.config.attachments.image.lazyload and self.context.item.metadata.renderer.class.to_s != "Alula::Generator::FeedBuilder"
+      if context.site.config.attachments.image.lazyload and !self.context.item.metadata.renderer.class.to_s[/FeedBuilder/]
         tag += " src=\"#{asset_url("grey.gif")}\""
         tag += " data-original=\"#{src}\""
       else
         tag += " src=\"#{src}\""
       end
-      tag += " data-hires=\"#{hires}\"" if context.site.config.attachments.image.hires and hires and self.context.item.metadata.renderer.class.to_s != "Alula::Generator::FeedBuilder"
+      tag += " data-hires=\"#{hires}\"" if context.site.config.attachments.image.hires and hires and !self.context.item.metadata.renderer.class.to_s[/FeedBuilder/]
       tag += " width=\"#{info(source, type).width}\" height=\"#{info(source, type).height}\""
       tag += " />"
     end

data/lib/alula/processors/image.rb

@@ -28,7 +28,7 @@ module Alula
         next if (width > self.info.width and height > self.info.height) and size[:hires]
         
         # Generate resized image to output path
-        resize_image(output: output, size: size[:size])
+        resize_image(output: output, size: size[:size], type: size[:type])
       end
       
       # Cleanup ourself

data/lib/alula/processors/magick.rb

@@ -13,7 +13,8 @@ module Alula
       width, height = opts[:size]
       
       # Generate resized image
-      resized = case self.site.config.attachments.image.thumbnail_mode
+      resize_mode = self.site.config.attachments.image["#{opts[:type]}_mode"]
+      resized = case resize_mode
       when :square
         self.image.resize_to_fill(width, height)
       else

data/lib/alula/version.rb

@@ -2,7 +2,7 @@ module Alula
   module VERSION
     MAJOR = 0
     MINOR = 4
-    PATCH = 15
+    PATCH = 16
     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.15
+  version: 0.4.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-19 00:00:00.000000000 Z
+date: 2012-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie