aoc_generator 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b769226917de985f62166b06a18ac48433df5e5ca362fdfc7248338d368ce39
-  data.tar.gz: 9f1be6d33fe107041e8ebcbc90c9dc67b05d5ad27506a84ee2ebe5239cf4920b
+  metadata.gz: 1ae6b1d2734c4a21d5608955e4bc5c36d6a2226644834eebbade401de59ebe87
+  data.tar.gz: fc64a51413098fc34a5b33a5ab7d6df042bef03800a134b9ab06c3c950e289d4
 SHA512:
-  metadata.gz: 0fad21368f7c4033a73670fdb2dece5a1ed468de3e0075d50426b821d65a3e15ae840bf2c8f6e20f5e8070f836ffe21bb72eb7abd100162bed5ee60101ca8821
-  data.tar.gz: 1ec320f03139f386435f78e21f3922e840a36433795f7e34421ff4d464b53073497c7c742da1998a025b15e31c1c34e719a5f008cd049a8ad65d2351f1ad8234
+  metadata.gz: a6165ed4974b4f84a8500530ca257e757bf61ccb932233e8d34e7237ab36f5e0208bc89b592e09844252e86b4253659197d5322799ff184224ab292c97d93c0a
+  data.tar.gz: 44620d63c9fcf49970148ae4ae4335bc1e9d97a942c33310df4a0dc860c353322ad229981dbbb9f6bcba2e0e7de7a2ac904d32ca283ba9ef45e45ae3c968a7b6

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## [0.1.3] - 2024-11-28
+## [0.1.5] - 2024-11-28
+
+- Generate main file with class methods, rather than instance methods
+
+## [0.1.4]
+
+- Add test data to spec file
+
+## [0.1.3]
 
 - Allow to read a AOC_SESSION environment variable
 - Change file names

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aoc_generator (0.1.3)
+    aoc_generator (0.1.5)
       fileutils (~> 1.7)
       nokogiri (~> 1.16)
       thor (~> 1.3)

data/lib/advent_of_code_generator/cli.rb

@@ -38,8 +38,7 @@ module AdventOfCodeGenerator
                   default: ENV.fetch("AOC_SESSION", nil)
 
     def generate
-      scraper = AdventOfCodeGenerator::Scraper.new(options)
-      generator = AdventOfCodeGenerator::Generator.new(options, scraper)
+      generator = AdventOfCodeGenerator::Generator.new(options, content)
 
       generator.call
     end
@@ -47,5 +46,14 @@ module AdventOfCodeGenerator
     def self.exit_on_failure?
       true
     end
+
+    private
+
+    def content
+      scraped_data = AdventOfCodeGenerator::Scraper.new(options).call
+      parsed_data = AdventOfCodeGenerator::HTMLParser.new(scraped_data[:puzzle_description]).call
+
+      scraped_data.merge(parsed_data)
+    end
   end
 end

data/lib/advent_of_code_generator/generator.rb

@@ -20,11 +20,11 @@ module AdventOfCodeGenerator
   class Generator
     FileData = Struct.new(:path, :content)
 
-    def initialize(options, scraper)
+    def initialize(options, scraped_data)
       @year = options[:year].to_s
       @day = options[:day].to_s.rjust(2, "0") # Ensures day is two digits (e.g., "01" instead of "1")
       @username = options[:username].gsub(/[_\-\.\s]/, "")
-      @scraper = scraper
+      @scraped_data = scraped_data
     end
 
     def call
@@ -45,14 +45,14 @@ module AdventOfCodeGenerator
 
     def readme
       path = "#{daily_directory}/README.md"
-      content = @scraper.puzzle_description
+      content = @scraped_data[:puzzle_description]
 
       FileData.new(path, content)
     end
 
     def data_file
       path = "#{daily_directory}/data.txt"
-      content = @scraper.input_data
+      content = @scraped_data[:input_data]
 
       FileData.new(path, content)
     end
@@ -65,15 +65,11 @@ module AdventOfCodeGenerator
         module #{@username.capitalize}
           module Year#{@year}
             class Day#{@day}
-              def initialize(input)
-                @input = input
-              end
-
-              def part_one
+              def self.part_one(input)
                 raise NotImplementedError
               end
 
-              def part_two
+              def self.part_two(input)
                 raise NotImplementedError
               end
             end
@@ -86,22 +82,28 @@ module AdventOfCodeGenerator
 
     def spec_file
       path = "#{daily_directory}/day_#{@day}_spec.rb"
+      input, expectations = @scraped_data.values_at(:test_input, :test_expectations)
+      input ||= ["", ""]
       content = <<~RUBY
         # frozen_string_literal: true
 
         require_relative "day_#{@day}"
 
         RSpec.describe #{@username.capitalize}::Year#{@year}::Day#{@day} do
-          subject(:puzzle) { described_class.new(input) }
-
-          let(:input) { File.read("\#{__dir__}/data.txt") }
-
           it "solves Part One" do
-            expect(puzzle.part_one).to eq("")
+            input = <<~INPUT
+              #{input[0]&.gsub("\n", "\n      ")}
+            INPUT
+
+            expect(described_class.part_one(input)).to eq(#{expectations[0]})
           end
 
-          xit "solves Part Two" do
-            expect(puzzle.part_two).to eq("some other value")
+          it "solves Part Two", skip: "not implemented yet" do
+            input = <<~INPUT
+              #{input[1]&.gsub("\n", "\n      ")}
+            INPUT
+
+            expect(described_class.part_two(input)).to eq(#{expectations[1]})
           end
         end
       RUBY

data/lib/advent_of_code_generator/html_parser.rb

@@ -5,20 +5,41 @@ require "nokogiri"
 module AdventOfCodeGenerator
   # Converts HTML puzzle descriptions from adventofcode.com into markdown format.
   class HTMLParser
-    def initialize(input)
-      @input = input
+    def initialize(html_content)
+      @html_content = html_content
     end
 
     def call
-      articles.map do |node|
-        process_article(node)
-      end.join("\n").strip
+      {
+        puzzle_description: part_descriptions.join("\n"),
+        test_input:,
+        test_expectations:
+      }
     end
 
     private
 
+    def part_descriptions
+      @part_descriptions ||= articles.map do |node|
+        process_article(node).join("\n")
+      end
+    end
+
+    def test_input
+      part_descriptions.map { |desc| desc.scan(/```sh\n(.*?)\n```/m) }.flatten
+    end
+
+    def test_expectations
+      part_descriptions
+        .flat_map { |desc| desc.scan(/\*\*`(.*?)`\*\*/) }
+        .map do |matches|
+          match = matches.first
+          match&.match?(/\A\d+\z/) ? match.to_i : match
+        end.compact
+    end
+
     def articles
-      doc = Nokogiri::HTML(@input)
+      doc = Nokogiri::HTML(@html_content)
       doc.css("article")
     end
 

data/lib/advent_of_code_generator/scraper.rb

@@ -6,11 +6,25 @@ require_relative "html_parser"
 module AdventOfCodeGenerator
   # Fetches puzzle descriptions and input data from adventofcode.com.
   class Scraper
-    def initialize(options, parser = AdventOfCodeGenerator::HTMLParser)
+    def initialize(options)
       @year = options[:year]
       @day = options[:day]
       @session_key = options[:session]
-      @parser = parser
+    end
+
+    def call
+      {
+        puzzle_description:,
+        input_data:
+      }
+    end
+
+    private
+
+    def headers
+      return {} unless @session_key
+
+      @headers ||= { cookie: "session=#{@session_key}" }
     end
 
     def puzzle_description
@@ -19,24 +33,16 @@ module AdventOfCodeGenerator
       uri = URI("https://adventofcode.com/#{@year}/day/#{@day}")
       response = Net::HTTP.get_response(uri, headers)
 
-      @parser.new(response.body).call
+      response.body
     end
 
     def input_data
-      return @input_data if @input_data
       return warn "No session key provided; unable to download data file." unless @session_key
 
       uri = URI("https://adventofcode.com/#{@year}/day/#{@day}/input")
       response = Net::HTTP.get_response(uri, headers)
-      @input_data ||= response.body
-    end
-
-    private
 
-    def headers
-      return {} unless @session_key
-
-      @headers ||= { cookie: "session=#{@session_key}" }
+      response.body
     end
   end
 end

data/lib/advent_of_code_generator.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module AdventOfCodeGenerator
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 
   class Error < StandardError; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aoc_generator
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Daniel Nguyen