picturama 0.0.3 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    picturama (0.0.3)
+    picturama (0.0.5)
       mini_magick (~> 3.6.0)
       stringex (~> 2.0.2)
 

data/lib/picturama.rb

@@ -20,7 +20,7 @@ module Picturama
     Dir["#{album_source}/*"].each { |album|
       if File.directory?(album)
         potential_album = Picturama::Album.new(:folder => album)
-        albums.push(potential_album)
+        albums.push(potential_album) if potential_album.valid?
       end
     }
     albums

data/lib/picturama/album.rb

@@ -80,6 +80,10 @@ module Picturama
       end
     end
 
+    def valid?
+      has_thumbnails? && !info.nil?
+    end
+
     protected
 
     def generate_sorting(filter)

data/lib/picturama/picture.rb

@@ -3,13 +3,17 @@ require 'picturama'
 module Picturama
   class Picture < File
     
-    attr_accessor :thumbnail
+    attr_accessor :thumbnail, :resized, :metainfo
 
     def initialize(args)
       super
-      @thumbnail = "#{File.dirname(path)}/thumbnails/#{Picturama::config['thumbnail_prefix']}#{File.basename(path)}"
-      @resized = "#{File.dirname(path)}/resized/resized_#{File.basename(path)}"
-      @metainfo = "#{File.dirname(path)}/resized/resized_#{File.basename(path)}.info"
+      @thumbnail = "#{File.dirname(path)}/thumbnails/#{Picturama::config['thumbnail_prefix']}#{basename}"
+      @resized = "#{File.dirname(path)}/resized/resized_#{basename}"
+      @metainfo = "#{File.dirname(path)}/resized/resized_#{basename}.info"
+    end
+
+    def basename
+      File.basename(path)
     end
 
     def info
@@ -29,5 +33,9 @@ module Picturama
       File.delete(@resized) if has_resized?
     end
 
+    def type
+      File.extname(path).split('.').last
+    end
+
   end
 end

data/lib/picturama/version.rb

@@ -1,3 +1,3 @@
 module Picturama
-  VERSION = '0.0.3'
+  VERSION = '0.0.5'
 end

data/lib/tasks/album.rake

@@ -0,0 +1,43 @@
+namespace :album do
+  desc "metadata handling for a given album"
+  namespace :metadata do
+    desc "generate metadata for an album in a given path"
+    task :generate do
+      puts ""
+      print "Type the album path:   "
+      path = STDIN.gets.chomp
+      if File.directory?(path)
+        puts "Title:"
+        title = STDIN.gets.chomp
+        unless title.nil?
+          puts "Description (optional):"
+          description = STDIN.gets.chomp
+          puts "Author (optional):"
+          author = STDIN.gets.chomp
+          info = {"album" => {"title" => title, "description" => description, "author" => author}}
+          File.open("#{path}/.info.yml", 'w+') {|f| f.write(info.to_yaml) }
+        else
+          puts "Title cannot be empty. Run the task again"  
+        end
+      else
+        puts "Sorry but #{path.inspect} entered is not a folder. Run the task again"
+      end
+    end
+
+    desc "retrieve metadata album based on path"
+    task :check do
+      puts ""
+      print "Type the album path:   "
+      path = STDIN.gets.chomp
+      info_file = "#{path}/.info.yml"
+      if File.directory?(path) && File.exists?(info_file)
+        data = YAML.load_file(info_file)['album']
+        puts "Title: #{data['title']}"
+        puts "Description: #{data['description']}"
+        puts "Author: #{data['author']}"
+      else
+        puts "Sorry but #{path.inspect} entered is not a folder. Run the task again"
+      end
+    end
+  end
+end

data/lib/tasks/thumbnail.rake

@@ -0,0 +1,28 @@
+namespace :thumbnail do
+
+  desc "Generate thumbnail for a given folder or just a single file"
+  task :generate, :source do |t, args|
+    if File.directory?(args[:source]) || File.exists?(args[:source])
+      size = Picturama::config['thumnail_default_size']
+      album = Picturama::Album.new(:folder => args[:source])
+      puts "Generating #{album.count_pictures} thumbnails for folder #{args[:source]}..."
+      puts "Size: #{size}"
+      unless album.has_broken_thumbnails?
+        puts "WARNING: Seems that this album has all his thumbnails properly generated. There are no broken thumbs."
+      end
+      album.init_thumbnails
+      album.pictures.each do |picture|
+        unless picture.has_thumbnail?
+          thumb = MiniMagick::Image.open(picture.path)
+          thumb.resize "#{size}"
+          thumb.format "jpg"
+          thumb.write picture.thumbnail
+          puts "Thumbnail generated for source #{File.basename(picture.path)}. Target destination #{File.basename(picture.thumbnail)}"
+        end
+      end
+    else
+      puts "Error => target destination #{args[:source]} does not exist"
+    end
+  end
+
+end

data/lib/tasks/url.rake

