lucid_http 0.11.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 261b34c3ff617c6412a4b5928f123cf72d692df9
-  data.tar.gz: e53200bdfd633cb285ca4d2fe3b0b28863f58bd6
+SHA256:
+  metadata.gz: 12e62ee94cac510a96bc7ea3193be7e0c56a8d5aad3832141a870bb9ee5c1c02
+  data.tar.gz: de38b31034e053b7b2675c35ed65a7425feae29c746dfa26fe1d91f9cdb79023
 SHA512:
-  metadata.gz: 7abd597d390c286da5e298ff25788dcccde01ad074b3920e24a403c545608d14692de13765017bf733d1882917b4b47ba9987ba2ad60bcd33c9bbd3fc075d2e1
-  data.tar.gz: 676abd88bdb500abb3fa57a44dfaf90f68fca9b0466fb1561b4e0f0b4eaf59e108d2f5d0942f7dcab7448466324fe30e94567a08b0942c64b3d9d27c72bdbd1a
+  metadata.gz: ae325f21b42b39254a2240408e7a3e7ed19519f9e5e7fef361140daa67146997e4503ea7e170cc4cb67a06d5661251d8249badd21eb4226dba36d42cecc3f13e
+  data.tar.gz: 0f426752fae717c5d95efc68039b1e84569250a39a4b7c5b9e618c1f1b56e1f6634628c08a1b7d73a62b8b0a537b251b31e95746cdd77f9fad9923ca751154cf

data/.rspec

@@ -0,0 +1,3 @@
+--require spec_helper
+--color
+--format=progress

data/lib/lucid_http/followers.rb

@@ -0,0 +1,25 @@
+module LucidHttp
+
+  module Follower
+
+    def self.for(keyword)
+      {
+        no_follow: NoFollow.new,
+        follow:    Follow.new,
+      }.fetch(keyword)
+    end
+
+    class NoFollow
+      def client
+        HTTP
+      end
+    end
+
+    class Follow
+      def client
+        HTTP.follow
+      end
+    end
+  end
+
+end

data/lib/lucid_http/formatters.rb

@@ -0,0 +1,26 @@
+require "json"
+module LucidHttp
+
+  module Formatter
+
+    def  self.for(keyword)
+      {
+        plain: PlainFormatter.new,
+        json:  JsonFormatter.new,
+      }.fetch(keyword)
+    end
+
+    class PlainFormatter
+      def call(response_body)
+        response_body
+      end
+    end
+
+    class JsonFormatter
+      def call(response_body)
+        JSON.parse(response_body)
+      end
+    end
+  end
+
+end

data/lib/lucid_http/response.rb

@@ -0,0 +1,41 @@
+module LucidHttp
+  class Response
+    attr_reader :base_url
+    attr_reader :path
+
+    def initialize(base_url:, path:, formatter:, follower:, verb: :get, form: {})
+      @base_url  = base_url
+      @path      = path
+      @formatter = LucidHttp::Formatter.for(formatter)
+      @follower  = LucidHttp::Follower.for(follower).client
+      @verb      = verb
+      @form      = form
+
+      @response = @follower.send(@verb, url, params: form)
+    end
+
+    def body
+      @formatter.call(@response.body.to_s)
+    end
+
+    def status
+      @response.status.to_s
+    end
+
+    def content_type
+      @response.content_type.mime_type
+    end
+
+    def url
+      "#{base_url}#{path}"
+    end
+
+    def error
+      body.split("\n").first
+    end
+
+    def verb
+      @verb.to_s.upcase
+    end
+  end
+end

data/lib/lucid_http/version.rb

@@ -1,3 +1,3 @@
 module LucidHttp
-  VERSION = "0.11.1"
+  VERSION = "1.1.0"
 end

data/lib/lucid_http.rb

@@ -1,104 +1,72 @@
 require "lucid_http/version"
 require "http"
-require "delegate"
-require "json"
+require "lucid_http/followers"
+require "lucid_http/formatters"
+require "lucid_http/response"
 
 module LucidHttp
-  def self.target_url
-    @target_url ||= ENV.fetch("TARGET_URL") { "http://localhost:9292" }
-  end
-
-  def self.target_url=(url="http://localhost:9292")
-    @target_url = url
-  end
+  class Client
+    attr_reader :base_url
 
-  class PrettyStatus < SimpleDelegator
-    def inspect
-      to_s
+    def initialize(base_url:)
+      @base_url = base_url
     end
-  end
-end
 
