dsp_blueprint_parser 0.2.2 → 0.2.3

data/lib/dsp_blueprint_parser/parser.rb

@@ -1,89 +1,108 @@
-# frozen_string_literal: true
-
-module DspBlueprintParser
-  # class to orchestrate parsing
-  class Parser
-    SECONDS_AT_EPOC = 62_135_596_800
-
-    # @param [String] str_blueprint
-    def initialize(str_blueprint)
-      @data_sections = DataSections.new(str_blueprint)
-    end
-
-    # @return [BlueprintData]
-    def blueprint
-      @blueprint ||= BlueprintData.new.tap do |blueprint|
-        parse_metadata(blueprint)
-        parse_areas(blueprint)
-        parse_buildings(blueprint)
-      end
-    end
-
-    private
-
-    # @return [Array<String>]
-    def header_segments
-      @header_segments ||= @data_sections.header_segments
-    end
-
-    # @return [BinaryReader]
-    def reader
-      @reader ||= BinaryReader.new(@data_sections.decompressed_body)
-    end
-
-    # @param ticks [Integer]
-    # @return [Time]
-    def ticks_to_epoch(ticks)
-      # 10mil ticks per second
-      seconds = ticks / 10_000_000
-
-      Time.at(seconds - SECONDS_AT_EPOC)
-    end
-
-    # @param [BlueprintData] blueprint
-    def parse_areas(blueprint)
-      reader.read_i8.times do
-        area = Area.new
-        area.index = reader.read_i8
-        area.parent_index = reader.read_i8
-        area.tropic_anchor = reader.read_i16
-        area.area_segments = reader.read_i16
-        area.anchor_local_offset_x = reader.read_i16
-        area.anchor_local_offset_y = reader.read_i16
-        area.width = reader.read_i16
-        area.height = reader.read_i16
-
-        blueprint.areas << area
-      end
-    end
-
-    # @param [BlueprintData] blueprint
-    def parse_buildings(blueprint)
-      BuildingParser.process!(blueprint, reader)
-    end
-
-    # @param [BlueprintData] blueprint
-    def parse_metadata(blueprint)
-      blueprint.icon_layout = header_segments[1].to_i
-      blueprint.icon0 = header_segments[2].to_i
-      blueprint.icon1 = header_segments[3].to_i
-      blueprint.icon2 = header_segments[4].to_i
-      blueprint.icon3 = header_segments[5].to_i
-      blueprint.icon4 = header_segments[6].to_i
-
-      blueprint.time = ticks_to_epoch(header_segments[8].to_i)
-      blueprint.game_version = header_segments[9]
-
-      blueprint.short_description = CGI.unescape(header_segments[10]) if header_segments[10]
-      blueprint.description = CGI.unescape(header_segments[11]) if header_segments[11]
-
-      blueprint.version = reader.read_i32
-      blueprint.cursor_offset_x = reader.read_i32
-      blueprint.cursor_offset_y = reader.read_i32
-      blueprint.cursor_target_area = reader.read_i32
-      blueprint.drag_box_size_x = reader.read_i32
-      blueprint.drag_box_size_y = reader.read_i32
-      blueprint.primary_area_idx = reader.read_i32
-    end
-  end
-end
+# frozen_string_literal: true
+
+module DspBlueprintParser
+  # class to orchestrate parsing
+  class Parser
+    SECONDS_AT_EPOC = 62_135_596_800
+    URI_PARSER = URI::Parser.new.freeze
+
+    # @param [String] str_blueprint
+    def initialize(str_blueprint)
+      @data_sections = DataSections.new(str_blueprint)
+    end
+
+    # @return [BlueprintData]
+    def blueprint
+      @blueprint ||= BlueprintData.new.tap do |blueprint|
+        parse_metadata(blueprint)
+        parse_areas(blueprint)
+        parse_buildings(blueprint)
+      end
+    end
+
+    private
+
+    # @return [Array<String>]
+    def header_segments
+      @header_segments ||= @data_sections.header_segments
+    end
+
+    # @return [BinaryReader]
+    def reader
+      @reader ||= BinaryReader.new(@data_sections.decompressed_body)
+    end
+
+    # @param ticks [Integer]
+    # @return [Time]
+    def ticks_to_epoch(ticks)
+      # 10mil ticks per second
+      seconds = ticks / 10_000_000
+
+      Time.at(seconds - SECONDS_AT_EPOC)
+    end
+
+    # @param [BlueprintData] blueprint
+    def parse_areas(blueprint)
+      reader.read_i8.times do
+        area = Area.new
+        area.index = reader.read_i8
+        area.parent_index = reader.read_i8
+        area.tropic_anchor = reader.read_i16
+        area.area_segments = reader.read_i16
+        area.anchor_local_offset_x = reader.read_i16
+        area.anchor_local_offset_y = reader.read_i16
+        area.width = reader.read_i16
+        area.height = reader.read_i16
+
+        blueprint.areas << area
+      end
+    end
+
+    # @param [BlueprintData] blueprint
+    def parse_buildings(blueprint)
+      BuildingParser.process!(blueprint, reader)
+    end
+
+    # @param [BlueprintData] blueprint
+    def parse_metadata(blueprint)
+      header_version = header_segments[0].gsub(':', '').to_i
+
+      blueprint.icon_layout = header_segments[1].to_i
+      blueprint.icon0 = header_segments[2].to_i
+      blueprint.icon1 = header_segments[3].to_i
+      blueprint.icon2 = header_segments[4].to_i
+      blueprint.icon3 = header_segments[5].to_i
+      blueprint.icon4 = header_segments[6].to_i
+
+      blueprint.time = ticks_to_epoch(header_segments[8].to_i)
+      blueprint.game_version = header_segments[9]
+
+      blueprint.short_description = uri_unescape(header_segments[10])
+
+      if header_version >= 1
+        blueprint.author = uri_unescape(header_segments[11])
+        blueprint.custom_version = uri_unescape(header_segments[12])
+        blueprint.attributes = uri_unescape(header_segments[13])&.split(';')
+        blueprint.description = uri_unescape(header_segments[14])
+      elsif header_segments[11]
+        blueprint.description = uri_unescape(header_segments[11])
+      end
+
+      blueprint.version = reader.read_i32
+      blueprint.cursor_offset_x = reader.read_i32
+      blueprint.cursor_offset_y = reader.read_i32
+      blueprint.cursor_target_area = reader.read_i32
+      blueprint.drag_box_size_x = reader.read_i32
+      blueprint.drag_box_size_y = reader.read_i32
+      blueprint.primary_area_idx = reader.read_i32
+    end
+
+    # @param input [String, nil]
+    # @return [String, nil]
+    def uri_unescape(input)
+      return nil if input.nil?
+
+      URI_PARSER.unescape(input)
+    end
+  end
+end

data/lib/dsp_blueprint_parser/version.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
-
-module DspBlueprintParser
-  VERSION = '0.2.2'
-end
+# frozen_string_literal: true
+
+module DspBlueprintParser
+  VERSION = '0.2.3'
+end

data/lib/dsp_blueprint_parser.rb

@@ -1,46 +1,46 @@
-# frozen_string_literal: true
-
-require 'date'
-require 'zlib'
-require 'stringio'
-require 'base64'
-require 'md5f'
-
-require_relative 'dsp_blueprint_parser/version'
-require_relative 'dsp_blueprint_parser/blueprint_data'
-require_relative 'dsp_blueprint_parser/icon_layout'
-require_relative 'dsp_blueprint_parser/area'
-require_relative 'dsp_blueprint_parser/building'
-require_relative 'dsp_blueprint_parser/binary_reader'
-require_relative 'dsp_blueprint_parser/parser'
-require_relative 'dsp_blueprint_parser/building_parser'
-require_relative 'dsp_blueprint_parser/data_sections'
-
-BLUEPRINT_TYPE = /(BLUEPRINT|DYBP):/
-
-# module to receive a Dyson Sphere Program blueprint string and parse it
-module DspBlueprintParser
-  class Error < StandardError; end
-
-  # @param str_blueprint [String]
-  # @return [BlueprintData]
-  def self.parse(str_blueprint)
-    return if str_blueprint.size < 28
-    return unless str_blueprint.start_with? BLUEPRINT_TYPE
-
-    parser = Parser.new(str_blueprint)
-    parser.blueprint
-  end
-
-  # @param input [String]
-  # @return [Boolean]
-  def self.is_valid?(input)
-    return false if input.size < 28
-    return false unless input.start_with? BLUEPRINT_TYPE
-
-    sections = DataSections.new(input)
-    hash = MD5F::compute(sections.hashed_string)
-
-    return sections.hash == hash
-  end
-end
+# frozen_string_literal: true
+
+require 'date'
+require 'zlib'
+require 'stringio'
+require 'base64'
+require 'md5f'
+
+require_relative 'dsp_blueprint_parser/version'
+require_relative 'dsp_blueprint_parser/blueprint_data'
+require_relative 'dsp_blueprint_parser/icon_layout'
+require_relative 'dsp_blueprint_parser/area'
+require_relative 'dsp_blueprint_parser/building'
+require_relative 'dsp_blueprint_parser/binary_reader'
+require_relative 'dsp_blueprint_parser/parser'
+require_relative 'dsp_blueprint_parser/building_parser'
+require_relative 'dsp_blueprint_parser/data_sections'
+
+BLUEPRINT_TYPE = /(BLUEPRINT|DYBP):/
+
+# module to receive a Dyson Sphere Program blueprint string and parse it
+module DspBlueprintParser
+  class Error < StandardError; end
+
+  # @param str_blueprint [String]
+  # @return [BlueprintData]
+  def self.parse(str_blueprint)
+    return if str_blueprint.size < 28
+    return unless str_blueprint.start_with? BLUEPRINT_TYPE
+
+    parser = Parser.new(str_blueprint)
+    parser.blueprint
+  end
+
+  # @param input [String]
+  # @return [Boolean]
+  def self.is_valid?(input)
+    return false if input.size < 28
+    return false unless input.start_with? BLUEPRINT_TYPE
+
+    sections = DataSections.new(input)
+    hash = MD5F::compute(sections.hashed_string)
+
+    return sections.hash == hash
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dsp_blueprint_parser
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Lucas Falk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2025-12-28 00:00:00.000000000 Z
+date: 2026-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler