resterl 0.0.16 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 52b59fae88efaf01ddef720766197e661101b766
-  data.tar.gz: 0c4fb0c9858c1b39068e293cf25e53a7eacb2427
+SHA256:
+  metadata.gz: 34e6d5fb43fdcc446afac5ab06419e2632dac2bc2806a1528725d6165b492ab2
+  data.tar.gz: b6038c9b94e3db6134ec0de6cbc1763573c429f5c412186e59e6dd6af8de1dc2
 SHA512:
-  metadata.gz: b2763c61b9b1ef3e9fe64e78648f1fc67748d16040e9c28163853ba6779f4e7bc03442c865c452106aba58a7b8510b0c44267aee0fbe7f6db40df928b9c2f671
-  data.tar.gz: ac3bb5ab0e309aa16461b9c62e5fa42ff7ab8748b20203a0fae4b1e78241d831f313730fd0a1e20b4bc9dbb4f7facb4152e07b07d7a57f8589e45e5efcae2f6d
+  metadata.gz: c4371977339943f3a99831519bc1927724fa4b068902ccd86c2130e5566be7917d9693f0ac2fefd24ea70481f2854daaa1514d59bff59fd8464ece2fee0ea78e
+  data.tar.gz: 64f8c76852a4cd99e033910229f26fbb3be74e4c9162440cd5c47ccd11d7294247f19f15c414a52ff0f6289309827cf10048ade5557df08a58e67d29f450a098

data/.gitignore

@@ -21,3 +21,8 @@ pkg
 ## PROJECT::SPECIFIC
 PRIVATE_TODO.rdoc
 nbproject
+
+.bundle
+Gemfile.lock
+*.gem
+pkg

data/.rubocop.yml

@@ -0,0 +1,40 @@
+AllCops:
+  TargetRubyVersion: 2.0
+  Exclude:
+    - 'vendor/bundle/**/*'
+  DisplayCopNames: true
+Rails:
+  Enabled: false
+Style/Encoding:
+  EnforcedStyle: when_needed
+  Enabled: true
+Style/AsciiComments:
+  Enabled: false
+Style/Documentation:
+  Enabled: false
+Metrics/MethodLength:
+  Enabled: false
+Style/MethodDefParentheses:
+  Enabled: false
+Style/MultilineOperationIndentation:
+  EnforcedStyle: aligned
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+Style/MultilineMethodDefinitionBraceLayout:
+  Enabled: true
+Style/MultilineHashBraceLayout:
+  Enabled: true
+Style/SignalException:
+  Enabled: false
+Metrics/ClassLength:
+  Enabled: false
+Lint/AssignmentInCondition:
+  Enabled: false
+Metrics/ParameterLists:
+  Enabled: false
+Style/MultilineBlockChain:
+  Enabled: false
+Style/CommentAnnotation:
+  Enabled: false
+Style/GuardClause:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+2.7.4

data/Gemfile

@@ -1,2 +1,2 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 gemspec

data/lib/resterl/base_object.rb

@@ -1,98 +1,80 @@
 require 'hashie'
 
-# Idee: If-Match wäre bei .delete_object und .put_object ein interessantes
-#       Feature.
+module Resterl
+  class BaseObject
+    include ClassLevelInheritableAttributes
+    cattr_inheritable :resterl_client, :parser, :composer, :complete_mime_type,
+                      :mapper
+    attr_reader :response
 
-class Resterl::BaseObject #< Hashie::Mash
+    def initialize data = {}, response = nil
+      @data = Hashie::Mash.new data
+      @response = response
+    end
 
-  include ClassLevelInheritableAttributes
-  cattr_inheritable :resterl_client, :parser, :composer, :complete_mime_type,
-                    :mapper
-  attr_reader :response
+    def method_missing sym, *args, &block
+      @data.send sym, *args, &block
+    end
 
-  #self.resterl_client = nil
-  #self.complete_mime_type = 'text/plain'
+    def respond_to? sym, include_private = false
+      super || @data.respond_to?(sym, include_private)
+    end
 
-  def initialize data = {}, response = nil
-    @data = Hashie::Mash.new data
-    @response = response
-  end
+    class << self
+      def get_object url, params = {}
+        response = resterl_client.get(url, params, accept_header)
+        new_from_response(response)
+      end
 
-  def method_missing sym, *args, &block
-    # Vielleicht lassen sich auch feste Attribute delegieren, das wäre als
-    # method_missing.
-    @data.send sym, *args, &block
-  end
+      def post_to_object url, params = {}, data = {}
+        post_put_object(:post, url, params, data)
+      end
 
-  protected
+      def delete_object url
+        resterl_client.delete(url, {}, accept_header, {})
+      end
 
-  def self.get_object url, params = {}
-    headers = { 'Accept' => complete_mime_type }
-    response = resterl_client.get(url, params, headers)
-    doc = response.body
-    doc = parser.call(doc)
-    doc = mapper.map(doc) if @mapper
-    new(doc, response)
-  end
-  
-  def self.post_to_object url, params = {}, data = {}
-    # TODO: Refactoring
+      def put_object url, params = {}, data = {}
+        post_put_object(:put, url, params, data)
+      end
 
-    headers = {
-      'Accept' => complete_mime_type,
-      'Content-Type' => complete_mime_type
-    }
-    data = composer.call(data)
-    response = resterl_client.post(url, params, data, headers)
-    
-    doc = response.body
-    doc = parser.call(doc)
-    doc = mapper.map(doc) if @mapper
-    new(doc, response)
-  end
-  
-  def self.delete_object url
-    headers = {
-      'Accept' => complete_mime_type,
-    }
-    resterl_client.delete(url, {}, headers, {})
-    # TODO: Antwort parsen?
-  end
-  
-  def self.put_object url, params = {}, data
-    # TODO: Refactoring
-    
-    headers = {
-      'Accept' => complete_mime_type,
-      'Content-Type' => complete_mime_type
-    }
-    data = composer.call(data)
-    response = resterl_client.put(url, params, data, headers)
-    
-    doc = response.body
-    doc = parser.call(doc)
-    doc = mapper.map(doc) if @mapper
-    
-    # TODO: In Ordnung?
-    new(doc, response)
-  end
-  
+      def mime_type= t
+        self.parser, self.composer, self.complete_mime_type =
+          case t
+          when :json
+            [proc { |str| JSON.parse(str) },
+             proc(&:to_json),
+             'application/json'
+            ]
+          when :xml
+            [proc { |str| Hash.from_xml(str) },
+             proc(&:to_xml),
+             'application/xml'
+            ]
+          end
+      end
+
+      private
 
-  def self.mime_type= t
-    self.parser, self.composer, self.complete_mime_type = case t
-    when :json
-      # TODO prio 2: Only works when Rails is loaded?
-      [ proc {|str| JSON.parse(str)},
-        proc(&:to_json),
-        'application/json'
-      ]
-    when :xml
-      # TODO prio 2: Only works when Rails is loaded?
-      [ proc {|str| Hash.from_xml(str)},
-        proc(&:to_xml),
-        'application/xml'
-      ]
+      def post_put_object method, url, params, data
+        headers = accept_header.merge(
+          'Content-Type' => complete_mime_type
+        )
+        data = composer.call(data)
+        response = resterl_client.send(method, url, params, data, headers)
+        new_from_response response
+      end
+
+      def new_from_response response
+        doc = response.body
+        doc = parser.call(doc)
+        doc = mapper.map(doc) if @mapper
+        new(doc, response)
+      end
+
+      def accept_header
+        { 'Accept' => complete_mime_type }
+      end
     end
   end
-
 end

data/lib/resterl/client.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+# encoding: utf-8
 
 module Resterl
   class Client
@@ -8,6 +8,8 @@ module Resterl
       cache: Resterl::Caches::SimpleCache.new,
       ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE,
       expiry_multiplier: 10,
+      open_timeout: 15,
+      read_timeout: 60,
       minimum_cache_lifetime: 5 * 60 # 5 Minuten
     }
 
@@ -70,39 +72,8 @@ module Resterl
 
       # Anfrage stellen, ggf. ETag mit übergeben
       request = Resterl::GetRequest.new(self, url, params, headers)
-      new_response = request.perform.response
-
-      response, max_age_seconds =
-        case new_response
-        when Net::HTTPClientError,
-             Net::HTTPServerError
-          # Aus dem Cache muss nichts entfernt werden,
-          # weil ja auch kein Eintrag (mehr) drin ist.
-          new_response.error!
-        when Net::HTTPNotModified
-          # Wenn "304 Not Modified", dann altes
-          # Ergebnis als neues Ergebnis verwenden
-          r_temp = Resterl::Response.new(new_response,
-                                         options[:minimum_cache_lifetime])
-          old_response.update_expires_at(
-            r_temp.expires_at)
-          [old_response, r_temp.expires_at - Time.now]
-        when Net::HTTPSuccess
-          r = Resterl::Response.new(new_response,
-                                    options[:minimum_cache_lifetime])
-          [r, r.expires_at - Time.now]
-        else
-          raise 'unknown response'
-        end
-
-      # Cachezeit berechnen
-      expiry = [
-        max_age_seconds.to_i * options[:expiry_multiplier],
-        options[:minimum_cache_lifetime]
-      ].max
-
-      # Ergebnis im Cache speichern
-      @cache.write cache_key, response, expiry
+      response, max_age_seconds = get_response(request, old_response)
+      cache_response(response, max_age_seconds, cache_key)
 
       response
     end
@@ -129,5 +100,46 @@ module Resterl
     def data_to_cache_key *args
       args.hash
     end
+
+    def get_response(request, old_response)
+      # Anfrage stellen, ggf. ETag mit übergeben
+      new_response = request.perform.response
+
+      case new_response
+      when Net::HTTPClientError,
+           Net::HTTPServerError
+        # Aus dem Cache muss nichts entfernt werden,
+        # weil ja auch kein Eintrag (mehr) drin ist.
+        new_response.error!
+      when Net::HTTPNotModified
+        reuse_old_response(new_response, old_response)
+      when Net::HTTPSuccess
+        r = Resterl::Response.new(new_response,
+                                  options[:minimum_cache_lifetime])
+        [r, r.expires_at - Time.now]
+      else
+        raise 'unknown response'
+      end
+    end
+
+    def cache_response(response, max_age_seconds, cache_key)
+      # Cachezeit berechnen
+      expiry = [
+        max_age_seconds.to_i * options[:expiry_multiplier],
+        options[:minimum_cache_lifetime]
+      ].max
+
+      # Ergebnis im Cache speichern
+      @cache.write cache_key, response, expiry
+    end
+
+    def reuse_old_response(new_response, old_response)
+      # Wenn "304 Not Modified", dann altes
+      # Ergebnis als neues Ergebnis verwenden
+      r_temp = Resterl::Response.new(new_response,
+                                     options[:minimum_cache_lifetime])
+      old_response.update_expires_at(r_temp.expires_at)
+      [old_response, r_temp.expires_at - Time.now]
+    end
   end
 end

data/lib/resterl/generic_request.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/hash'
 
 module Resterl
   class GenericRequest
@@ -17,6 +18,7 @@ module Resterl
     def http_object_and_query_path
       uri = URI.parse(url)
       http = Net::HTTP.new(uri.host, uri.port)
+      apply_timeout_settings http
       apply_ssl http, uri
 
       path_with_query = uri.path
@@ -28,11 +30,7 @@ module Resterl
     end
 
     def query_param_string
-      @query_param_string ||= begin
-        @query_params.collect do |key, value|
-          "#{URI.escape(key.to_s)}=#{URI.escape(value.to_s)}"
-        end.join('&')
-      end
+      @query_param_string ||= @query_params.to_query
     end
 
     def apply_basic_auth request
@@ -46,6 +44,11 @@ module Resterl
       http.verify_mode = rest_client.options[:ssl_verify_mode]
     end
 
