compose 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d36eebaf01309fb4c0762dcbc6665e48704c47efdcc53d705a959eca780cbc2f
-  data.tar.gz: d109de09f9b08947aa5b17a3f67ce4e050854cc123a69d4ae95c791586e0e719
+  metadata.gz: 3ac262b371cf1ff49a50e94ea83aaf75e7867564341c3bd3bff024c77831c2b4
+  data.tar.gz: 8577e99ba4dc26f7cd96a40589bb4c75cca3394e6e3302d8d43c9786df4633dd
 SHA512:
-  metadata.gz: 657a0b56b8e25976c901be35c47d531947f524eef84e2696d9ebd0cdea8468b19ec1517b3eca803d49d4dac88e4a37b819695d3a8226bb323171fdeff8d38dd8
-  data.tar.gz: 72e63f67707c80f0287d5faab11e611e08f4910640e02be9c570738a11bfa939f4adba9c64a2ecd1cf9684c06fcdd5327f181fd1ebce40d2e1bde61ceee8c70e
+  metadata.gz: 5db9243359a8045ca48620bb0fb9f5dc0876fe763c01f0e3fba2cf46467b1feffc42d69afd35857aa1398b0977a8d0478fef6a338c847b0ef43651a934b386f3
+  data.tar.gz: 3e4de964ef36267bf768eba57c09d58e7037ae17e7313e61b068bb4611bb688ef914757b805a20d3ba7e4cc2a07f156d31bcb6270a0aebbca29a7708e2aa08a1

data/config/prompts/task.txt

@@ -7,6 +7,8 @@ Facts:
 2. Leave toLine empty for additions.
 3. Make sure the code snippet in the edit is complete. Feel free to make multiple edits, avoid repeating existing code if you can.
 4. Ensure the line numbers are accurate. Feel free to repeat existing code from previous or after lines to be sure.
+5. When adding new code to the end of a file, make sure to repeat the last
+   line of the file in the edit before adding a new line.
 
 ```json
 {

data/config/prompts/verify.txt

@@ -10,7 +10,10 @@ Verify this change:
 {{CHANGE}}
 ```
 
-and make sure it's needed and it's only replacing the correct lines, or adding the code to the correct place. Feel free to change additions to replacements or vice versa, or skip edits if they're not needed.
+and make sure it's needed and it's only replacing the correct lines, or adding
+the code to the correct place. Feel free to change additions to replacements
+or vice versa, fix atLine, fromLineNumber, toLineNumber if they would produce
+duplicated code lines, `or skip edits if they're not needed.
 Return only the fixed change object following this JSON spec:
 
 ```json

data/lib/compose/edit_processor.rb

@@ -86,7 +86,7 @@ module Compose
 
       case edit[:change][:type]
       when 'addition'
-        new_content.insert(edit[:change][:atLine] - 1, edit[:code])
+        new_content.insert(edit[:change][:atLine] - 1, edit[:code].split("\n").map { |line| line + "\n" })
       when 'replacement'
         new_content[edit[:change][:fromLineNumber] - 1..edit[:change][:toLineNumber] - 1] = edit[:code].split("\n").map { |line| line + "\n" }
       end
@@ -109,7 +109,7 @@ module Compose
           case edit[:change][:type]
           when 'addition'
             adjusted_line = edit[:change][:atLine] + line_offset
-            content.insert(adjusted_line - 1, edit[:code])
+            content.insert(adjusted_line - 1, edit[:code].split("\n").map { |line| line + "\n" })
             line_offset += edit[:code].count("\n") + 1
           when 'replacement'
             from_line = edit[:change][:fromLineNumber] + line_offset
@@ -121,6 +121,8 @@ module Compose
           end
         end
 
+        content = content.flatten
+
         FileUtils.mkdir_p(File.dirname(filename))
         File.write(filename, content.join)
         puts "Applied changes to #{filename}".green

data/lib/compose/file_processor.rb

@@ -2,6 +2,11 @@
 
 require 'find'
 require 'pathname'
+require 'httparty'
+require 'nokogiri'
+require 'reverse_markdown'
+require 'digest/md5'
+require 'fileutils'
 
 module Compose
   class FileProcessor
@@ -25,21 +30,19 @@ module Compose
       @files = {}
 
       input_files.each do |input|
-        if File.directory?(input)
+        if input.start_with?('http://', 'https://')
+          @files[input] = process_url(input)
+        elsif File.directory?(input)
           find_files_in_directory(input).each do |file|
-            @files[File.expand_path(file)] = nil
+            @files[File.expand_path(file)] = FileProcessor.load_file(file, include_imports: include_imports)
           end
         elsif File.file?(input)
-          @files[File.expand_path(input)] = nil
+          @files[File.expand_path(input)] = FileProcessor.load_file(file, include_imports: include_imports)
         else
           puts "Skipping invalid input: #{input}".yellow
         end
       end
 
-      @files.each do |file, _|
-        @files[file] = FileProcessor.load_file(file, include_imports: include_imports)
-      end
-
       self
     end
 
@@ -97,5 +100,33 @@ module Compose
     rescue
       false
     end
+
+    def process_url(url)
+      cached_file = File.join(ENV['HOME'], '.compose', 'cache', Digest::MD5.hexdigest(url))
+      content = if File.exist?(cached_file)
+                  File.read(cached_file)
+                else
+                  content = fetch_and_convert_url(url)
+                  return if content.nil?
+
+                  FileUtils.mkdir_p(File.dirname(cached_file))
+                  File.write(cached_file, content)
+                  content
+                end
+      return if content.nil?
+
+      "<url src='#{url}'>\n#{content}\n</url>"
+    end
+
+    def fetch_and_convert_url(url)
+      response = HTTParty.get(url, follow_redirects: true)
+      return nil if response.code != 200
+
+      doc = Nokogiri::HTML(response.body)
+      doc.search('script, style').remove
+      parsed_markdown = ReverseMarkdown.convert(doc.to_html, unknown_tags: :bypass)
+      normalized_markdown = parsed_markdown.gsub(/\s+/, ' ').strip
+      normalized_markdown
+    end
   end
 end

data/lib/compose/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Compose
-  VERSION = '0.1.5'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compose
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Dreaming Tulpa
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-openai
@@ -164,6 +164,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: reverse_markdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: digest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement