ygoprodeck 1.0.5 → 1.0.7

data/lib/ygoprodeck/search/banlist.rb

@@ -1,26 +1,38 @@
-
 module Ygoprodeck
-	class Banlist
-		def self.tcg
-			url = "#{Ygoprodeck::Endpoint.is}cardinfo.php?banlist=tcg"
-			uri = URI(url)
-			response = Net::HTTP.get(uri)
-			load = JSON.parse(response)
-			load
-		end
-		def self.ocg
-			url = "#{Ygoprodeck::Endpoint.is}cardinfo.php?banlist=ocg"
-			uri = URI(url)
-			response = Net::HTTP.get(uri)
-			load = JSON.parse(response)
-			load
-		end
-		def self.goat
-			url = "#{Ygoprodeck::Endpoint.is}cardinfo.php?banlist=goat"
-			uri = URI(url)
-			response = Net::HTTP.get(uri)
-			load = JSON.parse(response)
-			load
-		end
-	end
+  class Banlist
+    def self.fetch_banlist(format)
+      url = "#{Ygoprodeck::Endpoint.is}cardinfo.php?banlist=#{format}"
+      uri = URI(url)
+      
+      begin
+        response = Net::HTTP.get(uri)
+        load = JSON.parse(response)
+        
+        if load.has_key?('error')
+          { 'error' => load['error'] }
+        else
+          load
+        end
+        
+      rescue JSON::ParserError => e
+        { 'error' => 'Failed to parse JSON response' }
+      rescue SocketError => e
+        { 'error' => 'Network connection error' }
+      rescue StandardError => e
+        { 'error' => "An unexpected error occurred: #{e.message}" }
+      end
+    end
+    
+    def self.tcg
+      fetch_banlist('tcg')
+    end
+    
+    def self.ocg
+      fetch_banlist('ocg')
+    end
+    
+    def self.goat
+      fetch_banlist('goat')
+    end
+  end
 end

data/lib/ygoprodeck/search/card_sets.rb

@@ -1,12 +1,28 @@
-
 module Ygoprodeck
-	class Card
-		def self.sets
-			url = "https://db.ygoprodeck.com/api/v7/cardsets.php"
-			uri = URI(url)
-			response = Net::HTTP.get(uri)
-			load = JSON.parse(response)
-			load
-		end
-	end
+  class Card
+    def self.sets
+      url = "https://db.ygoprodeck.com/api/v7/cardsets.php"
+      uri = URI(url)
+      
+      begin
+        response = Net::HTTP.get(uri)
+        load = JSON.parse(response)
+        
+        if load.is_a?(Hash) && load.has_key?('error')
+          { 'error' => load['error'] }
+        else
+          load
+        end
+        
+      rescue JSON::ParserError => e
+        { 'error' => 'Failed to parse JSON response' }
+      rescue SocketError => e
+        { 'error' => 'Network connection error' }
+      rescue Timeout::Error => e
+        { 'error' => 'Request timed out' }
+      rescue StandardError => e
+        { 'error' => "An unexpected error occurred: #{e.message}" }
+      end
+    end
+  end
 end

data/lib/ygoprodeck/search/check_db_version.rb

@@ -1,11 +1,33 @@
 module Ygoprodeck
-	class CheckDbVer
-		def self.info
-			url = "https://db.ygoprodeck.com/api/v7/checkDBVer.php"
-			uri = URI(url)
-			response = Net::HTTP.get(uri)
-			load = JSON.parse(response)
-			load
-		end
-	end
+  class CheckDbVer
+    def self.info
+      url = "https://db.ygoprodeck.com/api/v7/checkDBVer.php"
+      uri = URI(url)
+      
+      begin
+        response = Net::HTTP.get_response(uri)
+        
+        unless response.is_a?(Net::HTTPSuccess)
+          return { 'error' => "HTTP request failed with status code: #{response.code}" }
+        end
+        
+        load = JSON.parse(response.body)
+        
+        if load.is_a?(Hash) && load.has_key?('error')
+          { 'error' => load['error'] }
+        else
+          load
+        end
+        
+      rescue JSON::ParserError => e
+        { 'error' => 'Failed to parse JSON response' }
+      rescue SocketError => e
+        { 'error' => 'Network connection error' }
+      rescue Net::ReadTimeout => e
+        { 'error' => 'Request timed out' }
+      rescue StandardError => e
+        { 'error' => "An unexpected error occurred: #{e.message}" }
+      end
+    end
+  end
 end

data/lib/ygoprodeck/search/fuzzy_name.rb

@@ -1,21 +1,20 @@
-
 module Ygoprodeck
