ast-tdl 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 757763f7548180daaeaf4e4d427a9837584d0f3b68ef8b08fc2cefffab8b293e
-  data.tar.gz: 4518d44a21c598c06872b1b5c60d13cd62816fd192e550c80a7e45f9617c4306
+  metadata.gz: f80f5ce52b90eddc0e2a1d7500a9cb72266cbb9942b48abe51452fc0e5772ed7
+  data.tar.gz: '019b6ee3ace2a1bf5075f4eda8bbde0e84fd01ad76edef4c8e449d91feefb6a7'
 SHA512:
-  metadata.gz: cf4a6d62f36951fcf352b6c93d31d4ba2a170169b1a82e7beb493b3283c7df5f1eecef2f62bdd94a18f86437e647665a8d2f5c5af357e82925b1ea199a10d642
-  data.tar.gz: d594576289625b607ebb359fbbe5e22623fafd0f9dcf904d33cc088b479dbfdba1c6b9c022c65e2534891cd7ae7295d770ee93d3bea322464d65f243dea30b3b
+  metadata.gz: 6c63722d51efd64fe0ec516b3861668ea5a9ba96dbb0b4449822ad7b3b0db96922d73addcc6a69fb28de517a608e13f05ccf57a27f15483f87263a97350feb0d
+  data.tar.gz: 8696fbc00936ba6fe0a533aa5f70e5745d96ba7b9f189267a7d3b40763262477348fede00c69b5de8a214db99850bce9fcb5b64d12ef339df35a4c0b686f094b

data/lib/ast.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'json'
-require_relative 'classes'
 require_relative 'interval'
 require_relative 'session'
 
@@ -69,7 +68,7 @@ module Ast
         session: @session.collect(&:to_hash),
         interval: @interval.collect(&:to_hash)
       }
-      training_json.to_json
+      JSON.pretty_generate(training_json)
     end
 
     ##

data/lib/interval.rb

@@ -7,81 +7,94 @@ class Interval
   # Initialization method for the +Interval+ class.
   # Params:
   # +name+:: the name of the interval
-  def initialize(_name)
-    @name = []
-    @sport = []
-    @info = []
-    @average_heart_rate = []
-    @total_duration = []
-    @average_heart_rate_rest = []
-    @total_duration_rest = []
+  def initialize(name)
+    @name = name
+    @sport = ''
+    @info = ''
+    @speed_duration = 0
+    @recovery_duration = 0
+    @speed_heart_rate = 0
+    @recovery_heart_rate = 0
+    @repetitions = 0
   end
 
   ##
-  # Building a new Sport object.
+  # Adding a sport to the object.
   # Params:
   # +type+:: the type of the sport
   def sport(type)
-    @sport << Sport.new(type)
+    @sport = type
   end
 
   ##
-  # Building a new Info object.
+  # Adding an info message to the object.
   # Params:
   # +message+:: the info message
   def info(message)
-    @info << Info.new(message)
+    @info = message
   end
 
   ##
-  # Building a new AverageHeartRate object.
+  # Adding a speed duration of an interval to the object.
   # Params:
-  # +heart_rate+:: the average heart rate in bpm
-  def average_heart_rate(heart_rate)
-    @average_heart_rate << AverageHeartRate.new(heart_rate)
+  # +speed_duration+:: the duration of the speed segment in minutes
+  def speed_duration(speed_duration)
+    @speed_duration = speed_duration.to_s.to_i
   end
 
   ##
-  # Building a new TotalDuration object.
+  # Adding a recovery duration of an interval to the object.
   # Params:
-  # +duration+:: the duration in seconds
-  def total_duration(duration)
-    @total_duration << TotalDuration.new(duration)
+  # +recovery_duration+:: the duration of the recovery segment in minutes
+  def recovery_duration(recovery_duration)
+    @recovery_duration = recovery_duration.to_s.to_i
   end
 
   ##
-  # Building a new AverageHeartRateRest object.
+  # Adding a speed heart rate of an interval to the object.
   # Params:
