image_genie 0.2.0 → 0.3.0

data/Manifest

@@ -1,12 +1,15 @@
 Manifest
+README
 README.rdoc
 Rakefile
+image_genie.gemspec
 lib/image_genie.rb
 lib/image_genie/base.rb
 lib/image_genie/command.rb
 lib/image_genie/convert.rb
 lib/image_genie/identify.rb
 lib/image_genie/montage.rb
+lib/image_genie/test.rb
 lib/image_genie/verify.rb
 test/test_helper.rb
 test/unit/base_test.rb

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake'
 require 'echoe'  
 require 'rake/testtask'
 
-Echoe.new('image_genie', '0.2.0') do |p|  
+Echoe.new('image_genie', '0.3.0') do |p|  
   p.description     = "ImageGenie - Simple Wrapper for command line ImageMagick"  
   p.url             = "https://github.com/bkimble"
   p.author          = "Billy Kimble"  

data/image_genie.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{image_genie}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Billy Kimble"]
-  s.date = %q{2011-02-08}
+  s.date = %q{2011-02-09}
   s.description = %q{ImageGenie - Simple Wrapper for command line ImageMagick}
   s.email = %q{basslines@gmail.com}
-  s.extra_rdoc_files = ["README.rdoc", "lib/image_genie.rb", "lib/image_genie/base.rb", "lib/image_genie/command.rb", "lib/image_genie/convert.rb", "lib/image_genie/identify.rb", "lib/image_genie/montage.rb", "lib/image_genie/verify.rb"]
-  s.files = ["Manifest", "README.rdoc", "Rakefile", "lib/image_genie.rb", "lib/image_genie/base.rb", "lib/image_genie/command.rb", "lib/image_genie/convert.rb", "lib/image_genie/identify.rb", "lib/image_genie/montage.rb", "lib/image_genie/verify.rb", "test/test_helper.rb", "test/unit/base_test.rb", "image_genie.gemspec"]
+  s.extra_rdoc_files = ["README", "README.rdoc", "lib/image_genie.rb", "lib/image_genie/base.rb", "lib/image_genie/command.rb", "lib/image_genie/convert.rb", "lib/image_genie/identify.rb", "lib/image_genie/montage.rb", "lib/image_genie/test.rb", "lib/image_genie/verify.rb"]
+  s.files = ["Manifest", "README", "README.rdoc", "Rakefile", "image_genie.gemspec", "lib/image_genie.rb", "lib/image_genie/base.rb", "lib/image_genie/command.rb", "lib/image_genie/convert.rb", "lib/image_genie/identify.rb", "lib/image_genie/montage.rb", "lib/image_genie/test.rb", "lib/image_genie/verify.rb", "test/test_helper.rb", "test/unit/base_test.rb"]
   s.homepage = %q{https://github.com/bkimble}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Image_genie", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/image_genie.rb

@@ -33,7 +33,7 @@ module ImageGenie
   
   module ClassMethods
     # Make helper methods
-    [:convert,:montage,:identify,:verify].each do |method|
+    [:convert,:montage,:identify,:verify,:test].each do |method|
       define_method(method) do |*splat|
         module_name = "#{self.name}::#{method.to_s.capitalize}"
         target = module_name.constantize

data/lib/image_genie/base.rb

@@ -15,7 +15,6 @@ module ImageGenie
       @paths
     end    
 
-    # Eventually I want this method to accept a model that encapsulates its command execution logic. 
     def self.execute(command)
       logger.info("Executing #{command}")
       pid, stdin, stdout, stderr = Open4::popen4(command)
@@ -24,7 +23,7 @@ module ImageGenie
 
     def self.path_for(program)
       paths[program.to_sym]
-    end
+    end    
     
     def self.make_command(command,*args)
       command.strip!
@@ -39,19 +38,21 @@ module ImageGenie
       components.compact.join(' ')
     end
     
+    
     def self.make_args(args)
       args = [args] if !args.is_a?(Array)
       return nil if args.empty?
       args.join(' ')
     end
     
+    
     # There is probably a better library to handle creation of command line flags,
     # but this works for now.
     def self.make_flags(options={})
       return nil if options.empty?
       options.collect{|k,v| "-#{k} #{v}"}.join(' ')
     end
-    
+        
     def self.logger
       @log ||= TimestampedBufferedLogger.new(Rails.root.join('log','image_genie.log'))
     end   

data/lib/image_genie/command.rb

@@ -1,5 +1,35 @@
 module ImageGenie
   class Command < Base    
+    attr_accessor :stdin,:stdout,:stderr,:pid,:status
+    attr_accessor :exception_class,:caller_obj
+    attr_accessor :output_buffer
+
+    def has_error?
+      !self.status.zero?      
+    end
+        
+    def initialize(obj)
+      self.output_buffer = ''
+      self.caller_obj = obj
+    end
+
+    def execute(command)
+      begin
+        caller_obj.pid, caller_obj.stdin, caller_obj.stdout, caller_obj.stderr = Open4::popen4(command)
+        caller_obj.input if caller_obj.respond_to?(:input)
+        caller_obj.output if caller_obj.respond_to?(:output)
+        puts "Waiting"
+        ignored, status = Process::waitpid2 caller_obj.pid
+        self.status = status.exitstatus
+        puts "checking for error now"
+        caller_obj.error if caller_obj.respond_to?(:error)
+      rescue Exception => e
+        raise
+      ensure
+        caller_obj.cleanup if caller_obj.respond_to?(:cleanup)
+      end
+    end    
+
     def self.handle_errors(stderr,status,exception)
       unless status.exitstatus.zero?
         errors = stderr.read.strip
@@ -7,5 +37,57 @@ module ImageGenie
         raise(exception, errors)
       end      
     end
+
+    def path_for(program)
+      self.class.paths[program.to_sym]
+    end
+
+    def make_command(command,*args)
+      command.strip!
+      components = [command]
+      args.each do |component|
+        components << case (component.class.name)
+        when 'Hash': make_flags(component)
+        when 'Array': make_args(component)
+        else " #{component}"
+        end
+      end
+      components.compact.join(' ')
+    end
+
+    def make_args(args)
+      args = [args] if !args.is_a?(Array)
+      return nil if args.empty?
+      args.join(' ')
+    end
+
+    # There is probably a better library to handle creation of command line flags,
+    # but this works for now.
+    def make_flags(options={})
+      return nil if options.empty?
+      options.collect{|k,v| "-#{k} #{v}"}.join(' ')
+    end
+    
+    
+    # define generic error/input/output handlers
+    def error
+      if has_error?
+        errors = stderr.read.strip
+        logger.error("#{caller_obj.class.name} #{errors}")
+        raise(caller_obj.exception_class, errors)        
+      end
+    end
+    
+    def output
+      # Generic output processing -- just read it and store it in a buffer. We may want to restrict the amount of data
+      # in here via a configuration directive so we don't eat up all of the available system memory.
+      while !stdout.eof?
+        self.output_buffer += stdout.readline
+      end
+    end
+    
   end
-end
+end
+
+
+

data/lib/image_genie/convert.rb

@@ -1,33 +1,28 @@
 module ImageGenie
   class ConvertError < StandardError; end; 
   class Convert < Command
-    def self.run(src, options={})
-      raise(UnableToLocateBinaryError, 'convert') if path_for(:convert).blank?
+    attr_accessor :src, :temp_image_file, :options, :src_format
 
-      logger.info("#{self.name} Attempting to convert #{src.path}")
-
-      begin
-        raise Errno::ENOENT,"#{src.path}" unless File.exists?(src.path)
-      rescue Errno::ENOENT => e
-        logger.error("#{self.name} #{e.message}")
-        raise
+    def output
+      while line = stdout.gets
+        temp_image_file.puts line
       end
+      temp_image_file.rewind
+    end
 
-      format = File.extname(src.path).downcase.gsub(/\.|\?/,'')
-
-      command = "#{path_for(:convert)} #{make_flags(options)} #{format}:#{src.path} #{format}:-"
-      temp_image_file = Tempfile.new([src.original_filename,".#{format}"]) 
-
-      execute(command) do |pid,stdin,stdout,stderr|
-        while line = stdout.gets
-          temp_image_file.puts line
-        end
-        ignored, status = Process::waitpid2 pid
-        handle_errors(stderr,status,ConvertError)
-      end
+    def initialize(src,options={})
+      self.src = src
+      self.options = options
+      self.src_format = File.extname(src.path).downcase.gsub(/\.|\?/,'')
+      logger.info("#{self.class.name} Attempting to convert #{src.path}")
+      raise Errno::ENOENT,"#{src.path}" unless File.exists?(src.path)
+      self.temp_image_file = Tempfile.new([src.original_filename,".#{src_format}"]) 
+      super(self)
+    end
 
-      temp_image_file.rewind
-      return temp_image_file
+    def run
+      execute("#{path_for(:convert)} #{make_flags(options)} #{src_format}:#{src.path} #{src_format}:-")      
+      temp_image_file
     end
   end
 end

data/lib/image_genie/identify.rb

@@ -2,32 +2,21 @@
 module ImageGenie
   class IdentifyError < StandardError; end;
   class Identify < Command
-    def self.run(filename, options={})
+    attr_accessor :filename
+    
+    def initialize(filename, options={})
+      self.exception_class = IdentifyError
       raise(UnableToLocateBinaryError, 'identify') if path_for(:identify).blank?
-
-      begin
-        raise Errno::ENOENT,"#{filename}" unless File.exists?(filename)
-      rescue Errno::ENOENT => e
-        logger.error("#{self.name} #{e.message}")
-        raise
-      end
-
+      self.filename = filename
+      raise Errno::ENOENT,"#{filename}" unless File.exists?(filename)
+      super(self)
+    end
+    
+    def run
       command = "#{path_for(:identify)} #{filename}"
-      output = ''
-
-      # We test for STDERR content
-      execute(command) do |pid,stdin,stdout,stderr|
-        while !stdout.eof?
-          output += stdout.readline
-        end
-
-        ignored, status = Process::waitpid2 pid
-        handle_errors(stderr,status,IdentifyError)
-      end
-
+      execute(command)
       fields = [:filename,:format,:dimensions,:geometry,:bit,:image_class,:colors,:filesize,:usertime,:identify_time]                    
-      return Hash[fields.zip(stdout.read.split(' '))]
+      return Hash[fields.zip(output_buffer.split(' '))]
     end
   end
-end
-
+end

data/lib/image_genie/montage.rb

@@ -1,52 +1,41 @@
 module ImageGenie
   class MontageError < StandardError; end; 
   class Montage < Command
-    attr_accessor :filenames,:filename,:options
+    attr_accessor :filenames, :options, :temp_image_file, :temp_image_list_file
 
-    def initialize(options={})
-      self.filenames = []
-      self.options = options
+    def output
+      while !stdout.eof?
+        temp_image_file.puts stdout.readline
+      end
+      temp_image_file.rewind
+    end
+    
+    def cleanup
+      logger.info("#{self.class.name} Cleaning up files")
+      temp_image_list_file.close
     end
 
-
-    def self.run(filenames, options={})
+    def initialize(filenames,options={})
+      logger.info("#{self.class.name} Attempting to make montage of #{filenames.count} files")
+      self.filenames = filenames
+      self.exception_class = MontageError
       raise(UnableToLocateBinaryError, 'montage') if path_for(:montage).blank?
+      self.options = options
       # Montage hates when you attempt to give it files with a path in it, so we
       # need to change to the system specified temp directory to do our work.
       Dir.chdir(Dir::tmpdir)
+      self.temp_image_file = Tempfile.new(['montage','.jpg'])
+      self.temp_image_list_file = Tempfile.new(['montage_image_filenames','.txt']) 
       # Create a temp file that will be all component files of this montage
-      temp_image_file = Tempfile.new(['montage','.jpg'])
-      temp_image_list_file = Tempfile.new(['montage_image_filenames','.txt']) 
       temp_image_list_file.puts filenames.join("\n")
       temp_image_list_file.rewind
+      super(self)
+    end
 
-      logger.info("#{self.name} Attempting to make a montage of #{filenames.size} files")
-
+    def run
       command = make_command(path_for(:montage), "@\"#{File.basename(temp_image_list_file.path)}\"", options, "jpeg:-")
-
-      begin
-        execute(command) do |pid,stdin,stdout,stderr|
-          while !stdout.eof?
-            temp_image_file.puts stdout.readline
-          end
-          temp_image_file.rewind
-
-          # Still foggy on if we need to wait until we read from STDOUT before waiting, or if
-          # we wait until we read STDOUT and STDERR.
-          ignored, status = Process::waitpid2 pid
-          handle_errors(stderr,status,MontageError)
-        end
-      rescue Exception => e
-        # Close the tempfile before raising
-        temp_image_file.close
-        raise
-      ensure
-        logger.info("#{self.name} Cleaning up files")
-        temp_image_list_file.close
-      end
-
+      execute(command)
       return temp_image_file
-
     end
   end
 end

data/lib/image_genie/test.rb

@@ -0,0 +1,43 @@
+module ImageGenie
+  class TestError < StandardError; end; 
+  class Test < Command
+    attr_accessor :temp_image_file, :temp_image_list_file
+    
+    def input
+    end
+    
+    def output
+      while !stdout.eof?
+        puts stdout.readline
+#        self.temp_image_file.puts stdout.readline
+      end
+#      temp_image_file.rewind
+    end
+    
+    
+    def error
+      if has_error?
+        errors = stderr.read.strip
+#        logger.error("#{self.name} #{errors}")
+        raise(exception_class, errors)        
+      end
+    end        
+
+    def initialize(options={})
+      self.exception_class = TestError
+      # Dir.chdir(Dir::tmpdir)
+      # # Create a temp file that will be all component files of this montage
+      # self.temp_image_file = Tempfile.new(['montage','.jpg'])
+      # self.temp_image_list_file = Tempfile.new(['montage_image_filenames','.txt']) 
+    end
+    
+    def run
+      execute("ls WERIOWEK",self)
+    end
+  end
+end
+
+
+
+
+

data/lib/image_genie/verify.rb

@@ -4,24 +4,19 @@ module ImageGenie
   class VerifyError < StandardError; end;
   class Verify < Command
 
-    def self.run(filename, options={})
-      raise(UnableToLocateBinaryError, 'identify') if path_for(:identify).blank?
-
-      begin
-        raise Errno::ENOENT,"#{filename}" unless File.exists?(filename)
-      rescue Errno::ENOENT => e
-        logger.error("#{self.name} #{e.message}")
-        raise
-      end      
+    attr_accessor :filename
 
-      command = "#{path_for(:identify)} #{filename}"
-      # We test for STDERR content        
-      execute(command) do |pid,stdin,stdout,stderr|
-        ignored, status = Process::waitpid2 pid    
-        handle_errors(stderr,status,VerifyError)
-      end
-      
-      return true
+    def initialize(filename, options={})
+      self.exception_class = VerifyError
+      raise(UnableToLocateBinaryError, 'identify') if path_for(:identify).blank?
+      self.filename = filename
+      raise Errno::ENOENT,"#{filename}" unless File.exists?(filename)
+      super(self)
     end
+
+    def run
+      execute("#{path_for(:identify)} #{filename}")
+      return true      
+    end    
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: image_genie
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Billy Kimble
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -08:00
+date: 2011-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,6 +39,7 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- README
 - README.rdoc
 - lib/image_genie.rb
 - lib/image_genie/base.rb
@@ -46,21 +47,24 @@ extra_rdoc_files:
 - lib/image_genie/convert.rb
 - lib/image_genie/identify.rb
 - lib/image_genie/montage.rb
+- lib/image_genie/test.rb
 - lib/image_genie/verify.rb
 files: 
 - Manifest
+- README
 - README.rdoc
 - Rakefile
+- image_genie.gemspec
 - lib/image_genie.rb
 - lib/image_genie/base.rb
 - lib/image_genie/command.rb
 - lib/image_genie/convert.rb
 - lib/image_genie/identify.rb
 - lib/image_genie/montage.rb
+- lib/image_genie/test.rb
 - lib/image_genie/verify.rb
 - test/test_helper.rb
 - test/unit/base_test.rb
-- image_genie.gemspec
 has_rdoc: true
 homepage: https://github.com/bkimble
 licenses: []