met_museum 1.4.0 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a79a7c355d8200cfccab7fdb7fbd01f37a74ee82a555de9a4697a6800616d2e4
-  data.tar.gz: 647315d7446816af5ce68035edcbedf32593a89aad70c511632f8ce3abe652c5
+  metadata.gz: 45f5c8d43daa6e64da5cb3c6788ee090c82070d84d9dbca31afb0bb3463dfcdc
+  data.tar.gz: 2bbbf5262f1bef794f6af6b7656903d17b1b9b11b5b37679a49a6abb852a6818
 SHA512:
-  metadata.gz: e31f31134b22d04612fdc5ef4f303cbfe2f25a1da5b9e0b2784b0fc3415daa8b876afba041f1747dd407dbab0cf57ca29e0a7350c6dfb0c0c0215b1fca655816
-  data.tar.gz: 28828344996f33389508a8664939a18fd3f182800dfe81bb3bf14d7b68864ecaa56d94698d73c93df6592af98be7f631d896aaf648b9d10b730fa9f3eb864fc5
+  metadata.gz: 03053e41e8aa40ab045f480a7bfbe0bfb38a2a909d5776f937938acec59afc3d964cb508e5756de2e11ae123059718659a8e4bcd74247e3eb84837c6ba9d9b9b
+  data.tar.gz: 214a6dd1cbeb31b8aa221fe794c7f3bcda4af5ef6ab41498830c8e4cd0582c2d7ea30178eff241f0c177ee618ab40dc577e1fbaa7492a2ecbadc0378bcffa13b

data/.github/workflows/ruby.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.5', '2.6', '2.7', '3.0' ]
+        ruby: [ '2.7', '3.0', '3.1' ]
     name: Ruby ${{ matrix.ruby }} spec
     steps:
     - uses: actions/checkout@v2
@@ -26,6 +26,7 @@ jobs:
       # uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
     - name: Install dependencies
       run: bundle install
     - name: Run spec

data/.rbgithook/pre-commit

@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+bundle exec rspec spec/

data/.ruby-version

@@ -0,0 +1 @@
+3.1.0

data/Gemfile

@@ -6,3 +6,5 @@ end
 
 # Specify your gem's dependencies in met_museum.gemspec
 gemspec
+
+gem "rbgithook", "~> 0.1.2"

data/Gemfile.lock

@@ -1,61 +1,54 @@
 PATH
   remote: .
   specs:
-    met_museum (1.4.0)
-      faraday
-      oj
+    met_museum (1.4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.1)
-    coderay (1.1.2)
-    diff-lcs (1.3)
-    faraday (1.2.0)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords
-    method_source (0.9.2)
-    multipart-post (2.1.1)
-    oj (3.10.6)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    ast (2.4.2)
+    coderay (1.1.3)
+    diff-lcs (1.5.0)
+    method_source (1.0.0)
+    parallel (1.22.1)
+    parser (3.1.2.0)
       ast (~> 2.4.1)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.7.1)
-    rexml (3.2.4)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    rbgithook (0.1.2)
+    regexp_parser (2.5.0)
+    rexml (3.2.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-retry (0.6.1)
+      rspec-support (~> 3.11.0)
+    rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.8.0)
-    rubocop (0.86.0)
+    rspec-support (3.11.0)
+    rubocop (1.30.1)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
-      rexml
-      rubocop-ast (>= 0.0.3, < 1.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.18.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.1.0)
-      parser (>= 2.7.0.1)
-    ruby-progressbar (1.10.1)
-    ruby2_keywords (0.0.2)
-    unicode-display_width (1.7.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.18.0)
+      parser (>= 3.1.1.0)
+    ruby-progressbar (1.11.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
@@ -65,6 +58,7 @@ DEPENDENCIES
   met_museum!
   pry
   rake (~> 13.0)
+  rbgithook (~> 0.1.2)
   rspec (~> 3.0)
   rspec-retry
   rubocop

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 hyuraku
+Copyright (c) 2021 hyuraku
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,4 +1,4 @@
-<img src="https://img.shields.io/travis/hyuraku/met_museum.svg"> <img src="https://img.shields.io/github/license/hyuraku/met_museum.svg">
+<img src="https://img.shields.io/github/workflow/status/hyuraku/rbgithook/Ruby"> <img src="https://img.shields.io/github/license/hyuraku/met_museum.svg">
  <img src="https://img.shields.io/gem/v/met_museum.svg">
 # MetMuseum
 

data/lib/met_museum/collection.rb

@@ -1,4 +1,3 @@
-require "met_museum/api_expections"
 require "met_museum/endpoint"
 require "met_museum/http_status_code"
 
@@ -15,10 +14,11 @@ module MetMuseum
         metadataDate: nil,
         departmentIds: nil
       }.merge(args)
+
       options[:metadataDate] = check_date(options[:metadataDate])
       query = { metadataDate: options[:metadataDate], departmentIds: options[:departmentIds] }
-      response = new_faraday(API_ENDPOINT, PUBLIC_URI, query)
-      return_response(response)
+      response = create_request(API_ENDPOINT, PUBLIC_URI, query)
+      arrange_response(response)
     end
 
     # returns a record for an object, containing all open access data about that object, including its image (if the image is available under Open Access)
@@ -80,8 +80,8 @@ module MetMuseum
     # @return [Hash<GalleryNumber, string>] Gallery number, where available
 
     def object(object_id)
-      response = new_faraday(API_ENDPOINT, "#{PUBLIC_URI}/#{object_id}")
-      return_response(response)
+      response = create_request(API_ENDPOINT, "#{PUBLIC_URI}/#{object_id}")
+      arrange_response(response)
     end
 
     # returns a listing of all departments
@@ -89,8 +89,8 @@ module MetMuseum
     # @return [Integer] departments Department ID as an integer. The departmentId is to be used as a query parameter on the `/objects` endpoint
     # @return [String] departments Display name for a department
     def department
-      response = new_faraday(API_ENDPOINT, DEPARTMENTS_URI)
-      return_response(response)
+      response = create_request(API_ENDPOINT, DEPARTMENTS_URI)
+      arrange_response(response)
     end
 
     # returns a listing of all Object IDs for objects that contain the search query within the object’s data
@@ -102,22 +102,27 @@ module MetMuseum
     # @return [Array<Object>] objects An array containing the objects that contain the search query within the object’s data
     def search(query, **args)
       args.merge!({q: query})
-      response = new_faraday(API_ENDPOINT, SEARCH_URI, args)
-      origin_response = return_response(response)
+      response = create_request(API_ENDPOINT, SEARCH_URI, args)
+      origin_response = arrange_response(response)
       limit = args[:limit].to_i
       return origin_response if limit <= 0
 
-      origin_response["objectIDs"][0..limit - 1].map { |id| MetMuseum::Collection.new.object(id) }
+      origin_response["objectIDs"].lazy.map { |id| MetMuseum::Collection.new.object(id) }.first(limit)
     end
 
     private
 
-    def new_faraday(url, dir, params = nil)
-      Faraday.new(url: url).get dir, params
+    def create_request(url, dir, params = {})
+      require 'uri'
+      require 'net/http'
+
+      uri = URI.join(url, dir)
+      uri.query = URI.encode_www_form(params)
+      Net::HTTP.get_response(uri)
     end
 
-    def response_successful?(response)
-      response.status == HTTP_OK_CODE
+    def response_successful?(response_code)
+      response_code == HTTP_OK_CODE
     end
 
     def check_date(date)
@@ -127,10 +132,12 @@ module MetMuseum
       raise TypeError, "Write certain date"
     end
 
-    def return_response(response)
-      return Oj.load(response.body) if response_successful?(response)
+    def arrange_response(response)
+      response_code = response.code.to_i
+      require 'json'
+      return JSON.parse(response.body) if response_successful?(response_code)
 
-      raise MetMuseum.error_class(response), "Code: #{response.status}, response: #{response.body}"
+      raise MetMuseum.error_class(response_code), "Code: #{response_code}, response: #{response.body}"
     end
 
     def multi_option

data/lib/met_museum/http_status_code.rb

@@ -1,3 +1,5 @@
+require "met_museum/api_expections"
+
 module MetMuseum
   HTTP_OK_CODE = 200
   HTTP_BAD_REQUEST_CODE = 400
@@ -6,8 +8,8 @@ module MetMuseum
   HTTP_NOT_FOUND_CODE = 404
   HTTP_UNPROCESSABLE_ENTITY_CODE = 429
 
-  def self.error_class(response)
-    case response.status
+  def self.error_class(response_code)
+    case response_code
     when HTTP_BAD_REQUEST_CODE
       BadRequestError
     when HTTP_UNAUTHORIZED_CODE

data/lib/met_museum/version.rb

@@ -1,3 +1,3 @@
 module MetMuseum
-  VERSION = "1.4.0".freeze
+  VERSION = "1.4.2".freeze
 end

data/lib/met_museum.rb

@@ -1,6 +1,3 @@
-require "faraday"
-require "oj"
-
 require "met_museum/collection"
 require "met_museum/version"
 

data/met_museum.gemspec

@@ -38,7 +38,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-retry"
   spec.add_development_dependency "rubocop"
-
-  spec.add_dependency "faraday"
-  spec.add_dependency "oj"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: met_museum
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: ruby
 authors:
 - hyuraku
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-29 00:00:00.000000000 Z
+date: 2022-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,34 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: faraday
-  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
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 'The Metropolitan Museum of Art Collection API wrapper '
 email:
 - calenthird@gamil.com
@@ -117,9 +89,10 @@ extra_rdoc_files: []
 files:
 - ".github/workflows/ruby.yml"
 - ".gitignore"
+- ".rbgithook/pre-commit"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".ruby-version"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -140,7 +113,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/hyuraku/met_museum
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -155,8 +128,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.8
+signing_key:
 specification_version: 4
 summary: MET museum api wrapper
 test_files: []

data/.travis.yml

@@ -1,13 +0,0 @@
----
-sudo: false
-language: ruby
-cache: bundler
-rvm:
-  - 2.7.1
-  - 2.6.0
-  - 2.5.0
-script:
-  - bundle exec rspec spec/
-before_install:
-  - gem install -v 2.0.1 bundler
-  - bundle update --bundler