flickr_cli 0.2.0 → 0.2.1

data/bin/flickr_cli

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
 require 'yaml'
 require 'flickr_cli'
-require 'image_cutter'
 FlickrCli.start_program

data/lib/flickr_cli.rb

@@ -1,12 +1,10 @@
 # Extental Dependencies
 require 'rubygems'
-require 'tempfile'
 require 'flickraw'
-require 'net/http'
-require 'cgi'
 require 'launchy'
 require 'highline/import'
-require 'RMagick'
+require 'asciiart'
+
 # Internal Libraries
 require 'authentication'
 require 'menu'

data/lib/menu.rb

@@ -1,5 +1,6 @@
 module FlickrCli
   module Menu
+    @cached_art  = {}
 
     def self.main_menu
       choose do |menu|
@@ -23,7 +24,7 @@ module FlickrCli
           menu.choice(photo) do
             # When you choose a photo...
             FlickrCli::Menu.download_and_print(photos.detect{|x| x.title == photo})
-            puts "Press any ENTER to continue"
+            puts "Press ENTER to continue"
             do_nothing = STDIN.gets
             self.menu_for(FlickrCli::Menu.menu_for(contact, the_page))
           end
@@ -41,28 +42,28 @@ module FlickrCli
     end
 
     def self.download_and_print(picked_photo)
+      if @cached_art["photo_#{picked_photo.id}"]
+        puts @cached_art["photo_#{picked_photo.id}"]
+      else
+        photos       = flickr.photos.getSizes(:photo_id => picked_photo.id)
+        download_url = nil
 
-      photos       = flickr.photos.getSizes(:photo_id => picked_photo.id)
-      download_url = nil
-
-      ["Large", "Medium"].each do |style|
-        if picture = photos.find{ |photo| photo.label == style }
-          download_url  = picture.source
+        ["Large", "Medium"].each do |style|
+          if picture = photos.find{ |photo| photo.label == style }
+            download_url  = picture.source
+          end
+          break if download_url
         end
-        break if download_url
+        @cached_art["photo_#{picked_photo.id}"] = AsciiArt.new(download_url).to_ascii_art(width: 175)
+
+        puts @cached_art["photo_#{picked_photo.id}"]
       end
-            
-      my_file = Tempfile.new("tempimage#{File.basename(download_url)}")
-      my_file << Net::HTTP.get_response(URI.parse(download_url)).body
-      my_file.close
-      puts FlickrCli::ImageCutter.convert_to_ascii(my_file.path)
-      my_file.delete
     end
 
     def self.good_by_message
       ["Be that way",
         "Goodbye - I'll never love again",
-        "See you later, bye!",
+        "I love my wife, is that a crime?",
         "Goodbye - Flickr? I hardly know her"].shuffle[0]
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickr_cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -60,14 +60,30 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.4
 - !ruby/object:Gem::Dependency
-  name: rmagick
+  name: asciiart
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -86,7 +102,6 @@ files:
 - bin/flickr_cli
 - lib/authentication.rb
 - lib/flickr_cli.rb
-- lib/image_cutter.rb
 - lib/menu.rb
 homepage: https://github.com/nodanaonlyzuul/flickr_cli
 licenses: []

data/lib/image_cutter.rb

@@ -1,51 +0,0 @@
-
-
-module FlickrCli
-  module ImageCutter
-
-    CHARS     =  [" ", ".", "~", ":", "+", "=", "o", "*", "x", "^", "%", "#", "@", "$", "M", "W"]
-    FONT_ROWS = 8
-    FONT_COLS = 4
-
-    def self.convert_to_ascii(file)
-
-      img = Magick::Image.read(file).first
-      
-      img.resize_to_fit!('728')
-
-      # Compute the image size in ASCII "pixels" and resize the image to have
-      # those dimensions. The resulting image does not have the same aspect
-      # ratio as the original, but since our "pixels" are twice as tall as
-      # they are wide we'll get our proportions back (roughly) when we render.
-    
-      pr = img.rows / FONT_ROWS
-      pc = img.columns / FONT_COLS
-      img.resize!(pc, pr)
-
-      img = img.quantize(16, Magick::GRAYColorspace)
-      img = img.normalize
-
-      # Depending on compile-time options for ImageMagick - pixel instensity is stored in different scales
-      # This will calculate the correct denominator to use
-      quantum_calc = Magick::QuantumRange / Magick::QuantumPixel.to_i
-      
-      # Draw the image surrounded by a border. The `view' method is slow but
-      # it makes it easy to address individual pixels. In grayscale images,
-      # all three RGB channels have the same value so the red channel is as
-      # good as any for choosing which character to represent the intensity of
-      # this particular pixel.
-                  
-      border = '+' + ('-' * pc) + '+'
-      puts border
-
-      img.view(0, 0, pc, pr) do |view|
-        pr.times do |i|
-        putc '|'
-        pc.times { |j| putc CHARS[view[i][j].red/quantum_calc] }
-        puts '|'
-      end
-      end
-      border
-    end
-  end
-end