alula 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/alula/assethelper.rb

@@ -49,7 +49,7 @@ module Alula
       FileUtils.mkdir_p(file_path)
       
       # Copy asset to originals
-      if options[:type] == :attachment
+      if options[:type] == :attachment and !File.exists?(File.join("attachments", "originals", @asset_path, "#{name}.#{ext}"))
         FileUtils.mkdir_p File.join("attachments", "originals", @asset_path)
         FileUtils.cp asset, File.join("attachments", "originals", @asset_path, "#{name}.#{ext}")
       end

data/lib/alula/site.rb

@@ -222,35 +222,32 @@ module Alula
     def assetgen
       puts "==> Generating assets"
       
-      width, height = @config["images"]["thumbnails"].split("x").collect {|i| i.to_i }
+      # width, height = @config["images"]["thumbnails"].split("x").collect {|i| i.to_i }
       
       # Get all attachements
+      attachments_path = File.join("attachments", "originals")
       images_path = File.join("attachments", "_generated", "images")
       thumbnails_path = File.join("attachments", "_generated", "thumbnails")
       
-      assets = Dir[File.join(images_path, "**", "*")]
+      attachments = Dir[File.join(attachments_path, "**", "*")]
         .select {|f| File.file?(f) }
-        .collect {|f| File.join(f.split("/")[3..-1])}
-      pb = ProgressBar.new "Assets", assets.count
-      # helper = Alula::AssetHelper.new(asset_path, @config)
+        .collect {|f| File.join(f.split("/")[2..-1])}
+      pb = ProgressBar.new "Assets", attachments.count
       
-      assets.each do |asset|
-        unless File.exists?(File.join(thumbnails_path, asset))
-          helper = Alula::AssetHelper.new(File.dirname(asset), @config)
-          tn_type, tn_generated = helper.process(File.join("attachments", "originals", asset), :type => :thumbnail)
-          pb.inc
+      attachments.each do |attachment|
+        unless File.exists?(File.join(images_path, attachment))
+          helper = Alula::AssetHelper.new(File.dirname(attachment), @config)
+          type, generated = helper.process(File.join("attachments", "originals", attachment), :type => :attachment)
+        end
+        
+        unless File.exists?(File.join(thumbnails_path, attachment))
+          helper = Alula::AssetHelper.new(File.dirname(attachment), @config)
+          tn_type, tn_generated = helper.process(File.join("attachments", "originals", attachment), :type => :thumbnail)
         end
+        
+        pb.inc
       end
-      # assets.each do |original|
-      #   unless File.exists?(File.join(thumbnails_path, original))
-      #     image = Magick::Image.read(File.join(originals_path, original)).first
-      #     image.crop_resized!(width, height, Magick::NorthGravity)
-      #     FileUtils.mkdir_p File.dirname(File.join(thumbnails_path, original))
-      #     image.write(File.join(thumbnails_path, original))
-      #   end
-      #   pb.inc
-      # end
-      
+
       pb.finish
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alula
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &70277502059980 !ruby/object:Gem::Requirement
+  requirement: &70221990546640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.11'
   type: :runtime
   prerelease: false
-  version_requirements: *70277502059980
+  version_requirements: *70221990546640
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70277502059420 !ruby/object:Gem::Requirement
+  requirement: &70221990546040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70277502059420
+  version_requirements: *70221990546040
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70277502058720 !ruby/object:Gem::Requirement
+  requirement: &70221990545360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.14'
   type: :runtime
   prerelease: false
-  version_requirements: *70277502058720
+  version_requirements: *70221990545360
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &70277502057920 !ruby/object:Gem::Requirement
+  requirement: &70221990544540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.13'
   type: :runtime
   prerelease: false
-  version_requirements: *70277502057920
+  version_requirements: *70221990544540
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70277502073420 !ruby/object:Gem::Requirement
+  requirement: &70221990543900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70277502073420
+  version_requirements: *70221990543900
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &70277502071820 !ruby/object:Gem::Requirement
+  requirement: &70221990558900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70277502071820
+  version_requirements: *70221990558900
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70277502070340 !ruby/object:Gem::Requirement
+  requirement: &70221990557340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70277502070340
+  version_requirements: *70221990557340
 - !ruby/object:Gem::Dependency
   name: front-compiler
-  requirement: &70277502069600 !ruby/object:Gem::Requirement
+  requirement: &70221990556380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70277502069600
+  version_requirements: *70221990556380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70277502067420 !ruby/object:Gem::Requirement
+  requirement: &70221990554020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70277502067420
+  version_requirements: *70221990554020
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70277502066880 !ruby/object:Gem::Requirement
+  requirement: &70221990553540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70277502066880
+  version_requirements: *70221990553540
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
-  requirement: &70277502066400 !ruby/object:Gem::Requirement
+  requirement: &70221990553020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *70277502066400
+  version_requirements: *70221990553020
 - !ruby/object:Gem::Dependency
   name: version
-  requirement: &70277502065920 !ruby/object:Gem::Requirement
+  requirement: &70221990552540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,7 +142,7 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *70277502065920
+  version_requirements: *70221990552540
 description: Alula is a simple tool for creating fast, static blogs easily.
 email:
 - mikko@owlforestry.com