photo_folder 1.1.1 → 1.1.2

data/lib/models/photo.rb

@@ -91,13 +91,13 @@ class Photo < ActiveRecord::Base
         self.date = (Time.mktime(date_match[1],date_match[2],date_match[3],date_match[4],date_match[5],date_match[6])).to_i
       end
     end
-    self.name = exif[:title] || full_path.split('/').pop.gsub(/\.[a-zA-Z]{1,4}/,'')
+    self.name = exif[:title] || Photo.name_from_path(full_path)
     self.lens = exif[:lens] ? exif[:lens] : nil
     @tags = exif[:tags] || []
   end
   
   def set_exif_data_without_mini_exiftool
-    self.name = full_path.split('/').pop.gsub(/\.[a-zA-Z]{1,4}/,'')
+    self.name = Photo.name_from_path(full_path)
     if(full_path.match(/\.png$/))
       width, height = File.read(full_path)[0x10..0x18].unpack('NN')
     else
@@ -110,6 +110,10 @@ class Photo < ActiveRecord::Base
     @tags = []
   end
   
+  def self.name_from_path(path)
+    path.split('/').pop.gsub(/\.[a-zA-Z]{1,4}/,'').gsub(/^[\d]{1,3}\-/,'')
+  end
+  
   class EXIFData
     EXIF_TRANSLATIONS = {
       :title => ['Title','ObjectName'],

data/lib/photo_folder.rb

@@ -262,6 +262,10 @@ module PhotoFolder
               puts "Unable to add photo: #{path}"
             end
           end
+          puts "Putting added photos in collections."
+          PhotoCollection.find(:all).each do |photo_collection|
+            photo_collection.set_children_parent_id
+          end
         else
           puts "No photos to add."
         end

data/photo_folder.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name     = "photo_folder"
-  s.version  = "1.1.1"
+  s.version  = "1.1.2"
   s.date     = "2010-05-27"
   s.summary  = "JavaScript gallery"
   s.email    = "ryan@syntacticx.com"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: photo_folder
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 1
-  version: 1.1.1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Ryan Johnson