met_museum 1.3.3 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e78d1ef3d724c81c274a2b009c09df3f296e319de8da098ffe466f5546c54667
-  data.tar.gz: abf44fecf0f446fb111a5df5730509b55c2dc9fc22aaa74f3e4ff2047da410d7
+  metadata.gz: c00614f5de71894e2e1f941957a2503a20c17690edcc21fcee175817d82d69f7
+  data.tar.gz: b0ebfbbc567c0407a1b623ea7aae5bad1101bfa9f272479d50898b1db18405c5
 SHA512:
-  metadata.gz: b71d5ec05575b2e26e4e75bed317aa73399d552f769ea2c816f120b9098ac86e8798d76ade64a1b0685124e7cfa495b77b09aeef4053b152684c5b2f32afea6e
-  data.tar.gz: 36df1c3a70cf2c806a0a5cf74c21dbccc946062cc9f56dc4f9b5a0bf6060662c37565841946678b954318d6d1192f445232a987c3ed9757bde89e8a32ec0bc2e
+  metadata.gz: e9fcf7f50cc2aaaa811ae5827a451bb85d584e22d04ec9a69da66467a1ebf46119c2271e699d81df6cff6d6da351fa7e1ea0e456105410763de77ab398bbcde9
+  data.tar.gz: d01338e51d75a155e942c22664720ac778156a44a81c7f565aa7ff8515d4119dbe21b8f24012566ec6e2d543f89ba0c72720a918bc184e84954623ba043f7dd7

data/.github/workflows/ruby.yml

@@ -0,0 +1,32 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: Ruby
+
+on: [push, pull_request]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7' ]
+    name: Ruby ${{ matrix.ruby }} spec
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
+    # change this to (see https://github.com/ruby/setup-ruby#versioning):
+      uses: ruby/setup-ruby@v1
+      # uses: ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
+    - name: Run spec
+      run: bundle exec rake

data/.rubocop.yml

@@ -0,0 +1,13 @@
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Documentation:
+  Enabled: false
+
+Metrics/AbcSize:
+  Enabled: true
+  Max: 20

data/.travis.yml

@@ -3,9 +3,9 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
+  - 2.7.1
   - 2.6.0
   - 2.5.0
-  - 2.4.2
 script:
   - bundle exec rspec spec/
 before_install:

data/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 group :development do
-  gem 'pry'
+  gem "pry"
 end
 
 # Specify your gem's dependencies in met_museum.gemspec

data/Gemfile.lock

@@ -1,24 +1,31 @@
 PATH
   remote: .
   specs:
-    met_museum (1.3.3)
+    met_museum (1.3.8)
       faraday
       oj
 
 GEM
   remote: https://rubygems.org/
   specs:
+    ast (2.4.1)
     coderay (1.1.2)
     diff-lcs (1.3)
-    faraday (0.15.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
     method_source (0.9.2)
     multipart-post (2.1.1)
-    oj (3.9.0)
+    oj (3.10.6)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rake (10.5.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)
@@ -34,6 +41,19 @@ GEM
     rspec-retry (0.6.1)
       rspec-core (> 3.3)
     rspec-support (3.8.0)
+    rubocop (0.86.0)
+      parallel (~> 1.10)
+      parser (>= 2.7.0.1)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.0.3, < 1.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)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
@@ -42,9 +62,10 @@ DEPENDENCIES
   bundler (~> 2.0)
   met_museum!
   pry
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rspec-retry
+  rubocop
 
 BUNDLED WITH
    2.0.2

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 hyuraku
+Copyright (c) 2020 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

@@ -240,9 +240,72 @@ MetMuseum::Collection.new.search('akasaka', {limit: 1})
   "tags"=>["Buildings", "Men", "Women"]}]
 
 
