medivo 0.0.2 → 0.0.3

data/app/assets/javascripts/medivo/models.coffee

@@ -27,10 +27,11 @@ Handlebars.registerHelper("address_without_comma", (lab)->
 
 ##########  Lab model ##############
 class window.Lab
-  constructor: (@data)->
   marker: null
   map_tooltip_template: Handlebars.compile("{{titleize name}}\n{{address_without_comma address}}\n{{titleize city}},{{state}} ")
 
+  constructor: (@data)->
+
   clearMarker: ->
     if this.marker
       this.marker.setMap(null)
@@ -55,11 +56,16 @@ class window.Lab
 
 ##########  LabList model ##############
 class window.LabList
+  show_number: 3
 
-  constructor: (lab_info)->
+  constructor: (lab_info, show_number)->
     @labs = []
+    @show_number = show_number if show_number
+    console.log(@show_number)
     this.setLabs(lab_info)
 
+  getLabs: -> @labs.slice(0, @show_number)
+
   setLabs: (lab_info)->
     this.clearMarkers()
     labs = @labs = []

data/app/assets/javascripts/medivo/show_labs.coffee

@@ -4,6 +4,7 @@ $(document).ready ->
   lab_list = null
   data = $('#lab_list_container').data('labs')
   if data
+    # can limit the number of labs to show with option show_labs in LabList constructor
     lab_list = new window.LabList( data.labs )
     map_view = new window.MapView( lab_list, data.zip_location )
     lab_list_view = new window.LabListView( lab_list )

data/app/assets/javascripts/medivo/{map.coffee → views.coffee}

@@ -1,17 +1,19 @@
+###############  LabList view  ###############
 class window.LabListView
   el: null
   template: null
 
   constructor: (@lab_list)->
-    this.el = $('ul#lab_list')
+    this.el = $('#lab_list')
     this.template = Handlebars.compile($('#lab_item_template').html())
     this.render()
 
   render: ->
     view = this
     view.el.empty()
-    $.each( @lab_list.labs, (index, lab)-> view.el.append( $(view.template(lab.data)) ) )
+    $.each( @lab_list.getLabs(), (index, lab)-> view.el.append( $(view.template(lab.data)) ) )
 
+###############  Map view  ###############
 class window.MapView
   constructor: (@collection, @center_point)->
     throw "you need a collection to make a MapView" unless @collection
@@ -44,7 +46,7 @@ class window.MapView
     this.markerBounds.extend(this.center_marker.position) if this.markerBounds and this.center_marker
 
   setMarkers: (map, markerBounds) ->
-    $.each( @collection.labs, (index, model)-> model.setMarker(map, markerBounds) )
+    $.each( @collection.getLabs(), (index, model)-> model.setMarker(map, markerBounds) )
 
   clear: ->
     this.collection.clearMarkers()

data/app/models/medivo/lab.rb

@@ -17,7 +17,7 @@ module Medivo
     def self.data_for_zip(zip='')
       zip = zip.to_s.match(/(\d{5})/) ? $1 : nil
       return {} unless zip and zip_info = ZipCode.find_by_zip_code(zip)
-      labs = findLabs(zip)[0..1]
+      labs = findLabs(zip)
       {:labs => labs, :zip_location => zip_info.center_info}
     end
 

data/app/models/medivo/order.rb

@@ -21,6 +21,22 @@ module Medivo
       self.take_tests_same_day = true
     end
 
+    # overriding save to return false if it does not save without errors
+    def save
+      new? ? create : update
+      valid?
+    end
+
+    # overriding create to capture 404 status and put that in error
+    # messages instead of throwing exception
+    def create
+        super
+        @remote_errors = nil
+    rescue ActiveResource::ResourceNotFound => e
+      @remote_errors = e
+      load_remote_errors(e,true)
+    end
+
     def to_param
       requisition_id
     end
@@ -33,15 +49,6 @@ module Medivo
       find(requsition_id)
     end
 
-    #  medivo_order = create(values)
-    #  unless medivo_order.valid?
-    #    Rails.logger.error("Error creating Medivo Lab order")
-    #    Rails.logger.error(medivo_order.inspect)
-    #    raise "Errors in Medivo Lab order #{medivo_order.errors.messages}"
-    #  end
-    #  medivo_order
-    #end
-
     def results
       @results ||= Array.wrap(try(:reconciled_results).try(:result))
     end

data/lib/medivo/version.rb

@@ -1,3 +1,3 @@
 module Medivo
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/dummy/app/assets/javascripts/application.js

@@ -7,7 +7,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require medivo/handlebars
-//= require medivo/map
+//= require medivo/views
 //= require medivo/models
 //= require medivo/show_labs
 //= require_tree .

data/spec/dummy/app/views/labs/search.html.haml

@@ -2,7 +2,7 @@
 %script{:id=>"lab_item_template", :type=>"text/x-handlebars-template"}
   %li.lab_info
     .lab_image
-      %img{:src=>"{{image}}", :width=>'12px'}  
+      -#%img{:src=>"{{image}}", :width=>'12px'}  
     %div
       .lab_name
         {{lab_name}}
@@ -11,6 +11,7 @@
       .phone
         Tel: {{telephone}}
     .link
+      // create your own /labs/select via :post method
       = form_for :lab, :url=>'/select', :method=>'post' do |f|
         %input{ :type=>:hidden, :name => 'id', :value=>"{{id}}" }
         %input{ :type=>:hidden, :name => 'lab_id', :value=>"{{lab_id}}" }
@@ -26,7 +27,7 @@
 #map_canvas_container
   #map_canvas{:style => "width:500px; height:350px"}
 
-// lab list display
+// lab list display  .. using ul/li style but you can change that
 #lab_list_container{ 'data-labs'=>@lab_data.to_json }
   %ul#lab_list
 

data/spec/dummy/log/development.log

@@ -4901,3 +4901,318 @@ Served asset /medivo/arrow.png - 304 Not Modified (0ms)
 
 Started GET "/assets/medivo/lab.png" for 127.0.0.1 at 2011-10-13 23:18:49 +0200
 Served asset /medivo/lab.png - 304 Not Modified (0ms)
+
+
+Started GET "/labs/search?zip_code=90210" for 127.0.0.1 at 2011-10-14 14:50:53 +0200
+  Processing by LabsController#search as HTML
+  Parameters: {"zip_code"=>"90210"}
+  Medivo::ZipCode Load (0.5ms)  SELECT "zip_codes".* FROM "zip_codes" WHERE "zip_codes"."zip_code" = '90210' LIMIT 1
+Rendered labs/search.html.haml within layouts/application (16.3ms)
+Compiled application.css  (0ms)  (pid 59011)
+Compiled application.js  (8ms)  (pid 59011)
+Compiled jquery.js  (1ms)  (pid 59011)
+Compiled jquery_ujs.js  (0ms)  (pid 59011)
+Compiled medivo/handlebars.js  (0ms)  (pid 59011)
+Compiled medivo/views.js  (184ms)  (pid 59011)
+Compiled medivo/models.js  (175ms)  (pid 59011)
+Compiled medivo/show_labs.js  (162ms)  (pid 59011)
+Completed 200 OK in 9568ms (Views: 691.4ms | ActiveRecord: 1.0ms)
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2011-10-14 14:51:03 +0200
+Served asset /jquery.js - 304 Not Modified (12ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2011-10-14 14:51:03 +0200
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/views.js?body=1" for 127.0.0.1 at 2011-10-14 14:51:03 +0200
+Served asset /medivo/views.js - 200 OK (2ms)
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2011-10-14 14:51:03 +0200
+Served asset /jquery_ujs.js - 304 Not Modified (1ms)
+
+
+Started GET "/assets/medivo/handlebars.js?body=1" for 127.0.0.1 at 2011-10-14 14:51:03 +0200
+Served asset /medivo/handlebars.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/medivo/models.js?body=1" for 127.0.0.1 at 2011-10-14 14:51:03 +0200
+Served asset /medivo/models.js - 200 OK (2ms)
+
+
+Started GET "/assets/medivo/show_labs.js?body=1" for 127.0.0.1 at 2011-10-14 14:51:03 +0200
+Served asset /medivo/show_labs.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2011-10-14 14:51:03 +0200
+Served asset /application.js - 200 OK (0ms)
+
+
+Started GET "/labs/search?zip_code=90210" for 127.0.0.1 at 2011-10-14 14:51:03 +0200
+  Processing by LabsController#search as */*
+  Parameters: {"zip_code"=>"90210"}
+  Medivo::ZipCode Load (0.1ms)  SELECT "zip_codes".* FROM "zip_codes" WHERE "zip_codes"."zip_code" = '90210' LIMIT 1
+Rendered labs/search.html.haml within layouts/application (9.6ms)
+Completed 200 OK in 1681ms (Views: 15.7ms | ActiveRecord: 0.5ms)
+
+
+Started GET "/assets/medivo/arrow.png" for 127.0.0.1 at 2011-10-14 14:51:05 +0200
+Served asset /medivo/arrow.png - 304 Not Modified (2ms)
+
+
+Started GET "/assets/medivo/lab.png" for 127.0.0.1 at 2011-10-14 14:51:05 +0200
+Served asset /medivo/lab.png - 304 Not Modified (2ms)
+
+
+Started GET "/labs/search?zip_code=90210" for 127.0.0.1 at 2011-10-14 14:53:15 +0200
+  Processing by LabsController#search as HTML
+  Parameters: {"zip_code"=>"90210"}
+  Medivo::ZipCode Load (0.1ms)  SELECT "zip_codes".* FROM "zip_codes" WHERE "zip_codes"."zip_code" = '90210' LIMIT 1
+Rendered labs/search.html.haml within layouts/application (9.3ms)
+Completed 200 OK in 1731ms (Views: 14.1ms | ActiveRecord: 0.6ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2011-10-14 14:53:17 +0200
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2011-10-14 14:53:17 +0200
+Served asset /jquery.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2011-10-14 14:53:17 +0200
+Served asset /jquery_ujs.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/show_labs.js?body=1" for 127.0.0.1 at 2011-10-14 14:53:17 +0200
+Served asset /medivo/show_labs.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/handlebars.js?body=1" for 127.0.0.1 at 2011-10-14 14:53:17 +0200
+Served asset /medivo/handlebars.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/views.js?body=1" for 127.0.0.1 at 2011-10-14 14:53:17 +0200
+Served asset /medivo/views.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/models.js?body=1" for 127.0.0.1 at 2011-10-14 14:53:17 +0200
+Served asset /medivo/models.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2011-10-14 14:53:17 +0200
+Served asset /application.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/arrow.png" for 127.0.0.1 at 2011-10-14 14:53:17 +0200
+Served asset /medivo/arrow.png - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/lab.png" for 127.0.0.1 at 2011-10-14 14:53:17 +0200
+Served asset /medivo/lab.png - 304 Not Modified (0ms)
+
+
+Started GET "/labs/search?utf8=%E2%9C%93&zip_code=90210&commit=Search" for 127.0.0.1 at 2011-10-14 16:43:49 +0200
+  Processing by LabsController#search as HTML
+  Parameters: {"utf8"=>"✓", "zip_code"=>"90210", "commit"=>"Search"}
+  Medivo::ZipCode Load (2.3ms)  SELECT "zip_codes".* FROM "zip_codes" WHERE "zip_codes"."zip_code" = '90210' LIMIT 1
+Rendered labs/search.html.haml within layouts/application (15.9ms)
+Compiled medivo/views.js  (209ms)  (pid 59208)
+Compiled medivo/models.js  (199ms)  (pid 59208)
+Compiled application.js  (10ms)  (pid 59208)
+Completed 200 OK in 2679ms (Views: 503.3ms | ActiveRecord: 2.8ms)
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2011-10-14 16:43:53 +0200
+Served asset /jquery.js - 304 Not Modified (5ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2011-10-14 16:43:53 +0200
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/handlebars.js?body=1" for 127.0.0.1 at 2011-10-14 16:43:53 +0200
+Served asset /medivo/handlebars.js - 304 Not Modified (4ms)
+
+
+Started GET "/assets/medivo/views.js?body=1" for 127.0.0.1 at 2011-10-14 16:43:53 +0200
+Served asset /medivo/views.js - 200 OK (2ms)
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2011-10-14 16:43:53 +0200
+Served asset /jquery_ujs.js - 304 Not Modified (27ms)
+
+
+Started GET "/assets/medivo/models.js?body=1" for 127.0.0.1 at 2011-10-14 16:43:53 +0200
+Served asset /medivo/models.js - 200 OK (2ms)
+
+
+Started GET "/assets/medivo/show_labs.js?body=1" for 127.0.0.1 at 2011-10-14 16:43:53 +0200
+Served asset /medivo/show_labs.js - 304 Not Modified (2ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2011-10-14 16:43:53 +0200
+Served asset /application.js - 200 OK (0ms)
+
+
+Started GET "/assets/medivo/arrow.png" for 127.0.0.1 at 2011-10-14 16:43:53 +0200
+Served asset /medivo/arrow.png - 304 Not Modified (1ms)
+
+
+Started GET "/assets/medivo/lab.png" for 127.0.0.1 at 2011-10-14 16:43:53 +0200
+Served asset /medivo/lab.png - 304 Not Modified (2ms)
+
+
+Started GET "/labs/search?utf8=%E2%9C%93&zip_code=90210&commit=Search" for 127.0.0.1 at 2011-10-14 16:44:27 +0200
+  Processing by LabsController#search as HTML
+  Parameters: {"utf8"=>"✓", "zip_code"=>"90210", "commit"=>"Search"}
+  Medivo::ZipCode Load (0.1ms)  SELECT "zip_codes".* FROM "zip_codes" WHERE "zip_codes"."zip_code" = '90210' LIMIT 1
+Rendered labs/search.html.haml within layouts/application (3.2ms)
+Compiled medivo/show_labs.js  (161ms)  (pid 59208)
+Compiled application.js  (9ms)  (pid 59208)
+Completed 200 OK in 1826ms (Views: 194.3ms | ActiveRecord: 0.6ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2011-10-14 16:44:29 +0200
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2011-10-14 16:44:29 +0200
+Served asset /jquery.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2011-10-14 16:44:29 +0200
+Served asset /jquery_ujs.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/show_labs.js?body=1" for 127.0.0.1 at 2011-10-14 16:44:29 +0200
+Served asset /medivo/show_labs.js - 200 OK (3ms)
+
+
+Started GET "/assets/medivo/handlebars.js?body=1" for 127.0.0.1 at 2011-10-14 16:44:29 +0200
+Served asset /medivo/handlebars.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/views.js?body=1" for 127.0.0.1 at 2011-10-14 16:44:29 +0200
+Served asset /medivo/views.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/models.js?body=1" for 127.0.0.1 at 2011-10-14 16:44:29 +0200
+Served asset /medivo/models.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2011-10-14 16:44:29 +0200
+Served asset /application.js - 200 OK (0ms)
+
+
+Started GET "/assets/medivo/arrow.png" for 127.0.0.1 at 2011-10-14 16:44:29 +0200
+Served asset /medivo/arrow.png - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/lab.png" for 127.0.0.1 at 2011-10-14 16:44:29 +0200
+Served asset /medivo/lab.png - 304 Not Modified (0ms)
+
+
+Started GET "/labs/search?utf8=%E2%9C%93&zip_code=90210&commit=Search" for 127.0.0.1 at 2011-10-14 16:46:21 +0200
+  Processing by LabsController#search as HTML
+  Parameters: {"utf8"=>"✓", "zip_code"=>"90210", "commit"=>"Search"}
+  Medivo::ZipCode Load (0.1ms)  SELECT "zip_codes".* FROM "zip_codes" WHERE "zip_codes"."zip_code" = '90210' LIMIT 1
+Rendered labs/search.html.haml within layouts/application (20.0ms)
+Compiled medivo/views.js  (174ms)  (pid 59208)
+Compiled medivo/show_labs.js  (161ms)  (pid 59208)
+Compiled application.js  (10ms)  (pid 59208)
+Completed 200 OK in 2217ms (Views: 429.3ms | ActiveRecord: 0.6ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2011-10-14 16:46:23 +0200
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2011-10-14 16:46:23 +0200
+Served asset /jquery.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2011-10-14 16:46:23 +0200
+Served asset /jquery_ujs.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/handlebars.js?body=1" for 127.0.0.1 at 2011-10-14 16:46:23 +0200
+Served asset /medivo/handlebars.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/views.js?body=1" for 127.0.0.1 at 2011-10-14 16:46:23 +0200
+Served asset /medivo/views.js - 200 OK (3ms)
+
+
+Started GET "/assets/medivo/models.js?body=1" for 127.0.0.1 at 2011-10-14 16:46:23 +0200
+Served asset /medivo/models.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/show_labs.js?body=1" for 127.0.0.1 at 2011-10-14 16:46:23 +0200
+Served asset /medivo/show_labs.js - 200 OK (2ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2011-10-14 16:46:23 +0200
+Served asset /application.js - 200 OK (0ms)
+
+
+Started GET "/assets/medivo/arrow.png" for 127.0.0.1 at 2011-10-14 16:46:24 +0200
+Served asset /medivo/arrow.png - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/lab.png" for 127.0.0.1 at 2011-10-14 16:46:24 +0200
+Served asset /medivo/lab.png - 304 Not Modified (0ms)
+
+
+Started GET "/labs/search?utf8=%E2%9C%93&zip_code=90210&commit=Search" for 127.0.0.1 at 2011-10-14 16:47:57 +0200
+  Processing by LabsController#search as HTML
+  Parameters: {"utf8"=>"✓", "zip_code"=>"90210", "commit"=>"Search"}
+  Medivo::ZipCode Load (0.1ms)  SELECT "zip_codes".* FROM "zip_codes" WHERE "zip_codes"."zip_code" = '90210' LIMIT 1
+Rendered labs/search.html.haml within layouts/application (20.4ms)
+Compiled medivo/models.js  (174ms)  (pid 59208)
+Compiled medivo/show_labs.js  (162ms)  (pid 59208)
+Compiled application.js  (48ms)  (pid 59208)
+Completed 200 OK in 1995ms (Views: 429.1ms | ActiveRecord: 0.7ms)
+
+
+Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2011-10-14 16:47:59 +0200
+Served asset /application.css - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2011-10-14 16:47:59 +0200
+Served asset /jquery.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2011-10-14 16:47:59 +0200
+Served asset /jquery_ujs.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/handlebars.js?body=1" for 127.0.0.1 at 2011-10-14 16:47:59 +0200
+Served asset /medivo/handlebars.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/views.js?body=1" for 127.0.0.1 at 2011-10-14 16:47:59 +0200
+Served asset /medivo/views.js - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/models.js?body=1" for 127.0.0.1 at 2011-10-14 16:47:59 +0200
+Served asset /medivo/models.js - 200 OK (2ms)
+
+
+Started GET "/assets/medivo/show_labs.js?body=1" for 127.0.0.1 at 2011-10-14 16:47:59 +0200
+Served asset /medivo/show_labs.js - 200 OK (2ms)
+
+
+Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2011-10-14 16:47:59 +0200
+Served asset /application.js - 200 OK (0ms)
+
+
+Started GET "/assets/medivo/arrow.png" for 127.0.0.1 at 2011-10-14 16:47:59 +0200
+Served asset /medivo/arrow.png - 304 Not Modified (0ms)
+
+
+Started GET "/assets/medivo/lab.png" for 127.0.0.1 at 2011-10-14 16:47:59 +0200
+Served asset /medivo/lab.png - 304 Not Modified (0ms)

data/spec/dummy/log/test.log

@@ -938,3 +938,31 @@ Served asset /medivo/arrow.png - 200 OK (5ms)
 
 Started GET "/assets/medivo/lab.png" for 127.0.0.1 at 2011-10-13 23:44:28 +0200
 Served asset /medivo/lab.png - 200 OK (1ms)
+
+
+Started GET "/medivo/labs/data?zip_code=90210" for 127.0.0.1 at 2011-10-14 16:48:50 +0200
+  Processing by Medivo::LabsController#data as HTML
+  Parameters: {"zip_code"=>"90210"}
+Completed 200 OK in 3ms (Views: 1.0ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/labs/search?zip_code=90210" for 127.0.0.1 at 2011-10-14 16:48:51 +0200
+  Processing by LabsController#search as HTML
+  Parameters: {"zip_code"=>"90210"}
+Completed 200 OK in 112ms (Views: 111.8ms | ActiveRecord: 0.0ms)
+
+
+Started GET "/assets/application.css" for 127.0.0.1 at 2011-10-14 16:48:51 +0200
+Compiled application.css  (1ms)  (pid 59241)
+Served asset /application.css - 200 OK (9ms)
+
+
+Started GET "/assets/application.js" for 127.0.0.1 at 2011-10-14 16:48:51 +0200
+Compiled application.js  (8ms)  (pid 59241)
+Compiled jquery.js  (1ms)  (pid 59241)
+Compiled jquery_ujs.js  (0ms)  (pid 59241)
+Compiled medivo/handlebars.js  (0ms)  (pid 59241)
+Compiled medivo/views.js  (217ms)  (pid 59241)
+Compiled medivo/models.js  (181ms)  (pid 59241)
+Compiled medivo/show_labs.js  (171ms)  (pid 59241)
+Served asset /application.js - 200 OK (609ms)

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

@@ -1 +1 @@
-55740
+59208

data/spec/models/orders_spec.rb

@@ -24,7 +24,7 @@ describe Medivo::Order do
   end
 
   it "test_types should be an array" do
-    order = Medivo::Order.new({:test_types=>[1,2]})
+    order = Medivo::Order.new({:test_types=>[1, 2]})
     order.valid?
     order.errors.messages[:test_types].should == nil
   end
@@ -35,12 +35,56 @@ describe Medivo::Order do
     order.take_tests_same_day.should == true
   end
 
-  #it "incorrect test ids returning 404" do
-  #   stub_request(:post, "http://test:test@test.medivo.com/customers.xml").
-  #          to_return(:status => 404)
-  #  order = Medivo::Order.new
-  #  p order.save(:validate => false)
-  #end
+  it "save with incorrect test ids returning 404 sets an error message instead of throwing exception" do
+    stub_request(:post, "http://test:test@test.medivo.com/customers.xml").
+            to_return(:body => '<errors><error>Test type not found: 2020</error></errors>',
+                      :status => 404)
+    order = Medivo::Order.new(
+            :email => "dude@dude.com",
+            :address=> "my house",
+            :zip=> "90210",
+            :dob=> "19801201",
+            :home_phone=> "4155551212",
+            :psc=> 11,
+            :test_types=> [2020],
+            :account_number => "423",
+            :gender => "Male",
+            :dob => "19801201")
+
+    order.save.should == false
+    order.valid?.should == false
+    order.errors.messages.keys.should include :base
+    order.errors.messages[:base].should == ["Test type not found: 2020"]
+
+    # fixing the problem .. it now saves and is valid
+    stub_request(:post, "http://test:test@test.medivo.com/customers.xml").
+            to_return(:status => 200)
+
+    order.save.should == true
+    order.valid?.should == true
+  end
+
+  it "create with incorrect test ids returning 404 sets an error message instead of throwing exception" do
+    stub_request(:post, "http://test:test@test.medivo.com/customers.xml").
+            to_return(:body => '<errors><error>Test type not found: 2020</error></errors>',
+                      :status => 404)
+
+    order = Medivo::Order.create(
+            :email => "dude@dude.com",
+            :address=> "my house",
+            :zip=> "90210",
+            :dob=> "19801201",
+            :home_phone=> "4155551212",
+            :psc=> 11,
+            :test_types=> [2020],
+            :account_number => "423",
+            :gender => "Male",
+            :dob => "19801201")
+
+    order.valid?.should == false
+    order.errors.messages.keys.should include :base
+    order.errors.messages[:base].should == ["Test type not found: 2020"]
+  end
 end
 
 describe Medivo::InsuranceOrder do

data/spec/requests/labs_spec.rb

@@ -6,7 +6,7 @@ describe 'LabController' do
     WebMock.allow_net_connect!
   end
 
-  describe "#data" do
+  describe "showing lab list and map" do
 
     before do
       @zip_code = "90210"
@@ -14,7 +14,7 @@ describe 'LabController' do
       stub(Medivo::Lab).findLabs(@zip_code) { [BeverlyHillsLab1, BeverlyHillsLab2] }
     end
 
-    it "returns lab and zip data" do
+    it "/labs/data returns lab and zip data as json" do
       visit Medivo::Engine.routes.url_helpers.data_labs_path :zip_code => @zip_code
       # can't seem to get json back .. just html .. but it works in rails server just fine
       # so testing for the string will have to do for now
@@ -22,8 +22,8 @@ describe 'LabController' do
       page.body.should match /#{BeverlyHillsLab2.name}/i
     end
 
-    it "shows search results on the map", :js=>true, :driver=>:selenium_chrome do
-      visit search_labs_path(:zip_code=>@zip_code)
+    it "/labs/search shows search results on the map and list", :js=>true, :driver=>:selenium_chrome do
+      visit search_labs_path :zip_code=>@zip_code
       page.body.should match /465 N ROXBURY DR STE 715, BEVERLY HILLS, CA/i
       page.body.should match /8737 BEVERLY BLVD STE 401, LOS ANGELES, CA/i
     end

data/spec/support/blueprints.rb

@@ -52,3 +52,4 @@ BeverlyHillsLab2 = Medivo::Lab.new(
     "zip"=>"90048"
   }
 )
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: medivo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-13 00:00:00.000000000 +02:00
+date: 2011-10-14 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2165007280 !ruby/object:Gem::Requirement
+  requirement: &2156666860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165007280
+  version_requirements: *2156666860
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2165005940 !ruby/object:Gem::Requirement
+  requirement: &2156665360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165005940
+  version_requirements: *2156665360
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2165004560 !ruby/object:Gem::Requirement
+  requirement: &2156663340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165004560
+  version_requirements: *2156663340
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &2165003600 !ruby/object:Gem::Requirement
+  requirement: &2156661740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165003600
+  version_requirements: *2156661740
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2165002700 !ruby/object:Gem::Requirement
+  requirement: &2156660740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165002700
+  version_requirements: *2156660740
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2165001820 !ruby/object:Gem::Requirement
+  requirement: &2156659700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165001820
+  version_requirements: *2156659700
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2165000120 !ruby/object:Gem::Requirement
+  requirement: &2156658740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +88,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2165000120
+  version_requirements: *2156658740
 description: Use the medivo platform to make a lab order or find a lab location
 email:
 - dsudol@medivo.com
@@ -100,9 +100,9 @@ files:
 - app/assets/images/medivo/lab.png
 - app/assets/javascripts/medivo/application.js
 - app/assets/javascripts/medivo/handlebars.js
-- app/assets/javascripts/medivo/map.coffee
 - app/assets/javascripts/medivo/models.coffee
 - app/assets/javascripts/medivo/show_labs.coffee
+- app/assets/javascripts/medivo/views.coffee
 - app/assets/stylesheets/medivo/application.css
 - app/controllers/medivo/application_controller.rb
 - app/controllers/medivo/labs_controller.rb
@@ -168,12 +168,14 @@ files:
 - spec/dummy/tmp/cache/assets/CFF/8D0/sprockets%2Fc1053414055bf81a6d316dc14f12f9fd
 - spec/dummy/tmp/cache/assets/D19/310/sprockets%2F110931639fc185699ea1aaaf87dd488b
 - spec/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
+- spec/dummy/tmp/cache/assets/D45/320/sprockets%2Fc50ff379a1bdf1dd4d22249058749cf6
 - spec/dummy/tmp/cache/assets/D54/ED0/sprockets%2F71c9fa01091d432b131da3bb73faf3d4
 - spec/dummy/tmp/cache/assets/D62/380/sprockets%2F712d93afe40570cc939133bddca13bc7
 - spec/dummy/tmp/cache/assets/D84/210/sprockets%2Fabd0103ccec2b428ac62c94e4c40b384
 - spec/dummy/tmp/cache/assets/D9C/F50/sprockets%2F224e78bb9e1c414a2d518a3aaffd6f77
 - spec/dummy/tmp/cache/assets/D9D/4E0/sprockets%2Fe9dab92986b1516fca08474613ccadcb
 - spec/dummy/tmp/cache/assets/DA2/040/sprockets%2F6ab79dcced8cc9933b734e7b21c3a183
+- spec/dummy/tmp/cache/assets/DD1/FD0/sprockets%2Fa531f33dc9c5852d39d64a9eda44dacf
 - spec/dummy/tmp/cache/assets/DD2/A50/sprockets%2Fecb5dd9066b50eb678cd8c9dbb21d229
 - spec/dummy/tmp/cache/assets/DD4/2B0/sprockets%2Fef214a63f29afe7f3cbffc65af943108
 - spec/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
@@ -199,7 +201,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1983744793530917805
+      hash: -2555924488673341874
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -208,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1983744793530917805
+      hash: -2555924488673341874
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.6.2
@@ -260,12 +262,14 @@ test_files:
 - spec/dummy/tmp/cache/assets/CFF/8D0/sprockets%2Fc1053414055bf81a6d316dc14f12f9fd
 - spec/dummy/tmp/cache/assets/D19/310/sprockets%2F110931639fc185699ea1aaaf87dd488b
 - spec/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
+- spec/dummy/tmp/cache/assets/D45/320/sprockets%2Fc50ff379a1bdf1dd4d22249058749cf6
 - spec/dummy/tmp/cache/assets/D54/ED0/sprockets%2F71c9fa01091d432b131da3bb73faf3d4
 - spec/dummy/tmp/cache/assets/D62/380/sprockets%2F712d93afe40570cc939133bddca13bc7
 - spec/dummy/tmp/cache/assets/D84/210/sprockets%2Fabd0103ccec2b428ac62c94e4c40b384
 - spec/dummy/tmp/cache/assets/D9C/F50/sprockets%2F224e78bb9e1c414a2d518a3aaffd6f77
 - spec/dummy/tmp/cache/assets/D9D/4E0/sprockets%2Fe9dab92986b1516fca08474613ccadcb
 - spec/dummy/tmp/cache/assets/DA2/040/sprockets%2F6ab79dcced8cc9933b734e7b21c3a183
+- spec/dummy/tmp/cache/assets/DD1/FD0/sprockets%2Fa531f33dc9c5852d39d64a9eda44dacf
 - spec/dummy/tmp/cache/assets/DD2/A50/sprockets%2Fecb5dd9066b50eb678cd8c9dbb21d229
 - spec/dummy/tmp/cache/assets/DD4/2B0/sprockets%2Fef214a63f29afe7f3cbffc65af943108
 - spec/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af