pacing 1.0.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51308fae8355d11876362b5f8079e2ce3ba4f9895cd84f3fd3f72758a8527a47
-  data.tar.gz: 86235e9e944f0250cb22d67da1483b30b793e0961539556a5b79f152a5b9ea6b
+  metadata.gz: a71bff11bdcc21f74452c5217d348302f8e3680e3c2ed9d753ba1acd156f4d4a
+  data.tar.gz: b78da81e0108e399aba1b422f56ce5509948d2708e8b6c5a011a0f82d91086fb
 SHA512:
-  metadata.gz: 3bb5310571685c41aa07daa78dfe72272498eda87a01239165692c9ced4a02bd3a4c0afb7b7748f67b6d804756b4cfbdc9d9f55b6c38171dac49eda7c2a3f818
-  data.tar.gz: 58758425a4e180e61b7c47ecac9dec3f2a9e685b37a47d46514a74951f18b5fd87839d05fc46cbef04b40da0c85e93e80853cdc31933917e413d2dc2b285716a
+  metadata.gz: 87c3abd50e088736eae74610469c86972c2ec09c0e8da94d3c7e27dd02e34d62aef25ddab2acf602d90d46e8aefd515d3b1d6102fac37dd813bcbd24ef71f507
+  data.tar.gz: 98a2d9a5b3fc8bd62630273ead673bce8a2c2ec3667dd706b3e3ab8efdbdd6db95df39501d8ac0a08170db4b40d6c66439fad08f6937a8c1b61bc97051377c7e

data/README.md

@@ -116,8 +116,29 @@ paced.calculate
     }
   ]
 =end