@@ -0,0 +1,14 @@
+namespace :url do
+  desc "Normalize album names name for URL format"
+  task :sluglify, :source do |t, args|
+    albums = Picturama::albums(args[:source])
+    puts "In folder #{args[:source].inspect} I'm moving..."
+    albums.each do |album|
+      target_folder = "#{args[:source]}/#{album.folder.to_url}"
+      unless File.directory?(target_folder)
+        FileUtils.mv "#{args[:source]}/#{album.folder}", "#{target_folder}"
+        puts "#{album.folder.inspect} to #{album.folder.to_url.inspect}"
+      end
+    end
+  end
+end

data/rakefile

@@ -10,92 +10,6 @@ require "bundler/gem_tasks"
 require "rake"
 require "rake/testtask"
 
-namespace :thumbnail do
+Dir.glob('lib/tasks/*.rake').each {|r| import r}
 
-  desc "Generate thumbnail for a given folder or just a single file"
-  task :generate, :source do |t, args|
-    if File.directory?(args[:source]) || File.exists?(args[:source])
-      size = Picturama::config['thumnail_default_size']
-      album = Picturama::Album.new(:folder => args[:source])
-      puts "Generating #{album.count_pictures} thumbnails for folder #{args[:source]}..."
-      puts "Size: #{size}"
-      unless album.has_broken_thumbnails?
-        puts "WARNING: Seems that this album has all his thumbnails properly generated. There are no broken thumbs."
-      end
-      album.init_thumbnails
-      album.pictures.each do |picture|
-        unless picture.has_thumbnail?
-          thumb = MiniMagick::Image.open(picture.path)
-          thumb.resize "#{size}"
-          thumb.format "jpg"
-          thumb.write picture.thumbnail
-          puts "Thumbnail generated for source #{File.basename(picture.path)}. Target destination #{File.basename(picture.thumbnail)}"
-        end
-      end
-    else
-      puts "Error => target destination #{args[:source]} does not exist"
-    end
-  end
-
-end
-
-namespace :url do
-  desc "Normalize album names name for URL format"
-  task :sluglify, :source do |t, args|
-    albums = Picturama::albums(args[:source])
-    puts "In folder #{args[:source].inspect} I'm moving..."
-    albums.each do |album|
-      target_folder = "#{args[:source]}/#{album.folder.to_url}"
-      unless File.directory?(target_folder)
-        FileUtils.mv "#{args[:source]}/#{album.folder}", "#{target_folder}"
-        puts "#{album.folder.inspect} to #{album.folder.to_url.inspect}"
-      end
-    end
-  end
-end
-
-namespace :album do
-  desc "metadata handling for a given album"
-  namespace :metadata do
-    desc "generate metadata for an album in a given path"
-    task :generate do
-      puts ""
-      print "Type the album path:   "
-      path = STDIN.gets.chomp
-      if File.directory?(path)
-        puts "Title:"
-        title = STDIN.gets.chomp
-        unless title.nil?
-          puts "Description (optional):"
-          description = STDIN.gets.chomp
-          puts "Author (optional):"
-          author = STDIN.gets.chomp
-          info = {"album" => {"title" => title, "description" => description, "author" => author}}
-          File.open("#{path}/.info.yml", 'w+') {|f| f.write(info.to_yaml) }
-        else
-          puts "Title cannot be empty. Run the task again"  
-        end
-      else
-        puts "Sorry but #{path.inspect} entered is not a folder. Run the task again"
-      end
-    end
-
-    desc "retrieve metadata an album based on path"
-    task :check do
-      puts ""
-      print "Type the album path:   "
-      path = STDIN.gets.chomp
-      info_file = "#{path}/.info.yml"
-      if File.directory?(path) && File.exists?(info_file)
-        data = YAML.load_file(info_file)['album']
-        puts "Title: #{data['title']}"
-        puts "Description: #{data['description']}"
-        puts "Author: #{data['author']}"
-      else
-        puts "Sorry but #{path.inspect} entered is not a folder. Run the task again"
-      end
-    end
-  end
-end
-
-task :default
+task :default

data/spec/picture_spec.rb

@@ -22,5 +22,13 @@ describe "For a given picture in a given album" do
     @picture.has_thumbnail?.should be_false
   end
 
+  it "checks the image basename" do
+    @picture.basename.should == 'king.jpg'
+  end
+
+  it "checks the image extension" do
+    @picture.type.downcase.should == 'jpg'
+  end
+
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picturama
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_magick
@@ -80,6 +80,9 @@ files:
 - lib/picturama/album.rb
 - lib/picturama/picture.rb
 - lib/picturama/version.rb
+- lib/tasks/album.rake
+- lib/tasks/thumbnail.rake
+- lib/tasks/url.rake
 - picturama.gemspec
 - rakefile
 - spec/album_spec.rb
@@ -104,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 760458003
+      hash: -319223615
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -113,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 760458003
+      hash: -319223615
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24