-  # +heart_rate_rest+:: the average rest heart rate in bpm
-  def average_heart_rate_rest(heart_rate_rest)
-    @average_heart_rate_rest << AverageHeartRateRest.new(heart_rate_rest)
+  # +speed_heart_rate+:: the average speed heart rate in bpm
+  def speed_heart_rate(speed_heart_rate)
+    @speed_heart_rate = speed_heart_rate.to_s.to_i
   end
 
   ##
-  # Building a new TotalDurationRest object.
+  # Adding a recovery heart rate of an interval to the object.
   # Params:
-  # +duration rest+:: the rest duration in seconds
-  def total_duration_rest(duration_rest)
-    @total_duration_rest << TotalDurationRest.new(duration_rest)
+  # +recovery_heart_rate+:: the average speed heart rate in bpm
+  def recovery_heart_rate(recovery_heart_rate)
+    @recovery_heart_rate = recovery_heart_rate.to_s.to_i
+  end
+
+  ##
+  # Adding a number of repetitions to the object.
+  # Params:
+  # +repetitions+:: number of interval repetitions
+  def repetitions(repetitions)
+    @repetitions = repetitions.to_s.to_i
   end
 
   ##
   # Converting an interval to a string.
   def to_s
-    "#{@sport[0].type} #{@info[0].message}"
+    "#{@sport} #{@info}"
   end
 
   ##
   # Converting an interval to a JSON-ized string.
   def to_hash
-    {
-      name: @name.collect(&:to_hash),
-      sport: @sport.collect(&:to_hash),
-      info: @info.collect(&:to_hash),
-      average_heart_rate: @average_heart_rate.collect(&:to_hash),
-      total_duration: @total_duration.collect(&:to_hash),
-      average_heart_rate_rest: @average_heart_rate_rest.collect(&:to_hash),
-      total_duration_rest: @total_duration_rest.collect(&:to_hash),
+    hash = {
+      name: @name,
+      sport: @sport,
+      info: @info,
+      speed_duration: @speed_duration,
+      recovery_duration: @recovery_duration,
+      speed_heart_rate: @speed_heart_rate,
+      recovery_heart_rate: @recovery_heart_rate,
+      repetitions: @repetitions
     }
+
+    hash[:info] = @info if @info
+    hash
   end
 end

data/lib/session.rb

@@ -7,61 +7,63 @@ class Session
   # Initialization method for the +Session+ class.
   # Params:
   # +name+:: the name of the session
-  def initialize(_name)
-    @name = []
-    @sport = []
-    @info = []
-    @average_heart_rate = []
-    @total_duration = []
+  def initialize(name)
+    @name = name
+    @sport = ''
+    @info = ''
+    @average_heart_rate = 0
+    @total_duration = 0
   end
 
   ##
-  # Building a new Sport object.
+  # Adding a sport type to the object.
   # Params:
   # +type+:: the type of the sport
   def sport(type)
-    @sport << Sport.new(type)
+    @sport = type
   end
 
   ##
-  # Building a new Info object.
+  # Adding a message to the object.
   # Params:
   # +message+:: the info message
   def info(message)
-    @info << Info.new(message)
+    @info = message
   end
 
   ##
-  # Building a new AverageHeartRate object.
+  # Adding an average heart rate to the object.
   # Params:
   # +heart_rate+:: the average heart rate in bpm
   def average_heart_rate(heart_rate)
-    @average_heart_rate << AverageHeartRate.new(heart_rate)
+    @average_heart_rate = heart_rate.to_s.to_i
   end
 
   ##
-  # Building a new TotalDuration object.
+  # Adding a total duration to the object.
   # Params:
-  # +duration+:: the duration in seconds
+  # +duration+:: the duration in minutes
   def total_duration(duration)
-    @total_duration << TotalDuration.new(duration)
+    @total_duration = duration.to_s.to_i
   end
 
   ##
   # Converting a session to a string.
   def to_s
-    "#{@sport[0].type} #{@info[0].message}"
+    "#{@sport} #{@info}"
   end
 
   ##
   # Converting a session to a JSON-ized string.
   def to_hash
-    {
-      name: @name.collect(&:to_hash),
-      sport:	@sport.collect(&:to_hash),
-      info:	@info.collect(&:to_hash),
-      average_heart_rate: @average_heart_rate.collect(&:to_hash),
-      total_duration: @total_duration.collect(&:to_hash),
+    hash = {
+      name: @name,
+      sport:	@sport,
+      average_heart_rate: @average_heart_rate,
+      total_duration: @total_duration,
     }
+
+    hash[:info] = @info if @info != ''
+    hash
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ast-tdl
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - firefly-cpp
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-28 00:00:00.000000000 Z
+date: 2022-07-05 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -23,7 +23,6 @@ files:
 - README.md
 - lib/ast-tdl.rb
 - lib/ast.rb
-- lib/classes.rb
 - lib/interval.rb
 - lib/session.rb
 homepage: https://github.com/firefly-cpp/ast-tdl

data/lib/classes.rb

@@ -1,148 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-
-##
-# This class represents a sport with a type.
-class Sport
-  # The type of a sport.
-  attr_reader :type
-
-  ##
-  # Initialization method for the +Sport+ class.
-  # Params:
-  # +type+:: the type of the sport
-  def initialize(type)
-    @type = type
-  end
-
-  ##
-  # Converting +Sport+ class to a hash.
-  def to_hash
-    {
-      type: @type
-    }
-  end
-end
-
-##
-# This class represents information with a message.
-class Info
-  # The info message.
-  attr_reader :message
-
-  ##
-  # Initialization method for the +Info+ class.
-  # Params:
-  # +message+:: the info message
-  def initialize(message)
-    @message = message
-  end
-
-  ##
-  # Converting +Info+ class to a hash.
-  def to_hash
-    {
-      message: @message
-    }
-  end
-end
-
-##
-# This class represents an average heart rate.
-class AverageHeartRate
-  # An average heart rate.
-  attr_reader :heart_rate
-
-  ##
-  # Initialization method for the +AverageHeartRate+ class.
-  # Params:
-  # +heart_rate+:: the average heart rate
-  def initialize(heart_rate)
-    heart_rate = heart_rate.to_s.to_i
-    raise ArgumentError, 'Maximum heart rate is 220.' if heart_rate > 220
-
-    @heart_rate = heart_rate
-  end
-
-  ##
-  # Converting +AverageHeartRate+ class to a hash.
-  def to_hash
-    {
-      average_hr: @heart_rate
-    }
-  end
-end
-
-##
-# This class represents a total duration of a session or an interval.
-class TotalDuration
-  # The total duration in seconds.
-  attr_reader :duration
-
-  ##
-  # Initialization method for the +TotalDuration+ class.
-  # Params:
-  # +duration+:: the total duration
-  def initialize(duration)
-    @duration = duration
-  end
-
-  ##
-  # Converting +TotalDuration+ class to a hash.
-  def to_hash
-    {
-      duration: @duration
-    }
-  end
-end
-
-##
-# This class represents an average heart rate in the resting period.
-class AverageHeartRateRest
-  # The average rest heart rate.
-  attr_reader :average_heart_rate_rest
-
-  ##
-  # Initialization method for the +AverageHeartRateRest+ class.
-  # Params:
-  # +average_heart_rate_rest+:: the average heart rate
-  def initialize(average_heart_rate_rest)
-    average_heart_rate_rest = average_heart_rate_rest.to_s.to_i
-    raise ArgumentError, 'Maximum heart rate is 220.' if average_heart_rate_rest > 220
-
-    @average_heart_rate_rest = average_heart_rate_rest
-  end
-
-  ##
-  # Converting +AverageHeartRateRest+ class to a hash.
-  def to_hash
-    {
-      average_heart_rate_rest: @average_heart_rate_rest
-    }
-  end
-end
-
-##
-# This class represents a total duration of a session or an
-# interval in the resting period.
-class TotalDurationRest
-  # The total duration in seconds.
-  attr_reader :total_duration_rest
-
-  ##
-  # Initialization method for the +TotalDurationRest+ class.
-  # Params:
-  # +total_duration_rest+:: the total rest duration
-  def initialize(total_duration_rest)
-    @total_duration_rest = total_duration_rest
-  end
-
-  ##
-  # Converting +TotalDurationRest+ class to a hash.
-  def to_hash
-    {
-      total_duration_rest: @total_duration_rest
-    }
-  end
-end