yarrow 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c49c3ae295fd127f7533a0af4c543d5315a2929a580a21b6b4c26379e519490
-  data.tar.gz: 6867e3004c89dc7362a83378f3b0d55a14803d513cc77445c7893a31ffb4e4bd
+  metadata.gz: 0c19632ef74b70bca618fa332e555bc93a277ccb71791df1e43f871b2d6d54e7
+  data.tar.gz: e1c4be606929e0d1c3a07e21bcf43b9d89847b45ccc59ff3a78ee9713a64bb55
 SHA512:
-  metadata.gz: '0056694b64f9ac4d000e85341570b4a5b630f27b5de15d5dcf12eeae1dc3625368abfd1d65a6c0a26f9793cbd6993e076c7e46d76ef97007874e8dddfd75c7af'
-  data.tar.gz: fa5469997f6e674f3f2b1daf8bbc525637b2cbb2db7b9a8a1d494c85b1ce4d2725753ece2a2d114a905b994fe96f99e9db09178fa6f92483d4ee5d6208a500ad
+  metadata.gz: 592a83f0ae68084ad789353f8319a290b02e2268c00fd84fed70cba5e1469f5cbd215ea17732801622c8b10867513bdd37fd02dc8bda95d75c3a70014230fb46
+  data.tar.gz: f1eab1e023451b5bbd6a88aecf610a887db96b37fff19c6c4cf500dacfadeb0461865d4ffad118f4b4d254889e52bbbc4583b8d74e5299efe7940308a1eeba07

data/README.md

@@ -40,7 +40,6 @@ A rough sketch of the project direction.
 
 | Version | Features |
 |---------|----------|
-| `0.6`   | Default media type mapping, graph collectors, markup converters |
 | `0.7`   | Content model/object mapping, template/site context |
 | `0.8`   | HTML publishing workflow |
 | `0.9`   | PDF publishing workflow |

data/bin/yarrow-server

@@ -9,9 +9,9 @@ $:.unshift(File.join(File.dirname(File.expand_path(path)), '..', 'lib'))
 
 require 'yarrow'
 
-Yarrow::Configuration.register_defaults
+config = Yarrow::Configuration.load_defaults
 
 Yarrow.logger = Logger.new(STDOUT)
 
-server = Yarrow::Server.new
+server = Yarrow::Server.new(config)
 server.run

data/lib/yarrow/config.rb

@@ -37,9 +37,9 @@ module Yarrow
       :port,
       :host,
       :handler,
-      :docroot,
+      #:docroot,
       :middleware,
-      :root_dir
+      #:root_dir
     )
 
     # Top level root config namespace.

data/lib/yarrow/defaults.yml

@@ -18,7 +18,7 @@ assets:
     - js
   manifest_file: manifest.json
 server:
-  live_reload: true
+  live_reload: false
   auto_index: true
   default_index: index.html
   default_type: text/plain

data/lib/yarrow/schema/types.rb

@@ -9,13 +9,25 @@ module Yarrow
         def self.kind_of(t, u)
           new("#{t} is not a subclass of #{u}")
         end
+
+        def self.respond_to_any(t, m)
+          new("#{t} does not implement any of #{m}")
+        end
+
+        def self.respond_to_all(t, m)
+          new("#{t} does not implement #{m}")
+        end
       end
   
       class TypeClass
+        def self.of(unit_type)
+          new(unit_type)
+        end
+
         attr_reader :unit
   
-        def initialize(unit=nil)
-          @unit = unit
+        def initialize(unit_type=nil)
+          @unit = unit_type
         end
   
         def check_instance_of!(input)
@@ -30,8 +42,16 @@ module Yarrow
           end
         end
 
-        def check_respond_to!(input)
+        def check_respond_to_any!(input, methods)
+          unless methods.any? { |m| input.respond_to?(m) }
+            raise CastError.respond_to_any(input.class, methods)
+          end
+        end
 
+        def check_respond_to_all!(input, methods)
+          unless methods.all? { |m| input.respond_to?(m) }
+            raise CastError.respond_to_all(input.class, methods)
+          end
         end
 
         def cast(input); end
@@ -50,23 +70,41 @@ module Yarrow
         end
       end
   
-      class Kind
+      class Kind < TypeClass
         def cast(input)
           check_kind_of!(input)
           input
         end
       end
   
-      class Interface
-  
-      end
-  
-      class Optional
-  
+      class Interface < TypeClass
+        def self.any(*args)
+          interface_type = new(args)
+          interface_type.implementation = :any
+          interface_type
+        end
+
+        def self.all(*args)
+          interface_type = new(args)
+          interface_type.implementation = :all
+          interface_type
+        end
+
+        attr_accessor :implementation
+
+        alias members unit
+
+        def cast(input)
+          case implementation
+          when :any then check_respond_to_any!(input, members)
+          when :all then check_respond_to_all!(input, members)
+          end
+          
+          input
+        end
       end
-  
-      class Constrained
-  
+
+      class Union
       end
     end
   end

data/lib/yarrow/schema/value.rb

@@ -1,5 +1,16 @@
 module Yarrow
   module Schema
+    # class Structure < Struct
+    #   def self.inherited(subclass)
+    #     unless subclass.name
+    #       puts "CLASS"
+    #       p caller_locations[3]
+    #     else
+    #       p subclass.name.downcase.to_sym
+    #     end
+    #   end
+    # end
+
     # Value object (with comparison by value equality). This just chucks back a
     # Ruby struct but wraps the constructor with method advice that handles
     # type checking and conversion.

data/lib/yarrow/server.rb

@@ -1,4 +1,5 @@
 require 'rack'
+require 'rackup'
 
 module Yarrow
   ##
@@ -52,8 +53,8 @@ module Yarrow
         @app = app
       end
 
-      def should_try_rewrite(path)
-        !request_path.ends_with(".html") || !request_path.ends_with("/")
+      def should_try_rewrite(request_path)
+        !request_path.end_with?(".html") || !request_path.end_with?("/")
       end
 
       def call(env)
@@ -123,14 +124,14 @@ module Yarrow
         reactor.start
       end
 
-      handler = Rack::Handler.get(run_options[:server])
+      handler = Rackup::Handler.get(run_options[:server])
 
       trap(:INT) do
         handler.shutdown if handler.respond_to?(:shutdown)
         reactor.stop if live_reload?
       end
 
-      handler.run(app, run_options)
+      handler.run(app, **run_options)
     end
 
     private

data/lib/yarrow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 module Yarrow
   APP_NAME = 'Yarrow'
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 end

data/yarrow.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new do |spec|
   spec.executables << 'yarrow'
   spec.executables << 'yarrow-server'
   spec.add_runtime_dependency 'mementus', '~> 0.8'
-  spec.add_runtime_dependency 'rack', '~> 2.0'
+  spec.add_runtime_dependency 'rack', '~> 3.0'
+  spec.add_runtime_dependency 'rackup', '~> 0.2'
   spec.add_runtime_dependency 'rack-livereload', '~> 0.3'
   spec.add_runtime_dependency 'eventmachine', '~> 1.2'
   spec.add_runtime_dependency 'em-websocket', '~> 0.5.1'
@@ -24,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.11'
   spec.add_development_dependency 'coveralls', '~> 0.8.23'
-  spec.add_development_dependency 'rack-test', '~> 0.8'
+  spec.add_development_dependency 'rack-test', '~> 2.0'
   spec.homepage = 'http://rubygemspec.org/gems/yarrow'
   spec.license = 'MIT'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yarrow
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Mark Rickerby
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-08 00:00:00.000000000 Z
+date: 2022-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mementus
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rack-livereload
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '2.0'
 description: Yarrow is a tool for generating well structured documentation from a
   variety of input sources.
 email: me@maetl.net