-# show specified number of objects
-MetMuseum::Collection.new.search('akasaka', {isHighlight: true})
-=> {"total"=>9, "objectIDs"=>[36572, 37231, 37023, 29953, 55713, 56937, 36708, 36958, 55684]}
+# show object_ids size and themselves with certain departmentId --< omit >--
+MetMuseum::Collection.new.search('flower', {departmentId: 12})
+=> {"total"=>7922,
+ "objectIDs"=>
+  [207138,
+   197555,
+   207151,
+   206979,
+   --< omit >--
+
+# show object_ids size and themselves which are isOnView
+MetMuseum::Collection.new.search('flower', {isOnView: true})
+=> => {"total"=>2066,
+ "objectIDs"=>
+  [207138,
+   3689,
+   11207,
+   252906,
+   252349,
+   --< omit >--
+
+# show object_ids size and themselves which are artistOrCulture
+MetMuseum::Collection.new.search('flower', {artistOrCulture: true})
+=>  {"total"=>5, "objectIDs"=>[207138, 3689, 196563, 196560, 198662]}
+
+
+# show object_ids size and themselves with certain medium
+MetMuseum::Collection.new.search('flower', {medium: "Paintings"})
+=> {"total"=>706,
+ "objectIDs"=>
+  [11207,
+   436121,
+   10481,
+   435882,
+   --< omit >--
+
+
+# show object_ids size and themselves which are hasImages
+MetMuseum::Collection.new.search('flower', {hasImages: true})
+=> {"total"=>18731,
+ "objectIDs"=>
+  [207138,
+   3689,
+   11207,
+   252906,
+   --< omit >--
+
+# show object_ids size and themselves with certain geoLocation
+MetMuseum::Collection.new.search('flower', {geoLocation: "Paris"})
+=> {"total"=>292,
+ "objectIDs"=>
+  [195320,
+   707455,
+   193814,
+   200432,
+   --< omit >--
+
+# show object_ids size and themselves with datarange
+MetMuseum::Collection.new.search('flower', {dateBegin: 1700,dateEnd: 1750})
+=> {"total"=>1444,
+ "objectIDs"=>
+  [9199,
+   3759,
+   398162,
+   666591,
+   --< omit >--
 ```
 </div>
 </details>
@@ -259,4 +322,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the MetMuseum project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/met_museum/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the MetMuseum project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/hyuraku/met_museum/blob/master/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/lib/met_museum/api_expections.rb

@@ -3,7 +3,6 @@ module MetMuseum
   BadRequestError = Class.new(MetMuseumError)
   UnauthorizedError = Class.new(MetMuseumError)
   ForbiddenError = Class.new(MetMuseumError)
-  ApiRequestsQuotaReachedError = Class.new(MetMuseumError)
   NotFoundError = Class.new(MetMuseumError)
   UnprocessableEntityError = Class.new(MetMuseumError)
   ApiError = Class.new(MetMuseumError)

data/lib/met_museum/collection.rb

@@ -6,16 +6,18 @@ module MetMuseum
   class Collection
     # Return a listing of all valid Object IDs available to use
     # @param [Date] metadataDate Returns any objects with updated data after this date
+    # @param [DateTime] metadataDate Returns any objects with updated data after this date
     # @params [Integer] departmentIds Returns any objects in a specific department
     # @return [Hash<total, Integer>] The total number of publicly-available objects
     # @return [Hash<objectIDs, Array<Integer>>] An array containing the object ID of publicly-available object
-    def objects(options = {})
+    def objects(**args)
       options = {
         metadataDate: nil,
         departmentIds: nil
-      }.merge(options)
-      options[:metadataDate] = check_date(options[:metadataDate]) unless options[:metadataDate].nil?
-      response = Faraday.new(:url => API_ENDPOINT).get PUBLIC_URI, {:metadataDate => options[:metadataDate], :departmentIds => options[:departmentIds]}
+      }.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)
     end
 
@@ -52,6 +54,8 @@ module MetMuseum
     # @return [Hash<objectEndDate, string>] Machine readable date indicating the year the artwork was completed (may be the same year or different year than the objectBeginDate)
     # @return [Hash<medium, string>] Refers to the materials that were used to create the artwork
     # @return [Hash<dimensions, string>] Size of the artwork or object
+    # @return [Hash<dimensionsParsed, Array<Hash>>] 	Size of the artwork or object in centimeters, parsed
+    # @return [Hash<measurements, Array<Hash>>] 	Array of elements, each with a name, description, and set of measurements. Spatial measurements are in centimeters; weights are in kg.
     # @return [Hash<creditLine, String>] 	Text acknowledging the source or origin of the artwork and the year the object was acquired by the museum.
     # @return [Hash<geographyType, String>] 	Qualifying information that describes the relationship of the place catalogued in the geography fields to the object that is being catalogued
     # @return [Hash<city, String>] City where the artwork was created
@@ -71,8 +75,12 @@ module MetMuseum
     # @return [Hash<repository, String>]
     # @return [Hash<objectURL, String>] URL to object's page on metmuseum.org
     # @return [Hash<tags,  Array<String>>] An array of subject keyword tags associated with the object
-    def object(objectID)
-      response = Faraday.get "#{API_ENDPOINT}#{PUBLIC_URI}/#{objectID}"
+    # @return [Hash<objectWikidata_URL, string>] Wikidata URL for the object
+    # @return [Hash<isTimelineWork, boolean>] Whether the object is on the Timeline of Art History website
+    # @return [Hash<GalleryNumber, string>] Gallery number, where available
+
+    def object(object_id)
+      response = new_faraday(API_ENDPOINT, "#{PUBLIC_URI}/#{object_id}")
       return_response(response)
     end
 
@@ -81,7 +89,7 @@ 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 = Faraday.get "#{API_ENDPOINT}#{DEPARTMENTS_URI}"
+      response = new_faraday(API_ENDPOINT, DEPARTMENTS_URI)
       return_response(response)
     end
 
@@ -92,35 +100,33 @@ module MetMuseum
     # @return [Integer] total The total number of publicly-available objects
     # @return [Array<Integer>] objectIDs An array containing the object ID of publicly-available object
     # @return [Array<Object>] objects An array containing the objects that contain the search query within the object’s data
-    def search(query, options = {})
-      options = {
-        limit: 0,
-        isHighlight: false
-      }.merge(options)
-      response = Faraday.new(:url => API_ENDPOINT).get SEARCH_URI, {:q => query}
+    def search(query, **args)
+      options = default_search_options.merge(args)
+      response = new_faraday(API_ENDPOINT, SEARCH_URI, {
+                               q: query,
+                               isHighlight: options[:isHighlight],
+                               title: options[:title],
+                               tags: options[:tags],
+                               departmentId: options[:departmentId],
+                               isOnView: options[:isOnView],
+                               artistOrCulture: options[:artistOrCulture],
+                               medium: options[:medium]&.multi_option,
+                               hasImages: options[:hasImages],
+                               geoLocation: options[:geoLocation]&.multi_option,
+                               dateBegin: options[:dateBegin],
+                               dateEnd: options[:dateEnd]
+                             })
       origin_response = return_response(response)
-      return origin_response if options[:limit] <= 0
-      origin_response["objectIDs"][0..options[:limit] - 1].map{|id| MetMuseum::Collection.new.object(id)}
+      limit = options[:limit].to_i
+      return origin_response if limit <= 0
+
+      origin_response["objectIDs"][0..limit - 1].map { |id| MetMuseum::Collection.new.object(id) }
     end
 
     private
 
-    def error_class(response)
-      case response.status
-      when HTTP_BAD_REQUEST_CODE
-        BadRequestError
-      when HTTP_UNAUTHORIZED_CODE
-        UnauthorizedError
-      when HTTP_FORBIDDEN_CODE
-        return ApiRequestsQuotaReachedError if api_requests_quota_reached?
-        ForbiddenError
-      when HTTP_NOT_FOUND_CODE
-        NotFoundError
-      when HTTP_UNPROCESSABLE_ENTITY_CODE
-        UnprocessableEntityError
-      else
-        ApiError
-      end
+    def new_faraday(url, dir, params = nil)
+      Faraday.new(url: url).get dir, params
     end
 
     def response_successful?(response)
@@ -128,7 +134,8 @@ module MetMuseum
     end
 
     def check_date(date)
-      return date.to_s if date.class == Date
+      return nil if date.nil?
+      return date.to_date.to_s if date.is_a? Date
 
       raise TypeError, "Write certain date"
     end
@@ -136,7 +143,31 @@ module MetMuseum
     def return_response(response)
       return Oj.load(response.body) if response_successful?(response)
 
-      raise error_class(response), "Code: #{response.status}, response: #{response.body}"
+      raise MetMuseum.error_class(response), "Code: #{response.status}, response: #{response.body}"
+    end
+
+    def multi_option
+      return self if is_a? String
+      return join("|") if is_a? Array
+
+      raise TypeError, "Write String or Array type"
+    end
+
+    def default_search_options
+      {
+        limit: 0,
+        isHighlight: false,
+        title: true,
+        tags: true,
+        departmentId: nil,
+        isOnView: nil,
+        artistOrCulture: nil,
+        medium: nil,
+        hasImages: nil,
+        geoLocation: nil,
+        dateBegin: 0,
+        dateEnd: 2000
+      }
     end
   end
 end

data/lib/met_museum/http_status_code.rb

@@ -1,8 +1,25 @@
 module MetMuseum
-  HTTP_OK_CODE = 200.freeze
-  HTTP_BAD_REQUEST_CODE = 400.freeze
-  HTTP_UNAUTHORIZED_CODE = 401.freeze
-  HTTP_FORBIDDEN_CODE = 403.freeze
-  HTTP_NOT_FOUND_CODE = 404.freeze
-  HTTP_UNPROCESSABLE_ENTITY_CODE = 429.freeze
+  HTTP_OK_CODE = 200
+  HTTP_BAD_REQUEST_CODE = 400
+  HTTP_UNAUTHORIZED_CODE = 401
+  HTTP_FORBIDDEN_CODE = 403
+  HTTP_NOT_FOUND_CODE = 404
+  HTTP_UNPROCESSABLE_ENTITY_CODE = 429
+
+  def self.error_class(response)
+    case response.status
+    when HTTP_BAD_REQUEST_CODE
+      BadRequestError
+    when HTTP_UNAUTHORIZED_CODE
+      UnauthorizedError
+    when HTTP_FORBIDDEN_CODE
+      ForbiddenError
+    when HTTP_NOT_FOUND_CODE
+      NotFoundError
+    when HTTP_UNPROCESSABLE_ENTITY_CODE
+      UnprocessableEntityError
+    else
+      ApiError
+    end
+  end
 end

data/lib/met_museum/version.rb

@@ -1,3 +1,3 @@
 module MetMuseum
-  VERSION = "1.3.3"
+  VERSION = "1.3.8".freeze
 end

data/met_museum.gemspec

@@ -1,5 +1,4 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "met_museum/version"
 
@@ -9,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["hyuraku"]
   spec.email         = ["calenthird@gamil.com"]
 
-  spec.summary       = %q{MET museum api wrapper}
-  spec.description   = %q{The Metropolitan Museum of Art Collection API wrapper }
+  spec.summary       = "MET museum api wrapper"
+  spec.description   = "The Metropolitan Museum of Art Collection API wrapper "
   spec.homepage      = "https://github.com/hyuraku/met_museum"
   spec.license       = "MIT"
 
@@ -27,7 +26,7 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
@@ -35,9 +34,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: met_museum
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.8
 platform: ruby
 authors:
 - hyuraku
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -101,8 +115,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -139,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: MET museum api wrapper