andhapp-players 1.1.0 → 1.1.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
+:patch: 1
 :major: 1
 :minor: 1 

data/bin/players

@@ -1,7 +1,8 @@
 app_path = ARGV.first
 
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", 'lib')
 require 'pscript'
 
 player = Players::Pscript.new
-player.run
+player.init
+player.run

data/lib/convert_images_to_photoshop_layers.vbs

@@ -1,23 +1,15 @@
 
 Dim appRef
 Dim originalRulerUnits
-Dim docRef, artLayerRef, textItemRef, imageLayerRef, currentDoc 
-Dim fso, folder, files, srcFolderName, srcFolderLocation, destFolderLocation, destFileName
+Dim docRef, artLayerRef, imageLayerRef, currentDoc 
+Dim fso, folder, files
 
 Set appRef = CreateObject("Photoshop.Application")
 
-' Remember current unit settings and then set units to
-' the value expected by this script
+' Remember current unit settings and then set units to the value expected by this script
 originalRulerUnits = appRef.Preferences.RulerUnits
 appRef.Preferences.RulerUnits = 2
 
-'set srcFolderName = Wscript.Arguments(0)
-'WScript.Echo directoryName
-
-'Set srcFolderLocation = "J:\Projects\GitRepository\photoshopScripts\jobBag1232774143\"
-'Set destFolderLocation = "J:\Projects\GitRepository\photoshopScripts\"
-'Set destFileName = srcFolderName + "_collated_psd_version"
-
 Set fso =  CreateObject("Scripting.FileSystemObject")
 Set folder = fso.GetFolder(Wscript.Arguments(0))
 Set files = folder.Files
@@ -48,6 +40,5 @@ photoshopSaveOptions, True, 2
 
 ' don�t save anything we did
 appRef.ActiveDocument.Close(2)
-'the enumerated value Close(2) = PsSaveOptions >2 (psDoNotSaveChanges)
 
-appRef.Quit
+appRef.Quit

data/lib/options.yaml

@@ -1,5 +1,5 @@
 website_address: 'http://geekandpoke.smugmug.com/gallery/5297189_ToNCK#323502743_kns4p'  
 destination_folder: final
 destination_filename: final.psd
-extension_of_files_to_download: jpg # jpg or gif or png
-close_photoshop_after_processing: 0 # yes(0) | no(1)
+extension_of_files_to_download: jpg # default jpg
+close_photoshop_after_processing: 2 # no(0) | yes(2) # default yes(2)

data/lib/pconstants.rb

@@ -2,5 +2,7 @@ module Players
   module Pconstants
     OPTIONS_FILE = 'options.yaml'
     HTTP = 'http://'
+    URL_SEPERATOR = '/'
+    INIT_DIR = 'players-init'
   end
 end

data/lib/players.rb

@@ -1,4 +1,5 @@
-%w(net/http hpricot ftools yaml ..\lib\pconstants).each {|x| require x}
+%w(net/http hpricot ftools yaml).each {|x| require x}
+require File.join(File.dirname(__FILE__), '..', 'lib', 'pconstants')
 
 module Players
 
@@ -8,25 +9,45 @@ module Players
 
     attr_reader :options
     
+    def sinit
+      create_player_init_directory
+      copy_options_file_in_init_dir
+      load_options
+    end
+
     def run
-      load_options  
+      response = make_http_request(@options["website_address"])
+      all_image_elements = collect_source_of_image_element(reponse)
+      required_image_elements = select_the_supplied_extension_elements(all_image_elements, @options["extension_of_files_to_download"])
+      create_destination_directory("#{Pconstants::INIT_DIR}#{File::SEPARATOR}#{@options['destination_folder']}")
+      elements_with_full_url = build_full_url(get_host_name_from_protocol_sanitised_url(get_protocol_sanitised_url(@options["website_address"])), required_image_elements)
+      download_the_images("#{Pconstants::INIT_DIR}#{File::SEPARATOR}#{@options['destination_folder']}", elements_with_full_url)
+      make_call_to_external_vb_script("#{Pconstants::INIT_DIR}#{File::SEPARATOR}#{@options['destination_folder']}")
+    end
+
+    def create_player_init_directory
+      FileUtils.mkdir_p("#{Pconstants::INIT_DIR}")
+    end
+
+    def copy_options_file_in_init_dir
+      File.copy(File.join(File.dirname(__FILE__), '..', 'lib', "#{Pconstants::OPTIONS_FILE}"), "#{Pconstants::INIT_DIR}#{File::SEPARATOR}#{Pconstants::OPTIONS_FILE}")
     end
 
     def load_options(name = nil)
-      fail "no options file to load" if !files_in_a_folder("..\\lib").index("#{name || Pconstants::OPTIONS_FILE}")
-      @options = YAML::load(File.open("..\\lib\\#{Pconstants::OPTIONS_FILE}"))
+      fail "no options file to load" if !files_in_a_folder(Pconstants::INIT_DIR).index("#{name || Pconstants::OPTIONS_FILE}")
+      @options = YAML::load( File.open( File.join(Pconstants::INIT_DIR, "#{Pconstants::OPTIONS_FILE}") ) )
     end
 
     def files_in_a_folder(name)
-      Dir.entries(name).each {|x| [] << x if !File.directory?(x)}       
+      Dir.entries(name).each {|x| [] << x if !File.directory?(x)}
     end
     
     def get_protocol_sanitised_url(url)