-def response
-  @__lucid_http__res
-end
+    %i[get post put patch delete options].each do |verb|
+      define_method(verb.upcase) do |path, formatter: :plain, follower: :no_follow, form: {}|
+        do_verb(
+          verb: verb, path: path,
+          formatter: formatter, follower: follower,
+          form: form,
+        )
+      end
+    end
 
-def __lucid_http__clean
-  instance_variables.grep(/@__lucid_http__/).each do |v|
-    remove_instance_variable(v.to_sym)
+    def do_verb(verb:, path:, formatter:, follower:, form:)
+      LucidHttp::Response.new(
+        base_url: base_url, path: path, verb: verb,
+        formatter: formatter, follower: follower,
+        form: form,
+      )
+    end
   end
 end
 
-def __lucid_http__setup(url, action: :get, follow: false, form: nil, json: false, **opts)
-  __lucid_http__clean
-  @__lucid_http__client = HTTP.persistent(LucidHttp.target_url)
-  if json
-    @__lucid_http__client = @__lucid_http__client.accept("application/json")
+%i[get post put patch delete options].each do |verb|
+  define_method(verb.upcase) do |path, formatter: :plain, follower: :no_follow, form: {}|
+    @__response = LucidHttp::Client.new(base_url: "http://localhost:9292").do_verb(
+      verb: verb, path: path,
+      formatter: formatter, follower: follower,
+      form: form,
+    )
+    @__response.body
   end
-  if follow
-    @__lucid_http__client = @__lucid_http__client.follow
-  end
-
-  @__lucid_http__path = @__lucid_http__client.default_options.persistent + url
-  @__lucid_http__res = @__lucid_http__client.send(action.to_sym, url, form: form)
-  @__lucid_http__json = json
 end
 
 def body
-  @__lucid_http__body ||= __lucid_http__get_body
+  @__response.body
 end
 
-def __lucid_http__get_body
-  original_body = response.body.to_s
-  if !@__lucid_http__json
-    original_body
-  else
-    JSON.parse(original_body)
-  end
+def verb
+  @__response.verb
 end
 
 def status
-  @__lucid_http__status = LucidHttp::PrettyStatus.new(response.status)
+  @__response.status
 end
 
 def content_type
-  response.content_type.mime_type
+  @__response.content_type
 end
 
-def path
-  @__lucid_http__path
+def url
+  @__response.url
 end
 
-def error
-  if status.to_i == 500
-    body.split("\n").first
-  else
-    "No 500 error found."
-  end
+def path
+  @__response.path
 end
 
-%i[get post put patch delete head options].each do |verb|
-  define_method(verb.upcase) do |url, **opts|
-    __lucid_http__setup(url, action: verb, **opts)
-    new_body = case status.to_i
-               when 200
-                 body
-               else
-                 "STATUS: #{status}"
-               end
-
-    new_body
-  end
+def error
+  @__response.error
 end
-
-# def POST(url, **opts)
-#   __lucid_http__setup(url, action: :post, **opts)
-#   new_body = case status.to_i
-#              when 200
-#                body
-#              else
-#                "STATUS: #{status}"
-#              end
-
-#   new_body
-# end

data/lucid_http.gemspec

@@ -21,9 +21,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "http", "~> 2.1"
+  spec.add_runtime_dependency "http"
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "rackup",  "~> 2.1.0"
+  spec.add_development_dependency "rake",    "~> 13.0.6"
+  spec.add_development_dependency "roda",    "~> 3.66.0"
+  spec.add_development_dependency "rspec",   "~> 3.12.0"
+  spec.add_development_dependency "bundler", "~> 2.4.8"
 end

metadata

@@ -1,71 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: lucid_http
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Federico Iachetti
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rackup
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 13.0.6
+- !ruby/object:Gem::Dependency
+  name: roda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.66.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 3.66.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.12.0
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 2.4.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 2.4.8
 description: Lucid Http wraps the http.rb gem in a simple DSL. Is particularly useful
   for screencasts and simple presentations.
 email:
@@ -75,6 +103,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -84,13 +113,16 @@ files:
 - bin/console
 - bin/setup
 - lib/lucid_http.rb
+- lib/lucid_http/followers.rb
+- lib/lucid_http/formatters.rb
+- lib/lucid_http/response.rb
 - lib/lucid_http/version.rb
 - lucid_http.gemspec
 homepage: https://github.com/iachettifederico/lucid_http
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,9 +137,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.10
-signing_key: 
+rubygems_version: 3.4.8
+signing_key:
 specification_version: 4
 summary: Lucid Http wraps the http.rb gem in a simple DSL.
 test_files: []