jikan.rb 0.0.5 → 0.0.6

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/bin/console

@@ -1,14 +1,19 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "jikan"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-require "pry"
-Pry.start
-
-# require "irb"
-# IRB.start(__FILE__)
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "jikan"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+require "pry"
+Pry.start
+
+def reload!
+    files = $LOADED_FEATURES.select { |feat| feat =~ /\/jikan\// }
+    files.each { |file| load file }
+end
+
+# require "irb"
+# IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/jikan.gemspec

@@ -1,42 +1,43 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "jikan/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "jikan.rb"
-  spec.version       = Jikan::VERSION
-  spec.authors       = ["Zerocchi"]
-	spec.email         = ["slaveration@gmail.com"]
-
-	spec.summary       = %q{A simple Ruby wrapper for jikan.me API.}
-  spec.description   = %q{This is a wrapper for unofficial MyAnimeList API, Jikan.me. 
-                        Consult Jikan.me documentation to learn more. }
-	spec.homepage      = "https://github.com/Zerocchi/jikan.rb"
-  spec.license       = "MIT"
-
-  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
-  # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-
-	spec.add_runtime_dependency "http", "~> 3.0.0"
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-	spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
-end
+
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require "jikan/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "jikan.rb"
+  spec.version       = Jikan::VERSION
+  spec.authors       = ["Zerocchi"]
+	spec.email         = ["slaveration@gmail.com"]
+
+	spec.summary       = %q{A simple Ruby wrapper for jikan.me API.}
+  spec.description   = %q{This is a wrapper for unofficial MyAnimeList API, Jikan.me. 
+                        Consult Jikan.me documentation to learn more. }
+	spec.homepage      = "https://github.com/Zerocchi/jikan.rb"
+  spec.license       = "MIT"
+
+  # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
+  # to allow pushing to a single host or delete this section to allow pushing to any host.
+  if spec.respond_to?(:metadata)
+    spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  else
+    raise "RubyGems 2.0 or newer is required to protect against " \
+      "public gem pushes."
+  end
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_runtime_dependency "http", "~> 3.0.0"
+  spec.add_runtime_dependency "require_all", "~> 2.0.0"
+
+  spec.add_development_dependency "bundler", "~> 1.16"
+	spec.add_development_dependency "pry"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "vcr"
+  spec.add_development_dependency "webmock"
+end

data/lib/jikan.rb

@@ -1,38 +1,55 @@
-require 'jikan/query'
-
-module Jikan
-  class FlagError < StandardError; end
-  class ClientError < StandardError; end
-
-  BASE_URL = "http://api.jikan.moe"
-  BASE_URL_SSL = "https://api.jikan.moe"
-
-  FLAGS = {
-    'anime' => [ :episodes, :characters_staff, :news, :pictures, :videos, :stats ],
-    'manga' => [ :character, :news, :pictures, :stats ],
-    'character' => [ :pictures ],
-    'person' => [ :pictures ],
-    'search' => [:anime, :manga, :person, :character]
-  }
-
-  # shortcut methods
-  def self.anime(id, flag=nil)
-    Jikan::Query.new.anime_id(id, flag)
-  end
-  
-  def self.manga(id, flag=nil)
-    Jikan::Query.new.manga_id(id, flag)
-  end
-  
-  def self.character(id, flag=nil)
-    Jikan::Query.new.character_id(id, flag)
-  end
-  
-  def self.person(id, flag=nil)
-    Jikan::Query.new.person_id(id, flag)
-  end
-  
-  def self.search(query, flag=:anime, page=1)
-    Jikan::Query.new.search(query, flag, page)
-  end
-end
+require 'jikan/query'
+
+module Jikan
+  class FlagError < StandardError; end
+  class ClientError < StandardError; end
+
+  BASE_URL = "http://api.jikan.moe"
+  BASE_URL_SSL = "https://api.jikan.moe"
+  BASE_URL_V3 = "http://api.jikan.moe/v3"
+  BASE_URL_V3_SSL = "https://api.jikan.moe/v3"
+
+  FLAGS = {
+    'anime' => [ :episodes, :characters_staff, :news, :pictures, :videos, :stats, :reviews, :recommendations, :userupdates ],
+    'manga' => [ :character, :news, :pictures, :stats, :reviews, :recommendations, :userupdates ],
+    'character' => [ :pictures ],
+    'person' => [ :pictures ],
+    'search' => [:anime, :manga, :person, :character],
+    'season' => [:summer, :spring, :fall, :winter, :later],
+    'user' => [:profile, :history, :friends, :animelist, :mangalist],
+    'club' => [:members]
+  }
+
+  # shortcut methods
+  def self.anime(id, flag=nil)
+    Jikan::Query.new.anime_id(id, flag)
+  end
+  
+  def self.manga(id, flag=nil)
+    Jikan::Query.new.manga_id(id, flag)
+  end
+  
+  def self.character(id, flag=nil)
+    Jikan::Query.new.character_id(id, flag)
+  end
+  
+  def self.person(id, flag=nil)
+    Jikan::Query.new.person_id(id, flag)
+  end
+  
+  def self.search(query, flag=:anime, page=1)
+    Jikan::Query.new.search(query, flag, page)
+  end
+
+  def self.season(season, year)
+    Jikan::Query.new.season(season, year)
+  end
+
+  def self.club(id, flag=nil)
+    Jikan::Query.new.club(id, flag)
+  end
+
+  def self.user(name, flag=nil)
+    Jikan::Query.new.user(name, flag)
+  end
+end

data/lib/jikan/api.rb

@@ -1,60 +1,66 @@
-require "http"
-require "json"
-
-module Jikan
-  class API
-
-    def initialize(use_ssl=true)
-			@endpoint = ""
-			@id = nil
-			@flag = nil
-			@selected_base = if use_ssl then Jikan::BASE_URL_SSL else Jikan::BASE_URL end
-		end
-
-		def get(endpoint, id, flag=nil, qry='')
-			@endpoint = endpoint
-			@id = id
-			@flag = flag
-      @query = qry
-
-			construct_url
-			get_data
-		end
-
-    private
-
-		def construct_url
-			@end_url = "#{@selected_base}/#{@endpoint}"
-      @url = "#{@end_url}/#{@id}"
-
-      if @endpoint.eql?('search')
-				unless Jikan::FLAGS[@endpoint].include? @flag
-					raise Jikan::FlagError, 'Flag not supported'
-				else
-					# This is inconsistencies in the API.
-					if @flag == :anime || @flag == :manga
-						@url = "#{@end_url}/#{@flag.to_s}/#{@query.downcase.delete(' ')}/#{@id}"
-					elsif @flag == :character || @flag == :person
-						@url = "#{@end_url}/#{@flag.to_s}/#{@query.downcase.gsub!(' ', '_')}/#{@id}"
-					end
-				end
-      end
-
-			unless @flag.nil? || @endpoint.eql?('search')
-				unless Jikan::FLAGS[@endpoint].include? @flag
-					raise Jikan::FlagError, 'Flag not supported'
-				end
-				@url << "/#{@flag.to_s}"
-			end
-		end
-
-		def get_data
-			res = HTTP.get(@url)
-			if res.status >= 400
-				raise ClientError, "#{res.status}: error on endpoint #{@endpoint} (URL: #{@url})"
-			end
-
-			JSON.parse(res.body)
-		end
-  end
+require "http"
+require "json"
+require "uri"
+
+module Jikan
+  class API
+
+    def initialize(use_ssl=true)
+			@endpoint = ""
+			@id = nil
+			@flag = nil
+			@year = nil
+			@page = nil
+			@query = nil
+			@selected_base = if use_ssl then Jikan::BASE_URL_V3_SSL else Jikan::BASE_URL_v3 end
+		end
+
+		def get(endpoint:, flag: nil, id: 0, query: nil, year: Date.today.year, page: 1)
+			@endpoint = endpoint
+			@id = id
+			@flag = flag
+			@query = query
+			@year = year
+			@page = page
+
+			construct_url
+			get_data
+		end
+
+    private
+
+		def construct_url
+			@end_url = "#{@selected_base}/#{@endpoint}"
+
+			unless @flag.nil? || Jikan::FLAGS[@endpoint].include?(@flag)
+				raise Jikan::FlagError, 'Flag not supported'
+			end
+
+      if @endpoint.eql?('season')
+				if @flag.eql?(:later)
+					@url = URI.encode("#{@end_url}/#{@flag}")
+				elsif
+					@url = URI.encode("#{@end_url}/#{@year}/#{@flag}")
+				end
+			elsif @endpoint.eql?('search')
+				@url = URI.encode("#{@end_url}/#{@flag.to_s}?q=#{@query}&page=#{@page}")
+			elsif @endpoint.eql?('user')
+				@url = URI.encode("#{@end_url}/#{@query}/#{@flag.to_s}")
+			else
+				@url = "#{@end_url}/#{@id}"
+				unless @flag.nil?
+					@url << "/#{@flag.to_s}"
+				end
+			end
+		end
+
+		def get_data
+			res = HTTP.get(@url)
+			if res.status >= 400
+				raise ClientError, "#{res.status}: error on endpoint #{@endpoint} (URL: #{@url})"
+			end
+
+			JSON.parse(res.body)
+		end
+  end
 end

data/lib/jikan/{anime.rb → models/anime.rb}

@@ -1,72 +1,74 @@
-require 'jikan/entity'
-
-module Jikan
-  class Anime < MediaEntity
-
-    def aired
-      raw['aired']
-    end
-    
-    def adaptation
-      raw['related']['adaptation']
-    end
-
-    def background
-      raw['background']
-    end
-
-    def broadcast
-      raw['broadcast']
-    end
-
-    def duration
-      raw['duration']
-    end
-
-    def ending
-      raw['ending_theme']
-    end
-
-    def episodes
-      raw['episodes']
-    end
-
-    def eps_list
-      raw['episode']
-    end
-    
-    def licensor
-      raw['licensor']
-    end
-
-    def opening
-      raw['opening_theme']
-    end
-
-    def premiered
-      raw['premiered']
-    end
-
-    def producer
-      raw['producer']
-    end
-
-    def related
-      raw['related']
-    end
-
-    def side_story
-      raw['side_story']
-    end
-
-    def studio
-      raw['studio']
-    end
-  end
-
-	class AnimeResult < Anime
-		def details(flag=nil)
-      Jikan::anime id, flag
-		end
-	end
-end
+require 'jikan/models/entity'
+
+module Jikan
+  class Anime < MediaEntity
+
+    def aired
+      raw['aired']
+    end
+    
+    def adaptation
+      raw['related']['adaptation']
+    end
+
+    def background
+      raw['background']
+    end
+
+    def broadcast
+      raw['broadcast']
+    end
+
+    def duration
+      raw['duration']
+    end
+
+    def ending
+      raw['ending_theme'] || raw['ending_themes']
+    end
+
+    def episodes
+      raw['episodes']
+    end
+
+    def eps_list
+      raw['episode'] || raw['episodes']
+    end
+    
+    def licensor
+      raw['licensor'] || raw['licensors']
+    end
+
+    def opening
+      raw['opening_theme'] || raw['opening_themes']
+    end
+
+    def premiered
+      raw['premiered']
+    end
+
+    def producer
+      raw['producer'] || raw['producers']
+    end
+
+    def related
+      raw['related']
+    end
+
+    def side_story
+      raw['side_story']
+    end
+
+    def studio
+      raw['studio'] || raw['studios']
+    end
+  end
+
+	class AnimeResult < Anime
+		def details(flag=nil)
+      Jikan::anime id, flag
+		end
+  end
+  
+  class BasicAnime < Entityography; end
+end