-      url.split(Pconstants::HTTP).last  
+      url.split("#{Pconstants::HTTP}").last  
     end
 
     def get_host_name_from_protocol_sanitised_url(url)
-      url.split("/").first  
+      url.split("#{Pconstants::URL_SEPERATOR}").first  
     end
     
     def get_remaining_url_from_protocol_sanitised_url(url)
@@ -39,7 +60,7 @@ module Players
       remaining_address = get_remaining_url_from_protocol_sanitised_url(url)
       result = Net::HTTP.get_response(main_host_name, remaining_address)
       fail "could not connect to the site" if result.nil?
-      @response = result.body
+      result.body
     end
 
     def collect_source_of_image_element(response)
@@ -53,7 +74,7 @@ module Players
     end
 
     def create_destination_directory(name)
-      FileUtils.mkdir(name)
+      FileUtils.mkdir_p(name)
     end
 
     def build_full_url(host_name, elements)
@@ -61,7 +82,7 @@ module Players
     end
 
     def get_image_name(value)
-      value[value.rindex("/")+1..value.length]
+      value[value.rindex("#{Pconstants::URL_SEPERATOR}")+1..value.length]
     end
 
     def download_the_images(destination_dir, elements)
@@ -71,12 +92,12 @@ module Players
         image_name = get_image_name(query_string) 
         Net::HTTP.start(host) { |http|
           resp = http.get(query_string)
-          open(destination_dir + "/" + image_name, "wb") { |file| file.write(resp.body) }
+          open(destination_dir + "#{File::SEPARATOR}" + image_name, "wb") { |file| file.write(resp.body) }
         }
       }
     end
-
-    def make_call_to_external_vb_script
+    
+    def make_call_to_external_vb_script(directory_name)
       system "cscript convert_images_to_photoshop_layers.vbs #{directory_name}"
     end
     

data/players.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{players}
-  s.version = "1.1.0"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anuj Dutta"]
-  s.date = %q{2009-04-29}
+  s.date = %q{2009-05-06}
   s.default_executable = %q{players}
   s.description = %q{Players - Photoshop Layers}
   s.email = %q{anuj@andhapp.com}

data/test/ts_players.rb

@@ -1,11 +1,12 @@
-%w(test/unit redgreen shoulda rr fileutils ..\lib\players ftools).each{|x| require x}
+%w(test/unit redgreen shoulda rr fileutils ftools).each{|x| require x}
+require File.join(File.dirname(__FILE__), '..', 'lib', 'players')
 
 class TestPlayers < Test::Unit::TestCase
 
   include RR::Adapters::TestUnit unless include?(RR::Adapters::TestUnit)
   
   def files_in_a_folder(name)
-    Dir.entries(name).each {|x| [] << x if !File.directory?(x)}       
+    Dir.entries(name).each {|x| [] << x if !File.directory?(x)}
   end
 
   def dir_in_a_folder(name)
@@ -15,6 +16,8 @@ class TestPlayers < Test::Unit::TestCase
   context "" do
     setup do
       @player = Players::Pscript.new
+      @player.create_player_init_directory
+      @player.copy_options_file_in_init_dir
       @options = @player.load_options
       
       @response = '<div id="photos">
@@ -25,7 +28,15 @@ class TestPlayers < Test::Unit::TestCase
       </div>'
 
     end
-    
+
+    should "initialise the player script in a folder called players in the directory where it is run" do 
+     dir_in_a_folder(".").include?("players-init")
+    end
+
+    should "copy the options file in this folder and use this options file" do
+     files_in_a_folder(".").include?("options.yaml")
+    end
+
     should "raise exception if the options file is not present" do
       assert_raises(RuntimeError) {@player.load_options('some_options.yaml')}
     end
@@ -36,7 +47,7 @@ class TestPlayers < Test::Unit::TestCase
       assert_equal @options["destination_folder"], 'final'
       assert_equal @options["destination_filename"], 'final.psd'
       assert_equal @options["extension_of_files_to_download"], 'jpg' 
-      assert_equal @options["close_photoshop_after_processing"], 0
+      assert_equal @options["close_photoshop_after_processing"], 2
     end
     
     should "get protocal sanitised url" do
@@ -70,8 +81,8 @@ class TestPlayers < Test::Unit::TestCase
     end
 
     should "create destination directory" do
-      @player.create_destination_directory("test_final")
-      assert dir_in_a_folder(".").include?("test_final")
+      @player.create_destination_directory("players-init#{File::SEPARATOR}test_final")
+      assert dir_in_a_folder("players-init").include?("test_final")
     end
     
     should "build required images full url" do
@@ -87,11 +98,11 @@ class TestPlayers < Test::Unit::TestCase
 
     should "download the images" do
       @player.download_the_images(".", ["geekandpoke.smugmug.com/photos/323503251_vdoAH-Th.jpg"])
-      files_in_a_folder(".").include?("spacer.gif")
+      files_in_a_folder(".").include?("323503251_vdoAH-Th.jpg")
     end
 
     teardown do
-      FileUtils.rmdir("test_final") if test(?d, "test_final")
+      FileUtils.rmtree("players-init") if test(?d, "players-init")
       FileUtils.rm("323503251_vdoAH-Th.jpg") if File.exists?("323503251_vdoAH-Th.jpg")
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: andhapp-players
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Anuj Dutta
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-29 00:00:00 -07:00
+date: 2009-05-06 00:00:00 -07:00
 default_executable: players
 dependencies: []