medivo 0.1.13 → 0.1.14

data/lib/medivo/version.rb

@@ -1,3 +1,3 @@
 module Medivo
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

data/lib/pdf/medivo/fdf_generator.rb

@@ -2,62 +2,33 @@ module Medivo
   module FdfGenerator
 
     def self.file(info)
-      afile = Tempfile.new('fdf', :encoding => 'ascii-8bit')
-      afile.write "%FDF-1.2\x0d%\xe2\xe3\xcf\xd3\x0d\x0a"; # header
-      afile.write "1 0 obj\x0d<< " # open the Root dictionary
-      afile.write "\x0d/FDF << " # open the FDF dictionary
-      afile.write "/Fields [ " # open the form Fields array
+      PdfGenerator.tmp_pdf do |afile|
+        afile.write "%FDF-1.2\x0d%\xe2\xe3\xcf\xd3\x0d\x0a"; # header
+        afile.write "1 0 obj\x0d<< " # open the Root dictionary
+        afile.write "\x0d/FDF << " # open the FDF dictionary
+        afile.write "/Fields [ " # open the form Fields array
 
-      info.each { |key, value|
-        if value.class == Hash
-          value.each { |sub_key, sub_value|
-            afile.write '<< /T (' + key.to_s + '_' + sub_key.to_s + ') /V '
-            afile.write '(' + escape_data(sub_value) + ') /ClrF 2 /ClrFf 1 >> '
-          }
-        else
-          afile.write '<< /T (' + key.to_s + ') /V (' + escape_data(value) + ') /ClrF 2 /ClrFf 1 >> '
-        end
-      }
+        info.each { |key, value|
+          if value.class == Hash
+            value.each { |sub_key, sub_value|
+              afile.write '<< /T (' + key.to_s + '_' + sub_key.to_s + ') /V '
+              afile.write '(' + escape_data(sub_value) + ') /ClrF 2 /ClrFf 1 >> '
+            }
+          else
+            afile.write '<< /T (' + key.to_s + ') /V (' + escape_data(value) + ') /ClrF 2 /ClrFf 1 >> '
+          end
+        }
 
-      afile.write "] \x0d" # close the Fields array
-      afile.write ">> \x0d" # close the FDF dictionary
-      afile.write ">> \x0dendobj\x0d" # close the Root dictionary
+        afile.write "] \x0d" # close the Fields array
+        afile.write ">> \x0d" # close the FDF dictionary
+        afile.write ">> \x0dendobj\x0d" # close the Root dictionary
 
-      # trailer note the "1 0 R" reference to "1 0 obj" above
-      afile.write "trailer\x0d<<\x0d/Root 1 0 R \x0d\x0d>>\x0d"
-      afile.write "%%EOF\x0d\x0a"
-      afile.close
-      afile
+        # trailer note the "1 0 R" reference to "1 0 obj" above
+        afile.write "trailer\x0d<<\x0d/Root 1 0 R \x0d\x0d>>\x0d"
+        afile.write "%%EOF\x0d\x0a"
+      end
     end
 
-    #def self.file(info)
-    #  PdfGenerator.tmp_pdf do |afile|
-    #    afile.write "%FDF-1.2\x0d%\xe2\xe3\xcf\xd3\x0d\x0a"; # header
-    #    afile.write "1 0 obj\x0d<< " # open the Root dictionary
-    #    afile.write "\x0d/FDF << " # open the FDF dictionary
-    #    afile.write "/Fields [ " # open the form Fields array
-    #
-    #    info.each { |key, value|
-    #      if value.class == Hash
-    #        value.each { |sub_key, sub_value|
-    #          afile.write '<< /T (' + key.to_s + '_' + sub_key.to_s + ') /V '
-    #          afile.write '(' + escape_data(sub_value) + ') /ClrF 2 /ClrFf 1 >> '
-    #        }
-    #      else
-    #        afile.write '<< /T (' + key.to_s + ') /V (' + escape_data(value) + ') /ClrF 2 /ClrFf 1 >> '
-    #      end
-    #    }
-    #
-    #    afile.write "] \x0d" # close the Fields array
-    #    afile.write ">> \x0d" # close the FDF dictionary
-    #    afile.write ">> \x0dendobj\x0d" # close the Root dictionary
-    #
-    #    # trailer note the "1 0 R" reference to "1 0 obj" above
-    #    afile.write "trailer\x0d<<\x0d/Root 1 0 R \x0d\x0d>>\x0d"
-    #    afile.write "%%EOF\x0d\x0a"
-    #  end
-    #end
-
     def self.escape_data(value)
       value.to_s.strip.gsub(/[\(]/, '\\(').gsub(/[\)]/, '\\)')
     end

data/lib/pdf/medivo/pdf_generator.rb

@@ -5,7 +5,7 @@ module Medivo
       pdf = Tempfile.new('pdf', :encoding => 'ascii-8bit')
       yield pdf
       # if you don't close here the helper method pdf_to_text does not work
-      # its also a good idea to close the temp file
+      # its also a good idea to close the temp file anyway
       pdf.close
       pdf
     end
@@ -15,11 +15,12 @@ module Medivo
     # variables   Hash    the hash of variables to fill in
     #
     # return  pdf File
+    #
     def self.variable_fields(file_path, variables)
       raise "variables #{variables} should be a hash" unless variables.is_a? Hash
       tmp_pdf do |pdf|
         fdf = FdfGenerator.file(variables)
-        system 'pdftk', file_path, 'fill_form', fdf.path, 'output', pdf.path#, 'flatten'
+        system 'pdftk', file_path, 'fill_form', fdf.path, 'output', pdf.path, 'flatten'
         fdf.unlink
       end
     end
@@ -28,13 +29,17 @@ module Medivo
     # file_path   String  path to pdf file with variable fields
     # variables   Hash    the hash of variables to fill in
     # images      Array   of image info like:
-    #           [ {:path=>'/absolute/path/to/image1.jpg', :at=>[x_pos,y_pos]},
-    #            {:path=>'/absolute/path/to/image2.jpg', :at=>[20,800], :width=>20, :height=>40} ]
+    #  [ {:path=>'/absolute/path/to/image1.jpg', :options=>{ :at=>[x_pos, y_pos]} },
+    #    {:path=>'/absolute/path/to/image2.jpg', :options=>{ :at=>[20, 800], :width=>20, :height=>40} }
+    #  ]
     #
     # return  pdf File
+    #
+    # NOTE: need to create tmp dir in home directory for temporary image files
+    #
     def self.variable_fields_with_images(file_path, variables, images=[])
       content_pdf = variable_fields(file_path, variables)
-      image_path = Rails.root.join "tmp/image_path_#{SecureRandom.hex(6)}_#{Time.now.to_i}.pdf"
+      image_path =  "#{ENV['HOME']}/tmp/image_path_#{SecureRandom.hex(6)}_#{Time.now.to_i}.pdf"
       img_pdf = Prawn::Document.generate(image_path) do |pdf|
         images.each do |img_info|
           pdf.image img_info[:path], img_info[:options]

data/spec/dummy/log/test.log

@@ -151,3 +151,67 @@ Served asset /medivo/markerB.png - 200 OK (3ms)
 
 Started GET "/assets/medivo/arrow.png" for 127.0.0.1 at 2011-11-06 19:34:34 -0500
 Served asset /medivo/arrow.png - 200 OK (6ms)
+
+
+Started GET "/medivo/labs/lab_data?zip_code=90210" for 127.0.0.1 at 2011-11-06 21:00:16 -0500
+  Processing by Medivo::LabsController#lab_data as HTML
+  Parameters: {"zip_code"=>"90210"}
+Completed 200 OK in 322ms (Views: 1.1ms)
+
+
+Started GET "/labs/lab_search?zip_code=90210" for 127.0.0.1 at 2011-11-06 21:00:19 -0500
+  Processing by LabsController#lab_search as HTML
+  Parameters: {"zip_code"=>"90210"}
+Completed 200 OK in 293ms (Views: 99.7ms)
+
+
+Started GET "/assets/application.css" for 127.0.0.1 at 2011-11-06 21:00:20 -0500
+Served asset /application.css - 200 OK (5ms)
+
+
+Started GET "/assets/application.js" for 127.0.0.1 at 2011-11-06 21:00:20 -0500
+Served asset /application.js - 200 OK (24ms)
+
+
+Started GET "/assets/medivo/markerA.png" for 127.0.0.1 at 2011-11-06 21:00:20 -0500
+Served asset /medivo/markerA.png - 200 OK (2ms)
+
+
+Started GET "/assets/medivo/markerB.png" for 127.0.0.1 at 2011-11-06 21:00:20 -0500
+Served asset /medivo/markerB.png - 200 OK (2ms)
+
+
+Started GET "/assets/medivo/arrow.png" for 127.0.0.1 at 2011-11-06 21:00:21 -0500
+Served asset /medivo/arrow.png - 200 OK (2ms)
+
+
+Started GET "/medivo/labs/lab_data?zip_code=90210" for 127.0.0.1 at 2011-11-07 08:16:41 -0500
+  Processing by Medivo::LabsController#lab_data as HTML
+  Parameters: {"zip_code"=>"90210"}
+Completed 200 OK in 284ms (Views: 1.0ms)
+
+
+Started GET "/labs/lab_search?zip_code=90210" for 127.0.0.1 at 2011-11-07 08:16:44 -0500
+  Processing by LabsController#lab_search as HTML
+  Parameters: {"zip_code"=>"90210"}
+Completed 200 OK in 320ms (Views: 95.1ms)
+
+
+Started GET "/assets/application.css" for 127.0.0.1 at 2011-11-07 08:16:44 -0500
+Served asset /application.css - 200 OK (654ms)
+
+
+Started GET "/assets/application.js" for 127.0.0.1 at 2011-11-07 08:16:45 -0500
+Served asset /application.js - 200 OK (33ms)
+
+
+Started GET "/assets/medivo/markerA.png" for 127.0.0.1 at 2011-11-07 08:16:45 -0500
+Served asset /medivo/markerA.png - 200 OK (1ms)
+
+
+Started GET "/assets/medivo/markerB.png" for 127.0.0.1 at 2011-11-07 08:16:45 -0500
+Served asset /medivo/markerB.png - 200 OK (3ms)
+
+
+Started GET "/assets/medivo/arrow.png" for 127.0.0.1 at 2011-11-07 08:16:45 -0500
+Served asset /medivo/arrow.png - 200 OK (2ms)

data/spec/lib/pdf_generator_spec.rb

@@ -21,7 +21,7 @@ describe Medivo::PdfGenerator do
               :first_name => 'me!!!!!',
               :sched_date => 'todays date',
               :app_date => 'my appt date',
-              :app_time => 'my appt time',
+              :app_time => 'appt time',  # small field .. so too much text will break test
               :lab_name => 'LabCorp',
               :lab_address => 'the lab address',
               :order_number => 'the lab id'
@@ -31,8 +31,9 @@ describe Medivo::PdfGenerator do
       pdf_file = Medivo::PdfGenerator.variable_fields(path, fields)
 
       text = pdf_to_text(pdf_file)
+      text = text.strip_space
       fields.values.each do |value|
-        text.should match value
+        text.should match value.strip_space
       end
       pdf_file.unlink
     end
@@ -53,9 +54,9 @@ Southeast Region
             {:director_name=>md},
             [{:path=> img_path, :options=>{:at=> [40, 100], :width=>170, :height=>40}}]
     )
-    show_me_the_pdf(pdf_file, '/tmp/test.pdf')
+    #show_me_the_pdf(pdf_file, '/tmp/test.pdf')
     text = pdf_to_text(pdf_file)
-    text.should match "Catherine E. Palmier, M.D."
+    text.strip_space.should match "Catherine E. Palmier, M.D.".strip_space
     pdf_file.unlink
   end
 end

data/spec/lib/pdf_group_spec.rb

@@ -30,7 +30,7 @@ describe Medivo::PdfGroup do
     end
 
     text = pdf_to_text(pdf_group.pdf)
-    text.should match "Account #:111111111 Req\/Control #:#{requisition_id}"
+    text.should match /Account #:111111111 Req\/Control #:#{requisition_id}/x
   end
 
   it "#lab_result" do
@@ -42,7 +42,7 @@ describe Medivo::PdfGroup do
     end
 
     text = pdf_to_text(pdf_group.pdf)
-    text.should match "COLLECTED:2011-09-06 RECEIVED:2011-09-06 REPORTED:2011-09-06"
+    text.strip_space.should match "COLLECTED:2011-09-06 RECEIVED:2011-09-06 REPORTED:2011-09-06".strip_space
   end
 
   it "#static_pdf" do
@@ -52,7 +52,7 @@ describe Medivo::PdfGroup do
     end
 
     text = pdf_to_text(pdf_group.pdf)
-    text.should match "Q: What does a positive result mean"
+    text.strip_space.should match "Q: What does a positive result mean".strip_space
   end
 
   it "handles a combination of pdfs" do
@@ -71,8 +71,9 @@ describe Medivo::PdfGroup do
     end
 
     text = pdf_to_text(pdf_group.pdf)
+    text = text.strip_space
     text.should match name
-    text.should match "Account #:111111111 Req\/Control #:#{requisition_id}"
-    text.should match "Q: What does a positive result mean"
+    text.should match "Account #:111111111 Req\/Control #:#{requisition_id}".strip_space
+    text.should match "Q: What does a positive result mean".strip_space
   end
 end

data/spec/support/helper.rb

@@ -1,6 +1,6 @@
 class String
   def strip_space
-    gsub(/\s/, '')
+    gsub(/\s|\n|\r/, '')
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: medivo
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-06 01:00:00.000000000 -04:00
+date: 2011-11-07 00:00:00.000000000 -05:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2161952680 !ruby/object:Gem::Requirement
+  requirement: &2173814200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161952680
+  version_requirements: *2173814200
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2161952260 !ruby/object:Gem::Requirement
+  requirement: &2173813780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161952260
+  version_requirements: *2173813780
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2161951720 !ruby/object:Gem::Requirement
+  requirement: &2173813240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161951720
+  version_requirements: *2173813240
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &2161951300 !ruby/object:Gem::Requirement
+  requirement: &2173812800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161951300
+  version_requirements: *2173812800
 - !ruby/object:Gem::Dependency
   name: geocoder
-  requirement: &2161950880 !ruby/object:Gem::Requirement
+  requirement: &2173812380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161950880
+  version_requirements: *2173812380
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2161950460 !ruby/object:Gem::Requirement
+  requirement: &2173811960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161950460
+  version_requirements: *2173811960
 - !ruby/object:Gem::Dependency
   name: pdfkit
-  requirement: &2161950040 !ruby/object:Gem::Requirement
+  requirement: &2173811520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161950040
+  version_requirements: *2173811520
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &2161949620 !ruby/object:Gem::Requirement
+  requirement: &2173811100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161949620
+  version_requirements: *2173811100
 description: Use the medivo platform to find lab locations, make labcorp appointments,
   place lab orders
 email:
@@ -293,7 +293,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1719666100364276602
+      hash: 1540401396263977125
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -302,7 +302,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1719666100364276602
+      hash: 1540401396263977125
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.6.2