+    def apply_timeout_settings http
+      http.open_timeout = rest_client.options[:open_timeout]
+      http.read_timeout = rest_client.options[:read_timeout]
+    end
+
     def redirect_url
       response['location'] || response.body.match(/<a href=\"([^>]+)\">/i)[1]
     end

data/lib/resterl/version.rb

@@ -1,3 +1,3 @@
 module Resterl
-  VERSION = '0.0.16'
+  VERSION = '0.1.1'.freeze
 end

data/lib/resterl.rb

@@ -2,8 +2,9 @@ require 'net/http'
 require 'net/https'
 require 'yajl/json_gem'
 ################################################################################
-module Resterl; end
-module Resterl::Caches; end
+module Resterl
+  module Caches; end
+end
 ################################################################################
 require 'resterl/class_level_inheritable_attributes'
 
@@ -23,7 +24,3 @@ require 'resterl/put_request'
 require 'resterl/delete_request'
 require 'resterl/response'
 require 'resterl/base_object'
-
-################################################################################
-Net::HTTP.version_1_1 if RUBY_VERSION < '1.9.3'
-################################################################################

data/resterl.gemspec

@@ -1,25 +1,25 @@
 # encoding: utf-8
-$:.push File.expand_path("../lib", __FILE__)
-require "resterl/version"
-
+require File.expand_path('../lib/resterl/version', __FILE__)
 
 Gem::Specification.new do |s|
   s.name = 'resterl'
   s.version = Resterl::VERSION
-  s.authors = ["Florian Dütsch"]
-  s.email = 'florian.duetsch@nix-wie-weg.de'
-  s.homepage = 'http://github.com/Nix-wie-weg/resterl'
+  s.authors = ['Florian Dütsch', 'Stefan Hoffmann']
+  s.email = ['florian.duetsch@nix-wie-weg.de', 'stefan.hoffmann@nix-wie-weg.de']
+  s.homepage = 'https://github.com/Nix-wie-weg/resterl'
   s.summary = 'Rudimentary HTTP client with focus on caching'
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{|f|File.basename(f)}
-  #s.require_paths = ["lib"]
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
+  s.executables   = s.files.grep(%r{^bin/}).map { |f| File.basename(f) }
+  s.require_paths = ['lib']
+  s.required_ruby_version = '>= 2.0.0'
 
-  s.add_runtime_dependency 'activesupport', '>= 2.3.18'
-  s.add_runtime_dependency 'hashie', '~> 0.4.0'
+  s.add_runtime_dependency 'activesupport', '>= 3.2.0'
+  s.add_runtime_dependency 'hashie', '~> 3.5.7'
   s.add_runtime_dependency 'yajl-ruby', '~> 1.1'
-  s.add_development_dependency 'rspec', '~> 3.1'
-  s.add_development_dependency 'webmock', '~> 1.20.4'
-  s.add_development_dependency 'timecop', '~> 0.7.1'
+  s.add_development_dependency 'rspec', '~> 3.7'
+  s.add_development_dependency 'webmock', '~> 3.4.1'
+  s.add_development_dependency 'timecop', '~> 0.9.1'
+  s.add_development_dependency 'rubocop', '~> 0.39.0'
   s.add_development_dependency 'pry'
 end

data/spec/lib/resterl/base_object_spec.rb

@@ -0,0 +1,23 @@
+require_relative '../../spec_helper'
+require 'active_support/core_ext/object/try'
+
+describe Resterl::BaseObject do
+  subject { described_class.new(foo: :bar) }
+
+  context '#try from ActiveSupport' do
+    it 'returns a value if the key exists' do
+      expect(subject.try(:foo)).to eq :bar
+    end
+    it 'returns nil if the key does not exist' do
+      expect(subject.try(:fox)).not_to be
+    end
+  end
+
+  it { is_expected.to respond_to(:response) }
+  it { is_expected.to respond_to(:foo) }
+  it { is_expected.not_to respond_to(:fox) }
+
+  it 'supports respond_to with private methods' do
+    expect(subject.respond_to?(:log_built_in_message, true)).to be_truthy
+  end
+end

data/spec/lib/resterl/{client.rb → client_spec.rb}

@@ -4,9 +4,9 @@ require 'webmock/rspec'
 require 'timecop'
 
 describe Resterl::Client do
+  subject(:client) { Resterl::Client.new }
 
   describe 'minimum cache lifetime' do
-
     before do
       Timecop.freeze(Time.parse('2015-01-01 01:00'))
 
@@ -16,7 +16,6 @@ describe Resterl::Client do
         headers: { cache_control: 'max-age=0, private, must-revalidate' }
       ).then.to_raise('2 requests')
     end
-    let(:client) { Resterl::Client.new }
 
     it 'is used in "max-age=0" case' do
       response = client.get 'http://www.example.com/', {}, {}
@@ -33,4 +32,12 @@ describe Resterl::Client do
       end.not_to raise_error
     end
   end
+
+  it 'encodes url params' do
+    stub_request(
+      :get, "http://www.example.com/?text=Ein%20gro%C3%9Fer%20Spa%C3%9F!"
+    ).to_return(status: 200, body: '', headers: {})
+
+    client.get 'http://www.example.com/', { text: 'Ein großer Spaß!' }, {}
+  end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: resterl
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.1.1
 platform: ruby
 authors:
 - Florian Dütsch
-autorequire: 
+- Stefan Hoffmann
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2021-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.18
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.18
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 3.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 3.5.7
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +59,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.4
+        version: 3.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.4
+        version: 3.4.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.39.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.39.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -108,19 +123,22 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
-email: florian.duetsch@nix-wie-weg.de
+description:
+email:
+- florian.duetsch@nix-wie-weg.de
+- stefan.hoffmann@nix-wie-weg.de
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".document"
 - ".gitignore"
+- ".rubocop.yml"
+- ".ruby-version"
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
-- TODO.rdoc
 - lib/resterl.rb
 - lib/resterl/base_object.rb
 - lib/resterl/caches/cache_interface.rb
@@ -139,12 +157,13 @@ files:
 - lib/resterl/response.rb
 - lib/resterl/version.rb
 - resterl.gemspec
-- spec/lib/resterl/client.rb
+- spec/lib/resterl/base_object_spec.rb
+- spec/lib/resterl/client_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/Nix-wie-weg/resterl
+homepage: https://github.com/Nix-wie-weg/resterl
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,19 +171,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.2
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Rudimentary HTTP client with focus on caching
 test_files:
-- spec/lib/resterl/client.rb
+- spec/lib/resterl/base_object_spec.rb
+- spec/lib/resterl/client_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/TODO.rdoc

@@ -1,7 +0,0 @@
-* Edit README.rdoc
-* Tests!
-* Use technoweenie's faraday as base (http://github.com/technoweenie/faraday)
-* Secure caching with tests
-* Store parsed objects in cache (instead of the plain response)
-* Persistent connections
-* Documentation