met_museum 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef81d7c49056c60b5ba0439ec78c4d12cf6fbd97595695954c01d2054c4cb3e5
-  data.tar.gz: 3aa6c3f2ccde6a0b6f0206c2a9a65fbcd98acd3b702ed90d26d7445b738818a1
+  metadata.gz: f3166d79682a65468f1125eae072b225fe074956a14d46f519f614d005c546e0
+  data.tar.gz: ff4e0edf78eb5f1ee51ce033853e24b5df8d79f309ebf331cd2be3fd4f4446fe
 SHA512:
-  metadata.gz: 96dadddae090cae90fc0e352aa35511062203396ef4820fd8aeaf17658090d3d583b9062751c618fc5baf2e8b56026381582faff7f7d750a4b93d421106785c2
-  data.tar.gz: 0cb8381af808d542e6bd264798189aa0099e0f3a86ee31212887b9db1f68fbff5692ec4035b076b98dc28e8d1e7e56097a6c7acd9ae2949a872da761b9fa76aa
+  metadata.gz: b3c5648e505cb4643486345315323677f782e0a27476ba2645f3db9728d2bd0c5ed64179ac3588173cd40126f69711d620e0d50469c29e144b2f11d46107ada0
+  data.tar.gz: d211eed392861e8e897d6d3e1abe7893ba162f4402345e10d266414c485af879dbebdaa9d2be98ed6a2705342311f344e901dffcb77cdafca9b1afd16abe1455

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    met_museum (1.1.3)
+    met_museum (1.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -132,6 +132,7 @@ collection.object(1000)
  "metadataDate"=>"2019-01-30T09:08:07.74Z",
  "repository"=>"Metropolitan Museum of Art, New York, NY",
  "objectURL"=>"https://www.metmuseum.org/art/collection/search/1000"}
+ "tags"=>["Coat of Arms", "Dishes"]}
 ```
 </pre>
 </details>

data/lib/met_museum/api_expections.rb

@@ -7,4 +7,5 @@ module MetMuseum
   NotFoundError = Class.new(MetMuseumError)
   UnprocessableEntityError = Class.new(MetMuseumError)
   ApiError = Class.new(MetMuseumError)
+  TypeError = Class.new(MetMuseumError)
 end

data/lib/met_museum/collection.rb

@@ -1,13 +1,16 @@
+require "met_museum/api_expections"
+require "met_museum/endpoint"
+require "met_museum/http_status_code"
+
 module MetMuseum
   class Collection
     # Return a listing of all valid Object IDs available to use
-    # @param [String] metadataDate Returns any objects with updated data after this date
+    # @param [Date] metadataDate Returns any objects with updated data after this date
     # @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(metadataDate = nil)
-      metadataDate = check_date_args(metadataDate) unless metadataDate.nil?
-      conn = Faraday.new(:url => API_ENDPOINT)
-      response = conn.get PUBLIC_URI, {:metadataDate => metadataDate}
+      metadataDate = check_date(metadataDate) unless metadataDate.nil?
+      response = Faraday.new(:url => API_ENDPOINT).get PUBLIC_URI, {:metadataDate => metadataDate}
       return_response(response)
     end
 
@@ -72,10 +75,13 @@ module MetMuseum
     # @param [String] query Returns a listing of all Object IDs for objects that contain the search query within the object’s data
     # @return [Integer] total The total number of publicly-available objects
     # @return [Array<Integer>] objectIDs An array containing the object ID of publicly-available object
-    def search(query)
-      conn = Faraday.new(:url => API_ENDPOINT)
-      response = conn.get SEARCH_URI, {:q => query}
-      return_response(response)
+    def search(query, show_number = 0)
+      response = Faraday.new(:url => API_ENDPOINT).get SEARCH_URI, {:q => query}
+      #error if show_number <= 0
+      origin_response = return_response(response)
+      return origin_response if show_number.to_i <= 0 && show_number != 'all'
+      show_number = origin_response['total'].to_i if show_number == 'all'
+      origin_response["objectIDs"][0..show_number - 1].map{|id| object(id)}
     end
 
     private
@@ -102,20 +108,14 @@ module MetMuseum
       response.status == HTTP_OK_CODE
     end
 
-    def check_date_args(date = nil)
-      case date.class.to_s
-      when "Date"
-        date = date.to_s
-      when "DateTime"
-        date = date.to_date.to_s
-      when "String"
-        date
-      end
-      date
+    def check_date(date)
+      return date.to_s if date.class == Date
+    
+      raise TypeError, "Write certain date"
     end
 
     def return_response(response)
-      return Oj.load(response.body)if response_successful?(response)
+      return Oj.load(response.body) if response_successful?(response)
 
       raise error_class(response), "Code: #{response.status}, response: #{response.body}"
     end

data/lib/met_museum/version.rb

@@ -1,3 +1,3 @@
 module MetMuseum
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/lib/met_museum.rb

@@ -1,10 +1,7 @@
 require "faraday"
 require "oj"
 
-require "met_museum/api_expections"
-require "met_museum/endpoint"
 require "met_museum/collection"
-require "met_museum/http_status_code"
 require "met_museum/version"
 
 module MetMuseum

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: met_museum
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - hyuraku
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-16 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler