ur 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b35ba597a897efe98627c42379ea8ad07796bda96bcc937efaf2695d690618
-  data.tar.gz: c16c03ab3bd0038fa8b3b6d7448c1e2f3395a89fab5b0028b59076917c113c39
+  metadata.gz: 06e6df921036d0111ac6b57e937508d5689d30bbb702ebfc691749a9c31884ed
+  data.tar.gz: d160635a422395081f510059b7916aa9264c3289c3cc1d9170769c32c6d1cbb3
 SHA512:
-  metadata.gz: 7378736285ca4afe01785e7da1df1c7ceb157880c50656f3119565d08dab9d69c89485c0b6ac28ba18d68594391b94c9a29d55cd31b86ecc91bd56b315c081c7
-  data.tar.gz: 12296a2e2334a9bec5bb618483bf15dd01ef13af98cc6577fa79ccafe424c75f1b68899be25515a07cc451915026c19d9401e3a34445ee16cb4f7ee76d133507
+  metadata.gz: 41b9e773174eb1beaa88b128ebde4e75830e4c9bc9ee907bcbf24e9be7157ba0cff8a980bdc8b18a978a02d990d7933dcd3ae88fdacba81ed59f87046d36a559
+  data.tar.gz: 42dc377e5da9acccb960e35dea7d7d874c5a90b5965b025b0dd2a8c6443b89eae282f1f034bcee450dd8962bb06470d7016cbeaebf24871e3851853db83654ff

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+# v0.0.4
+- bump JSI v0.2.0
+
 # v0.0.3
-- bump JSI version
+- bump JSI v0.1.0
 
 # v0.0.2
 

data/README.md

@@ -2,6 +2,18 @@
 
 Ur: Unified Request/Response Representation in Ruby
 
+## Properties
+
+An ur primarily consists of a request, a response, and additional processing information.
+
+The request consists of the request method, uri, headers, and body.
+
+The response consists of the response status, headers, and body.
+
+The processing information consists of the time the request began, the duration of the request, or tag strings. This is optional.
+
+Other attributes may be present, and are ignored by this library.
+
 ## Usage with middleware
 
 Rack middleware:

data/lib/ur.rb

@@ -71,7 +71,17 @@ class Ur
 
       new({'bound' => 'inbound'}).tap do |ur|
         ur.processing.begin!
+
         ur.request['method'] = rack_request.request_method
+
+        ur.request.addressable_uri = Addressable::URI.new(
+          :scheme => rack_request.scheme,
+          :host => rack_request.host,
+          :port => rack_request.port,
+          :path => rack_request.path,
+          :query => (rack_request.query_string unless rack_request.query_string.empty?)
+        )
+
         ur.request.headers = env.map do |(key, value)|
           http_match = key.match(/\AHTTP_/)
           if http_match
@@ -84,13 +94,7 @@ class Ur
             end
           end
         end.compact.inject({}, &:update)
-        ur.request.addressable_uri = Addressable::URI.new(
-          :scheme => rack_request.scheme,
-          :host => rack_request.host,
-          :port => rack_request.port,
-          :path => rack_request.path,
-          :query => (rack_request.query_string unless rack_request.query_string.empty?)
-        )
+
         env["rack.input"].rewind
         ur.request.body = env["rack.input"].read
         env["rack.input"].rewind
@@ -101,15 +105,14 @@ class Ur
       new({'bound' => 'outbound'}).tap do |ur|
         ur.processing.begin!
         ur.request['method'] = request_env[:method].to_s
-        ur.request.headers = request_env[:request_headers]
         ur.request.uri = request_env[:url].normalize.to_s
+        ur.request.headers = request_env[:request_headers]
         ur.request.set_body_from_faraday(request_env)
       end
     end
   end
 
   def initialize(ur = {}, **opt, &b)
-    ur = JSI::JSON::Node.new_doc(ur) unless ur.is_a?(JSI::JSON::Node)
     super(ur, **opt, &b)
     unless instance.respond_to?(:to_hash)
       raise(TypeError, "expected hash argument. got: #{ur.pretty_inspect.chomp}")
@@ -158,6 +161,7 @@ class Ur
   schema['properties'].each do |property_name, property_schema|
     if property_schema['type'] == 'object' && property_schema['properties']
       property_schema['properties'].each_key do |property_property_name|
+        # ur.request_method => ur['request']['method']
         define_method("#{property_name}_#{property_property_name}") do
           self[property_name][property_property_name]
         end

data/lib/ur/faraday/yield_ur.rb

@@ -2,14 +2,16 @@ class Ur
   module Faraday
     class YieldUr < ::Faraday::Middleware
       def initialize(app, options = {}, &block)
+        raise(ArgumentError, "no block given to yield ur") unless block
+        raise(TypeError, "options must be a Hash") unless options.respond_to?(:to_hash)
         @app = app
         @options = options
         @yield_to = block
       end
 
       def call(request_env)
-        ur = Scorpio::Ur.from_faraday_request(request_env)
-        ur.logger = @options[:logger]
+        ur = (@options[:ur_class] || Ur).from_faraday_request(request_env)
+        ur.logger = @options[:logger] if @options[:logger]
         ur.faraday_on_complete(@app, request_env) do |response_env|
           @yield_to.call(ur)
         end

data/lib/ur/version.rb

@@ -1 +1 @@
-UR_VERSION = "0.0.3"
+UR_VERSION = "0.0.4".freeze

data/ur.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jsi", "~> 0.1.0"
+  spec.add_dependency "jsi", "~> 0.2.0"
   spec.add_dependency "addressable", "~> 2.0"
   spec.add_development_dependency "rack"
   spec.add_development_dependency "rack-test"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ur
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsi
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement