photo-helper 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f793d621388e948911926c3f3a4d8a0198d6b2da1d1e13dad185eb7ca8b3bf8
-  data.tar.gz: c459e096a41bc7213571782befc9f2fe397209516b7e74e7e9bdbdd58e6f0f61
+  metadata.gz: 267cd7787b42ba92cc8a5cbb0b2fc3b6df7c89e9f9e329448d15ca2b0497f312
+  data.tar.gz: 50a2f2411eb195e74445652ce13e6bd3e5aaefc7b2e9a9fba8134cb0530d786d
 SHA512:
-  metadata.gz: 762600a20e6d62978c90a5ae69f75bf736790753e12c8545b6ff1a822d6a23f3cef5f52f0b7808c2a65761cc8c352465f6bbd08918f1192d7738936d3f71e228
-  data.tar.gz: 201b2a1fb043de1c27ef0cfeac1eb6a05b6c6f7ac72f7d7560af745c9f142defdc1140309ac01ea4c44e137abfeb72ffa718dd23b0968367d837afcafc5b373c
+  metadata.gz: 3b9af79a851d3be2e57a1c20189fd0e145a415f09046a95820b8c97cf6d9dc82d64dd6b6cba3effc9edd6bde73a05bab5fc1705e0f2dfaa74de0d93519a48b50
+  data.tar.gz: 626ca8ea86130530e073ec17f3144376e104b618edbff9c057f26203d15423899b7e8fa6d2721b0ea0f453f5f94df5c33e6a5f990562fa3ffaea5b06b961b904

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    photo-helper (0.5.5)
+    photo-helper (0.5.6)
       ejson
       mimemagic
       mini_magick

data/lib/helpers/smugmug_album.rb

@@ -8,7 +8,7 @@ class SmugmugAlbumHelper
   attr_accessor :smugmug_api
 
   PATH_REGEX = %r{^.+Pictures\/.+\/(\d{4})\/(\d{2})_.+\/[^_]+_([^\/]+)}
-  KEYWORD_WHITELITS = %w(instagram exported)
+  # KEYWORD_WHITELITS = %w(instagram exported)
 
   def self.supported_folder?(search_path)
     PATH_REGEX.match?(search_path)
@@ -37,7 +37,9 @@ class SmugmugAlbumHelper
   def initialize(search_path, album = nil)
     @search_extensions = IMAGE_EXTENSIONS.concat(["XMP"])
 
+
     @search_path = Pathname.new(search_path)
+
     @smugmug = SmugmugAPI.new
 
     @album_name = album || album_name
@@ -52,6 +54,7 @@ class SmugmugAlbumHelper
 
   def parse_path
     if matches = "#{@search_path}/".to_s.match(PATH_REGEX)
+      @album_root = Pathname.new(matches[0])
       @year = matches[1]
       @month = Date::MONTHNAMES[matches[2].to_i].capitalize
       @location = matches[3].split("_").map(&:capitalize).join(' ')
@@ -180,10 +183,6 @@ class SmugmugAlbumHelper
       trash_album_name = File.join("trash/#{album_name}")
       trash_album = @smugmug.get_or_create_album(trash_album_name)
       @smugmug.move_images(to_delete.map{ |u| u[:uri] }, trash_album[:id])
-      # to_delete.each do |uploaded|
-      #   puts uploaded[:filename]
-      #   @smugmug.http(:delete, uploaded[:uri])
-      # end
     end
   end
 
@@ -284,9 +283,9 @@ class SmugmugAlbumHelper
   end
 
   def image_dir_keywords(image)
-    rel = Pathname.new(image).relative_path_from(@search_path).to_s.downcase.split("/")
-    # ignore first and last parts
-    rel &= KEYWORD_WHITELITS
+    rel = Pathname.new(image).relative_path_from(@album_root).to_s.downcase.split("/")
+    # drop filename
+    rel.pop
     return nil if rel.empty?
     rel
   end

data/lib/photo-helper/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module PhotoHelper
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: photo-helper
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Benjamin Caldwell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler