rivulet-rb 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 622289122f59a270997655c87af3287273f2f16f820f7713dd95092a32cb102b
-  data.tar.gz: 99896962459012b47744e0e8466a1b691bf5bc04f5337ef44ab3039b12938296
+  metadata.gz: e4b42dc6a74dc928bb126b9cb6802b096b1b59b83b5c6ff0773ca1ed8922199a
+  data.tar.gz: f00390412a9018f6ef39ea9293ff62b3920107c26070cd6a7a6c7bfe9e3512e6
 SHA512:
-  metadata.gz: '081156052069871b24b394ef91db773c57a9c3c1225fb52b76499f944e7d834edb0319f87211e0c53bc5d57d24e43c6d744df0455f3206a850c427c72ef0db87'
-  data.tar.gz: 25b0d8cdb73570dd48c16d5e15d8bfb371f2721e47ffff66b12d9f87c9057957629c4fc2b005c85295fd7e1c4fa2d460b0522aea2b80da67aef5ddb8c6253038
+  metadata.gz: e8dc3048c25021f16dd148ce023235ae01abf8655e8b0dfebd0761a9aa2c600164aaeb6143019c3fbfb4233d2efe784d28a574d28f0d1e799c352df6bb413398
+  data.tar.gz: 4ad74647d4a0a32b274672998ca6e8413f2bd03c7111f684b151e252d8ffae537feab8362b050babaa4957a50e053e6b5474ed248f3d78dc4a06b875225af812

data/lib/rivulet/cli/new.rb

@@ -24,6 +24,8 @@ module Rivulet
         ].freeze
 
         def call(name:, with_db: nil, **)
+          name = normalize_name(name)
+
           DIRS.each { |d| create_dir "#{name}/#{d}" }
 
           write name, 'Gemfile',                    gemfile(with_db)
@@ -43,10 +45,30 @@ module Rivulet
           copy name, 'AGENTS.md', File.expand_path('../../../docs/AGENTS.md', __dir__)
 
           puts "\nDone! Next steps:\n  cd #{name}\n  docker compose up"
+        rescue ArgumentError => e
+          puts "ERROR: #{e.message}"
+          exit false
         end
 
         private
 
+        def normalize_name(name)
+          normalized = name.to_s
+                           # "HTTPServer" -> "HTTP_Server": split an acronym from the word that follows
+                           .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+                           # "myApp" -> "my_App": split a camelCase boundary
+                           .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+                           # "my app 2" -> "my_app_2": collapse spaces, dashes, dots, etc. into "_"
+                           .gsub(/[^0-9a-zA-Z]+/, '_')
+                           .downcase
+                           # "  My App  " -> "my_app": drop leading/trailing "_"
+                           .gsub(/\A_+|_+\z/, '')
+
+          raise ArgumentError, "invalid application name #{name}" if normalized.empty?
+
+          normalized
+        end
+
         def create_dir(path)
           FileUtils.mkdir_p(path)
           puts "  create  #{path}/"
@@ -101,7 +123,7 @@ module Rivulet
 
           <<~RUBY
             Rivulet.configure do |config|
-              config.app.name = name
+              config.app.name = :#{name}
 
               #{dsn_line}
 
@@ -192,7 +214,7 @@ module Rivulet
                 volumes:
                   - db:/var/lib/postgresql/data
                 healthcheck:
-                  test: ["CMD-SHELL", "pg_isready -U rivulet"]
+                  test: ["CMD-SHELL", "pg_isready -U rivulet -d #{name}_development"]
                   interval: 5s
                   timeout: 3s
                   retries: 5

data/lib/rivulet/container.rb

@@ -24,6 +24,7 @@ module Rivulet
       register('run_migrations')    { Rivulet::Steps::RunMigrations.new }
       register('run_console')       { Rivulet::Steps::RunConsole.new }
       register('print_routes')      { Rivulet::Steps::PrintRoutes.new }
+      register('freeze_settings')   { Rivulet::Steps::FreezeSettings.new }
     end
   end
 end

data/lib/rivulet/operations/run_console.rb

@@ -8,6 +8,7 @@ module Rivulet
         load_db:           'steps.load_db',
         load_routes:       'steps.load_routes',
         load_initializers: 'steps.load_initializers',
+        freeze_settings:   'steps.freeze_settings',
         run_console:       'steps.run_console'
       ]
 
@@ -18,6 +19,7 @@ module Rivulet
         result = step load_app.(result)
         result = step load_routes.(result)
         result = step load_initializers.(result)
+        result = step freeze_settings.(result)
         result = step run_console.(result)
 
         result

data/lib/rivulet/operations/startup.rb

@@ -7,7 +7,8 @@ module Rivulet
         load_app:          'steps.load_app',
         load_db:           'steps.load_db',
         load_routes:       'steps.load_routes',
-        load_initializers: 'steps.load_initializers'
+        load_initializers: 'steps.load_initializers',
+        freeze_settings:   'steps.freeze_settings'
       ]
 
       def call(input = {})
@@ -17,6 +18,7 @@ module Rivulet
         result = step load_app.(result)
         result = step load_routes.(result)
         result = step load_initializers.(result)
+        result = step freeze_settings.(result)
 
         result
       end

data/lib/rivulet/request.rb

@@ -1,11 +1,12 @@
 module Rivulet
   class Request
-    attr_reader :http_method, :path, :content_type, :body, :session, :env
+    attr_reader :http_method, :path, :content_type, :query_string, :body, :session, :env
 
     def initialize(env)
       @http_method  = env['REQUEST_METHOD'].downcase.to_sym
       @path         = env['PATH_INFO']
       @content_type = env['CONTENT_TYPE']
+      @query_string = env['QUERY_STRING']
       @body         = env['rack.input']
       @session      = env['rack.session']
       @env          = env
@@ -14,5 +15,29 @@ module Rivulet
     def cookies
       Rack::Utils.parse_cookies(env)
     end
+
+    def query_params
+      Rack::Utils
+      .parse_nested_query(query_string)
+      .then { |params| deep_symbolize_keys(params) }
+    end
+
+    def body_params
+      return {} unless content_type&.include?('application/json')
+      raw = body.read
+      return {} if raw.nil? || raw.empty?
+      Oj.load(raw, symbolize_names: true)
+    rescue Oj::ParseError
+      {}
+    end
+
+    private
+
+    def deep_symbolize_keys(hash)
+      hash.each_with_object({}) do |(key, val), result|
+        val = deep_symbolize_keys(val) if val.is_a? Hash
+        result[key.to_sym] = val
+      end
+    end
   end
 end

data/lib/rivulet/steps/build_context.rb

@@ -31,17 +31,9 @@ module Rivulet
 
       def build_params(route, request, path_match)
         path_params = extract_params(route, path_match)
-        body_params = parse_body(request)
-        body_params.merge(path_params)
-      end
-
-      def parse_body(request)
-        return {} unless request.content_type&.include?('application/json')
-        raw = request.body.read
-        return {} if raw.nil? || raw.empty?
-        Oj.load(raw, symbolize_names: true)
-      rescue Oj::ParseError
-        {}
+        body_params = request.body_params
+        query_params = request.query_params
+        query_params.merge(body_params, path_params)
       end
 
       def find_route(routes, request)

data/lib/rivulet/steps/compile_response.rb

@@ -10,7 +10,7 @@ module Rivulet
         body, headers =
           case format
           when :json
-            payload = Oj.dump(response.body, mode: :json)
+            payload = Oj.dump(response.body, mode: :strict)
 
             [
               Protocol::HTTP::Body::Buffered.wrap(payload),

data/lib/rivulet/steps/freeze_settings.rb

@@ -0,0 +1,12 @@
+module Rivulet
+  module Steps
+    class FreezeSettings < Rivulet::Step
+      def call(input)
+        app = input[:resource]
+        app.config.finalize!
+
+        Success(input)
+      end
+    end
+  end
+end

data/lib/rivulet/steps/load_settings.rb

@@ -9,7 +9,6 @@ module Rivulet
         load app_file
 
         app.config.logger = app.config.logger.engine || default_logger(app)
-        app.config.finalize!
 
         Success(input)
       end

data/lib/rivulet/version.rb

@@ -1,3 +1,3 @@
 module Rivulet
-  VERSION = '0.3.0'
+  VERSION = '0.3.2'
 end

data/lib/rivulet.rb

@@ -34,6 +34,7 @@ require_relative 'rivulet/steps/build_context'
 require_relative 'rivulet/steps/validate_response'
 require_relative 'rivulet/steps/compile_response'
 require_relative 'rivulet/steps/dispatch'
+require_relative 'rivulet/steps/freeze_settings'
 require_relative 'rivulet/steps/load_app'
 require_relative 'rivulet/steps/load_db'
 require_relative 'rivulet/steps/load_routes'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rivulet-rb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Vladimir Dombrovskiy <vold@fastmail.com>
@@ -149,6 +149,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: irb
+  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: oj
   requirement: !ruby/object:Gem::Requirement
@@ -318,6 +332,7 @@ files:
 - lib/rivulet/steps/build_context.rb
 - lib/rivulet/steps/compile_response.rb
 - lib/rivulet/steps/dispatch.rb
+- lib/rivulet/steps/freeze_settings.rb
 - lib/rivulet/steps/load_app.rb
 - lib/rivulet/steps/load_db.rb
 - lib/rivulet/steps/load_initializers.rb
@@ -350,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.19
+rubygems_version: 4.0.23
 specification_version: 4
 summary: A small Rack web framework built on dry-rb, falcon and forced layering architecture
 test_files: []