medivo 0.2.18 → 0.2.19

data/app/controllers/medivo/labs_controller.rb

@@ -10,6 +10,7 @@ module Medivo
       data = Medivo::Appointment.find(params[:lab_code], params[:date], params[:am_pm])
       render :json=> {times: data}
     rescue => e
+      p e.backtrace
       appointment_error_handler(e)
     end
 

data/app/models/medivo/appointment.rb

@@ -27,8 +27,7 @@ module Medivo
           data = build_fake_data(date)
         end
         # filter the hash before returning
-        search_date = Time.parse(date)
-        filter_data(data, am_pm, search_date)
+        filter_data(data, am_pm, date.to_time)
       end
 
       ##
@@ -70,10 +69,10 @@ module Medivo
         true unless !Rails.env.test? and @config.real_data == false
       end
 
-      def filter_data(times, am_pm, search_date)
+      def filter_data(times, am_pm, search_time)
         times.collect { |time| AppointmentTime.new(time) }
             .select { |at| at.match(am_pm, Time.now) }
-            .sort_by {|at| at.nearness_to_date(search_date) }
+            .sort_by {|at| at.nearness_to_time(search_time) }
             .collect { |at| at.time_str }
       end
 
@@ -105,7 +104,7 @@ class AppointmentTime
     time and time_str.match(/#{am_pm}/) and (time >= current_time)
   end
 
-  def nearness_to_date(date)
-    (time - date).to_i.abs
+  def nearness_to_time(other_time)
+    (time - other_time).to_i.abs
   end
 end

data/lib/medivo/version.rb

@@ -1,3 +1,3 @@
 module Medivo
-  VERSION = "0.2.18"
+  VERSION = "0.2.19"
 end

data/spec/dummy/log/development.log

@@ -21457,3 +21457,203 @@ Started GET "/medivo/labs/find_appointment?utf8=%E2%9C%93&date=11%2F19%2F2011&la
   Processing by Medivo::LabsController#find_appointment as JS
   Parameters: {"utf8"=>"✓", "date"=>"11/19/2011", "lab_code"=>"23021", "commit"=>"Search for appointments"}
 Completed 200 OK in 5182ms (Views: 4.8ms)
+
+
+Started GET "/labs/lab_search?zip_code=90210" for 127.0.0.1 at 2011-11-16 10:37:19 -0500
+  Processing by LabsController#lab_search as HTML
+  Parameters: {"zip_code"=>"90210"}
+Rendered labs/search.html.haml within layouts/application (28.9ms)
+Compiled application.css  (0ms)  (pid 13083)
+Compiled application.js  (8ms)  (pid 13083)
+Compiled jquery.js  (3ms)  (pid 13083)
+Compiled jquery_ujs.js  (0ms)  (pid 13083)
+Compiled medivo/lab_list/application.js  (8ms)  (pid 13083)
+Compiled medivo/handlebars.js  (0ms)  (pid 13083)
+Compiled medivo/helpers.js  (173ms)  (pid 13083)
+Compiled medivo/lab_list/models.js  (210ms)  (pid 13083)
+Compiled medivo/models.js  (169ms)  (pid 13083)
+Compiled medivo/lab_list/views.js  (181ms)  (pid 13083)
+Compiled medivo/views.js  (166ms)  (pid 13083)
+Compiled medivo/lab_list/handlers.js  (171ms)  (pid 13083)
+Compiled medivo/lab_list/sample/show_labs.js  (187ms)  (pid 13083)
+Compiled medivo/lab_appointment/application.js  (11ms)  (pid 13083)
+Compiled medivo/date.js  (0ms)  (pid 13083)
+Compiled medivo/lab_appointment/models.js  (171ms)  (pid 13083)
+Compiled medivo/lab_appointment/views.js  (162ms)  (pid 13083)
+Compiled medivo/lab_appointment/handlers.js  (176ms)  (pid 13083)
+Compiled medivo/lab_appointment/sample/show_appointments.js  (186ms)  (pid 13083)
+Completed 200 OK in 4292ms (Views: 2178.9ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2011-11-16 10:37:23 -0500
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:23 -0500
+Served asset /jquery.js - 304 Not Modified (4ms)
+
+
+Started GET "/assets/medivo/models.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:23 -0500
+Served asset /medivo/models.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/medivo/handlebars.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:23 -0500
+Served asset /medivo/handlebars.js - 304 Not Modified (4ms)
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /jquery_ujs.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/medivo/helpers.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/helpers.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/medivo/lab_list/models.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/lab_list/models.js - 304 Not Modified (3ms)
+
+
+Started GET "/assets/medivo/views.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/views.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/medivo/lab_list/views.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/lab_list/views.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/medivo/lab_list/handlers.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/lab_list/handlers.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/medivo/lab_list/application.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/lab_list/application.js - 304 Not Modified (32ms)
+
+
+Started GET "/assets/medivo/lab_list/sample/show_labs.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/lab_list/sample/show_labs.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/medivo/date.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/date.js - 304 Not Modified (3ms)
+
+
+Started GET "/assets/medivo/lab_appointment/models.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/lab_appointment/models.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/medivo/lab_appointment/views.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/lab_appointment/views.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/medivo/lab_appointment/application.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/lab_appointment/application.js - 304 Not Modified (3ms)
+
+
+Started GET "/assets/medivo/lab_appointment/sample/show_appointments.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/lab_appointment/sample/show_appointments.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /application.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/lab_appointment/handlers.js?body=1" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/lab_appointment/handlers.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/medivo/ajax_waiting.gif" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/ajax_waiting.gif - 304 Not Modified (2ms)
+
+
+Started GET "/assets/medivo/markerA.png" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/markerA.png - 304 Not Modified (3ms)
+
+
+Started GET "/assets/medivo/markerB.png" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/markerB.png - 304 Not Modified (5ms)
+
+
+Started GET "/assets/medivo/markerC.png" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/markerC.png - 304 Not Modified (2ms)
+
+
+Started GET "/assets/medivo/arrow.png" for 127.0.0.1 at 2011-11-16 10:37:24 -0500
+Served asset /medivo/arrow.png - 304 Not Modified (2ms)
+
+
+Started GET "/medivo/labs?utf8=%E2%9C%93&zip_code=10005&commit=Search" for 127.0.0.1 at 2011-11-16 10:37:33 -0500
+  Processing by Medivo::LabsController#index as JS
+  Parameters: {"utf8"=>"✓", "zip_code"=>"10005", "commit"=>"Search"}
+Completed 200 OK in 1971ms (Views: 19.8ms)
+
+
+Started GET "/assets/medivo/markerA.png" for 127.0.0.1 at 2011-11-16 10:37:35 -0500
+Served asset /medivo/markerA.png - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/markerB.png" for 127.0.0.1 at 2011-11-16 10:37:35 -0500
+Served asset /medivo/markerB.png - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/markerC.png" for 127.0.0.1 at 2011-11-16 10:37:35 -0500
+Served asset /medivo/markerC.png - 304 Not Modified (0ms)
+
+
+Started GET "/medivo/labs?utf8=%E2%9C%93&zip_code=10009&commit=Search" for 127.0.0.1 at 2011-11-16 10:39:58 -0500
+  Processing by Medivo::LabsController#index as JS
+  Parameters: {"utf8"=>"✓", "zip_code"=>"10009", "commit"=>"Search"}
+Completed 200 OK in 1864ms (Views: 20.8ms)
+
+
+Started GET "/assets/medivo/markerA.png" for 127.0.0.1 at 2011-11-16 10:40:00 -0500
+Served asset /medivo/markerA.png - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/markerB.png" for 127.0.0.1 at 2011-11-16 10:40:00 -0500
+Served asset /medivo/markerB.png - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/markerC.png" for 127.0.0.1 at 2011-11-16 10:40:00 -0500
+Served asset /medivo/markerC.png - 304 Not Modified (0ms)
+
+
+Started GET "/medivo/labs/find_appointment?utf8=%E2%9C%93&date=11%2F19%2F2011&lab_code=21926&commit=Search+for+appointments" for 127.0.0.1 at 2011-11-16 10:40:10 -0500
+  Processing by Medivo::LabsController#find_appointment as JS
+  Parameters: {"utf8"=>"✓", "date"=>"11/19/2011", "lab_code"=>"21926", "commit"=>"Search for appointments"}
+Completed 500 Internal Server Error in 4066ms (Views: 4.5ms)
+
+
+Started GET "/medivo/labs/find_appointment?utf8=%E2%9C%93&date=11%2F19%2F2011&lab_code=21926&commit=Search+for+appointments" for 127.0.0.1 at 2011-11-16 10:41:26 -0500
+  Processing by Medivo::LabsController#find_appointment as JS
+  Parameters: {"utf8"=>"✓", "date"=>"11/19/2011", "lab_code"=>"21926", "commit"=>"Search for appointments"}
+Completed 500 Internal Server Error in 6346ms (Views: 4.6ms)
+
+
+Started GET "/medivo/labs/find_appointment?utf8=%E2%9C%93&date=11%2F19%2F2011&lab_code=21926&commit=Search+for+appointments" for 127.0.0.1 at 2011-11-16 10:44:25 -0500
+  Processing by Medivo::LabsController#find_appointment as JS
+  Parameters: {"utf8"=>"✓", "date"=>"11/19/2011", "lab_code"=>"21926", "commit"=>"Search for appointments"}
+Completed 500 Internal Server Error in 3540ms (Views: 4.5ms)
+
+
+Started GET "/medivo/labs/find_appointment?utf8=%E2%9C%93&date=11%2F19%2F2011&lab_code=21926&commit=Search+for+appointments" for 127.0.0.1 at 2011-11-16 10:44:49 -0500
+  Processing by Medivo::LabsController#find_appointment as JS
+  Parameters: {"utf8"=>"✓", "date"=>"11/19/2011", "lab_code"=>"21926", "commit"=>"Search for appointments"}
+Completed 500 Internal Server Error in 3678ms (Views: 5.1ms)
+
+
+Started GET "/medivo/labs/find_appointment?utf8=%E2%9C%93&date=11%2F19%2F2011&lab_code=21926&commit=Search+for+appointments" for 127.0.0.1 at 2011-11-16 10:45:49 -0500
+  Processing by Medivo::LabsController#find_appointment as JS
+  Parameters: {"utf8"=>"✓", "date"=>"11/19/2011", "lab_code"=>"21926", "commit"=>"Search for appointments"}
+Completed 500 Internal Server Error in 3997ms (Views: 4.6ms)
+
+
+Started GET "/medivo/labs/find_appointment?utf8=%E2%9C%93&date=11%2F19%2F2011&lab_code=21926&commit=Search+for+appointments" for 127.0.0.1 at 2011-11-16 10:46:37 -0500
+  Processing by Medivo::LabsController#find_appointment as JS
+  Parameters: {"utf8"=>"✓", "date"=>"11/19/2011", "lab_code"=>"21926", "commit"=>"Search for appointments"}
+Completed 500 Internal Server Error in 4162ms (Views: 4.6ms)
+
+
+Started GET "/medivo/labs/find_appointment?utf8=%E2%9C%93&date=11%2F19%2F2011&lab_code=21926&commit=Search+for+appointments" for 127.0.0.1 at 2011-11-16 10:49:35 -0500
+  Processing by Medivo::LabsController#find_appointment as JS
+  Parameters: {"utf8"=>"✓", "date"=>"11/19/2011", "lab_code"=>"21926", "commit"=>"Search for appointments"}
+Completed 200 OK in 2671ms (Views: 4.5ms)

data/spec/dummy/tmp/pids/server.pid

@@ -0,0 +1 @@
+14208

data/spec/models/appointment_spec.rb

@@ -13,7 +13,9 @@ describe Medivo::Appointment do
       let(:body) { {'times'=> @all_times} }
 
       def returned_times(date, am_pm, freeze_date = date)
-        Timecop.freeze(Date.parse(freeze_date))
+        freeze_date = Date.strptime(freeze_date, "%m/%d/%Y")
+        date = Date.strptime(date, "%m/%d/%Y")
+        Timecop.freeze(freeze_date)
         stub_appointment_request(lab_code, date, am_pm, body)
         value = Medivo::Appointment.find(lab_code, date, am_pm)
         Timecop.return
@@ -21,29 +23,34 @@ describe Medivo::Appointment do
       end
 
       it "filters out past date times" do
-        returned_times('2011-11-04', '').should_not include "11/03/2011|08:30 AM"
+        @all_times =   ["11/16/2011|01:00 PM"]
+        returned_times('11/19/2011', '')
+      end
+
+      it "filters out past date times" do
+        returned_times('11/04/2011', '').should_not include "11/03/2011|08:30 AM"
       end
 
       it "filters out past or pm times" do
-        returned_times('2011-11-04', 'AM').should == ["11/04/2011|08:30 AM"]
+        returned_times('11/04/2011', 'AM').should == ["11/04/2011|08:30 AM"]
       end
 
       it "filters out past or am times" do
-        returned_times('2011-11-04', 'PM').should == ["11/04/2011|08:30 PM"]
+        returned_times('11/04/2011', 'PM').should == ["11/04/2011|08:30 PM"]
       end
 
       it "filters out invalid time strings" do
         @all_times = ["11/02011|08:30 AM", "11/04/2011|11:30 AM"]
-        returned_times('2011-11-04', '').should == ["11/04/2011|11:30 AM"]
+        returned_times('11/04/2011', '').should == ["11/04/2011|11:30 AM"]
       end
 
       it "orders the time strings by date" do
-        returned_times('2011-11-04', '').should == ["11/04/2011|08:30 AM", "11/04/2011|08:30 PM"]
+        returned_times('11/04/2011', '').should == ["11/04/2011|08:30 AM", "11/04/2011|08:30 PM"]
       end
 
       it "orders the time strings by nearness to search date" do
         @all_times = ["11/06/2011|12:30 AM", "11/04/2011|08:30 PM", "11/05/2011|08:30 AM"]
-        returned_times('2011-11-06', '', "2011-11-04").should == ["11/06/2011|12:30 AM", "11/05/2011|08:30 AM", "11/04/2011|08:30 PM"]
+        returned_times('11/06/2011', '', "11/04/2011").should == ["11/06/2011|12:30 AM", "11/05/2011|08:30 AM", "11/04/2011|08:30 PM"]
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: medivo
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.19
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152297540 !ruby/object:Gem::Requirement
+  requirement: &2165120660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152297540
+  version_requirements: *2165120660
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2152297120 !ruby/object:Gem::Requirement
+  requirement: &2165116880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152297120
+  version_requirements: *2165116880
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2152296660 !ruby/object:Gem::Requirement
+  requirement: &2165116420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152296660
+  version_requirements: *2165116420
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &2152296240 !ruby/object:Gem::Requirement
+  requirement: &2165115960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152296240
+  version_requirements: *2165115960
 - !ruby/object:Gem::Dependency
   name: geocoder
-  requirement: &2152295820 !ruby/object:Gem::Requirement
+  requirement: &2165115540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152295820
+  version_requirements: *2165115540
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2152295400 !ruby/object:Gem::Requirement
+  requirement: &2165115100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152295400
+  version_requirements: *2165115100
 - !ruby/object:Gem::Dependency
   name: pdfkit
-  requirement: &2152294980 !ruby/object:Gem::Requirement
+  requirement: &2165114680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152294980
+  version_requirements: *2165114680
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &2152294560 !ruby/object:Gem::Requirement
+  requirement: &2165114260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152294560
+  version_requirements: *2165114260
 description: Use the medivo platform to find lab locations, make labcorp appointments,
   place lab orders
 email:
@@ -269,6 +269,7 @@ files:
 - spec/dummy/tmp/cache/assets/E32/FC0/sprockets%2Fe55fb2eef11567fe04fdaf7e73af5ba4
 - spec/dummy/tmp/cache/assets/E59/D50/sprockets%2Fbe1cc4d9b0efb617e58baa16dd1dee58
 - spec/dummy/tmp/image_path_fb5f3a59200b_1320622886.pdf
+- spec/dummy/tmp/pids/server.pid
 - spec/fixtures/hl7/lc_hga1c_abnormal.hl7
 - spec/fixtures/hl7/lc_hga1c_normal.hl7
 - spec/fixtures/images/southeast.jpg
@@ -311,7 +312,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -280239849762613463
+      hash: 1009107623208251976
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -320,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -280239849762613463
+      hash: 1009107623208251976
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.6.2
@@ -428,6 +429,7 @@ test_files:
 - spec/dummy/tmp/cache/assets/E32/FC0/sprockets%2Fe55fb2eef11567fe04fdaf7e73af5ba4
 - spec/dummy/tmp/cache/assets/E59/D50/sprockets%2Fbe1cc4d9b0efb617e58baa16dd1dee58
 - spec/dummy/tmp/image_path_fb5f3a59200b_1320622886.pdf
+- spec/dummy/tmp/pids/server.pid
 - spec/fixtures/hl7/lc_hga1c_abnormal.hl7
 - spec/fixtures/hl7/lc_hga1c_normal.hl7
 - spec/fixtures/images/southeast.jpg