+
+paced.interval # Return current interval start and end dates
+
+# Below is the result you will get
+=begin
+=> [
+  {
+    discipline: 'Speech Therapy',
+    start_date: '04-01-2022',
+    reset_date: '05-01-2022'
+  },
+  {
+    discipline: 'Physical Therapy',
+    start_date: '04-01-2022',
+    reset_date: '05-01-2022'
+  }
+]
+# =>
+=end
 ```
 
+Interval `start_date` and `end_date`'s are different from start and end dates for the service. Here they define the start and end dates under evaluation in a specific interval, be it `month`, `week`, or `year`. They represent when the bounds of an interval.
+
 It is important to note that the `pace` is hugely influenced by the `summer_holidays` period and the `mode` in which it is calculated.
 
 ## Data Types

data/lib/pacing/error.rb

@@ -0,0 +1,75 @@
+require 'date'
+require 'holidays'
+
+module Pacing
+  class Error
+    attr_reader :school_plan, :date, :non_business_days, :state, :mode, :interval, :summer_holidays
+
+    def initialize(school_plan:, date:, non_business_days:, state: :us_tn, mode: :liberal, summer_holidays: [])
+      @school_plan = school_plan
+      @non_business_days = non_business_days
+      @date = date
+      @state = state
+      @mode = [:strict, :liberal].include?(mode) ? mode : :liberal
+
+      raise ArgumentError.new("You must pass in at least one school plan") if school_plan.nil?
+      raise TypeError.new("School plan must be a hash") if school_plan.class != Hash
+
+      raise ArgumentError.new('You must pass in a date') if date.nil?
+      raise TypeError.new("The date should be formatted as a string in the format mm-dd-yyyy") if date.class != String || !/(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])-(19|20)\d\d/.match?(date)
+      raise ArgumentError.new('Date must be within the interval range of the school plan') if !date_within_range
+
+      non_business_days.each do |non_business_day|
+        raise TypeError.new('"Non business days" dates should be formatted as a string in the format mm-dd-yyyy') if non_business_day.class != String || !/(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])-(19|20)\d\d/.match?(non_business_day)
+      end
+
+      school_plan[:school_plan_services].each do |school_plan_service|
+        raise TypeError.new("School plan type must be a string and cannot be nil") if school_plan_service[:school_plan_type].class != String || school_plan_service[:school_plan_type].nil?
+
+        raise ArgumentError.new("School plan services start and end dates can not be nil") if school_plan_service[:start_date].nil? || school_plan_service[:end_date].nil?
+
+        raise TypeError.new("School plan services start and end dates should be formatted as a string in the format mm-dd-yyyy") if school_plan_service[:start_date].class != String || !/(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])-(19|20)\d\d/.match?(school_plan_service[:start_date])
+
+        raise TypeError.new("School plan services start and end dates should be formatted as a string in the format mm-dd-yyyy") if school_plan_service[:end_date].class != String || !/(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])-(19|20)\d\d/.match?(school_plan_service[:end_date])
+
+        raise TypeError.new("Type of service must be a string and cannot be nil") if school_plan_service[:type_of_service].class != String || school_plan_service[:type_of_service].nil?
+
+        raise TypeError.new("Frequency must be an integer and cannot be nil") if school_plan_service[:frequency].class != Integer || school_plan_service[:frequency].nil?
+
+        raise TypeError.new("Interval must be a string and cannot be nil") if school_plan_service[:interval].class != String || school_plan_service[:interval].nil?
+
+        raise TypeError.new("Time per session in minutes must be an integer and cannot be nil") if school_plan_service[:time_per_session_in_minutes].class != Integer || school_plan_service[:time_per_session_in_minutes].nil?
+
+        raise TypeError.new("Completed visits for current interval must be an integer and cannot be nil") if school_plan_service[:completed_visits_for_current_interval].class != Integer || school_plan_service[:completed_visits_for_current_interval].nil?
+
+        raise TypeError.new("Extra sessions allowable must be an integer and cannot be nil") if school_plan_service[:extra_sessions_allowable].class != Integer || school_plan_service[:extra_sessions_allowable].nil?
+
+        raise TypeError.new("Interval for extra sessions allowable must be a string and cannot be nil") if school_plan_service[:interval_for_extra_sessions_allowable].class != String || school_plan_service[:interval_for_extra_sessions_allowable].nil?
+      end
+    end
+
+    def date_within_range
+      valid_range_or_exceptions = false
+
+      begin
+        @school_plan[:school_plan_services].each do |school_plan_service|
+          if (parse_date(school_plan_service[:start_date]) < parse_date(@date) && parse_date(@date) < parse_date(school_plan_service[:end_date]))
+            valid_range_or_exceptions = true
+          end
+        end
+      rescue => exception
+        valid_range_or_exceptions = true
+      end
+
+      valid_range_or_exceptions
+    end
+
+    def parse_date(date)
+      begin
+        Date.strptime(date, '%m-%d-%Y')
+      rescue => exception
+      end
+    end
+  end
+end
+

data/lib/pacing/normalizer.rb

@@ -0,0 +1,210 @@
+require 'date'
+require 'holidays'
+
+module Pacing
+  class Normalizer
+
+    attr_accessor :services, :date
+
+    def initialize(services, date)
+      @date = date
+      @services = active_services(services)
+    end
+
+    def normalize
+      { school_plan_services: disciplines_cleaner([speech_discipline, occupational_discipline, physical_discipline, feeding_discipline]) }
+    end
+
+    def speech_discipline
+      discipline = {
+        :school_plan_type => 'IEP',
+        :start_date => "01-01-2100", # some arbitrary start date
+        :end_date => "01-01-2000", # some arbitrary end date
+        :type_of_service => 'Speech Therapy',
+        :frequency => 0,
+        :interval => '',
+        :time_per_session_in_minutes => 0,
+        :completed_visits_for_current_interval => 0,
+        :extra_sessions_allowable => 0,
+        :interval_for_extra_sessions_allowable => ''
+      }
+
+      discipline_services = services.filter do |service|
+        ["pragmatic language", "speech and language", "language", "speech", "language therapy", "speech therapy", "speech and language therapy", "speech language therapy"].include?(service[:type_of_service].downcase)
+      end
+      
+      return {} if discipline_services.empty?
+
+      discipline_services = normalize_to_monthly_frequency(discipline_services)
+
+      discipline_data(discipline_services, discipline)
+    end
+
+    def occupational_discipline
+      discipline = {
+        :school_plan_type => 'IEP',
+        :start_date => "01-01-2100", # some arbitrary start date
+        :end_date => "01-01-2000", # some arbitrary end date
+        :type_of_service => 'Occupational Therapy',
+        :frequency => 0,
+        :interval => '',
+        :time_per_session_in_minutes => 0,
+        :completed_visits_for_current_interval => 0,
+        :extra_sessions_allowable => 0,
+        :interval_for_extra_sessions_allowable => ''
+      }
+
+      discipline_services = services.filter do |service|
+        ["occupation therapy", "occupational therapy", "occupation"].include?(service[:type_of_service].downcase)
+      end
+      
+      return {} if discipline_services.empty?
+
+      discipline_services = normalize_to_monthly_frequency(discipline_services)
+
+      discipline_data(discipline_services, discipline)
+    end
+
+    def physical_discipline
+      discipline = {
+        :school_plan_type => 'IEP',
+        :start_date => "01-01-2100", # some arbitrary start date
+        :end_date => "01-01-2000", # some arbitrary end date
+        :type_of_service => 'Physical Therapy',
+        :frequency => 0,
+        :interval => '',
+        :time_per_session_in_minutes => 0,
+        :completed_visits_for_current_interval => 0,
+        :extra_sessions_allowable => 0,
+        :interval_for_extra_sessions_allowable => ''
+      }
+
+      discipline_services = services.filter do |service|
+        ["physical therapy", "physical"].include?(service[:type_of_service].downcase)
+      end
+      
+      return {} if discipline_services.empty?
+
+      discipline_services = normalize_to_monthly_frequency(discipline_services)
+
+      discipline_data(discipline_services, discipline)
+    end
+
+    def feeding_discipline
+      discipline = {
+        :school_plan_type => 'IEP',
+        :start_date => "01-01-2100", # some arbitrary start date
+        :end_date => "01-01-2000", # some arbitrary end date
+        :type_of_service => 'Feeding Therapy',
+        :frequency => 0,
+        :interval => '',
+        :time_per_session_in_minutes => 0,
+        :completed_visits_for_current_interval => 0,
+        :extra_sessions_allowable => 0,
+        :interval_for_extra_sessions_allowable => ''
+      }
+
+      discipline_services = services.filter do |service|
+        ["feeding therapy", "feeding"].include?(service[:type_of_service].downcase)
+      end
+      
+      return {} if discipline_services.empty?
+
+      discipline_services = normalize_to_monthly_frequency(discipline_services)
+
+      discipline_data(discipline_services, discipline)
+    end
+
+    def discipline_data(services, discipline)
+      services.each do |service|
+        discipline[:start_date] = parse_date(service[:start_date]) < parse_date(discipline[:start_date]) ? service[:start_date] : discipline[:start_date]
+
+        discipline[:end_date] = parse_date(service[:end_date]) > parse_date(discipline[:end_date]) ? service[:end_date] : discipline[:end_date]
+
+        discipline[:frequency] += service[:frequency].to_i
+
+        discipline[:completed_visits_for_current_interval] = service[:completed_visits_for_current_interval] if service[:completed_visits_for_current_interval] > discipline[:completed_visits_for_current_interval]
+
+        discipline[:time_per_session_in_minutes] = service[:time_per_session_in_minutes] > discipline[:time_per_session_in_minutes] ? service[:time_per_session_in_minutes] : discipline[:time_per_session_in_minutes]
+
+        discipline[:interval] = service[:interval]
+
+        discipline[:extra_sessions_allowable] += service[:extra_sessions_allowable].to_i
+
+        discipline[:interval_for_extra_sessions_allowable] = service[:interval_for_extra_sessions_allowable]
+      end
+
+      discipline
+    end
+
+    def same_interval(services)
+      interval = services[0].nil? ? "" : services[0][:interval]
+      same = true
+
+      services.each do |service|
+        if interval != service[:interval]
+          # puts "this happened for real? interval #{interval} and service interval #{service[:interval]} #{services}"
+          same = false
+        end
+      end
+
+      same
+    end
+
+    def normalize_to_monthly_frequency(services)
+      # average business days for each interval
+      interval_average_days = {
+        "weekly" => 5,
+        "monthly" => 22,
+        "yearly" => 210 # take away average holidays period with is 2.5 months
+      }
+
+      return services if same_interval(services)
+
+      services.map do |service|
+        if !(service[:interval] == "monthly")
+          # weekly(5 days) = frequency # weekly
+          # monthly(20 days) = frequency * monthly 
+          # yearly(200 days)
+
+          f = service[:frequency]
+
+          service[:frequency] = ((service[:frequency] * interval_average_days["monthly"].to_f) / interval_average_days[service[:interval]]).round
+
+          service[:interval] = "monthly"
+        end
+
+        service
+      end
+
+      services
+    end
+
+    def parse_date(date)
+      begin
+        Date.strptime(date, '%m-%d-%Y')
+      rescue => exception
+      end
+    end
+
+    def disciplines_cleaner(disciplines)
+      # use the fake arbitrary reset date to remove unrequired disciplines
+      disciplines.filter { |discipline| !discipline.empty? }
+    end
+
+    def active_services(services)
+      services.filter do |school_plan_service|
+        within = true
+        begin
+          if !(parse_date(school_plan_service[:start_date]) <= parse_date(date) && parse_date(date) <= parse_date(school_plan_service[:end_date]))
+            within = false
+          end
+        rescue => exception
+        end
+
+        within
+      end
+    end
+  end
+end
+

data/lib/pacing/pacer.rb

@@ -2,7 +2,6 @@ require 'date'
 require 'holidays'
 
 module Pacing
-  # two modes(strict: use start dates strictly in calculating pacing)
   class Pacer
     COMMON_YEAR_DAYS_IN_MONTH = [nil, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
     attr_reader :school_plan, :date, :non_business_days, :state, :mode, :interval, :summer_holidays
@@ -14,47 +13,45 @@ module Pacing
       @state = state
       @mode = [:strict, :liberal].include?(mode) ? mode : :liberal
 
-      raise ArgumentError.new("You must pass in at least one school plan") if @school_plan.nil?
-      raise TypeError.new("School plan must be a hash") if @school_plan.class != Hash
+      Pacing::Error.new(school_plan: school_plan, date: date, non_business_days: non_business_days, state: state, mode: mode, summer_holidays: summer_holidays)
 
-      raise ArgumentError.new('You must pass in a date') if @date.nil?
-      raise TypeError.new("The date should be formatted as a string in the format mm-dd-yyyy") if @date.class != String || !/(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])-(19|20)\d\d/.match?(@date)
-      raise ArgumentError.new('Date must be within the interval range of the school plan') if !date_within_range
-
-      @non_business_days.each do |non_business_day|
-        raise TypeError.new('"Non business days" dates should be formatted as a string in the format mm-dd-yyyy') if non_business_day.class != String || !/(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])-(19|20)\d\d/.match?(non_business_day)
-      end
-
-      @school_plan[:school_plan_services].each do |school_plan_service|
-        raise TypeError.new("School plan type must be a string and cannot be nil") if school_plan_service[:school_plan_type].class != String || school_plan_service[:school_plan_type].nil?
-
-        raise ArgumentError.new("School plan services start and end dates can not be nil") if school_plan_service[:start_date].nil? || school_plan_service[:end_date].nil?
-
-        raise TypeError.new("School plan services start and end dates should be formatted as a string in the format mm-dd-yyyy") if school_plan_service[:start_date].class != String || !/(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])-(19|20)\d\d/.match?(school_plan_service[:start_date])
-
-        raise TypeError.new("School plan services start and end dates should be formatted as a string in the format mm-dd-yyyy") if school_plan_service[:end_date].class != String || !/(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])-(19|20)\d\d/.match?(school_plan_service[:end_date])
-
-        raise TypeError.new("Type of service must be a string and cannot be nil") if school_plan_service[:type_of_service].class != String || school_plan_service[:type_of_service].nil?
-
-        raise TypeError.new("Frequency must be an integer and cannot be nil") if school_plan_service[:frequency].class != Integer || school_plan_service[:frequency].nil?
-
-        raise TypeError.new("Interval must be a string and cannot be nil") if school_plan_service[:interval].class != String || school_plan_service[:interval].nil?
+      @summer_holidays = summer_holidays.empty? ? parse_summer_holiday_dates : [parse_date(summer_holidays[0]), parse_date(summer_holidays[1])]
+    end
 
-        raise TypeError.new("Time per session in minutes must be an integer and cannot be nil") if school_plan_service[:time_per_session_in_minutes].class != Integer || school_plan_service[:time_per_session_in_minutes].nil?
+    def interval
+      # filter out services that haven't started or whose time is passed
+      services = @school_plan[:school_plan_services].filter do |school_plan_service|
+        within = true
+        if !(parse_date(school_plan_service[:start_date]) <= parse_date(@date) && parse_date(@date) <= parse_date(school_plan_service[:end_date]))
+          within = false
+        end
 
-        raise TypeError.new("Completed visits for current interval must be an integer and cannot be nil") if school_plan_service[:completed_visits_for_current_interval].class != Integer || school_plan_service[:completed_visits_for_current_interval].nil?
+        within
+      end
 
-        raise TypeError.new("Extra sessions allowable must be an integer and cannot be nil") if school_plan_service[:extra_sessions_allowable].class != Integer || school_plan_service[:extra_sessions_allowable].nil?
+      services = services.map do |service|
+        if ["pragmatic language", "speech and language", "language", "speech", "language therapy", "speech therapy", "speech and language therapy", "speech language therapy"].include?(service[:type_of_service].downcase)
+          discipline_name = "Speech Therapy"
+        elsif ["occupation therapy", "occupational therapy"].include?(service[:type_of_service].downcase)
+          discipline_name = "Occupational Therapy"
+        elsif ["physical therapy"].include?(service[:type_of_service].downcase)
+          discipline_name = "Physical Therapy"
+        elsif ["feeding therapy"].include?(service[:type_of_service].downcase)
+          discipline_name = "Feeding Therapy"
+        end
 
-        raise TypeError.new("Interval for extra sessions allowable must be a string and cannot be nil") if school_plan_service[:interval_for_extra_sessions_allowable].class != String || school_plan_service[:interval_for_extra_sessions_allowable].nil?
+        discipline = {}
+        discipline[:discipline] = discipline_name
+        discipline[:reset_date] = reset_date(start_date: service[:start_date], interval: service[:interval])
+        discipline[:start_date] = start_of_treatment_date(parse_date(service[:start_date]), service[:interval]).strftime("%m-%d-%Y")
+        discipline
       end
-
-      @summer_holidays = summer_holidays.empty? ? parse_summer_holiday_dates : [parse_date(summer_holidays[0]), parse_date(summer_holidays[1])]
     end
 
     def calculate
       # filter out services that haven't started or whose time is passed
-      services = @school_plan[:school_plan_services].filter do |school_plan_service|
+      school_plan_services = Pacing::Normalizer.new(@school_plan[:school_plan_services], @date).normalize
+      services = school_plan_services[:school_plan_services].filter do |school_plan_service|
         within = true
         if !(parse_date(school_plan_service[:start_date]) <= parse_date(@date) && parse_date(@date) <= parse_date(school_plan_service[:end_date]))
           within = false
@@ -84,12 +81,17 @@ module Pacing
 
         discipline[:expected_visits_at_date] = expected
 
-        discipline[:type_of_service] = service[:type_of_service]
+        discipline[:discipline] = service[:type_of_service]
+
+        discipline[:pace_indicator] = pace_indicator(discipline[:pace])
+        discipline[:pace_suggestion] = readable_suggestion(rate: discipline[:suggested_rate])
+
+        discipline.delete(:suggested_rate)
 
         discipline
       end
 
-      disciplines_cleaner ([speech_discipline(services), occupational_discipline(services), physical_discipline(services), feeding_discipline(services)])
+      services
     end
 
     # get a spreadout of visit dates over an interval by using simple proportion.
@@ -215,6 +217,7 @@ module Pacing
 
     # get actual date of the first day of the week where date falls
     def week_start(date, offset_from_sunday=0)
+      offset_from_sunday = @mode == :liberal ? 1 : 0
       return date if date.monday?
       date - ((date.wday - offset_from_sunday) % 7)
     end
@@ -226,7 +229,9 @@ module Pacing
 
     # reset date for the monthly interval
     def reset_date_monthly(start_date, interval)
-      (start_of_treatment_date(parse_date(start_date), interval) + COMMON_YEAR_DAYS_IN_MONTH[(parse_date(@date)).month]).strftime("%m-%d-%Y")
+      month = (parse_date(@date)).month
+
+      (start_of_treatment_date(parse_date(start_date), interval) + COMMON_YEAR_DAYS_IN_MONTH[month]).strftime("%m-%d-%Y")
     end
 
     # reset date for the weekly interval
@@ -245,7 +250,7 @@ module Pacing
       # start_date
     end
 
-    # start of treatment for the montly interval
+    # start of treatment for the monthly interval
     def start_of_treatment_date_monthly(start_date)
       if @mode == :strict
         return parse_date("#{parse_date(@date).month}-#{start_date.day}-#{parse_date(@date).year}")
@@ -260,12 +265,14 @@ module Pacing
 
     # start of treatment for the weekly interval
     def start_of_treatment_date_weekly(start_date)
+      # TODO: Update with assumption that Monday is start of week
+      # Future TODO: allow user to pass in configuration for start of week
       parsed_date = parse_date(@date)
       week_start_date = week_start(parsed_date)
       weekly_date = week_start_date
 
       if week_start_date != parsed_date && @mode == :strict
-        weekly_date = week_start_date + start_date.wday #unless start_date.wday == 1
+        weekly_date = week_start_date + start_date.wday # unless start_date.wday == 1
         weekly_date = parsed_date < weekly_date ? weekly_date - 7 : weekly_date
       end
 
@@ -288,112 +295,6 @@ module Pacing
       valid_range_or_exceptions
     end
 
-    def speech_discipline(services)
-      discipline = {
-        :discipline => "Speech Therapy",
-        :remaining_visits => 0,
-        :used_visits => 0,
-        :pace => 0,
-        :pace_indicator => "🐢",
-        :pace_suggestion => "once a day",
-        :suggested_rate => 0,
-        :expected_visits_at_date => 0,
-        :reset_date => nil } # some arbitrarity date in the past
-
-      discipline_services = services.filter do |service|
-        ["pragmatic language", "speech and language", "language", "speech", "language therapy", "speech therapy", "speech and language therapy", "speech language therapy"].include?(service[:type_of_service].downcase)
-      end
-
-      return {} if discipline_services.empty?
-
-      discipline_data(discipline_services, discipline)
-    end
-
-    def occupational_discipline(services)
-      discipline = {
-        :discipline=>"Occupational Therapy",
-        :remaining_visits=>0,
-        :used_visits=>0,
-        :pace=>0,
-        :pace_indicator=>"🐢",
-        :pace_suggestion=>"once a day",
-        :suggested_rate => 0,
-        :expected_visits_at_date=>0,
-        :reset_date=> nil } # some arbitrarity date in the past
-
-      discipline_services = services.filter do |service|
-        ["occupation therapy", "occupational therapy"].include?(service[:type_of_service].downcase)
-      end
-
-      return {} if discipline_services.empty?
-
-      discipline_data(discipline_services, discipline)
-    end
-
-    def physical_discipline(services)
-      discipline = {
-        :discipline=>"Physical Therapy",
-        :remaining_visits=>0,
-        :used_visits=>0,
-        :pace=>0,
-        :pace_indicator=>"🐢",
-        :pace_suggestion=>"once a day",
-        :suggested_rate => 0,
-        :expected_visits_at_date=>0,
-        :reset_date=> nil } # some arbitrarity date in the past
-
-      discipline_services = services.filter do |service|
-        ["physical therapy"].include?(service[:type_of_service].downcase)
-      end
-
-      return {} if discipline_services.empty?
-
-      discipline_data(discipline_services, discipline)
-    end
-
-    def feeding_discipline(services)
-      discipline = {
-        :discipline=>"Feeding Therapy",
-        :remaining_visits=>0,
-        :used_visits=>0,
-        :pace=>0,
-        :pace_indicator=>"🐢",
-        :pace_suggestion=>"once a day",
-        :suggested_rate => 0,
-        :expected_visits_at_date=>0,
-        :reset_date=> nil } # some arbitrarity date in the past
-
-      discipline_services = services.filter do |service|
-        ["Feeding Therapy"].include? service[:type_of_service]
-      end
-
-      return {} if discipline_services.empty?
-
-      discipline_data(discipline_services, discipline)
-    end
-
-    def discipline_data(services, discipline)
-      services.each do |service|
-        discipline[:pace] = discipline[:pace] ? discipline[:pace].to_i + service[:pace].to_i : service[:pace]
-
-        discipline[:remaining_visits] = discipline[:remaining_visits] ? discipline[:remaining_visits].to_i + service[:remaining_visits].to_i : service[:remaining_visits]
-
-        discipline[:used_visits] = discipline[:used_visits] ? discipline[:used_visits].to_i + service[:used_visits].to_i : service[:used_visits]
-
-        discipline[:expected_visits_at_date] = discipline[:expected_visits_at_date] ? discipline[:expected_visits_at_date].to_i + service[:expected_visits_at_date].to_i : service[:expected_visits_at_date]
-
-        discipline[:suggested_rate] = discipline[:suggested_rate] ? discipline[:suggested_rate].to_f + service[:suggested_rate].to_f : service[:suggested_rate].to_f
-
-        discipline[:reset_date] = (!discipline[:reset_date].nil? && parse_date(service[:reset_date]) < parse_date(discipline[:reset_date])) ? discipline[:reset_date] : service[:reset_date]
-      end
-
-      discipline[:pace_indicator] = pace_indicator(discipline[:pace])
-      discipline[:pace_suggestion] = readable_suggestion(rate: discipline[:suggested_rate])
-
-      discipline.delete(:suggested_rate)
-      discipline
-    end
-
     def readable_suggestion(rate:)
       # rate = suggested_rate(remaining_visits: remaining_visits, start_date: start_date, interval: interval)
 
@@ -429,11 +330,6 @@ module Pacing
       days_left
     end
 
-    def disciplines_cleaner(disciplines)
-      # use the fake arbitrary reset date to remove unrequired disciplines
-      disciplines.filter { |discipline| !discipline.empty? }
-    end
-
     def parse_summer_holiday_dates
       holidays_start = parse_date("05-13-#{parse_date(@date).year}")
       holidays_start += 1 until holidays_start.wday == 5
@@ -442,7 +338,6 @@ module Pacing
       holidays_start += 1 until holidays_start.wday == 1
 
       [holidays_start, holidays_end]
-    end
+    end 
   end
 end
-

data/lib/pacing/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pacing
-  VERSION = "1.0.1"
+  VERSION = "2.0.0"
 end

data/lib/pacing.rb

@@ -1,2 +1,4 @@
+require "pacing/normalizer"
+require "pacing/error"
 require "pacing/pacer"
 require "pacing/version"