medivo 0.2.15 → 0.2.16

data/app/models/medivo/appointment.rb

@@ -22,12 +22,12 @@ module Medivo
         if real_data?
           data = resource.get :params=>{:labcorp_id=>lab_code, :appointment_date=>date}
           # data is json encoded hash: { :times => ['time1', 'time2'] }
-          data = JSON.parse(data)
+          data = JSON.parse(data)['times']
         else
           data = build_fake_data(date)
         end
         # filter the hash before returning
-        filter_data(data, am_pm)
+        {'times'=> filter_data(data, am_pm)}
       end
 
       ##
@@ -46,8 +46,7 @@ module Medivo
         if real_data?
           data = resource.post :labcorp_id=>lab_code, :time_id=>time_id, :user=>user
           # data is json  { :confimation => ( 'real number' or nil if no appointment made ) }
-          data = JSON.parse(data)
-          data['confirmation']
+          JSON.parse(data)['confirmation']
         else
           nil
         end
@@ -70,22 +69,21 @@ module Medivo
         true unless !Rails.env.test? and @config.real_data == false
       end
 
-      def filter_data(hash, am_pm)
+      def filter_data(times, am_pm)
         now = Time.now
-        hash['times'].reject! do |time_string|
-          time = Time.strptime(time_string, LABCORP_FORMAT) rescue nil
-          !time or !time_string.match(/#{am_pm}/) or (time < now)
-        end
-        hash
+        times.collect! { |time| OpenStruct.new(time: (Time.strptime(time, LABCORP_FORMAT) rescue nil), time_str: time) }
+        times.reject! { |o| !o.time or !o.time_str.match(/#{am_pm}/) or (o.time < now) }
+        times.sort_by! {|o| o.time }
+        times.collect! { |o| o.time_str }
       end
 
       def build_fake_data(date)
         date = date.is_a?(String) ? Date.strptime(date, MDY_FORMAT) : date
-        {'times'=> [
-                build_date(date, "08:30 AM"), build_date(date, "10:30 AM"),
-                build_date((date + 1), "03:30 PM"), build_date((date+1), "01:30 PM"),
-                build_date((date + 2), "10:30 AM"), build_date((date+1), "03:00 PM"),
-        ]}
+        [
+          build_date(date, "08:30 AM"), build_date(date, "10:30 AM"),
+          build_date((date + 1), "03:30 PM"), build_date((date+1), "01:30 PM"),
+          build_date((date + 2), "10:30 AM"), build_date((date+1), "03:00 PM"),
+        ]
       end
 
       def build_date(date, time)

data/lib/medivo/version.rb

@@ -1,3 +1,3 @@
 module Medivo
-  VERSION = "0.2.15"
+  VERSION = "0.2.16"
 end

data/spec/models/appointment_spec.rb

@@ -7,7 +7,7 @@ describe Medivo::Appointment do
 
     describe "with valid data" do
       before do
-        @all_times = ["11/03/2011|08:30 AM", "11/04/2011|08:30 AM", "11/04/2011|08:30 PM"]
+        @all_times = ["11/03/2011|08:30 AM", "11/04/2011|08:30 PM", "11/04/2011|08:30 AM"]
       end
 
       let(:body) { {'times'=> @all_times} }
@@ -21,11 +21,11 @@ describe Medivo::Appointment do
       end
 
       it "returns times" do
-        returned_times('11/01/2011', '').should == @all_times
+        returned_times('11/01/2011', '').should == @all_times.sort
       end
 
       it "filters out past date times" do
-        returned_times('11/04/2011', '').should == @all_times.slice(1, 2)
+        returned_times('11/04/2011', '').should == @all_times.slice(1, 2).sort
       end
 
       it "filters out past or pm times" do
@@ -40,6 +40,10 @@ describe Medivo::Appointment do
         @all_times = ["11/02011|08:30 AM", "11/04/2011|11:30 AM"]
         returned_times('11/04/2011', '').should == ["11/04/2011|11:30 AM"]
       end
+
+      it "orders the time strings" do
+        returned_times('11/04/2011', '').should == ["11/04/2011|08:30 AM", "11/04/2011|08:30 PM"]
+      end
     end
 
     describe "with invalid request returns error message" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: medivo
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2165114340 !ruby/object:Gem::Requirement
+  requirement: &2152994980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2165114340
+  version_requirements: *2152994980
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &2165113900 !ruby/object:Gem::Requirement
+  requirement: &2152994560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165113900
+  version_requirements: *2152994560
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2165113440 !ruby/object:Gem::Requirement
+  requirement: &2152994100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165113440
+  version_requirements: *2152994100
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &2165113020 !ruby/object:Gem::Requirement
+  requirement: &2152993680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165113020
+  version_requirements: *2152993680
 - !ruby/object:Gem::Dependency
   name: geocoder
-  requirement: &2165112600 !ruby/object:Gem::Requirement
+  requirement: &2152993260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165112600
+  version_requirements: *2152993260
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2165112180 !ruby/object:Gem::Requirement
+  requirement: &2152992840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165112180
+  version_requirements: *2152992840
 - !ruby/object:Gem::Dependency
   name: pdfkit
-  requirement: &2165111740 !ruby/object:Gem::Requirement
+  requirement: &2152992420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165111740
+  version_requirements: *2152992420
 - !ruby/object:Gem::Dependency
   name: prawn
-  requirement: &2165111320 !ruby/object:Gem::Requirement
+  requirement: &2152992000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +99,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165111320
+  version_requirements: *2152992000
 description: Use the medivo platform to find lab locations, make labcorp appointments,
   place lab orders
 email:
@@ -312,7 +312,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 883431128477834155
+      hash: -273585973971509204
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -321,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 883431128477834155
+      hash: -273585973971509204
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.6.2