desoto-photoapp 0.3.13 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12843f84063ab4c237cd748175c29c503f696178
-  data.tar.gz: 9edfcc231a6fbbad2c2c00602149c8a2afa8f4d3
+  metadata.gz: 41ab1f398a0bbeffd3c2a3cd706d06af5af61b13
+  data.tar.gz: 6c4d936736f34c912d22e17d6e07c99e53123aaa
 SHA512:
-  metadata.gz: 984bc63ef359b19cae05f2c854d25f11243b2bcdbcc5f29d8ea819c9b3e5ed7b00ff7c99bac34bc82429951a4720fda5690bb315e592bd55b69bbae17c205c27
-  data.tar.gz: 536f2c8b809a7cef670699596fb2c36379e79908584b83ec954cfe8dc306ea622df11a3e2e034e4d1b027b745a93a94fd3f2a3b95f650b4fdf87dbee58e6ab34
+  metadata.gz: 38d54f93d076252d54a43d808257769a38c7c0271724f86a30920d60ea153801195cec2e68e2efcbefd80ca934dca45c987320cdb1e81ff593c51531a9d36b0d
+  data.tar.gz: 5c5077022600b123ead6725c3074c7c4210870caaefab218926cbf7ae80c99da62a847dec7d9ba2ed066cebe13c49f7d2e643f2543c61fb1811d746d7a29c3c5

data/README.md

@@ -10,6 +10,14 @@ Add this line to your application's Gemfile:
 gem 'desoto-photoapp'
 ```
 
+Install ImageMagick
+
+```
+brew remove imagemagick
+brew update && brew install imagemagick@6"
+brew link imagemagick@6
+```
+
 And then execute:
 
     $ bundle
@@ -17,7 +25,8 @@ And then execute:
 Install the [Automator actions](https://photosautomation.com/index.html) for importing photos. Download the [installer here](https://photosautomation.com/installer.zip).
 
 
-Run the setup command:
+
+Run the setup commands:
 
 ```
 $ photoapp setup

data/exe/photoapp

@@ -30,14 +30,11 @@ end
 
 def actions
   system "open /System/Library/Image\\ Capture/Support/Application/AutoImporter.app"
-  system "open /System/Library/CoreServices/Folder\\ Actions\\ Setup.app"
+
+  system 'open '+folder_actions_setup
 end
 
 def setup
-  if `brew list imagemagick` =~ /Error:/
-    system "brew update && brew install imagemagick"
-  end
-
   unless `ls /Library/Automator` =~ /Import Files into Photos/
     system "say 'please install Automator actions for Photos app'"
     system "open #{Photoapp.gem_dir('assets/photos-action-installer.pkg')}"
@@ -47,6 +44,25 @@ def setup
   actions
 end
 
+def folder_actions_setup
+
+  @app_path ||= begin
+    app = 'Folder Actions Setup.app'
+    base = '/System/Library/CoreServices/'
+
+    old = File.join( base, app )
+    new = File.join( base, 'Applications', app )
+
+    path = if File.exist? old
+      old
+    elsif File.exist? new
+      new
+    end
+
+    path.gsub(' ', '\ ')
+  end
+end
+
 if options['version']
   puts Photoapp::VERSION
   abort
@@ -58,19 +74,19 @@ case cmd
 when 'config'
   case ARGV.shift
   when 'printer'
+    system 'open https://github.com/imathis/desoto-photoapp#default-printer-settings'
+    system 'say "Configure your printer according to these configurations"'
+    sleep 3
     system 'open http://127.0.0.1:631/printers/'
     system 'say "Choose the printer you want to configure"'
     sleep 3
     system 'say "Select Set Default Options from the Administration drop-down."'
-    sleep 3
-    system 'say "then configure your printer based on the settings you see here"'
-    sleep 3
-    system 'open https://github.com/imathis/desoto-photoapp#default-printer-settings'
+    system 'say "Then refer to the printer configurations listed ealier."'
   when 'import'
     system 'say "launching AutoImporter, press command comma to change settings"'
     system 'open /System/Library/Image\ Capture/Support/Application/AutoImporter.app'
   when 'action'
-    system 'open /System/Library/CoreServices/Folder\ Actions\ Setup.app'
+    system 'open '+folder_actions_setup
     system 'say "Add an action for the cave.pics/import folder and select the photoapp process workflow from the list. Then close the app."'
   end
 when 'test'

