alula 0.4.5 → 0.4.6

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/alula/config.rb

@@ -78,26 +78,24 @@ module Alula
          production: { hosts: ["/"] },
       },
       
-      # Content generators
-      generators: {
-        paginate: {
-          items: 10,
-          template: "/:locale/page/:page/",
-        },
-        feedbuilder: {
-          items: 10,
-          name: "feed.xml",
-          slug: "feed",
-          template: "/:locale/:name",
-        },
-        sitemap: {}
-      },
-      
       # Plugins
       plugins: {},
       
       # Blog Content options
       content: {
+        generators: {
+          paginate: {
+            items: 10,
+            template: "/:locale/page/:page/",
+          },
+          feedbuilder: {
+            items: 10,
+            name: "feed.xml",
+            slug: "feed",
+            template: "/:locale/:name",
+          },
+          sitemap: {}
+        },
         filters: {
           smilies: nil,
         },

data/lib/alula/content.rb

@@ -65,7 +65,7 @@ module Alula
     end
     
     def generate_content
-      @site.config.generators.each do |type, options|
+      @site.config.content.generators.each do |type, options|
         
         generator = Alula::Generator.load(type: type, options: options, site: @site)
         if generator

data/lib/alula/processor.rb

@@ -72,11 +72,12 @@ module Alula
         info = Dimensions.dimensions(self.item.filepath)
         info ||= begin
           _info = MiniExiftool.new self.item.filepath
-          [_info.imagewidth, _info.imageheight]
+          [_info.imagewidth, _info.imageheight, _info.rotation]
         end
         Hashie::Mash.new({
           width: info[0],
           height: info[1],
+          rotation: info[2] || 0,
         })
       end
     end

data/lib/alula/processors/video.rb

@@ -8,7 +8,11 @@ module Alula
         # Check if video requires rotating
         if self.info.rotation == 90 or self.info.rotation == 270
           size.reverse!
+        # elsif self.info.height > self.info.width  # We have pre-rotated portait video, match framesize
+        #   size.reverse!
         end
+        # Write rotated values back
+        format[:size] = size.join("x")
         width, height = size
         
         # Generate attachment name hash
@@ -40,7 +44,7 @@ module Alula
         .select{|tn|
           width, height = tn[:size].split("x").collect{|i| i.to_i};
           !File.exists?(tn[:output]) and !((width > self.info.width and height > self.info.height) and tn[:hires])
-        }
+      }
       
       thumbnails = Hash[thumbnails.collect{|tn| [tn[:label], tn]}]
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alula
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -643,7 +643,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1137735401138233003
+      hash: -1337494601730845437
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -652,7 +652,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1137735401138233003
+      hash: -1337494601730845437
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23