-	class Fname
-		attr_reader :f_name
-		def self.is(f_name)
-			url = "#{Ygoprodeck::Endpoint.is}cardinfo.php?fname=#{f_name}"
-			uri = URI(url)
-			response = Net::HTTP.get(uri) 
-			load = JSON.parse(response)
-			
-			if load['data'][0] == nil
-				'{"error"=>"No card matching your query was found in the database."}'
-			else
-				load['data'][0]
-			end
-			
-		end
-	end
-	
-end
+  class Fname
+    def self.is(f_name)
+      url = "#{Ygoprodeck::Endpoint.is}cardinfo.php?fname=#{URI.encode_www_form_component(f_name)}"
+      uri = URI(url)
+
+      begin
+        response = Net::HTTP.get(uri)
+        load = JSON.parse(response)
+
+        return nil if load["data"].nil? || load["data"].empty?
+
+        load["data"][0]
 
+      rescue JSON::ParserError, SocketError, StandardError => e
+        nil
+      end
+    end
+  end
+end

data/lib/ygoprodeck/search/list.rb

@@ -1,21 +1,47 @@
-
 module Ygoprodeck
-	class List
-		attr_reader :list
-		def self.is(list)
-			url = "#{Ygoprodeck::Endpoint.is}cardinfo.php?fname=#{list}"
-			uri = URI(url)
-			response = Net::HTTP.get(uri)
-			load = JSON.parse(response)
-			
-			if load['data'] == nil
-				'{"error"=>"No card matching your query was found in the database."}'
-			else
-				load['data']
-			end
-			
-		end
-	end
-	
-end
-
+  class List
+    attr_reader :list
+    
+    def self.is(list)
+      begin
+        # Encode query parameter to handle special characters properly
+        url = "#{Ygoprodeck::Endpoint.is}cardinfo.php?fname=#{URI.encode_www_form_component(list)}"
+        uri = URI(url)
+        
+        # Use timeout to prevent hanging on slow connections
+        response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https', open_timeout: 10, read_timeout: 10) do |http|
+          http.get(uri.request_uri)
+        end
+        
+        # Check HTTP status code first
+        case response
+        when Net::HTTPSuccess
+          load = JSON.parse(response.body)
+          
+          if load.has_key?('error')
+            return { 'error' => load['error'] }
+          elsif load['data'].nil? || load['data'].empty?
+            return { 'error' => 'No card matching your query was found in the database.' }
+          else
+            return load['data']
+          end
+        else
+          return { 'error' => "HTTP request failed with status code: #{response.code}" }
+        end
+        
+      rescue URI::InvalidURIError => e
+        { 'error' => 'Invalid URL or search term' }
+      rescue JSON::ParserError => e
+        { 'error' => 'Failed to parse JSON response' }
+      rescue Net::OpenTimeout => e
+        { 'error' => 'Connection timed out' }
+      rescue Net::ReadTimeout => e
+        { 'error' => 'Request timed out' }
+      rescue SocketError => e
+        { 'error' => 'Network connection error' }
+      rescue StandardError => e
+        { 'error' => "An unexpected error occurred: #{e.message}" }
+      end
+    end
+  end
+end

data/lib/ygoprodeck/search/match.rb

@@ -0,0 +1,35 @@
+module Ygoprodeck
+  class Match
+    def self.normalize(text)
+      text.downcase.gsub(/[^a-z0-9\s\-]/, '').strip
+    end
+
+    def self.is(name_card)
+      json_path = File.expand_path('assets/names_card.json', __dir__)
+      names = JSON.parse(File.read(json_path))
+
+      normalized_input = normalize(name_card)
+      input_words = normalized_input.split
+
+      substring_matches = names.select { |name| normalize(name).include?(normalized_input) }
+
+      if !substring_matches.empty?
+        best_match = substring_matches.min_by { |name| normalize(name).length }
+      else
+        word_matches = names.select do |name|
+          name_words = normalize(name).split
+          input_words.all? { |word| name_words.any? { |nw| nw.include?(word) } }
+        end
+
+        if !word_matches.empty?
+          best_match = word_matches.min_by { |name| normalize(name).length }
+        else
+          matcher = Levenshtein.new(normalized_input)
+          best_match = names.min_by { |name| matcher.match(normalize(name)) }
+        end
+      end
+
+      best_match
+    end
+  end
+end

data/lib/ygoprodeck/search/name.rb

@@ -1,21 +1,22 @@
-
 module Ygoprodeck
-	class Name
-		attr_reader :name
-		def self.is(name)
-			url = "#{Ygoprodeck::Endpoint.is}cardinfo.php?name=#{name}"
-			uri = URI(url)
-			response = Net::HTTP.get(uri)
-			load = JSON.parse(response)
-			
-			if load['data'][0] == nil
-				'{"error"=>"No card matching your query was found in the database."}'
-			else
-				load['data'][0]
-			end
-			
-		end
-	end
-	
-end
+  class Name
+    attr_reader :name
+    
+    def self.is(name)
+      url = "#{Ygoprodeck::Endpoint.is}cardinfo.php?name=#{URI.encode_www_form_component(name)}"
+      uri = URI(url)
+
+      begin
+        response = Net::HTTP.get(uri)
+        load = JSON.parse(response)
+
+        return nil if load["data"].nil? || load["data"].empty?
+
+        load["data"][0]
 
+      rescue JSON::ParserError, SocketError, StandardError => e
+        nil
+      end
+    end
+  end
+end

