yotsuba 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48d3289804f7c84c1eed41d3bf2fb32b1531a05a
-  data.tar.gz: b6a84c8f189a424e2a5b5d180c686a6db9b9f023
+  metadata.gz: 76b652a4c650b22100d4d701393711541c68d64d
+  data.tar.gz: 547ea8a390b38426e16533ed38c40e7396d55223
 SHA512:
-  metadata.gz: 3ec3be4b889ef85639bd6d4466186011d84753008a946db110d6edfdbd5aa4fc422d3614d0d0f4edb94ca072cb16a65ab6fd9caf18701ad63dc5c1f3fc8a335f
-  data.tar.gz: f298bf48eb88c324974732bd55137ecdabc568fae5626d8f7d530ebc539532d95490d65fa00308d67a86260f2840f141b2419aca300cd6ccb41aad238d301a18
+  metadata.gz: 8a499aa346247857d285fd29866504cc4f64e2a95d44023af7f44a3142a8b25eeac8e6bdadc2db8b5dc387fd5fa5f864c2e5021c1c1fe2c257630ff524ec46ad
+  data.tar.gz: c6c0908de703c8b699243ef3f8754248c41f0da014ba627ecb00baae901d49abe08fecf3fc389207da975d888857b1c8e8906178d82daae731ed002bc828b15c

data/lib/yotsuba.rb

@@ -6,4 +6,4 @@ require 'serial'
 require 'anime'
 require 'file'
 require 'download'
-require 'methods'
+require 'messenger'

data/lib/yotsuba/anime.rb

@@ -1,73 +1,14 @@
 module Yotsuba
   class Anime
-    attr_reader :id, :title, :num_files
 
-    @@all_animes = []
+    attr_reader :id, :title, :num_files
 
     def initialize(options = {id: nil, title: nil, num_files: nil})
       @id = options[:id]
       @title = options[:title]
       @num_files = options[:num_files]
-      @@all_animes << self if self.valid?
       return self
     end
 
-    def valid?
-      self.id != nil && self.title != nil && self.num_files != nil
-    end
-
-    def files
-      @files ||= Yotsuba.get_files(self)
-    end
-
-    def self.clear_anime_list!
-      @@all_animes = []
-    end
-
-    def self.all
-      precache_animes
-      @@all_animes
-    end
-
-    def self.[](key)
-      return Anime.find_by(title: key) if key.is_a?(String)
-      return Anime.find_by(id: key) if key.is_a?(Fixnum)
-      return Anime.search(key) if key.is_a?(Regexp)
-
-      raise(ArgumentError, "Argument should be a String (title), Fixnum (id), or Regexp (matches title).")
-    end
-
-    def self.find_by(hash = {title: nil, id: nil})
-      precache_animes
-      @@all_animes.each do |anime|
-        match = check_property(anime, :id, hash) || check_property(anime, :title, hash)
-        return match if match
-      end
-      return nil
-    end
-
-    def self.find(id)
-      Anime.find_by(id: id)
-    end
-
-    def self.search(regexp)
-      precache_animes
-      results = []
-      @@all_animes.each do |anime|
-        results << anime if anime.title.match(regexp)
-      end
-      return results
-    end
-
-    private
-
-      def self.precache_animes
-        Yotsuba.get_animes if @@all_animes.length == 0
-      end
-
-      def self.check_property(object, symbol, hash)
-        hash[symbol] && object.respond_to?(symbol) && object.send(symbol) == hash[symbol] ? object : nil
-      end
-
   end
 end

data/lib/yotsuba/dependencies.rb

@@ -1 +1,5 @@
 require 'savon'
+require 'typhoeus'
+require 'fileutils'
+require 'concurrent'
+

data/lib/yotsuba/download.rb

@@ -1,14 +1,7 @@
-require 'typhoeus'
-require 'fileutils'
-require 'concurrent'
-
 module Yotsuba
-
   class Download
     include Concurrent::Async
 
-    @@all_downloads = []
-
     attr_reader :status, :file, :id
 
     def initialize(options = {animefile: nil, output_dir: "." })
@@ -16,18 +9,10 @@ module Yotsuba
       @output_dir = File.absolute_path(options[:output_dir])
       @multiple = (@file.download_links.length > 1) if @file
       @status = "Queued"
-      if self.valid?
-        @id = @@all_downloads.length + 1
-        @@all_downloads << self if self.valid?
-      end
 
       init_mutex # Required by Concurrent::Async
     end
 
-    def valid?
-      self.file != nil
-    end
-
     def run
       @path = @multiple ? File.join(@output_dir, @file.name+".zip") : @path = File.join(@output_dir, @file.name)
 
@@ -56,7 +41,6 @@ module Yotsuba
     def delete
       abort if @status != "Aborted"
       File.delete(@path) if @path
-      @@all_downloads -= [self]
       return true
     end
 
@@ -68,34 +52,6 @@ module Yotsuba
       100.0 * self.bytes_written / self.file.size
     end
 
-    def self.all
-      @@all_downloads
-    end
-
-    def self.[](key)
-      return self.find_by(id: key) if key.is_a?(Fixnum)
-      return self.find_by(file: key) if key.is_a?(AnimeFile)
-      return self.find_by(filename: key) if key.is_a?(String)
-      return self.find_by
-    end
-
-    def self.find_by(hash = {id: nil, file: nil, filename: nil, status: nil, percent_downloaded: nil})
-      @@all_downloads.each do |download|
-        match = check_property(download, :id, hash) ||
-        check_property(download, :file, hash) ||
-        check_property(download, :filename, hash) ||
-        check_property(download, :status, hash) ||
-        check_property(download, :percent_downloaded, hash)
-
-        return match if match
-      end
-      return nil
-    end
-
-    def self.find(id)
-      return Download.find_by(id: id)
-    end
-
     private
 
       def create_request(link)
