farseer 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22cbc0c49fc2a306b2e0e7291dd58e09047bd2eef4b679d2be9f9e307c6db2e1
-  data.tar.gz: a3a1a49b2748d129931af363e3a4bcbb9fdbd174956de07a4de0daceb0cc07cb
+  metadata.gz: 1f6d2e808d2e8ac8a9b119598834508dc1482f0cfaf68c34737fefb4bd261db6
+  data.tar.gz: 7282626a92655eb5b4044edef19689042127e22fb83e7751b5128c80f3749a89
 SHA512:
-  metadata.gz: 8b3bc436e67fcd46f61964cb6e3e70c7f3a8c374a1712680f4a91901daaf9ae071c79428ac40da19038619e8a05556cbbfd0167d43b5841020b082d730f909a6
-  data.tar.gz: 2303e7849b72c10e9353ff9faf362c3d8e0113f24247dbd95104ea45d2c5877e96bcf2444d402853909f14590f4a3c8295f813f99ebc23e1c4bbccbb33c11ae8
+  metadata.gz: f970a3b6804799587f2e715de0bff16efbaa6904e86259f735f6d417c5590cf0eb8bda85349509782c0258a215405c55c285159f7e31905406d08340891c3453
+  data.tar.gz: 7c5eaffc7d1b135bff0eae234f1322c1ded4971e0c8a68bfcd47cd43783037193d242a39e3fd2a59e06d76a267e8543967e1cde846f5dea7f2db03deb08d5ef9

data/CHANGELOG.md

@@ -7,6 +7,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.0] - 2024-06-11
+### Added
+- `Farseer::Empty` which always succeeds and parses nothing, returning the whole
+    string as rest.
+
+### Changed
+- Change usage of `#eql?` to `#==` in `Farseer::Result`.
+- `Farseer::And` does not join the resulting tokens anymore, but rather return
+    an array of tokens.
+- Remove all development dependencies from `Gemfile` in favor of having
+    `lollipop` in the `gemspec`.
+
+## [0.8.0] - 2024-06-04
+### Added
+- `Farseer::Map` which is a parser with a callback to map the resulting token
+    into something else.
+- `Farseer::MapFactory` which adds `#map`, a factory method for new parsers with
+    callbacks. It creates a new instance of `Farseer::Map`.
+- Included `Farseer::MapFactory` into all parsers.
+
+
 ## [0.7.0] - 2024-06-04
 ### Added
 - `Farseer::And` to run a sequence of parsers that must all succeed.
@@ -23,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Update development dependencies.
 
+
 ## [0.6.0] - 2024-06-03
 ### Added
 - `Farseer::Opt`  to parse `0` to `1` times the wrapped parser. (`?`)
@@ -37,6 +59,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Updated development dependencies
 
+
 ## [0.5.0] - 2024-06-03
 ### Added
 - `Farseer::Char` as a single character parser.
@@ -54,6 +77,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Update `muina` version requirement to `~> 0.5`
 
+
 ## [0.4.0] - 2024-06-03
 ### Added
 - `Farseer.any_char_parser` to parse a single character from a given set.
@@ -64,6 +88,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Stop using `module_function` and change methods into singleton methods.
 - Update `bundler` version.
 
+
 ## [0.3.0] - 2024-06-02
 ### Added
 - `Farseer#ws_parser` to parse all leading whitespace.

data/SECURITY.md

@@ -6,8 +6,8 @@ Currently supported version are:
 
 | Version | Supported          |
 | ------- | ------------------ |
-|   0.6.0 | :white_check_mark: |
-| < 0.6.0 | :x:                |
+|   0.9.0 | :white_check_mark: |
+| < 0.9.0 | :x:                |
 
 ## Reporting a Vulnerability
 

data/lib/farseer/and.rb

@@ -2,6 +2,8 @@
 
 module Farseer
   class And
+    include MapFactory
+
     def initialize(*parsers)
       @parsers = parsers.flatten
       freeze
@@ -10,7 +12,7 @@ module Farseer
     def parse(input)
       return Maybe.none if @parsers.empty?
 
