alula 0.4.8 → 0.4.9

data/VERSION

@@ -1 +1 @@
-0.4.8
+0.4.9

data/lib/alula/attachment_processor.rb

@@ -22,11 +22,13 @@ module Alula
       @@lock.synchronize do      
         md5 = Digest::MD5.hexdigest(name)
         asset_hash = md5[0..3]
-        until !mapping.key(asset_hash) or mapping.key(asset_hash) == name
-          asset_hash = md5[0..(asset_hash.length + 1)]
+        asset_name = File.join(path + [asset_hash]) + File.extname(name)
+        until !mapping.key(asset_name) or mapping.key(asset_name) == name
+          asset_hash = md5[0..(asset_hash.length)]
+          asset_name = File.join(path + [asset_hash]) + File.extname(name)
         end
       
-        mapping[name] = File.join(path + [asset_hash]) + File.extname(name)
+        mapping[name] = asset_name
       end
       
       mapping[name]

data/lib/alula/config.rb

@@ -53,7 +53,7 @@ module Alula
       hides_base_locale: true, # Hide default locale
       
       # Default theme
-      theme: 'minimal',
+      theme: {'minimal' => {}},
       
       # Template for generating post permalinks
       permalinks: '/:locale/:year/:month/:title/',
@@ -122,11 +122,12 @@ module Alula
       # Attachement Processors
       attachments: {
         "image" => {
-          "size"      => "800x600",
-          "thumbnail" => "300x300",
-          "keep_tags" => ["CopyrightNotice", "Title", "DateTimeOriginal"],
-          "hires"     => true,
-          "lazyload"  => true,
+          "size"           => "800x600",
+          "thumbnail"      => "300x300",
+          "thumbnail_mode" => :square,
+          "keep_tags"      => ["CopyrightNotice", "Title", "DateTimeOriginal"],
+          "hires"          => true,
+          "lazyload"       => true,
         },
         "video" => {
           "size-hd"        => "1280x720",

data/lib/alula/contents/item.rb

@@ -371,11 +371,11 @@ module Alula
         mtime = nil
         unless @item.nil?
           mtime = @item.mtime
-          if self.site.git
-            rev = %x{git rev-list -n 1 HEAD #{Shellwords.escape(@item.filepath)}}.strip
-            time = %x{git show --pretty=format:%ai --abbrev-commit #{rev}|head -1}.strip
-            mtime = Time.parse(time) rescue nil
-          end
+          # if self.site.git
+          #   rev = %x{git rev-list -n 1 HEAD #{Shellwords.escape(@item.filepath)}}.strip
+          #   time = %x{git show --pretty=format:%ai --abbrev-commit #{rev}|head -1}.strip
+          #   mtime = Time.parse(time) rescue nil
+          # end
         end
         mtime
       end

data/lib/alula/core_ext/tag.rb

@@ -26,8 +26,8 @@ module Alula
       @options = {}
       
       # Parse tag options
-      if m = /^([\"'][\S\. ]+[\"']|[\S\.]+)(.*)$/.match(@markup)
-        @source = m[1].gsub(/^['"]?([^'"]+)['"]?$/, '\1')
+      if m = /^([\"][\S\. ]+[\"]|[\S\.]+)(.*)$/.match(@markup)
+        @source = m[1].gsub(/^["]?([^"]+)["]?$/, '\1')
         @source = "" if @source == '""'
         @options["source"] = @source unless @source.empty?
 

data/lib/alula/processors/magick.rb

@@ -9,11 +9,16 @@ module Alula
     mimetype "image/jpeg", "image/png", "image/gif"
     
     def resize_image(opts)
-      output = opts.delete(:output)
-      width, height = opts.delete(:size)
+      output = opts[:output]
+      width, height = opts[:size]
       
       # Generate resized image
-      resized = self.image.resize_to_fit(width, height)
+      resized = case self.site.config.attachments.image.thumbnail_mode
+      when :square
+        self.image.resize_to_fill(width, height)
+      else
+        self.image.resize_to_fit(width, height)
+      end
       # Make it progressive
       resized.interlace = ::Magick::PlaneInterlace
       

data/lib/alula/site.rb

@@ -176,6 +176,7 @@ module Alula
     def banner
       puts ""
       puts "Alula #{Alula::VERSION}"
+      puts ""
     end
     
     def load_plugins
@@ -188,7 +189,6 @@ module Alula
       if @plugins
         puts "Plugins: " + @plugins.collect {|name, plugin| "#{name} #{plugin.version}"}.join(" ")
       end
-      puts ""
     end
     
     def load_filters
@@ -209,8 +209,11 @@ module Alula
       @context = Alula::Context.new(site: self, storage: self.storage)
       @context.send(:extend, Helpers)
       
-      @theme = Alula::Theme.load(site: self)
-      puts "Theme: #{@theme.theme} #{@theme.version}"
+      # @theme = Alula::Theme.load(config.theme, site: self)
+      @theme = Alula::Theme.load(config.theme.to_a.last[0], config.theme.to_a.last[1])
+      
+      puts "  Theme: #{@theme.name} #{@theme.version}"
+      puts ""
       
       # Create our asset environment
       @environment = Environment.new
@@ -279,7 +282,8 @@ module Alula
       
       @@lock = Mutex.new
       
-      Parallel.map(self.content.attachments, :in_threads => Parallel.processor_count) do |attachment|
+      # Parallel.map(self.content.attachments, :in_threads => Parallel.processor_count) do |attachment|
+      self.content.attachments.each do |attachment|
         if processor = attachments.get(attachment)
           processor.process
         end
@@ -303,7 +307,7 @@ module Alula
         io.puts "/*"
         
         # Theme style
-        io.puts " *= require #{self.config.theme}"
+        io.puts " *= require #{@theme.name}"
         
         # Plugins
         @plugins.each do |name, plugin|
@@ -328,7 +332,7 @@ module Alula
         io.puts "/*"
 
         # Theme scripts
-        io.puts " *= require #{self.config.theme}"
+        io.puts " *= require #{@theme.name}"
 
         # Plugins
         @plugins.each do |name, plugin|

data/lib/alula/theme.rb

@@ -2,6 +2,19 @@ require 'alula/theme/layout'
 
 module Alula
   class Theme
+    def self.register(name, klass); themes[name.to_s] = klass; end
+    def self.themes; @@themes ||= {}; end
+    def themes; self.class.themes; end
+    
+    def self.load(name, options)
+      if themes[name] and !(!!options == options and !options)
+        theme = themes[name]
+        return theme.new(options) if theme.install(options)
+      end
+    end
+    
+    def self.install(options); true; end
+    
     attr_reader :version
     attr_reader :site
     attr_reader :theme
@@ -9,35 +22,39 @@ module Alula
     attr_reader :layouts
     attr_reader :context
     
-    def self.register(theme, path, version)
-      @@themes ||= {}
-      @@themes[theme.to_s] = ::File.join(path, theme.to_s)
-      
-      @@theme_versions ||= {}
-      @@theme_versions[theme.to_s] = version
-    end
+    # def self.register(theme, path, version)
+    #   @@themes ||= {}
+    #   @@themes[theme.to_s] = ::File.join(path, theme.to_s)
+    #   
+    #   @@theme_versions ||= {}
+    #   @@theme_versions[theme.to_s] = version
+    # end
     
-    def self.load(opts)
-      return nil unless self.class_variable_defined?(:@@themes)
-      site = opts[:site]
-      
-      theme_name = site.config.theme
-      return self.new(theme_name, opts) if @@themes.has_key?(theme_name)
-
-      return nil
-    end
-    
-    def initialize(theme, opts)
-      @site = opts.delete(:site)
-      @theme = theme
-      @path = @@themes[theme]
+    # def self.load(opts)
+    #   return nil unless self.class_variable_defined?(:@@themes)
+    #   site = opts[:site]
+    #   
+    #   theme_name = site.config.theme
+    #   return self.new(theme_name, opts) if @@themes.has_key?(theme_name)
+    # 
+    #   return nil
+    # end
+    # 
+    def initialize(opts)
+      @site = Site.instance
+      # @theme = theme
+      # @path = @@themes[theme]
       
       @context = @site.context
       
       @layouts = {}
       @views = {}
       
-      @version = @@theme_versions[theme]
+      # @version = @@theme_versions[theme]
+    end
+    
+    def name
+      themes.key(self.class)
     end
     
     def searchpath(type, name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alula
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
+date: 2012-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parallel
@@ -644,7 +644,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3562643851070026928
+      hash: 2079066484659239768
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -653,7 +653,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3562643851070026928
+      hash: 2079066484659239768
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23