@@ -119,9 +75,5 @@ module Yotsuba
         @file_handle.close
       end
 
-      def check_property(object, symbol, hash)
-        hash[symbol] && object.respond_to?(symbol) && object.send(symbol) == hash[symbol] ? object : nil
-      end
-
   end
 end

data/lib/yotsuba/file.rb

@@ -1,37 +1,17 @@
 module Yotsuba
   class AnimeFile
 
-    attr_reader :id, :name, :size, :first_downloaded, :times_downloaded, :anime_id
+    attr_reader :id, :name, :size, :first_downloaded, :times_downloaded, :anime
 
-    def initialize(options = {id: nil, name: nil, size: nil, first_downloaded: nil, times_downloaded: nil, anime_id: nil})
+    def initialize(options = {id: nil, name: nil, size: nil, first_downloaded: nil, times_downloaded: nil, anime: nil})
       @id = options[:id]
       @name = options[:name]
       @size = options[:size]
       @first_downloaded = options[:first_downloaded]
       @times_downloaded = options[:times_downloaded]
-      @anime_id = options[:anime_id]
+      @anime = options[:anime]
       return self
     end
 
-    def anime
-      @anime ||= Yotsuba::Anime[self.anime_id]
-    end
-
-    def download_links
-      @download_links ||= Yotsuba.get_download_links(self)
-    end
-
-    def download(output_dir)
-      @download ||= Download.new(animefile: self, output_dir: output_dir)
-    end
-
-    def ==(other_file)
-      other_file && self.id == other_file.id
-    end
-
-    def eq(other_file)
-      self == other_file
-    end
-
   end
 end

data/lib/yotsuba/messenger.rb

@@ -0,0 +1,57 @@
+module Yotsuba
+  module Messenger
+
+    def self.get_animes(options = {use_cache: false})
+      setup
+      return @animes if options[:use_cache] && @animes.length > 0
+      response = @client.call(:get_anime_list)
+      animes = response.body[:get_anime_list_response][:get_anime_list_result][:anime]
+      animes = [animes] unless animes.is_a?(Array)
+      results = []
+      animes.each do |a|
+        results << {
+          id: a[:id].to_i,
+          title: a[:title],
+          num_files: a[:num_file].to_i
+        }
+      end
+      @animes = results if options[:use_cache]
+      return results
+    end
+
+    def self.get_files(anime)
+      setup
+      response = @client.call(:get_list_episode, message: { animeTitle: anime.title, serial: Yotsuba::Serial })
+      files = response.body[:get_list_episode_response][:get_list_episode_result][:episode_file]
+      files = [files] unless files.is_a?(Array)
+      results = []
+      files.each do |f|
+        results << {
+          id: f[:id].to_i,
+          name: f[:name],
+          size: f[:file_size].to_i,
+          first_downloaded: f[:first_download_time_in_day],
+          times_downloaded: f[:download_times].to_i,
+          anime: anime
+        }
+      end
+      return results
+    end
+
+    def self.get_download_links(file)
+      setup
+      response = @client.call :request_link_download2, message: { animeTitle: file.anime.title, episodeName: file.name, serial: Yotsuba::Serial }
+      links = response.body[:request_link_download2_response][:request_link_download2_result].split('|||')
+      links = [links] unless links.is_a?(Array)
+      return links
+    end
+
+    private
+
+      def self.setup
+        @client ||= Savon.client(wsdl: 'http://anime.domdomsoft.com/Services/MainService.asmx?wsdl')
+        @animes ||= []
+      end
+
+  end
+end

data/lib/yotsuba/version.rb

@@ -1,3 +1,3 @@
 module Yotsuba
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yotsuba
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Suchipi Izumi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -129,7 +129,7 @@ files:
 - lib/yotsuba/dependencies.rb
 - lib/yotsuba/download.rb
 - lib/yotsuba/file.rb
-- lib/yotsuba/methods.rb
+- lib/yotsuba/messenger.rb
 - lib/yotsuba/serial.rb
 - lib/yotsuba/version.rb
 - yotsuba.gemspec

data/lib/yotsuba/methods.rb

@@ -1,47 +0,0 @@
-module Yotsuba
-
-  def self.setup_savon
-    @client ||= Savon.client(wsdl: 'http://anime.domdomsoft.com/Services/MainService.asmx?wsdl')
-  end
-
-  def self.get_animes
-    setup_savon
-    Anime.clear_anime_list!
-    response = @client.call(:get_anime_list)
-    animes = response.body[:get_anime_list_response][:get_anime_list_result][:anime]
-    animes.each do |a|
-      Anime.new({
-        id: a[:id].to_i,
-        title: a[:title],
-        num_files: a[:num_file].to_i
-      })
-    end
-    return animes.length > 0
-  end
-
-  def self.get_files(anime)
-    setup_savon
-    response = @client.call(:get_list_episode, message: { animeTitle: anime.title, serial: Serial })
-    files = response.body[:get_list_episode_response][:get_list_episode_result][:episode_file]
-    results = []
-    files = [files] unless files.is_a?(Array)
-    files.each do |f|
-      results << AnimeFile.new({
-        id: f[:id].to_i,
-        name: f[:name],
-        size: f[:file_size].to_i,
-        first_downloaded: f[:first_download_time_in_day],
-        times_downloaded: f[:download_times].to_i,
-        anime_id: anime.id
-      })
-    end
-    return results
-  end
-
-  def self.get_download_links(file)
-    setup_savon
-    response = @client.call :request_link_download2, message: { animeTitle: file.anime.title, episodeName: file.name, serial: Serial }
-    links = response.body[:request_link_download2_response][:request_link_download2_result].split('|||')
-  end
-
-end