docfolio 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e45dbe3f14a1a7135af5c0172af46430bd17a683
-  data.tar.gz: 33c879f96cc800b3b1e7a264cb1903b08536d408
+  metadata.gz: 7b800d02e4519f49588fb902a96dbe6be8cc4225
+  data.tar.gz: d8aca2ddac0c36710c5259fbdf5ffd0265e7d0d3
 SHA512:
-  metadata.gz: eef722b2f0ed517071307ed25ded7fa97faba77242cde022ad4681dcf90a8e27d628be498c902e8b62ef50a9abcc0e8370cc4c721bf2626e1466488cd9d8d52d
-  data.tar.gz: 208e402157fc17576d3578160afce37edeca054db9a6687ad01a1a008cb6b3f931476af32e85e494c5db96c59f15ca6fd359386290c987e1fc645ade1fb04900
+  metadata.gz: 8e97db1cbbe80b2a96e1a8cecaa55b715287506b9897a4349c225d37ab29f8aba2c72fc65ea5cfe206240650a2cce53b073d5bbed319909e297dbffaecb07fbc
+  data.tar.gz: 12e28cf7aa59b8ef0a2259e7cd34831bce8e288dd1f32c0c562a4e10a22062d3bb685371f43178e8817efd0fa203eb41c87a5d51391821121bf54dcaa2d301ba

data/bin/docfolio

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require_relative '../lib/docfolio/logs.rb'
+Docfolio.create('./')

data/lib/docfolio/docfolio.rb

@@ -1,75 +1 @@
-require_relative 'learning_diary.rb'
-require_relative 'views/collater_console_view.rb'
-
-# collection class for Learning Diarys / logs
-class Logs
-  include Enumerable
-
-  # iterates through every file in the data directory and parses with
-  #  LearningDiary
-  def initialize(loading_logs = true)
-    @logs = []
-    if loading_logs
-      log_files_dir.each do |log_file_name|
-        @logs << LearningDiary.new(log_file_name)
-      end
-    end
-  end
-
-  # Adds either a file to logs or a directory to logs
-  # @param [String] file_or_directory A string containing the name of a
-  #  file or directory
-  def add(file_or_directory)
-    log_directory(file_or_directory) if File.directory?(file_or_directory)
-    log_file(file_or_directory) if File.file?(file_or_directory)
-  end
-
-  # Implements Enumerable by iterating through each learning diary
-  def each(&block)
-    @logs.each { |p| block.call(p) }
-  end
-
-  private
-
-  # Adds a file to logs
-  # @param [String] file A string containing the name of a file
-  def log_file(file)
-    @logs << LearningDiary.new(file)
-  end
-
-  # Adds a directory to logs
-  # @param [String] dir A string containing the name of a directory
-  def log_directory(dir)
-    Dir[dir + '/**/*.txt'].each { |file| log_file(file) }
-  end
-
-  # @return [Array] An array of strings. Each string is a 
-  #   relative file path for every .txt file under the data directory
-  def log_files_dir
-    Dir['./docfolio/data/**/*.txt']
-  end
-end
-
-# controller class for the diaries/logs collection
-class Docfolio
-  def initialize
-    @logs = Logs.new
-    @view = CollaterConsoleView.new
-  end
-
-  # Creates a portfolio
-  # @param [String] portfolio_file_or_directory A portfolio file or a
-  #  name of a directory containing portfolio files including files
-  #  within subdirectories.
-  def self.create(portfolio_file_or_directory)
-    logs = Logs.new(false)
-    logs.add(portfolio_file_or_directory)
-    CollaterConsoleView.new.print_logs(logs)
-    true
-  end
-
-  # print all parsed logs to the console
-  def print_logs
-    @view.print_logs(@logs)
-  end
-end
+require_relative 'logs.rb'

data/lib/docfolio/learning_diary.rb

@@ -1,4 +1,3 @@
-require_relative 'date_format.rb'
 require_relative 'paragraph.rb'
 require_relative 'views/diary_console_view.rb'
 
@@ -7,39 +6,19 @@ require_relative 'views/diary_console_view.rb'
 class LearningDiary
   include Enumerable
 
-  # Array of paragraphs representing the parsed DSL from one file
+  # Paragraphs is an array representing the parsed DSL from one file
   attr_reader :paragraphs
 
+  # The credit arrays are arrays of elements of type
+  # [start_time, end_time, duration], one for each tag in all the paragraphs
+  # that earns credit
+  attr_reader :standard_credits, :impact_credits
+
   # @param [String] file name of a text file containing text in docfolio DSL
   def initialize(file)
-    # preparation
-    # @todo extract to an initialize_vars function, as in the paragraph class
-    Paragraph.reset
-    @console_view = DiaryConsoleView.new
-
-    # Array of paragraphs representing the parsed DSL from one file
-    @paragraphs = []
-    
-    # Array of elements of type [start_time, end_time, duration], one for
-    # each tag in all the paragraphs that earns standard credit
-    # @todo this perhaps would be better as a ||= in the corresponding function
-    @standard_credits_array = []    
-
-    # Array of elements of type [start_time, end_time, duration], one for
-    # each tag in all the paragraphs that earns impact credit
-    # @todo this perhaps would be better as a ||= in the corresponding function
-    @impact_credits_array = []
-
-    # read the whole txt file in one go
-    f = File.read(file, encoding: 'UTF-8')
-
-    # iterates through each paragraph
-    f.split(/\n/).each do |p|
-      next if p == '' # ignore if paragraph empty
-      @paragraphs << Paragraph.new(p) #
-    end
-    calc_standard_credits
-    calc_impact_credits
+    initialize_vars
+    parse(file)
+    calculate_credits
   end
 
   # Implements Enuemerable module by iterating through each paragraph in the
@@ -55,24 +34,12 @@ class LearningDiary
 
   # @return [Integer] The sum of the standard credits in minutes
   def standard_credits_total
-    @standard_credits_array.reduce(0) { |a, e| a + e[2] }
-  end
-
-  # @return [Array] The array of standard credits, each element of 
-  #  type [start_time, end_time, duration]
-  def standard_credits
-    @standard_credits_array
+    standard_credits.reduce(0) { |a, e| a + e[2] }
   end
 
   # @return [Integer] The sum of the impact credits in minutes
   def impact_credits_total
-    @impact_credits_array.reduce(0) { |a, e| a + e[2] }
-  end
-
-  # @return [Array] The array of impact credits, each element of 
-  #  type [start_time, end_time, duration]
-  def impact_credits
-    @impact_credits_array
+    impact_credits.reduce(0) { |a, e| a + e[2] }
   end
 
   # @return [Integer] The sum of the impact and standard credits in minutes
@@ -80,36 +47,118 @@ class LearningDiary
     impact_credits_total + standard_credits_total
   end
 
+  def significant_event?
+    paragraphs.each { |p| return true if p.significant_event? }
+    false
+  end
+
   private
 
-  # @todo Deal with edge case where the start and end times of different 
-  # elements overlap to avoid claiming credit for the same moments in
-  # time more than once
-  # @return [Array] Array of elements of type 
-  #  [start_time, end_time, duration], one for each tag in all the paragraphs 
+  def initialize_vars
+    Paragraph.reset
+    @console_view = DiaryConsoleView.new
+    @paragraphs = []
+    @standard_credits = []
+    @impact_credits = []
+  end
+
+  def calculate_credits
+    calc_standard_credits
+    calc_impact_credits
+  end
+
+  def parse(file)
+    # read the whole txt file in one go
+    f = File.read(file, encoding: 'UTF-8')
+
+    # iterates through each paragraph, extracting tagged content and time info
+    f.split(/\n/).each do |p|
+      p.strip!
+      next if p == '' # ignore if paragraph empty
+      previous_paragraph = @paragraphs.last
+      current_paragraph = Paragraph.new(p)
+      @paragraphs << current_paragraph
+      post_process(previous_paragraph, current_paragraph)
+    end
+  end
+
+  # if the prev/current times are of the form:
+  #
+  # 19:00-nil [[:LP, "By entering information
+  # 19:00-19:35
+  #
+  # then make it...
+  #
+  # 19:00-19:35 [[:LP, "By entering information
+  # 19:35-nil
+  def move_end_time_back(previous_paragraph, current_paragraph)
+    if  previous_paragraph.end_time.nil?          &&
+        ( ! current_paragraph.end_time.nil?  ) &&
+        ( previous_paragraph.start_time == current_paragraph.start_time )
+      previous_paragraph.end_time = current_paragraph.end_time
+      current_paragraph.start_time = current_paragraph.end_time
+      current_paragraph.end_time = nil
+    end
+  end
+
+  # if the prev/current times are of the form:
+  #
+  # 19:00-nil [[:LP, "By entering information
+  # 19:35-nil
+  #
+  # then make it...
+  #
+  # 19:00-19:35 [[:LP, "By entering information
+  # 19:35-nil
+  def assume_last_end_time_from_st_time(previous_paragraph, current_paragraph)
+    if  ( previous_paragraph.end_time.nil?     )  &&
+        ( ! current_paragraph.start_time.nil?  )  &&
+        ( ! previous_paragraph.start_time.nil? )  &&
+        ( previous_paragraph.start_time < current_paragraph.start_time )
+      previous_paragraph.end_time = current_paragraph.start_time
+    end
+  end
+
+  def post_process(previous_paragraph, current_paragraph)
+    return if previous_paragraph.nil?
+    move_end_time_back(previous_paragraph, current_paragraph)
+    assume_last_end_time_from_st_time(previous_paragraph, current_paragraph)
+  end
+
+  # @param [Symbol] is_creditable Name of the function to call on the
+  #  paragraphs to assertain if the paragraph times are to be counted
+  #  towards a particular type of credit
+  # @param [Array] credits  Array of elements of type
+  #  [start_time, end_time, duration], one for each tag in all the paragraphs
   #  that earns standard credit
-  def calc_standard_credits
+  # @return [Array] Array of elements of type
+  #  [start_time, end_time, duration], one for each tag in all the paragraphs
+  #  that earns credit of type credits
+  def calc_credits(is_creditable, credits)
     @paragraphs.each do |p|
-      next unless p.creditable?
+      next unless p.public_send(is_creditable)
       start     = p.start_time
       finish    = p.end_time
-      duration  = p.period
-      @standard_credits_array << [start, finish, duration] unless duration == 0
+      duration  = p.duration
+      credits << [start, finish, duration] unless duration == 0
     end
-    @standard_credits_array.uniq!
+    credits.uniq!
+  end
+
+  # @todo Deal with edge case where the start and end times of different
+  # elements overlap to avoid claiming credit for the same moments in
+  # time more than once
+  # @return [Array] Array of elements of type
+  #  [start_time, end_time, duration], one for each tag in all the paragraphs
+  #  that earns standard credit
+  def calc_standard_credits
+    calc_credits(:creditable?, standard_credits)
   end
 
-  # @return [Array] Array of elements of type 
-  #  [start_time, end_time, duration], one for each tag in all the paragraphs 
+  # @return [Array] Array of elements of type
+  #  [start_time, end_time, duration], one for each tag in all the paragraphs
   #  that earns impact credit
   def calc_impact_credits
-    @paragraphs.each do |p|
-      next unless p.impact_creditable?
-      start     = p.start_time
-      finish    = p.end_time
-      duration  = p.period
-      @impact_credits_array << [start, finish, duration] unless duration == 0
-    end
-    @impact_credits_array.uniq!
+    calc_credits(:impact_creditable?, impact_credits)
   end
 end

data/lib/docfolio/logs.rb

@@ -0,0 +1,63 @@
+require_relative 'learning_diary.rb'
+require_relative 'views/collater_console_view.rb'
+
+# collection class for Learning Diarys / logs
+class Logs
+  include Enumerable
+
+  # iterates through every file in the data directory and parses with
+  #  LearningDiary
+  def initialize
+    @logs = []
+  end
+
+  # Adds either a file to logs or a directory to logs
+  # @param [String] file_or_directory A string containing the name of a
+  #  file or directory
+  def add(file_or_directory)
+    log_directory(file_or_directory) if File.directory?(file_or_directory)
+    log_file(file_or_directory) if File.file?(file_or_directory)
+  end
+
+  # Implements Enumerable by iterating through each learning diary
+  def each(&block)
+    @logs.each { |p| block.call(p) }
+  end
+
+  private
+
+  # Adds a file to logs
+  # @param [String] file A string containing the name of a file
+  def log_file(file)
+    @logs << LearningDiary.new(file)
+  end
+
+  # Adds a directory to logs
+  # @param [String] dir A string containing the name of a directory
+  def log_directory(dir)
+    Dir[dir + '/**/*.txt'].each { |file| log_file(file) }
+  end
+end
+
+# controller class for the diaries/logs collection
+class Docfolio
+  def initialize
+    @logs = Logs.new
+    @view = CollaterConsoleView.new
+  end
+
+  # Creates a portfolio
+  # @param [String] portfolio_file_or_directory A portfolio file or a
+  #  name of a directory containing portfolio files including files
+  #  within subdirectories.
+  def self.create(portfolio_file_or_directory)
+    logs = Logs.new
+    logs.add(portfolio_file_or_directory)
+    CollaterConsoleView.new.print_logs(logs)
+  end
+
+  # print all parsed logs to the console
+  def print_logs
+    @view.print_logs(@logs)
+  end
+end

data/lib/docfolio/paragraph.rb

@@ -1,312 +1,118 @@
-require_relative 'tags.rb'
-
-# @param [Array] time_array updated start and end times in hours and minutes
-# @param [Array] times_and_dates current start and end times and date
-# @return [Array] returns the new times_and_dates array for use going forwards
-module MyTime
-  # processes new times and dates with current times and dates
-  class TimeProcesser
-    include Tags
-    
-    # Takes class start end times and dates as Time objects and amends the
-    # times, advancing the date if the start time has crossed midnight.
-    # @param [Array] current_times_and_dates An array containing the 
-    #  Paragraph class instance variables for the start time, end time
-    #  and date (day)
-    # @param [Array] new_times An array containing the from hour, from min, 
-    #  to hour, to min
-    # @return [Array] The updated Paragraph class instance variables for the 
-    #  start time, end time and date.
-    def process_times(new_times, current_times_and_dates)
-      @start_time, @end_time, @date = current_times_and_dates
-      f_hour, f_min, t_hour, t_min = new_times
-      if (has f_hour) && to_st_tme(f_hour, f_min)
-        t_hour  = f_hour
-        t_min   = f_min
-      end
-      to_end_time(t_hour, t_min) if has t_hour
-      [@start_time, @end_time, @date]
-    end
-
-    private
-
-    # @param [Number] f_hour From hours
-    # @param [Number] f_min From minutes
-    # @return [Boolean] if has a start time and no end time return true else 
-    #  set start time and return false (the nil for the last assignment of 
-    #  start_t)
-    def to_st_tme(f_hour, f_min)
-      # treat the time as an end time if there is a start time and no end time
-      has(@start_time) && (!has @end_time) ? true : start_t(f_hour, f_min)
-    end
-
-    # Set the end time to the current paragraph date at t_hour and t_min. 
-    # If the end time is before the start time, assume the end time is for the
-    # next day and add a day.
-    # @param [Number] t_hour To hours
-    # @param [Number] t_min To minutes
-    def to_end_time(t_hour, t_min)
-      # extract_time_object simply adds hours and mins to date
-      @end_time = extract_time_object(t_hour, t_min, @date)
-      # if end_time before start_time, assume it is the following day
-      @end_time += a_day if @end_time < @start_time
-    end
-
-    # Adds hours and mins to date (Time). Then adds a day if the start time is 
-    # before the end time. Finally, makes end time nil
-    # @todo why advance the start time by a day if before the end time?
-    # @todo why make end_time nil?
-    def start_t(hour, min)
-      # extract_time_object simply adds hours and mins to date
-      @start_time = extract_time_object(hour, min, @date)
-
-      # advance start time by one day if the start time is before the end_time
-      @start_time += a_day if (has @end_time) && @start_time < @end_time
-      @end_time = nil
-    end
-
-    # Improves readability of boolean condition statements. Is used from Time 
-    # objects and integer hour component, but it works for any object
-    # @param [Object] time_date_component Any object
-    # @return [Boolean] true if the parameter is not nil
-    def has(time_date_component)
-      !time_date_component.nil?
-    end
-
-    # returns one day in seconds and adds a day to the @date
-    def a_day
-      @date.nil? ? fail('needs date') : @date += 86_400
-      86_400
-    end
-  end
-
-  # Takes class start end times and dates as Time objects and amends the
-  # times, advancing the date if the start time has crossed midnight.
-  # @param [Array] times_and_dates An array containing the Paragraph class 
-  #  instance variables for the start time, end time and date (day)
-  # @param [Array] time_array An array containing the from hour, from min, 
-  #  to hour, to min
-  def process_times(time_array, times_and_dates)
-    TimeProcesser.new.process_times(time_array, times_and_dates)
-  end
-end
+require_relative './paragraph_modules/tags.rb'
+require_relative './paragraph_modules/date_times.rb'
 
 # Used by LearningDiary
 # Initialized with plain text, will parse and hold tagged content
 # Can keep track of time, section and id information from previous paragraphs
 # using class instance variables
 class Paragraph
-  include Enumerable
-  include MyTime
-
-  private
+  include TaggedContent
+  include DateTimes
 
-  include Tags
+  attr_reader :id
 
-  public
-
-  attr_reader :id, :tags
-
-  # instance start time and instance end time
+  # instance start time and instance end time.
   attr_accessor :start_time, :end_time
 
-  # initialize class date, start and class end time class instance variables
-  @cst = @cet = @date = nil
-
-
-  # initialize the section class instance variable. The section is an integer
-  # that is an index to the array of tags called SECTIONS declared in the
-  # module Tags
-  @section = 0 # :TITLE
-
-  @id = 0 
-
-  # Declaration of class instance variables
-  class << self
-    # class starttime and class end time, date, section 
-    # @todo find out what id is and does!
-    attr_accessor :st, :et, :date, :section, :id
-  end
-
-  # @param [String] p a single paragraph from a text file. 
-  def initialize(p)
-    # preparation
-    initialize_vars
-
-    # Extract the date and time from a paragraph if it contains date and time 
-    # info. Removes the date and time from the paragraph puts whats left into 
-    # rest_of_str. Puts the to hour, to min, from hour and from min into the 
-    # time array. Puts the date into Paragraph.date as a Time object.
-    #
-    # Paragraph.date is a class instance variable that holds the date to apply
-    # to this and subsequent paragraphs. It is initialized to nil when the 
-    # program starts and reset to nil when reset is called (which it is called 
-    # by the LearningDiary when initializing to parse a new file, called by
-    # the Collater when iterating through each text file)
-    #
-    # The extract_date function is from the Tag module
-    rest_of_str, time_array, Paragraph.date = extract_date(p, Paragraph.date)
-
-    # if a date or time has been found (and extracted)
-    if rest_of_str != p
-      # transer class start and end times to those of this paragraph, reset 
-      # section to :NOTE
-      note_time
-
-      # Takes the current class instance times and dates and newly extracted 
-      # paragraph dates from this paragraph, follows a set of rules to 
-      # determine what the class instant times and dates should become
-      assign_class_dates process_times(time_array, class_dates)
-      
-      # tranfser class start and end times to those of this paragraph, reset 
-      # section to :NOTE
-      note_time
-    end
+  # @param [String] raw_paragraph_string a single paragraph from a text file.
+  def initialize(raw_paragraph_string)
+    @tag_extractor = TagExtractor.new
 
-    # if a new date or time has not been found then return
-    # @todo should this be in an else statement? 
-    return if rest_of_str == ''
+    extract_content(extract_time(raw_paragraph_string))
 
-    tags_extracted?(rest_of_str) ? note_time : tag_section(rest_of_str)
-  end
-
-  # returns true if any tags are of type tag
-  # @param [Array] tag An array of tags
-  def tag?(tag)
-    @tags.each { |t| return true if t[0] == tag }
-    false
+    @start_time = TimeProcesser.st
+    @end_time = TimeProcesser.et
+    @id = Paragraph.id
+    Paragraph.id += 1
   end
 
   # resets the class variables so that a new file can be parsed
   # is called by LearningDiary when preparing to parse a new txt file
   def self.reset
-    Paragraph.date = Paragraph.st = Paragraph.et = nil
-    Paragraph.section = Paragraph.id = 0 # :TITLE
-  end
-
-  # @todo should this be private?
-  # Initialize the paragraph variables. 
-  def initialize_vars
-    @date_specified = @end_time_specified = @start_time_specified = false
-    @start_time = @end_time = nil
-
-    # Array of tagged content. e.g.
-    # @tags
-    # => [:TITLE, 'My Title']
-    #  @tags
-    # => [:INTRO, 'My introduction.']
-    # @tags
-    # => [:LP, 'Something I have learnt']
-    @tags = []
-
-    # Give the instance instance an id number that is kept track of by a
-    # class instance id, then increment the class instance id
-    @id = Paragraph.id
-    Paragraph.id += 1
+    TagExtractor.reset
+    TimeProcesser.reset
+    Paragraph.id = 0
   end
 
-  # Iterates through the instance tags
-  # @todo Find out if this is the tags for the paragraph or the whole 
-  #  document. Common sense says just the paragraph as this is just an 
-  #  instance instance variable
+  # Iterates through the tags of this paragraph
   def each(&block)
-    @tags.each { |t| block.call(t) }
+    tags.each { |t| block.call(t) }
   end
 
   # Implements [] for paragraph
-  # @return [Array] an element of the tags array, itself an element 
+  # @return [Array] an element of the tags array, itself an element
   #  of type [:tag, 'content']
   def [](index)
     tags[index]
   end
 
-  # true is the paragraph contains a tag that can earn credit
+  # true if the paragraph contains a tag that can earn credit
   def creditable?
-    @tags.each { |t| return true if CREDITABLE.include?(t[0]) }
-    false
+    @tag_extractor.creditable?
   end
 
   # true if the paragraph contains a tag that can earn impact credit
   def impact_creditable?
-    @tags.each { |t| return true if t[0] == :I }
-    false
+    @tag_extractor.impact_creditable?
+  end
+
+  def tag?(tag)
+    @tag_extractor.tag?(tag)
   end
 
+  def significant_event?
+    @tag_extractor.significant_event?
+  end
+
+  # public
   # @return [Integer] the interval in minutes between start and end times
-  def period
+  def duration
     return 0 if @end_time.nil? || @start_time.nil?
     (@end_time - @start_time).to_i / 60
   end
 
-  # @return end time if exists or failing that the start time if exists 
-  #  or failing that nil
-  def latest_time
-    return @end_time unless @end_time.nil?
-    return @start_time unless @start_time.nil?
-    nil
-  end
-
   private
 
-  # Indexes for the elements of a tabbed array. Elements are of 
-  # type [:tag, 'content']
-  TAG = 0
+  # TimeProcesser.date is a class instance variable that holds the date to
+  # apply to this and subsequent paragraphs. It is initialized to nil when the
+  # program starts and reset to nil when reset is called (which it is called
+  # by the LearningDiary when initializing to parse a new file, called by
+  # the Collater when iterating through each text file)
+  def extract_time(p)
+    # The extract_date function is from the DateExtractor class in the
+    # date module
+    array = DateExtractor.new.extract_date(p, TimeProcesser.date)
+    rest_of_str, time_array, TimeProcesser.date = array
 
-  # Content index number
-  CONTENT = 1
+    # Takes the current class instance times and dates and any newly extracted
+    # paragraph dates from this paragraph, follows a set of rules to
+    # determine what the class instant times and dates should become
+    TimeProcesser.new.process_times(time_array)
 
-  # Setter for the class instance variables for the start time, end time
-  # and date
-  def assign_class_dates(array)
-    Paragraph.st, Paragraph.et, Paragraph.date = array
+    rest_of_str
   end
 
-  # @return [Array] An array containing the class instant variables for the 
-  #  start time, end time and the date. 
-  def class_dates
-    [Paragraph.st, Paragraph.et, Paragraph.date]
+  def extract_content(rest_of_str)
+    @tag_extractor.extract_content(rest_of_str)
   end
 
-  # @todo split/rename the actions of this function
-  # Extracts all the tag for the paragraph
-  # @param [String] str Paragraph from which tags are to be extracted
-  # @return [Boolean] True if any tags have been extracted
-  def tags_extracted?(str)
-    (@tags.count) < (@tags += extract_tags(str)).count
+  def content(tag, str = '')
+    @tag_extractor.content(tag, str = '')
   end
 
-  # Add a single tagged content element of type 
-  # [:symbol (tag), String (content)] to the @tags instance instance variable
-  # using the current value of the section class instance variable as an
-  # index to reference the correct section tag symbol from the SECTIONS array
-  # @param [String] str the content to tag
-  def tag_section(str)
-    tag_it(SECTIONS[Paragraph.section], str)
+  def tags
+    @tag_extractor.tags
   end
 
-  # Joins all content in @tags of with a tag of type tag
-  # @param [Symbol] tag The tag for which content that should be selected.
-  # @param [String] str An optional string that can be passed to the function
-  #  to which selected content will be appended. 
-  def content(tag, str = '')
-    @tags.each { |t| str << t[CONTENT] + ' ' if t[TAG] == tag }
-    str
+  def all_tags
+    TagExtractor.all_tags
   end
 
-  # Safely increments the class instance section invariable 
-  def next_section
-    Paragraph.section += 1 unless Paragraph.section == (SECTIONS.count - 1)
-  end
-
-  # Add a single tagged content element of type 
-  # [:symbol (tag), String (content)] to the @tags instance instance variable.
-  # Move the section class instance variable up one (to current :INTRO) if 
-  # it is at position 0 (currently :TITLE)
-  # @param [String] p the content to tag
-  # @param [Symbol] tag the tag to use
-  def tag_it(tag, p)
-    @tags << [tag, p]
-    next_section if Paragraph.section == 0 # :TITLE
+  # Declaration of class instance variables
+  class << self
+    # The number of paragraph instances instantiated since last reset. Used to
+    # seqentially number the instances in a learning diary
+    attr_accessor :id
   end
 
   # Acts and a getter and setter for tagged content. Adds a getter and setter
@@ -316,21 +122,7 @@ class Paragraph
   #  paragraph.intro
   # Returns all content with a tag of :INTRO
   def method_missing(n, *args, &block)
-    if args[0].nil? # tag getter
-      ALL_TAGS.include?(n) ? content(n) : super(n, *args, &block)
-    else # section setter
-      SECTIONS.include?(n) ? tag_it(n, args[0]) : super(n, *args, &block)
-    end
-  end
-
-
-  # @todo this function does two things, split it up
-  # Sets the section to a simple :NOTE and transfers the class times to the 
-  # instance times.
-  # new untagged sections should be of :NOTE (2)
-  def note_time
-    Paragraph.section = 2 #:NOTE
-    @start_time = Paragraph.st
-    @end_time = Paragraph.et
+    # tag getter
+    args[0].nil? && all_tags.include?(n) ? content(n) : super(n, *args, &block)
   end
 end