desoto-photoapp 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c787135c0a663ba5705df7f6f3a85a24a6381f6
-  data.tar.gz: a6e51179a4ff3e65729e0fbb3bbdb7b1e27cdf9b
+  metadata.gz: 1b0486f840c909e8b401293cfbfb9a7a981cb555
+  data.tar.gz: ea42e1c39af0905fd43c32b50a2cf990c4e5ceba
 SHA512:
-  metadata.gz: 5580048daae9338910a4ededf26b01819ee0c6148cf3033cd5fee86f70ec87c943bc79a066d2157dd67cc880e9d44807c8bea2ceece5d026b9af732d26990fd6
-  data.tar.gz: 2924de7333afaed8bbb0a66c6e8eefa9fb4538cb203479e3de4a2c4e07ebb8d99fc434a1ae83bc2ecd8c440934c42bb8be519f0b1829e086941e8df7e6bca345
+  metadata.gz: 67b0f859dfb7a3109b2ddd24e7806c9ecca2364e8d6b86732e64c308ca6ab015b670fcf3947a09fb67c9fba431cb760cd9da64d78959d79ad343455b5b39ccc2
+  data.tar.gz: 284e81ea4016edf1c03b1a4cd015ea56c260344fcae7dea5d1a8fb27c1518050ee0db32eddbd2f7d37c7d7aaee82aaa2b2446754d079076b382baadcaab81965

data/exe/photoapp

@@ -52,7 +52,12 @@ if options['version']
   abort
 end
 
-if ARGV.first == 'setup'
+if ARGV.first == 'test'
+  ARGV.shift
+  path = ARGV.join('')
+  session = Photoapp::Session.new(options)
+  session.test_image(path)
+elsif ARGV.first == 'setup'
   ARGV.shift
   setup
 elsif ARGV.first == 'update'

data/lib/photoapp.rb

@@ -26,7 +26,6 @@ module Photoapp
     UPLOAD = 'upload'
     PRINT = 'print'
 
-
     def initialize(options={})
       @photos = []
       @config = config(options)
@@ -62,12 +61,15 @@ module Photoapp
 
     end
 
+    def logo
+      @logo ||= Magick::Image.read(config['watermark']).first
+    end
+
     def root(path='')
       File.expand_path(File.join(ROOT, path))
     end
 
     def process
-      logo = Magick::Image.read(config['watermark']).first
       photos = []
       tmp = root('.tmp')
       FileUtils.mkdir_p tmp
@@ -77,18 +79,12 @@ module Photoapp
       end
 
       load_photos.each do |f|
-        path = File.join(tmp, File.basename(f))
-        FileUtils.mv f, path
-        `automator -i #{path} #{Photoapp.gem_dir("lib/adjust-image.workflow")}`
-        photos << Photo.new(path, logo, self)
+        photos << process_image(f, tmp)
       end
 
       photos.each do |p|
         p.write
         p.add_to_photos
-      end
-
-      photos.each do |p|
         Photoapp.print(p.print_dest)
       end
 
@@ -97,6 +93,14 @@ module Photoapp
       FileUtils.rm_rf tmp
     end
 
+    def process_image(photo, destination)
+      path = File.join(destination, File.basename(photo))
+      FileUtils.mv photo, path
+      `automator -i #{path} #{Photoapp.gem_dir("lib/adjust-image.workflow")}`
+      Photo.new(path, logo, self)
+    end
+
+
     def load_photos
       files = ['*.jpg', '*.JPG', '*.JPEG', '*.jpeg'].map! { |f| File.join(config['source'], f) }
 
@@ -115,5 +119,17 @@ module Photoapp
       S3.new(@config).push
       FileUtils.rm_rf config['upload']
     end
+
+    # For processing a single image for testing purposes
+    #
+    def test_image(photo)
+      photo = File.expand_path(photo)
+      path = photo.sub(/\.jpe?g/i, '.copy.jpg')
+      FileUtils.cp photo, path
+      `automator -i #{path} #{Photoapp.gem_dir("lib/adjust-image.workflow")}`
+
+      Photo.new(path, logo, self).write(path)
+    end
+
   end
 end

data/lib/photoapp/photo.rb

@@ -21,7 +21,7 @@ module Photoapp
     end
 
     def watermark
-      @watermarked ||= image.composite(logo, SouthWestGravity, OverCompositeOp)
+      @watermarked ||= image.composite(logo, SouthWestGravity, 40, 40, OverCompositeOp)
     end
 
     def with_url
@@ -29,8 +29,8 @@ module Photoapp
         light_url = add_url("#fff")
         dark_url  = add_url("#000", true).blur_image(radius=6.0, sigma=2.0)
         watermark.dup
-          .composite(dark_url, SouthEastGravity, OverCompositeOp)
-          .composite(light_url, SouthEastGravity, OverCompositeOp)
+          .composite(dark_url, SouthEastGravity, 40, 40, OverCompositeOp)
+          .composite(light_url, SouthEastGravity, 40, 40, OverCompositeOp)
       end
     end
 
@@ -50,14 +50,20 @@ module Photoapp
       image
     end
 
-    def write
-      puts "writing #{upload_dest}"
-      puts "writing #{print_dest}"
-      FileUtils.mkdir_p(File.dirname(upload_dest))
-      FileUtils.mkdir_p(File.dirname(print_dest))
-      watermark.write upload_dest
-      with_url.write print_dest
-      cleanup
+    def write(path=nil)
+      if path
+        FileUtils.mkdir_p(File.dirname(path))
+        with_url.write path
+        cleanup
+      else
+        puts "writing #{upload_dest}"
+        puts "writing #{print_dest}"
+        FileUtils.mkdir_p(File.dirname(upload_dest))
+        FileUtils.mkdir_p(File.dirname(print_dest))
+        watermark.write upload_dest
+        with_url.write print_dest
+        cleanup
+      end
     end
 
     def add_to_photos

data/lib/photoapp/version.rb

@@ -1,3 +1,3 @@
 module Photoapp
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: desoto-photoapp
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Brandon Mathis