data/lib/photoapp.rb

@@ -41,10 +41,11 @@ module Photoapp
 
         config = {
           'source' => Dir.pwd, # where photos are located
-          'url_base' => 'www.cave.pics',
+          'url_base' => 'cave.pics',
           'watermark' => Photoapp.gem_dir('assets', 'watermark.png'),
           'font' => Photoapp.gem_dir('assets', "SourceSansPro-Semibold.ttf"),
-          'font_size' => 30,
+          'font_size' => 36,
+          'date_font_size' => 24,
           'config' => 'photoapp.yml',
           'upload' => 'upload',
           'print' => 'print',

data/lib/photoapp/photo.rb

@@ -21,33 +21,59 @@ module Photoapp
     end
 
     def watermark
-      @watermarked ||= image.composite(logo, SouthWestGravity, 80, 40, OverCompositeOp)
+      @watermarked ||= begin
+        date = date_text
+        image.composite(logo, SouthWestGravity, 50, 40, OverCompositeOp)
+          .composite(date[0], SouthWestGravity, 5, -10, OverCompositeOp)
+          .composite(date[1], SouthWestGravity, 5, -10, OverCompositeOp)
+      end
     end
 
     def with_url
       @printable ||= begin
-        light_url = add_url("#fff")
-        dark_url  = add_url("#000", true).blur_image(radius=6.0, sigma=2.0)
+        url = url_text
         watermark.dup
-          .composite(dark_url, SouthEastGravity, 80, 40, OverCompositeOp)
-          .composite(light_url, SouthEastGravity, 80, 40, OverCompositeOp)
+          .composite(url[0], SouthEastGravity, 40, 30, OverCompositeOp)
+          .composite(url[1], SouthEastGravity, 40, 30, OverCompositeOp)
       end
     end
 
-    def add_url(color, stroke=false)
+    def url_text
+      add_shadowed_text "#{config['url_base']}/#{short}.jpg", config['font_size'], NorthEastGravity
+    end
+
+    def date_text
+      date = Time.now.strftime('%b %d, %Y')
+      add_shadowed_text date, config['date_font_size'], NorthEastGravity, 250
+    end
+
+    def add_shadowed_text(text, size, gravity, width=800)
       setting = config
-      image = Image.new(800,100) { self.background_color = "rgba(255, 255, 255, 0)" }
-      text = Draw.new
-      text.annotate(image, 0, 0, 60, 50, "#{setting['url_base']}/#{short}.jpg") do
-        text.gravity = SouthEastGravity
-        text.pointsize = setting['font_size']
-        text.fill = color
-        text.font = setting['font']
-        if stroke
-          text.stroke = color
+      shadowed_text = []
+
+      %w(#000 #fff).each do |color|
+        image = Image.new(width, 70) { self.background_color = "rgba(255, 255, 255, 0" }
+        txt = Draw.new
+        txt.annotate(image, 0, 0, 0, 0, text) do
+          txt.gravity = gravity
+          txt.pointsize = size
+          txt.fill = color
+          txt.font = setting['font']
+
+          if color == '#000'
+            txt.stroke = color
+          end
+        end
+
+        # Blur drop shadow
+        if color == '#000'
+          image = image.blur_image(radius=6.0, sigma=2.0)
         end
+
+        shadowed_text.push image
       end
-      image
+
+      shadowed_text
     end
 
     def write(path=nil)

data/lib/photoapp/version.rb

@@ -1,3 +1,3 @@
 module Photoapp
-  VERSION = "0.3.13"
+  VERSION = "0.4.0"
 end

data/photoapp.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "colorator"
 
   spec.add_development_dependency "bundler", "~> 1.9"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake"
   spec.add_development_dependency "pry-byebug"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: desoto-photoapp
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.4.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2017-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -70,16 +70,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +186,7 @@ files:
 - assets/Update.app/Contents/Resources/zh_CN.lproj/ApplicationStub.nib
 - assets/Update.app/Contents/Resources/zh_TW.lproj/ApplicationStub.nib
 - assets/Update.app/Contents/document.wflow
+- assets/logo-source.afdesign
 - assets/photoapp-process.workflow/Contents/Info.plist
 - assets/photoapp-process.workflow/Contents/QuickLook/Thumbnail.png
 - assets/photoapp-process.workflow/Contents/document.wflow
@@ -225,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A tool for processing cave photos for DeSoto Caverns.