flickrup 0.0.12 → 0.0.13

data/lib/flickrup/ext/machine_tags.rb

@@ -5,11 +5,12 @@ class MachineTags
 
   def preupload(image, meta, config)
 
-    tags = config[:tags].split(" ")
+    tags = config[:tags]
 
     remapped = tags.map do |x|
       x.sub(/^([^:]+):([^:]+)::/,"\\1:\\2=")
-    end
+    end.uniq
+
 
 
     unless tags == remapped #write back to file
@@ -17,7 +18,7 @@ class MachineTags
       meta['Subject'] = remapped #also write Subject XMP tag
     end
 
-    config.merge({:tags => remapped.join(" ")})
+    config.merge({:tags => TagSet.new(remapped)})
 
   end
 end

data/lib/flickrup/ext/prefixed_extension.rb

@@ -4,7 +4,7 @@ class PrefixedExtension
   end
 
   def values(prefix_key, config)
-    all_tags = config[:tags].split(" ")
+    all_tags = config[:tags]
 
     prefix = @config[prefix_key]
 

data/lib/flickrup/ext/replacement_tags.rb

@@ -6,7 +6,6 @@ class ReplacementTags
   def preupload(image, meta, config)
 
     replacements = @config[:tag_replacements]
-    new_config = config
 
     if replacements != nil
       replacements.each do |tag_name, tag_value_replacements|
@@ -15,13 +14,12 @@ class ReplacementTags
         tag_value_replacements.each do |key, value|
           if existing == key
             meta[tag_name] = value
-            new_config = new_config.merge({tag_name => value})
             break
           end
         end
       end
     end
 
-    new_config
+    config
   end
 end

data/lib/flickrup/tag_set.rb

@@ -0,0 +1,11 @@
+class TagSet < Array
+  def initialize(tags)
+    super(tags)
+  end
+
+  def to_s
+    reduce("") do |result, tag|
+      "#{result} \"#{tag}\""
+    end
+  end
+end

data/lib/flickrup/tagged_image.rb

@@ -1,6 +1,7 @@
 require 'mini_exiftool'
 require 'fileutils'
 require "flickrup/logging"
+require "flickrup/tag_set"
 
 class TaggedImage
   include Logging
@@ -19,11 +20,12 @@ class TaggedImage
     else
       keywords
     end
+    TagSet.new(keywords)
   end
 
   def doUpload(preupload_handlers, uploader)
 
-    config = preupload_handlers.reduce({:tags => tags.join(" ")}) do |config, handler|
+    config = preupload_handlers.reduce({:tags => tags}) do |config, handler|
       handler.preupload(file, self, config)
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flickrup
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Jonathan Gilbert
@@ -148,6 +148,7 @@ files:
 - lib/flickrup/processor.rb
 - lib/flickrup/quick_listener.rb
 - lib/flickrup/slow_listener.rb
+- lib/flickrup/tag_set.rb
 - lib/flickrup/tagged_image.rb
 - lib/flickrup/uploader.rb
 - lib/flickrup.rb