data/lib/ygoprodeck/search/random.rb

@@ -1,12 +1,20 @@
-
 module Ygoprodeck
-	class Card
-		def self.random
-			url = "https://db.ygoprodeck.com/api/v7/cardinfo.php?num=1&offset=0&sort=random&cachebust"
-			uri = URI(url)
-			response = Net::HTTP.get(uri)
-			load = JSON.parse(response)
-			load['data'][0]
-		end
-	end
+  class Card
+    def self.random
+      url = "https://db.ygoprodeck.com/api/v7/cardinfo.php?num=1&offset=0&sort=random&cachebust"
+      uri = URI(url)
+
+      begin
+        response = Net::HTTP.get(uri)
+        load = JSON.parse(response)
+
+        return nil if load["data"].nil? || load["data"].empty?
+
+        load["data"][0]
+
+      rescue JSON::ParserError, SocketError, StandardError => e
+        nil
+      end
+    end
+  end
 end

data/lib/ygoprodeck/version.rb

@@ -1,3 +1,3 @@
 module Ygoprodeck
-  VERSION = "1.0.5"
+  VERSION = "1.0.7"
 end

data/lib/ygoprodeck.rb

@@ -1,6 +1,7 @@
 require 'open-uri'
 require 'net/http'
 require 'json'
+require 'amatch'
 require 'ygoprodeck/version'
 require 'ygoprodeck/errors'
 require 'ygoprodeck/search/client/endpoint'
@@ -10,10 +11,12 @@ require 'ygoprodeck/search/card_sets'
 require 'ygoprodeck/search/random'
 require 'ygoprodeck/search/name'
 require 'ygoprodeck/search/list'
+require 'ygoprodeck/search/match'
 require 'ygoprodeck/search/fuzzy_name'
 require 'ygoprodeck/search/archetype'
 require 'ygoprodeck/search/banlist'
 require 'ygoprodeck/search/check_db_version'
+include Amatch
 
 module Ygoprodeck
 end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-require "bundler/setup"
+require "bundler"
 require "ygoprodeck"
 
 RSpec.configure do |config|

data/ygoprodeck.gemspec

@@ -18,8 +18,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 	
   spec.required_ruby_version = '>= 2.0.0'
-	
-  spec.add_development_dependency "bundler", "~> 2.2.3"
+
+  spec.add_dependency "amatch", "~> 0.4.1" 
+  spec.add_development_dependency "bundler", "~> 2.5.23"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency 'rspec-prof', '~> 0.0.7'

metadata

@@ -1,29 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: ygoprodeck
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Rokhimin Wahid
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-30 00:00:00.000000000 Z
+date: 2025-05-15 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: amatch
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.5.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: 2.5.23
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -113,12 +126,19 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- examples/try.rb
-- examples/try_archetype.rb
+- examples/archetype.rb
+- examples/banlist.rb
+- examples/check_db.rb
+- examples/list.rb
+- examples/random.rb
+- examples/search.rb
+- examples/search_fuzzy.rb
+- examples/set.rb
 - lib/ygoprodeck.rb
 - lib/ygoprodeck/errors.rb
 - lib/ygoprodeck/search/all_card.rb
 - lib/ygoprodeck/search/archetype.rb
+- lib/ygoprodeck/search/assets/names_card.json
 - lib/ygoprodeck/search/banlist.rb
 - lib/ygoprodeck/search/card_sets.rb
 - lib/ygoprodeck/search/check_db_version.rb
@@ -126,6 +146,7 @@ files:
 - lib/ygoprodeck/search/client/image_gapis.rb
 - lib/ygoprodeck/search/fuzzy_name.rb
 - lib/ygoprodeck/search/list.rb
+- lib/ygoprodeck/search/match.rb
 - lib/ygoprodeck/search/name.rb
 - lib/ygoprodeck/search/random.rb
 - lib/ygoprodeck/version.rb
@@ -146,7 +167,6 @@ homepage: http://github.com/rokhimin/ygoprodeck
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -161,8 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.6.3
 specification_version: 4
 summary: ygoprodeck API wrapper for search yugioh's card
 test_files: []

data/examples/try.rb

@@ -1,21 +0,0 @@
-require 'ygoprodeck'
-
-# yugi is example, you free to change variable name
-yugi = Ygoprodeck::Fname.is('dark magician') # example I wanna search 'dark magician' using fuzzy search
-
-puts yugi # => get all information of dark magician (name,id,level,attr,atk,def,etc)
-
-puts '#' *10
-
-# => get specific information of dark magician
-puts yugi['id']
-puts yugi['name'] 
-puts yugi['attribute'] 
-puts yugi['type'] 
-puts yugi['race'] 
-puts yugi['level'] 
-puts yugi['desc']
-puts yugi['atk'] 
-puts yugi['def']
-puts Ygoprodeck::Image.is(yugi['id']) # => use id from yugi['id'] to get dark magician image
-puts Ygoprodeck::Image_small.is(yugi['id']) # => small version