roopap 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89351518736a65641e7e7183848e0627c5658d5f
-  data.tar.gz: 96f1c05f4f3636e17297c13437264c2035690a04
+  metadata.gz: f500a3565a08cf7ab821172f49331c39b4f7b5ee
+  data.tar.gz: bdd59573c7f1153bfc0482ae14fa9684dc636db3
 SHA512:
-  metadata.gz: 7a1fdfbb244964b1b9c72d7bc87701daa1c22eef9005ed8c144fb1d2352864e022e97ee52c029f5d1aac2d4e1746a5af4ec7ee8aa50c97d68fee25c3e7af377f
-  data.tar.gz: bb2b5da421a751c12355c21bb383eb45e768e3b32a447bec29e36067f46c0ac1b21c608f6f3f04638a249a1c836dbdb1319ec511e6f82257e11d513050917b83
+  metadata.gz: 4701be3a6cc3cc581c582c79c41cf11b7c14f7a0966ab07a6b61ca862bf81884a491fcf81dc6256615e082ddfb93dcf006ef25bd2322692a9d524e7f1131231a
+  data.tar.gz: 2f9ab9bd7b3c6078ee1e944ed66689073226c6efa52b9147a25e3aec8a9cacfc2b3f3b5f04a524930f98b0de0251524a25944d9ee0b3705d808c4dbc8eb9b23a

data/lib/roopap/organizer.rb

@@ -1,6 +1,7 @@
 require 'exifr'
 require 'pathname'
 require 'time'
+require 'digest'
 
 module Roopap
   class Organizer
@@ -13,7 +14,6 @@ module Roopap
         src_file_path =  c.to_s
         next unless jpg_file?(src_file_path)
         target_path = dest_for(src_file_path, dest)
-        prepare_dir(target_path)
         copy(src_file_path, target_path)
         inc_success_number
       end
@@ -37,7 +37,10 @@ module Roopap
       photo = EXIFR::JPEG.new(filepath)
       time = get_time(photo)
       dir_name = time.utc.strftime('%Y-%m')
-      File.join(root, dir_name)
+      dir_path = File.join(root, dir_name)
+      prepare_dir(dir_path)
+      filename = gen_filename(time, filepath)
+      File.join(dir_path, filename)
     end
 
     def get_time(photo)
@@ -47,12 +50,16 @@ module Roopap
       time
     end
 
+    def gen_filename(time, filepath)
+      "#{time.to_i}-#{Digest::MD5.hexdigest(File.read(filepath))[0..9]}.jpg"
+    end
+
     def prepare_dir(path)
       FileUtils.mkdir_p(path)
     end
 
-    def copy(filepath, dest)
-      FileUtils.cp(filepath, dest)
+    def copy(filepath, dest_path)
+      FileUtils.cp(filepath, dest_path)
     end
 
     def inc_success_number

data/lib/roopap/version.rb

@@ -1,3 +1,3 @@
 module Roopap
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/integration_spec.rb

@@ -19,8 +19,8 @@ describe "Calling Roopap via shell command" do
 
     `bin/roopap #{from} #{target}`
 
-    assert FileTest.exists?("#{target}/2006-01/a.jpg"), "No file in the target directory"
-    assert FileTest.exists?("#{target}/2011-04/b.jpg"), "No file in the target directory"
+    assert FileTest.exists?("#{target}/2006-01/1137496843-e489272393.jpg"), "No file in the target directory"
+    assert FileTest.exists?("#{target}/2011-04/1301726919-bb455c47e4.jpg"), "No file in the target directory"
   end
 
   it "displays number of copied files" do

data/spec/lib/organizer_spec.rb

@@ -22,8 +22,8 @@ module Roopap
 
       Organizer.new.perform(source, target)
 
-      assert FileTest.exists?("#{target}/2006-01/a.jpg"), "No file in the target directory"
-      assert FileTest.exists?("#{target}/2011-04/b.jpg"), "No file in the target directory"
+      assert FileTest.exists?("#{target}/2006-01/1137496843-e489272393.jpg"), "No file in the target directory"
+      assert FileTest.exists?("#{target}/2011-04/1301726919-bb455c47e4.jpg"), "No file in the target directory"
     end
 
     it "ignores non jpg file" do
@@ -32,7 +32,7 @@ module Roopap
 
       Organizer.new.perform(source, target)
 
-      assert FileTest.exists?("#{target}/2006-01/a.jpg"), "No file in the target directory"
+      assert FileTest.exists?("#{target}/2006-01/1137496843-e489272393.jpg"), "No file in the target directory"
     end
 
     it "returns number of organized files" do
@@ -55,7 +55,7 @@ module Roopap
         o.perform(source, target)
       end
 
-      assert FileTest.exists?("#{target}/2011-02/a.jpg"), "No file in the target directory"
+      assert FileTest.exists?("#{target}/2011-02/1297863330-e489272393.jpg"), "No file in the target directory"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roopap
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Nuttanart Pornprasitsakul
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler