bbbevents 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9f0ea583b187441128084badd6a7671aca2289135b15e11dbe2ca03473f8a89
-  data.tar.gz: 79f8ade1f3d3b035c66d63578118e97c688c62015cd37c782bb50b6c5880aade
+  metadata.gz: ea120800577b78c239ae7c6b0e1007162493fdad13904dcb88e7f9fe8b2762c2
+  data.tar.gz: 61671fcd6e70a3b341aee4e07d1b1961f06aeb3149d9f55785f422cb80af5b3b
 SHA512:
-  metadata.gz: bb7bdf62e41f2d56101ef656358b33a6a98fe093d6f6abd99e842766906b93c71db103bfdbd7689a1ad4a3414ad1efdddb5fba32e45995bce556d471c681e855
-  data.tar.gz: 84e933f01582767c3e9f1626bb77671fb21ca4ad8d63b159065616aed78b7d10b744d32875c338f4d493700e9db40ce50bbbdc21c10c9bce1716be0bb203f18d
+  metadata.gz: e8d31d953e2c5b43f92467200f71ca4dbf8c68ae5e7aacfb00ee1320daa527bc9031add9ae732931ab10005437a20fa5d4d28a37339b03a05fcc3946fbfdfc1a
+  data.tar.gz: df822b1085cbe78a1e293e8081a53d7836adbc606ede9c5d62dfc2e407b997afd099505ce5bc2d763a082f628fb450fcb9e985b23b99d207f1ebf178babedc27

data/.github/workflows/ci.yml

@@ -0,0 +1,20 @@
+name: CI
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: Rake Test
+    strategy:
+      matrix:
+        ruby: ['2.7', '3.0']
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: bundler exec rake spec

data/.github/workflows/release.yml

@@ -0,0 +1,32 @@
+name: bbbevents gem release
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    if: startsWith(github.ref, 'refs/tags/')
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7.0
+
+      - name: Install dependencies
+        run: bundle install
+
+      - name: Build gem
+        run: gem build *.gemspec
+
+      - name: Push gem
+        env:
+          GEM_HOST_API_KEY: ${{secrets.RUBYGEMS_API_KEY}}
+        run: |
+          pwd
+          ls -la
+          filename=$(ls *.gem | head -n 1)
+          gem push "$filename"

data/.gitignore

@@ -6,6 +6,8 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
+Gemfile.lock
 
 # rspec failure tracking
 .rspec_status
@@ -14,4 +16,9 @@
 /spec/testing.csv
 testdata/*.xml
 
-/bbbevents-*
+/bbbevents-*
+/pec
+
+# result of the example script
+/data.csv
+/data.json

data/.ruby-version

@@ -0,0 +1 @@
+2.7.0

data/README.md

@@ -15,7 +15,7 @@ bundle install --path vendor/bundle
 Copy an `events.xml` file into `testdata/` dir.
 
 ```
-bundle exec ./example.rb spec/fixtures/files/sample-events.xml
+bundle exec ruby example.rb testdata/events.xml
 ```
 
 ## Installation
@@ -102,10 +102,10 @@ poll.published?
 # Determine when the poll started.
 poll.start
 
-# Returns an Array contain possible options.
+# Returns an Array containing possible options.
 poll.options
 
-# Returns a Hash maping user_id's to their poll votes.
+# Returns a Hash mapping user_id's to their poll votes.
 poll.votes
 ```
 

data/bbbevents.gemspec

@@ -10,9 +10,9 @@ Gem::Specification.new do |spec|
   spec.email         = ["ffdixon@blindsidenetworks.com"]
 
   spec.summary       = %q{Easily parse data from a BigBlueButton recording's events.xml.}
-  spec.description   = %q{Easily parse data from a BigBlueButton recording's events.xml.}
+  spec.description   = %q{Ruby gem for easily parse data from a BigBlueButton recording's events.xml.}
   spec.homepage      = "https://www.blindsidenetworks.com"
-  spec.license       = "LGPL 3.0"
+  spec.license       = "LGPL-3.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -21,10 +21,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", ">= 1.15"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.4"
 
   # Gem dependecies.
-  spec.add_dependency "activesupport"
+  spec.add_dependency 'activesupport', '>= 5.0.0.1', '< 8'
+  spec.add_dependency 'rexml' # Required for activesupport from_xml
+
 end

data/example.rb

@@ -33,12 +33,10 @@ recording.files
 
 # Generate a CSV file with the data.
 recording.create_csv("data.csv")
- 
+
 puts "Writing the JSON data"
 
 # Write JSON data to file.
 File.open("data.json", 'w') do |f|
   f.write(recording.to_json)
 end
-
-

data/lib/bbbevents/attendee.rb

@@ -1,13 +1,13 @@
 module BBBEvents
   class Attendee
-    attr_accessor :id, :name, :moderator, :joins, :leaves, :duration, :recent_talking_time, :engagement
+    attr_accessor :id, :ext_user_id, :name, :moderator, :joins, :leaves, :duration, :recent_talking_time, :engagement, :sessions
 
     MODERATOR_ROLE = "MODERATOR"
     VIEWER_ROLE = "VIEWER"
 
     def initialize(join_event)
       @id        = join_event["userId"]
-      @extUserId = join_event["externalUserId"]
+      @ext_user_id = join_event["externalUserId"]
       @name      = join_event["name"]
       @moderator = (join_event["role"] == MODERATOR_ROLE)
 
@@ -25,6 +25,10 @@ module BBBEvents
         poll_votes: 0,
         talk_time: 0,
       }
+
+      # A hash of join and lefts arrays for each internal user id
+      # { "w_5lmcgjboagjc" => { :joins => [], :lefts => []}}
+      @sessions = Hash.new
     end
 
     def moderator?
@@ -59,15 +63,41 @@ module BBBEvents
     end
 
     def to_h
-      hash = {}
-      instance_variables.each { |var| hash[var[1..-1]] = instance_variable_get(var) }
-      hash
+      {
+        id: @id,
+        ext_user_id: @ext_user_id,
+        name: @name,
+        moderator: @moderator,
+        joins: @joins,
+        leaves: @leaves,
+        duration: @duration,
+        recent_talking_time: @recent_talking_time > 0 ? Time.at(@recent_talking_time) : '',
+        engagement: @engagement,
+        sessions: @sessions,
+      }
+    end
+
+    def as_json
+      {
+        id: @id,
+        ext_user_id: @ext_user_id,
+        name: @name,
+        moderator: @moderator,
+        joins: @joins.map { |join| BBBEvents.format_datetime(join) },
+        leaves: @leaves.map { |leave| BBBEvents.format_datetime(leave) },
+        duration: @duration,
+        recent_talking_time: @recent_talking_time > 0 ? BBBEvents.format_datetime(Time.at(@recent_talking_time)) : '',
+        engagement: @engagement,
+        sessions: @sessions.map { |key, session| {
+            joins: session[:joins].map { |join| join.merge({ timestamp: BBBEvents.format_datetime(join[:timestamp])}) },
+            lefts: session[:lefts].map { |leave| leave.merge({ timestamp: BBBEvents.format_datetime(leave[:timestamp])}) }
+          }
+        }
+      }
     end
 
     def to_json
-      hash = {}
-      instance_variables.each { |var| hash[var[1..-1]] = instance_variable_get(var) }
-      hash.to_json
+      JSON.generate(as_json)
     end
 
     private

data/lib/bbbevents/base.rb

@@ -5,6 +5,10 @@ module BBBEvents
   DATE_FORMAT = "%m/%d/%Y %H:%M:%S"
   UNKNOWN_DATE = "??/??/????"
 
+  def self.format_datetime(time)
+    time.strftime('%Y-%m-%dT%H:%M:%S.%L%:z')
+  end
+
   def self.parse(events_xml)
     Recording.new(events_xml)
   end

data/lib/bbbevents/events.rb

@@ -7,9 +7,11 @@ module BBBEvents
       "public_chat_event",
       "participant_status_change_event",
       "participant_talking_event",
+      "participant_muted_event",
       "poll_started_record_event",
       "user_responded_to_poll_record_event",
       "add_shape_event",
+      "poll_published_record_event",
     ]
 
     EMOJI_WHITELIST = %w(away neutral confused sad happy applause thumbsUp thumbsDown)
@@ -34,13 +36,23 @@ module BBBEvents
         @attendees[extUserId] = Attendee.new(e) unless @attendees.key?(extUserId)
       end
 
+      join_ts = Time.at(timestamp_conversion(e["timestamp"]))
+
       # Handle updates for re-joining users
       att = @attendees[extUserId]
-      att.joins << Time.at(timestamp_conversion(e["timestamp"]))
+      att.joins << join_ts
       att.name = e['name']
       if e['role'] == 'MODERATOR'
         att.moderator = true
       end
+
+      join_2 = {:timestamp => join_ts, :userid => intUserId, :ext_userid => extUserId, :event => :join}
+
+      unless att.sessions.key?(intUserId)
+        att.sessions[intUserId] = { :joins => [], :lefts => []}
+      end
+
+      att.sessions[intUserId][:joins] << join_2
     end
 
     # Log a users leave.
@@ -48,8 +60,18 @@ module BBBEvents
       intUserId = e['userId']
       # If the attendee exists, set their leave time.
       if att = @attendees[@externalUserId[intUserId]]
-        left = Time.at(timestamp_conversion(e["timestamp"]))
-        att.leaves << left
+        left_ts = Time.at(timestamp_conversion(e["timestamp"]))
+        att.leaves << left_ts
+
+        extUserId = 'missing'
+        if @externalUserId.key?(intUserId)
+          extUserId = @externalUserId[intUserId]
+        end
+
+        left_2 = {:timestamp => left_ts, :userid => intUserId, :ext_userid => extUserId, :event => :left}
+        att.sessions[intUserId][:lefts] << left_2
+
+        record_stop_talking(att, e["timestamp"])
       end
     end
 
@@ -93,7 +115,24 @@ module BBBEvents
         attendee.engagement[:talks] += 1
         attendee.recent_talking_time = timestamp_conversion(e["timestamp"])
       else
-        attendee.engagement[:talk_time] += timestamp_conversion(e["timestamp"]) - attendee.recent_talking_time
+        record_stop_talking(attendee, e["timestamp"])
+      end
+    end
+
+    def record_stop_talking(attendee, timestamp_s)
+      return if attendee.recent_talking_time == 0
+
+      attendee.engagement[:talk_time] += timestamp_conversion(timestamp_s) - attendee.recent_talking_time
+      attendee.recent_talking_time = 0
+    end
+
+    def participant_muted_event(e)
+      intUserId = e["participant"]
+
+      return unless attendee = @attendees[@externalUserId[intUserId]]
+
+      if e["muted"] == "true"
+        record_stop_talking(attendee, e["timestamp"])
       end
     end
 
@@ -102,7 +141,7 @@ module BBBEvents
       id = e["pollId"]
 
       @polls[id] = Poll.new(e)
-      @polls[id].start = timestamp_conversion(e["timestamp"])
+      @polls[id].start = Time.at(timestamp_conversion(e["timestamp"]))
     end
 
     # Log user responses to polls.
@@ -113,6 +152,12 @@ module BBBEvents
       return unless attendee = @attendees[@externalUserId[intUserId]]
 
       if poll = @polls[poll_id]
+        if poll.type == 'R-'
+          poll.votes[@externalUserId[intUserId]] = e["answer"]
+
+          # We want to store the responses as options.
+          poll.options.insert(e["answerId"].to_i, e["answer"])
+        end
         poll.votes[@externalUserId[intUserId]] = poll.options[e["answerId"].to_i]
       end
 
@@ -127,5 +172,13 @@ module BBBEvents
         end
       end
     end
+
+    def poll_published_record_event(e)
+      unless e["pollId"].nil?
+        if poll = @polls[e["pollId"]]
+          poll.published = true
+        end
+      end
+    end
   end
 end

data/lib/bbbevents/poll.rb

@@ -1,9 +1,11 @@
 module BBBEvents
   class Poll
-    attr_accessor :id, :start, :published, :options, :votes
+    attr_accessor :id, :type, :question, :start, :published, :options, :votes
 
     def initialize(poll_event)
       @id        = poll_event["pollId"]
+      @type      = poll_event["type"]
+      @question  = poll_event["question"].nil? ? "" : "#{poll_event['question']}"
       @published = false
       @options   = JSON.parse(poll_event["answers"]).map { |opt| opt["key"] }
       @votes     = {}
@@ -18,11 +20,22 @@ module BBBEvents
       instance_variables.each { |var| hash[var[1..-1]] = instance_variable_get(var) }
       hash
     end
+    alias_method :as_json, :to_h
 
     def to_json
-      hash = {}
-      instance_variables.each { |var| hash[var[1..-1]] = instance_variable_get(var) }
-      hash.to_json
+      JSON.generate(as_json)
+    end
+
+    def as_json
+      {
+        id: @id,
+        type: @type,
+        question: @question,
+        published: @published,
+        options: @options,
+        start: BBBEvents.format_datetime(@start),
+        votes: @votes
+      }
     end
   end
 end

data/lib/bbbevents/recording.rb

@@ -1,7 +1,9 @@
 require 'csv'
 require 'json'
+require 'active_support'
 require 'active_support/core_ext/hash'
 
+
 module BBBEvents
   CSV_HEADER = %w(name moderator chats talks emojis poll_votes raisehand talk_time join left duration)
   NO_VOTE_SYMBOL = "-"
@@ -15,6 +17,9 @@ module BBBEvents
       filename = File.basename(events_xml)
       raise "#{filename} is not a file or does not exist." unless File.file?(events_xml)
 
+      # The Hash.from_xml automatically converts keys with dashes '-' to snake_case
+      # (i.e canvas-recording-ready-url becomes canvas_recording_ready_url)
+      # see https://www.rubydoc.info/github/datamapper/extlib/Hash.from_xml
       raw_recording_data = Hash.from_xml(File.read(events_xml))
 
       raise "#{filename} is not a valid xml file (unable to parse)." if raw_recording_data.nil?
@@ -22,17 +27,24 @@ module BBBEvents
 
       recording_data = raw_recording_data["recording"]
       events = recording_data["event"]
+      events = [] if events.nil?
       events = [events] unless events.is_a?(Array)
 
       @metadata   = recording_data["metadata"]
-      @meeting_id = recording_data["meeting"]["id"]
-      @timestamp  = extract_timestamp(@meeting_id)
+      @meeting_id = recording_data["metadata"]["meetingId"]
+
+      internal_meeting_id = recording_data["meeting"]["id"]
 
-      @first_event = events.first["timestamp"].to_i
-      @last_event  = events.last["timestamp"].to_i
+      @timestamp  = extract_timestamp(internal_meeting_id)
+      @start = Time.at(@timestamp / 1000)
 
-      @start    = Time.at(@timestamp / 1000)
-      @finish   = Time.at(timestamp_conversion(@last_event))
+      if events.length > 0
+        @first_event = events.first["timestamp"].to_i
+        @last_event  = events.last["timestamp"].to_i
+        @finish = Time.at(timestamp_conversion(@last_event))
+      else
+        @finish = @start
+      end
       @duration = (@finish - @start).to_i
 
       @attendees = {}
@@ -47,7 +59,7 @@ module BBBEvents
 
       @attendees.values.each do |att|
         att.leaves << @finish if att.joins.length > att.leaves.length
-        att.duration = total_duration(att)
+        att.duration = total_duration(@finish, att)
       end
     end
 
@@ -91,9 +103,17 @@ module BBBEvents
       end
     end
 
+    # Transform any CamelCase keys to snake_case
+    def transform_metadata
+      @metadata.deep_transform_keys do |key|
+        k = key.to_s.underscore rescue key
+        k.to_sym rescue key
+      end
+    end
+
     def to_h
       {
-        metadata: @metadata,
+        metadata: transform_metadata,
         meeting_id: @meeting_id,
         duration: @duration,
         start: @start,
@@ -104,8 +124,230 @@ module BBBEvents
       }
     end
 
+    def as_json
+      {
+        metadata: transform_metadata,
+        meeting_id: @meeting_id,
+        duration: @duration,
+        start: BBBEvents.format_datetime(@start),
+        finish: BBBEvents.format_datetime(@finish),
+        attendees: attendees.map(&:as_json),
+        files: @files,
+        polls: polls.map(&:as_json)
+      }
+    end
+
     def to_json
-      to_h.to_json
+      JSON.generate(as_json)
+    end
+
+    def calculate_user_duration(join_events, left_events)
+      joins_leaves_arr = []
+      join_events.each { |j| joins_leaves_arr.append({:time => j.to_i, :datetime => j, :event => :join})}
+      left_events.each { |j| joins_leaves_arr.append({:time => j.to_i, :datetime => j, :event => :left})}
+
+      joins_leaves_arr_sorted = joins_leaves_arr.sort_by { |event| event[:time] }
+
+      partial_duration = 0
+      prev_event = nil
+
+      joins_leaves_arr_sorted.each do |cur_event|
+        duration = 0
+        if prev_event != nil and cur_event[:event] == :join and prev_event[:event] == :left
+          # user left and rejoining, don't update duration
+          prev_event = cur_event
+        elsif prev_event != nil
+          duration = cur_event[:time] - prev_event[:time]
+          partial_duration += duration
+          prev_event = cur_event
+        else
+          prev_event = cur_event
+        end
+      end
+
+      return partial_duration
+    end
+
+    def calculate_user_duration_based_on_userid(last_event_ts, sessions)
+      # combine join and left events into an array
+      joins_lefts_arr = build_join_lefts_array(last_event_ts, sessions)
+
+      # sort the events
+      joins_lefts_arr_sorted = joins_lefts_arr.sort_by { |event| event[:timestamp] }
+
+      combined_tuples = combine_tuples_by_userid(sessions)
+      combined_tuples_sorted = fill_missing_left_events(combined_tuples)
+
+      prepare_joins_lefts_for_overlap_checks(joins_lefts_arr_sorted)
+      mark_overlapping_events(combined_tuples_sorted, joins_lefts_arr_sorted)
+      removed_overlap_events = remove_overlapping_events(joins_lefts_arr_sorted)
+
+      duration_tuples = build_join_left_tuples(removed_overlap_events)
+
+      partial_duration = 0
+      duration_tuples.each do |tuple|
+        duration = tuple[:left][:timestamp].to_i - tuple[:join][:timestamp].to_i
+        partial_duration += duration
+      end
+
+      partial_duration
+    end
+
+    def tuples_by_userid(joins_arr, lefts_arr)
+      joins_length = joins_arr.length - 1
+      tuples = []
+      for i in 0..joins_length
+        tuple = {:join => joins_arr[i], :left => nil}
+
+        if i <= lefts_arr.length - 1
+          tuple[:left] = lefts_arr[i]
+        end
+        tuples.append(tuple)
+      end
+      tuples
+    end
+
+    def combine_tuples_by_userid(user_sessions)
+      combined_tuples = []
+
+      user_sessions.each do | userid, joins_lefts |
+        joins_lefts_arr = []
+        joins_lefts[:joins].each { |j| joins_lefts_arr.append(j)}
+        joins_lefts[:lefts].each { |j| joins_lefts_arr.append(j)}
+
+        tuples = tuples_by_userid(joins_lefts[:joins], joins_lefts[:lefts])
+
+        tuples.each do |tuple|
+          combined_tuples.append(tuple)
+        end
+      end
+
+      combined_tuples
+    end
+
+    def fill_missing_left_events(combined_tuples)
+      joins_lefts_arr_sorted = combined_tuples.sort_by { |event| event[:join][:timestamp]}
+
+      joins_lefts_arr_sorted_length = joins_lefts_arr_sorted.length - 1
+      for i in 0..joins_lefts_arr_sorted_length
+        cur_event = joins_lefts_arr_sorted[i]
+        if cur_event[:left].nil?
+          unless joins_lefts_arr_sorted_length == i
+            # Take the next event as the left event for this current event
+            next_event = joins_lefts_arr_sorted[i + 1]
+            left_event = {:timestamp => next_event[:timestamp], :userid => cur_event[:userid], :event => :left}
+
+            cur_event[:left] = left_event
+          end
+        end
+      end
+
+      joins_lefts_arr_sorted
+    end
+
+    def build_join_left_tuples(joins_lefts_arr_sorted)
+      jl_tuples = []
+      jl_tuple = {:join => nil, :left => nil}
+      loop_state = :find_join
+
+      events_length = joins_lefts_arr_sorted.length - 1
+      for i in 0..events_length
+
+        cur_event = joins_lefts_arr_sorted[i]
+
+        if loop_state == :find_join and cur_event[:event] == :join
+          jl_tuple[:join] = cur_event
+          loop_state = :find_left
+        end
+
+        next_event = nil
+        if i < events_length
+          next_event = joins_lefts_arr_sorted[i + 1]
+        end
+
+        if loop_state == :find_left
+          if next_event != nil and next_event[:event] == :left
+            # skip the current event to get to the next event
+          elsif (cur_event[:event] == :left and next_event != nil and next_event[:event] == :join) or (i == events_length)
+            jl_tuple[:left] = cur_event
+            jl_tuples.append(jl_tuple)
+            jl_tuple = {:join => nil, :left => nil}
+            loop_state = :find_join
+          end
+        end
+      end
+
+      jl_tuples
+    end
+
+    def build_join_lefts_array(last_event_timestamp, user_session)
+      joins_leaves_arr = []
+      lefts_count = 0
+      joins_count = 0
+
+      user_session.each do | userid, joins_lefts |
+        lefts_count += joins_lefts[:lefts].length
+        joins_count += joins_lefts[:joins].length
+        joins_lefts[:joins].each { |j| joins_leaves_arr.append(j)}
+        joins_lefts[:lefts].each { |j| joins_leaves_arr.append(j)}
+      end
+
+      if joins_count > lefts_count
+        last_event = joins_leaves_arr[-1]
+        joins_leaves_arr.append({:timestamp => last_event_timestamp, :userid => "    system    ", :ext_userid=> last_event[:ext_userid], :event => :left})
+      end
+
+      joins_leaves_arr
+    end
+
+    def prepare_joins_lefts_for_overlap_checks(joins_leaves_arr_sorted)
+      joins_leaves_arr_sorted.each do |event|
+        event[:remove] = false
+      end
+    end
+
+    def mark_overlapping_events(combined_tuples_sorted, joins_leaves_arr_sorted)
+      combined_tuples_sorted.each do |ce|
+        joins_leaves_arr_sorted.each do |jl|
+          event_ts = jl[:timestamp].to_i
+          ce_join = ce[:join][:timestamp].to_i
+
+          if event_ts > ce_join and not ce[:left].nil? and event_ts < ce[:left][:timestamp].to_i
+            jl[:remove] = true
+          end
+        end
+      end
+    end
+
+    def remove_overlapping_events(joins_leaves_arr_sorted)
+      keep_events = []
+      joins_leaves_arr_sorted.each do |ev|
+        if not ev[:remove]
+          keep_events.append(ev)
+        end
+      end
+      keep_events
+    end
+
+    def build_tuples_of_kept_events(kept_events)
+      odd_events = []
+      even_events = []
+      for i in 0..kept_events.length - 1
+        odd_even = i + 1
+        if odd_even.even?
+          even_events.append(kept_events[i])
+        else
+          odd_events.append(kept_events[i])
+        end
+      end
+
+      tuples = []
+      for i in 0..odd_events.length - 1
+        tuple = {:start => odd_events[i], :end => even_events[i]}
+        tuples.append(tuple)
+      end
+
+      tuples
     end
 
     private
@@ -129,14 +371,8 @@ module BBBEvents
     end
 
     # Calculates an attendee's duration.
-    def total_duration(att)
-      return 0 unless att.joins.length == att.leaves.length
-      total = 0
-
-      att.joins.length.times do |i|
-        total += att.leaves[i] - att.joins[i]
-      end
-      total
+    def total_duration(last_event_ts, att)
+      calculate_user_duration_based_on_userid(last_event_ts, att.sessions)
     end
   end
 end

data/lib/bbbevents/version.rb

@@ -1,3 +1,3 @@
 module BBBEvents
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: bbbevents
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Blindside Networks
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2023-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -54,6 +54,26 @@ dependencies:
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
+- !ruby/object:Gem::Dependency
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,18 +86,19 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Easily parse data from a BigBlueButton recording's events.xml.
+description: Ruby gem for easily parse data from a BigBlueButton recording's events.xml.
 email:
 - ffdixon@blindsidenetworks.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
+- ".ruby-version"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -92,9 +113,10 @@ files:
 - lib/bbbevents/poll.rb
 - lib/bbbevents/recording.rb
 - lib/bbbevents/version.rb
+- testdata/.gitkeep
 homepage: https://www.blindsidenetworks.com
 licenses:
-- LGPL 3.0
+- LGPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -111,8 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Easily parse data from a BigBlueButton recording's events.xml.

data/.travis.yml

@@ -1,14 +0,0 @@
-sudo: false
-
-language: ruby
-
-rvm:
-  - 2.5.1
-
-before_install: gem install bundler -v 1.15.4
-
-deploy:
-  provider: rubygems
-  api_key: ${RUBYGEMS_API_KEY}
-  on:
-    tags: true

data/Gemfile.lock

@@ -1,48 +0,0 @@
-PATH
-  remote: .
-  specs:
-    bbbevents (1.1.0)
-      activesupport
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (5.2.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    concurrent-ruby (1.1.5)
-    diff-lcs (1.3)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bbbevents!
-  bundler (>= 1.15)
-  rake (~> 10.0)
-  rspec (~> 3.4)
-
-BUNDLED WITH
-   1.16.3