-      initial = Maybe.return(Result.new('', input))
+      initial = Maybe.return(Result.new([], input))
 
       @parsers.reduce(initial) do |maybe_acc, parser|
         bind_accumulator(maybe_acc, parser)
@@ -30,7 +32,7 @@ module Farseer
     end
 
     def combine_results(acc_result, result)
-      combined_tokens = acc_result.token + result.token
+      combined_tokens = acc_result.token + [result.token]
       Maybe.return(Result.new(combined_tokens, result.rest))
     end
   end

data/lib/farseer/any.rb

@@ -2,6 +2,8 @@
 
 module Farseer
   class Any
+    include MapFactory
+
     def initialize(parser)
       @parser = parser
       freeze

data/lib/farseer/char.rb

@@ -2,6 +2,8 @@
 
 module Farseer
   class Char
+    include MapFactory
+
     def initialize(char)
       @char = char
       freeze

data/lib/farseer/chars.rb

@@ -2,6 +2,8 @@
 
 module Farseer
   class Chars
+    include MapFactory
+
     def initialize(*chars)
       @chars = chars.flatten
       freeze

data/lib/farseer/empty.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Farseer
+  class Empty
+    include MapFactory
+
+    def initialize
+      freeze
+    end
+
+    def parse(input)
+      Maybe.return Result.new('', input)
+    end
+  end
+end

data/lib/farseer/many.rb

@@ -2,6 +2,8 @@
 
 module Farseer
   class Many
+    include MapFactory
+
     def initialize(parser)
       @parser = parser
       freeze

data/lib/farseer/map.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Farseer
+  class Map
+    include MapFactory
+
+    def initialize(parser, &map)
+      @parser = parser
+      @map = map
+      freeze
+    end
+
+    def parse(input)
+      @parser.parse(input).map { |r| Result.new(@map.call(r.token), r.rest) }
+    end
+  end
+end

data/lib/farseer/map_factory.rb

@@ -0,0 +1,7 @@
+module Farseer
+  module MapFactory
+    def map(&)
+      Map.new(self, &)
+    end
+  end
+end

data/lib/farseer/opt.rb

@@ -2,6 +2,8 @@
 
 module Farseer
   class Opt
+    include MapFactory
+
     def initialize(parser)
       @parser = parser
       freeze

data/lib/farseer/or.rb

@@ -2,6 +2,8 @@
 
 module Farseer
   class Or
+    include MapFactory
+
     def initialize(*parsers)
       @parsers = parsers.flatten
       freeze

data/lib/farseer/regexp.rb

@@ -2,6 +2,8 @@
 
 module Farseer
   class Regexp
+    include MapFactory
+
     WS_REGEXP = /^(?'token'\s*)(?'rest'.*)$/
     RegexpError = Class.new(ArgumentError)
 

data/lib/farseer/result.rb

@@ -9,11 +9,11 @@ module Farseer
     end
     attr_reader :token, :rest
 
-    def eql?(other)
+    def ==(other)
       self.class.eql?(other.class) and
-        token.eql?(other.token) and
+        token == (other.token) and
         rest.eql?(other.rest)
     end
-    alias == eql?
+    alias eql? ==
   end
 end

data/lib/farseer/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Farseer
-  VERSION = '0.7.0'
+  VERSION = '0.9.0'
   public_constant :VERSION
 end

data/lib/farseer/word.rb

@@ -2,6 +2,8 @@
 
 module Farseer
   class Word
+    include MapFactory
+
     def initialize(word)
       @word = word
       freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: farseer
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - vaporyhumo
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: muina
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: lollipop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: Functional Parsing Library for Ruby
 email:
 - roanvilina@gmail.com
@@ -54,7 +68,10 @@ files:
 - lib/farseer/any.rb
 - lib/farseer/char.rb
 - lib/farseer/chars.rb
+- lib/farseer/empty.rb
 - lib/farseer/many.rb
+- lib/farseer/map.rb
+- lib/farseer/map_factory.rb
 - lib/farseer/opt.rb
 - lib/farseer/or.rb
 - lib/farseer/regexp.rb