sutazekarate 0.0.6 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f37dee7f327be824a944d61b79a96e24293a5f6cbb2cc6d4e2d3376489a7aad7
-  data.tar.gz: beb7294cd26183345189fc9939be33b58762daa58ccffd221747d00136e12244
+  metadata.gz: 46c5e24e72aee40b8888d2b57ed84a7d37f9bb9888a2b704ae7ac452f079d2fd
+  data.tar.gz: c2b6c9b7f62a6b849c7483b2ea81deac0a36a67e09621c680c5d0e54dddc260e
 SHA512:
-  metadata.gz: 2dd82780c2da171885b09685452f0eae0ac3ea3ec442c6f5e56b6751bbb5eacc8289be3bb3fc7ad8b89b120e80df86a47de3e12a69652e942212beca05872f58
-  data.tar.gz: f92a70ec8a00ff6ed1b37af3c138346005fe73912859ea9169ab2231cfcfb523fa4c82a3b9cbe0caa518630f964691da56205e1b7c4a3deed6b0291e6fc69d13
+  metadata.gz: 56750003dfe9b909d58e32bb99c6eb3e6e35757c939f01fdbfc8a14e79d64a44e8011035fc323da998bdd5209f99b88ba12986eb3db41448241c28dc2528dba5
+  data.tar.gz: bd625c28c312ff1ea7b41a2573e9bc3b7630ee796fcaaa899db7d07a094ed8bbd112ccc95cb6be730ea46a62aa542e3c3b5ce519393bcad78aeaf957df99f12a

data/lib/sutazekarate/category.rb

@@ -11,6 +11,7 @@ module Sutazekarate
     attribute :position
     attribute :name
     attribute :discipline
+    attribute :duration
     attribute :location
     attribute :location_color
     attribute :time_range
@@ -20,11 +21,11 @@ module Sutazekarate
     end
 
     def time_begin
-      time_range.begin
+      time_range&.begin
     end
 
     def time_end
-      time_range.end
+      time_range&.end
     end
 
     def competitors
@@ -114,7 +115,10 @@ module Sutazekarate
       id = Addressable::URI.parse(detail_element.search('a').first.attr('href')).query_values['k']
       category_element = Nokogiri::HTML5.fragment(data['kategoria'])
       category_span_elements = category_element.search('span')
-      name = category_span_elements[0].text.strip
+      name_raw = category_span_elements[0].text.strip
+      name_match = name_raw.match(/^([^(\/]+?)\s*(?:\(([^)]+)\))?\s*(?:\/([^\/]+)\/)?$/)
+      name = name_match[1]
+      duration = name_match[3]
       detail_element = category_span_elements[1]
       location = nil
       location_color = nil
@@ -133,6 +137,7 @@ module Sutazekarate
         position: data['pc'],
         name:,
         discipline:,
+        duration:,
         location:,
         location_color:,
         time_range:,

data/lib/sutazekarate/competition.rb

@@ -44,23 +44,13 @@ module Sutazekarate
 
     def timetables
       @timetables ||= begin
-        categories
-          .group_by(&:location)
-          .map do |location, location_categories|
-          entries = location_categories
-            .select { |category| category.time_range.present? }
-            .sort_by { |category| category.time_range.begin }
-            .map do |location_category|
-            TimetableEntry.new(
-              category: location_category,
-              time_range: location_category.time_range,
-            )
-          end
+        logger.debug("Fetching timetable for competition #{id}")
+        response = HTTP.get("https://sutazekarate.sk/pdf_timetable3.php?sutaz=#{id}")
 
-          Timetable.new(
-            location:,
-            entries:,
-          )
+        html = Nokogiri::HTML5.fragment(response.body.to_s)
+
+        html.search('.divttm').map do |location_element|
+          Timetable.build(location_element, categories:)
         end
       end
     end

data/lib/sutazekarate/timetable.rb

@@ -6,5 +6,18 @@ module Sutazekarate
 
     attribute :location
     attribute :entries
+
+    def self.build(location_element, categories: [])
+      location = location_element.search('.hlavicka').text.strip
+
+      entries = location_element.search('ul li').map do |entry_element|
+        TimetableEntry.build(entry_element, categories:)
+      end
+
+      Timetable.new(
+        location:,
+        entries:,
+      )
+    end
   end
 end

data/lib/sutazekarate/timetable_entry.rb

@@ -4,6 +4,7 @@ module Sutazekarate
     include ActiveModel::Attributes
     include ActiveModel::Serializers::JSON
 
+    attribute :title
     attribute :category
     attribute :time_range
 
@@ -18,5 +19,22 @@ module Sutazekarate
     def time_end
       time_range.end
     end
+
+    def self.build(entry_element, categories: [])
+      title = entry_element.children.first.text.strip
+      time_range_raw = entry_element.children.last.text.strip
+      time_range_match = time_range_raw.match(/(\d+:\d+) - (\d+:\d+)/)
+      time_range = Time.zone.parse(time_range_match[1])..Time.zone.parse(time_range_match[2])
+
+      category = categories.find do |category|
+        category.name == title
+      end
+
+      TimetableEntry.new(
+        category:,
+        title:,
+        time_range:,
+      )
+    end
   end
 end

data/lib/sutazekarate/version.rb

@@ -1,3 +1,3 @@
 module Sutazekarate
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sutazekarate
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
 platform: ruby
 authors:
 - Ahmed Al Hafoudh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 2024-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http