rtransmission 0.2 → 0.3

data/lib/rtransmission.rb

@@ -6,8 +6,8 @@ require 'rtransmission/version'
 require 'rtransmission/exception'
 require 'rtransmission/request'
 require 'rtransmission/response'
-require 'rtransmission/field'
-require 'rtransmission/fields'
+require 'rtransmission/client'
+require 'rtransmission/type'
+require 'rtransmission/types'
 require 'rtransmission/session'
 require 'rtransmission/torrent'
-require 'rtransmission/client'

data/lib/rtransmission/client.rb

@@ -23,6 +23,17 @@ module RTransmission
       session
     end
 
+    def self.rpc_name_to_ruby_name(rpc_name)
+      name = nil
+      if rpc_name.index('-')
+        name = rpc_name.gsub('-', '_')
+      else
+        name = rpc_name.gsub(/[A-Z]/) { |x| '_' + x.downcase }
+      end
+
+      name
+    end
+
     def initialize(args = {})
       @host = args[:host] || 'localhost'
       @port = args[:port] || 9091

data/lib/rtransmission/session.rb

@@ -6,21 +6,13 @@ module RTransmission
   class Session
     attr_reader :client
 
-    def self.define_field(name, rpc_name, args = {})
+    def self.attribute(rpc_name, args = {})
+      name = args[:name] || RTransmission::Client.rpc_name_to_ruby_name(rpc_name)
+
       self.send :define_method, name.to_s do
         request = RTransmission::Request.new('session-get', {}, 'Session.' + name.to_s) do |arguments|
-          result = arguments[rpc_name]
-          if args[:type]
-            type = args[:type]
-            if type.class == Array
-              type = type[0]
-              result.map! { |r| type.unmap(r) }
-            else
-              result = type.unmap(result)
-            end
-          end
-
-          result 
+          value = arguments[rpc_name]
+          RTransmission::Type.unmap(value, args[:type])
         end
 
         @client.call(request)
@@ -28,17 +20,7 @@ module RTransmission
 
       if args[:writeable] == true
         self.send :define_method, name.to_s.gsub('?', '') + '=' do |value|
-          rpc_value = value
-          if args[:type]
-            type = args[:type]
-            if type.class == Array
-              type = type[0]
-              rpc_value.map! { |r| type.map(r) }
-            else
-              rpc_value = type.map(rpc_value)
-            end
-          end
-
+          rpc_value = RTransmission::Type.unmap(value, args[:type])
           request = RTransmission::Request.new('session-set', {rpc_name => rpc_value}, 'Session.' + name.to_s + '=') do
             value
           end
@@ -48,49 +30,49 @@ module RTransmission
       end
     end
 
-    define_field :alt_speed_down, 'alt-speed-down', :writeable => true
-    define_field :alt_speed_enabled?, 'alt-speed-enabled', :writeable => true
-    define_field :alt_speed_time_begin, 'alt-speed-time-begin', :writeable => true
-    define_field :alt_speed_time_enabled?, 'alt-speed-time-enabled', :writeable => true
-    define_field :alt_speed_time_end, 'alt-speed-time-end', :writeable => true
-    define_field :alt_speed_time_day, 'alt-speed-time-day', :type => RTransmission::Fields::Day, :writeable => true
-    define_field :alt_speed_up, 'alt-speed-up', :writeable => true
-    define_field :blocklist_url, 'blocklist-url', :writeable => true
-    define_field :blocklist_enabled?, 'blocklist-enabled', :writeable => true
-    define_field :blocklist_size, 'blocklist-size'
-    define_field :cache_size_mb, 'cache-size-mb', :writeable => true
-    define_field :config_dir, 'config-dir'
-    define_field :download_dir, 'download-dir', :writeable => true
-    define_field :download_dir_free_space, 'download-dir-free-space'
-    define_field :dht_enabled?, 'dht-enabled', :writeable => true
-    define_field :encryption, 'encryption', :type => RTransmission::Fields::Encryption, :writeable => true
-    define_field :idle_seeding_limit, 'idle-seeding-limit', :writeable => true
-    define_field :idle_seeding_limit_enabled?, 'idle-seeding-limit-enabled', :writeable => true
-    define_field :incomplete_dir, 'incomplete-dir', :writeable => true
-    define_field :incomplete_dir_enabled?, 'incomplete-dir-enabled', :writeable => true
-    define_field :lpd_enabled?, 'lpd-enabled', :writeable => true
-    define_field :peer_limit_global, 'peer-limit-global', :writeable => true
-    define_field :peer_limit_per_torrent, 'peer-limit-per-torrent', :writeable => true
-    define_field :pex_enabled?, 'pex-enabled', :writeable => true
-    define_field :peer_port, 'peer-port', :writeable => true
-    define_field :peer_port_random_on_start?, 'peer-port-random-on-start', :writeable => true
-    define_field :port_forwarding_enabled?, 'port-forwarding-enabled', :writeable => true
-    define_field :rename_partial_files?, 'rename-partial-files', :writeable => true
-    define_field :rpc_version, 'rpc-version'
-    define_field :rpc_version_minimum, 'rpc-version-minimum'
-    define_field :script_torrent_done_filename, 'script-torrent-done-filename', :writeable => true
-    define_field :script_torrent_done_enabled?, 'script-torrent-done-enabled', :writeable => true
-    define_field :seed_ratio_limit, 'seedRatioLimit', :type => RTransmission::Fields::Percent, :writeable => true
-    define_field :seed_ratio_limited?, 'seedRatioLimited', :writeable => true
-    define_field :speed_limit_down, 'speed-limit-down', :writeable => true
-    define_field :speed_limit_down_enabled?, 'speed-limit-down-enabled', :writeable => true
-    define_field :speed_limit_up, 'speed-limit-up', :writeable => true
-    define_field :speed_limit_up_enabled?, 'speed-limit-up-enabled', :writeable => true
-    define_field :start_added_torrents?, 'start-added-torrents', :writeable => true
-    define_field :trash_original_torrent_files?, 'trash-original-torrent-files', :writeable => true
-    define_field :units, 'units' # FIXME: add type and writeable
-    define_field :utp_enabled?, 'utp-enabled', :writeable => true
-    define_field :version, 'version'
+    attribute 'alt-speed-down', :writeable => true
+    attribute 'alt-speed-enabled', :name => :alt_speed_enabled?, :writeable => true
+    attribute 'alt-speed-time-begin', :writeable => true
+    attribute 'alt-speed-time-enabled', :name => :alt_speed_time_enabled?, :writeable => true
+    attribute 'alt-speed-time-end', :writeable => true
+    attribute 'alt-speed-time-day', :type => :day, :writeable => true
+    attribute 'alt-speed-up', :writeable => true
+    attribute 'blocklist-url', :writeable => true
+    attribute 'blocklist-enabled', :name => :blocklist_enabled?, :writeable => true
+    attribute 'blocklist-size'
+    attribute 'cache-size-mb', :writeable => true
+    attribute 'config-dir'
+    attribute 'download-dir', :writeable => true
+    attribute 'download-dir-free-space'
+    attribute 'dht-enabled', :name => :dht_enabled?, :writeable => true
+    attribute 'encryption', :type => :encryption, :writeable => true
+    attribute 'idle-seeding-limit', :writeable => true
+    attribute 'idle-seeding-limit-enabled', :name => :idle_seeding_limit_enabled?, :writeable => true
+    attribute 'incomplete-dir', :writeable => true
+    attribute 'incomplete-dir-enabled', :name => :incomplete_dir_enabled?, :writeable => true
+    attribute 'lpd-enabled', :name => :lpd_enabled?, :writeable => true
+    attribute 'peer-limit-global', :writeable => true
+    attribute 'peer-limit-per-torrent', :writeable => true
+    attribute 'pex-enabled', :name => :pex_enabled?, :writeable => true
+    attribute 'peer-port', :writeable => true
+    attribute 'peer-port-random-on-start', :name => :peer_port_random_on_start?, :writeable => true
+    attribute 'port-forwarding-enabled', :name => :port_forwarding_enabled?, :writeable => true
+    attribute 'rename-partial-files', :name => :rename_partial_files?, :writeable => true
+    attribute 'rpc-version'
+    attribute 'rpc-version-minimum'
+    attribute 'script-torrent-done-filename', :writeable => true
+    attribute 'script-torrent-done-enabled', :name => :script_torrent_done_enabled?, :writeable => true
+    attribute 'seedRatioLimit', :writeable => true
+    attribute 'seedRatioLimited', :name => :seed_ratio_limited?, :writeable => true
+    attribute 'speed-limit-down', :writeable => true
+    attribute 'speed-limit-down-enabled', :name => :speed_limit_down_enabled?, :writeable => true
+    attribute 'speed-limit-up', :writeable => true
+    attribute 'speed-limit-up-enabled', :name => :speed_limit_up_enabled?, :writeable => true
+    attribute 'start-added-torrents', :name => :start_added_torrents?, :writeable => true
+    attribute 'trash-original-torrent-files', :name => :trash_original_torrent_files?, :writeable => true
+    attribute 'units' # FIXME: add type and writeable
+    attribute 'utp-enabled', :name => :utp_enabled?, :writeable => true
+    attribute 'version'
 
     def initialize(client)
       @client = client
@@ -98,7 +80,7 @@ module RTransmission
 
     def stats
       request = RTransmission::Request.new('session-stats', {}, 'Session.stats') do |arguments|
-        RTransmission::Fields::Stats.unmap(arguments)
+        RTransmission::Types::Stats.unmap(arguments)
       end
 
       @client.call(request)

data/lib/rtransmission/torrent.rb

@@ -4,9 +4,8 @@
 
 require 'base64'
 
-# FIXME: files-wanted/unwanted & prioriry-high/low/normal for both add and new torrents
+# FIXME: files-wanted/unwanted & prioriry-high/low/normal for new torrents
 # FIXME: add/remove/replace trackers
-# FIXME: location set support
 module RTransmission
   class Torrent
     attr_reader :id
@@ -17,7 +16,7 @@ module RTransmission
       raise RTransmission::Exception.new('Torrent#add: only one of remote_file, url, or torrent must be specified') if (args.keys & [:remote_file, :url, :torrent]).count != 1
       pargs['filename'] = args[:remote_file] if args[:remote_file]
       pargs['filename'] = args[:url] if args[:url]
-      pargs['metainfo'] = Base64::encode(args[:torrent]) if args[:torrent]
+      pargs['metainfo'] = Base64::encode64(args[:torrent]) if args[:torrent]
 
       pargs['cookies'] = args[:cookies] if args[:cookies]
       pargs['download-dir'] = args[:download_dir] if args[:download_dir]
@@ -45,21 +44,13 @@ module RTransmission
       session.client.call(request)
     end
 
-    def self.define_field(name, rpc_name, args = {})
+    def self.attribute(rpc_name, args = {})
+      name = args[:name] || RTransmission::Client.rpc_name_to_ruby_name(rpc_name)
+
       self.send :define_method, name.to_s do
         request = RTransmission::Request.new('torrent-get', {'ids' => @id, 'fields' => [rpc_name]}, 'Torrent.' + name.to_s) do |arguments|
-          result = arguments['torrents'][0][rpc_name]
-          if args[:type]
-            type = args[:type]
-            if type.class == Array
-              type = type[0]
-              result.map! { |r| type.unmap(r) }
-            else
-              result = type.unmap(result)
-            end
-          end
-
-          result 
+          value = arguments['torrents'][0][rpc_name]
+          RTransmission::Type.unmap(value, args[:type])
         end
 
         @session.client.call(request)
@@ -67,17 +58,7 @@ module RTransmission
 
       if args[:writeable] == true
         self.send :define_method, name.to_s.gsub('?', '') + '=' do |value|
-          rpc_value = value
-          if args[:type]
-            type = args[:type]
-            if type.class == Array
-              type = type[0]
-              rpc_value.map! { |r| type.map(r) }
-            else
-              rpc_value = type.map(rpc_value)
-            end
-          end
-
+          rpc_value = RTransmission::Type.map(value, args[:type])
           request = RTransmission::Request.new('torrent-set', {'ids' => @id, rpc_name => rpc_value}, 'Torrent.' + name.to_s + '=') do
             value
           end
@@ -87,70 +68,69 @@ module RTransmission
       end
     end
 
-    define_field :activity_date, 'activityDate', :type => RTransmission::Fields::Time
-    define_field :added_date, 'addedDate', :type => RTransmission::Fields::Time
-    define_field :bandwidth_priority, 'bandwidthPriority', :type => RTransmission::Fields::Priority, :writeable => true
-    define_field :comment, 'comment'
-    define_field :corrupt_ever, 'corruptEver'
-    define_field :creator, 'creator'
-    define_field :date_created, 'dateCreated', :type => RTransmission::Fields::Time
-    define_field :desired_available, 'desiredAvailable'
-    define_field :done_date, 'doneDate', :type => RTransmission::Fields::Time
-    define_field :download_dir, 'downloadDir'
-    define_field :downloaded_ever, 'downloadedEver'
-    define_field :download_limit, 'downloadLimit', :writeable => true
-    define_field :download_limited?, 'downloadLimited', :writeable => true
-    define_field :error, 'error', :type => RTransmission::Fields::Error
-    define_field :error_string, 'errorString'
-    define_field :eta, 'eta', :type => RTransmission::Fields::ETA
-    define_field :files, 'files', :type => [RTransmission::Fields::File]
-    define_field :file_stats, 'fileStats', :type => [RTransmission::Fields::FileStat]
-    define_field :hash_string, 'hashString'
-    define_field :have_unchecked, 'haveUnchecked'
-    define_field :have_valid, 'haveValid'
-    define_field :honors_session_limits?, 'honorsSessionLimits', :writeable => true
-    define_field :finished?, 'isFinished'
-    define_field :private?, 'isPrivate'
-    define_field :left_until_done, 'leftUntilDone'
-    define_field :magnet_link, 'magnetLink'
-    define_field :manual_announce_time, 'manualAnnounceTime' # FIXME: add type
-    define_field :max_connected_peers, 'maxConnectedPeers'
-    define_field :metadata_percent_complete, 'metadataPercentComplete'
-    define_field :name, 'name'
-    define_field :peer_limit, 'peer-limit', :writeable => true
-    define_field :peers, 'peers', :type => [RTransmission::Fields::Peer]
-    define_field :peers_connected, 'peersConnected'
-    define_field :peers_from, 'peersFrom', :type => RTransmission::Fields::PeersFrom
-    define_field :peers_getting_from_us, 'peersGettingFromUs'
-    define_field :peers_sending_to_us, 'peersSendingToUs'
-    define_field :percent_done, 'percentDone', :type => RTransmission::Fields::Percent
-    define_field :pieces, 'pieces', :type => RTransmission::Fields::Pieces
-    define_field :piece_count, 'pieceCount'
-    define_field :piece_size, 'pieceSize'
-    define_field :priorities, 'priorities', :type => [RTransmission::Fields::Priority]
-    define_field :rate_download, 'rateDownload'
-    define_field :rate_upload, 'rateUpload'
-    define_field :recheck_progress, 'recheckProgress', :type => RTransmission::Fields::Percent
-    define_field :seconds_downloading, 'secondsDownloading'
-    define_field :seconds_seeding, 'secondsSeeding'
-    define_field :seed_idle_limit, 'seedIdleLimit', :writeable => true
-    define_field :seed_idle_mode, 'seedIdleMode', :type => RTransmission::Fields::SeedIdleMode, :writeable => true
-    define_field :seed_ratio_limit, 'seedRatioLimit', :type => RTransmission::Fields::Percent, :writeable => true
-    define_field :seed_ratio_mode, 'seedRatioMode', :type => RTransmission::Fields::SeedRatioMode, :writeable => true
-    define_field :size_when_done, 'sizeWhenDone'
-    define_field :start_date, 'startDate', :type => RTransmission::Fields::Time
-    define_field :status, 'status', :type => RTransmission::Fields::Status
-    define_field :trackers, 'trackers', :type => [RTransmission::Fields::Tracker]
-    define_field :tracker_stats, 'trackerStats', :type => [RTransmission::Fields::TrackerStat]
-    define_field :total_size, 'totalSize'
-    define_field :torrent_file, 'torrentFile'
-    define_field :uploaded_ever, 'uploadedEver'
-    define_field :upload_limit, 'uploadLimit', :writeable => true
-    define_field :upload_limited?, 'uploadLimited', :writeable => true
-    define_field :upload_ratio, 'uploadRatio', :type => RTransmission::Fields::Percent
-    define_field :wanted, 'wanted'
-    define_field :webseeds, 'webseeds' # FIXME: add type
-    define_field :webseeds_sending_to_us, 'webseedsSendingToUs'
+    attribute 'activityDate', :type => :time
+    attribute 'addedDate', :type => :time
+    attribute 'bandwidthPriority', :type => :priority, :writeable => true
+    attribute 'comment'
+    attribute 'corruptEver'
+    attribute 'creator'
+    attribute 'dateCreated', :type => :time
+    attribute 'desiredAvailable'
+    attribute 'doneDate', :type => :time
+    attribute 'downloadDir'
+    attribute 'downloadedEver'
+    attribute 'downloadLimit', :writeable => true
+    attribute 'downloadLimited', :name => :download_limited?, :writeable => true
+    attribute 'error', :type => :error
+    attribute 'errorString'
+    attribute 'eta', :type => :eta
+    attribute 'files', :type => [:file]
+    attribute 'fileStats', :name => :files_stats, :type => [:file_stat]
+    attribute 'hashString'
+    attribute 'haveUnchecked'
+    attribute 'haveValid'
+    attribute 'honorsSessionLimits', :name => :honors_session_limits?, :writeable => true
+    attribute 'isFinished', :name => :finished?
+    attribute 'isPrivate', :name => :private?
+    attribute 'leftUntilDone'
+    attribute 'magnetLink'
+    attribute 'manualAnnounceTime' # FIXME: add type
+    attribute 'maxConnectedPeers'
+    attribute 'metadataPercentComplete'
+    attribute 'name'
+    attribute 'peer-limit', :writeable => true
+    attribute 'peers', :type => [:peer]
+    attribute 'peersConnected'
+    attribute 'peersFrom', :type => :peers_from
+    attribute 'peersGettingFromUs'
+    attribute 'peersSendingToUs'
+    attribute 'percentDone'
+    attribute 'pieceCount'
+    attribute 'pieceSize'
+    attribute 'priorities', :type => [:priority]
+    attribute 'rateDownload'
+    attribute 'rateUpload'
+    attribute 'recheckProgress'
+    attribute 'secondsDownloading'
+    attribute 'secondsSeeding'
+    attribute 'seedIdleLimit', :writeable => true
+    attribute 'seedIdleMode', :type => :seed_idle_mode, :writeable => true
+    attribute 'seedRatioLimit', :writeable => true
+    attribute 'seedRatioMode', :type => :seed_ratio_mode, :writeable => true
+    attribute 'sizeWhenDone'
+    attribute 'startDate', :type => :time
+    attribute 'status', :type => :status
+    attribute 'trackers', :type => [:tracker]
+    attribute 'trackerStats', :name => :trackers_stats, :type => [:tracker_stat]
+    attribute 'totalSize'
+    attribute 'torrentFile'
+    attribute 'uploadedEver'
+    attribute 'uploadLimit', :writeable => true
+    attribute 'uploadLimited', :name => :upload_limited?, :writeable => true
+    attribute 'uploadRatio'
+    attribute 'wanted'
+    attribute 'webseeds' # FIXME: add type
+    attribute 'webseedsSendingToUs'
 
     def initialize(session, id)
       @session = session
@@ -189,5 +169,55 @@ module RTransmission
 
       @session.client.call(RTransmission::Request.new('torrent-set-location', {'ids' => @id}.merge(pargs), 'Torrent.move'))
     end
+
+    def pieces
+      request = RTransmission::Request.new('torrent-get', {'ids' => @id, 'fields' => ['pieces']}, 'Torrent.pieces') do |arguments|
+        pieces = arguments['torrents'][0]['pieces']
+        Base64::decode64(pieces).unpack('B*')[0][0 .. piece_count - 1]
+      end
+
+      @session.client.call(request)
+    end
+
+    def priorities=(priorities)
+      phigh = []
+      pnormal = []
+      plow = []
+      0.upto(priorities.size - 1) do |i|
+        phigh << i if priorities[i] == :high
+        pnormal << i if priorities[i] == :normal
+        plow << i if priorities[i] == :low
+      end
+
+      pargs = {}
+      pargs.merge!({'priority-high' => phigh}) if phigh.size != 0
+      pargs.merge!({'priority-normal' => pnormal}) if pnormal.size != 0
+      pargs.merge!({'priority-low' => plow}) if plow.size != 0
+
+      request = RTransmission::Request.new('torrent-set', {'ids' => @id}.merge(pargs), 'Torrent.files_priorities=') do
+        priorities
+      end
+
+      @session.client.call(request)
+    end
+
+    def wanted=(wanted)
+      pwanted = []
+      punwanted = []
+      0.upto(wanted.size - 1) do |i|
+        pwanted << i if wanted[i]
+        punwanted << i unless wanted[i]
+      end
+
+      pargs = {}
+      pargs.merge!({'files-wanted' => pwanted}) if pwanted.size != 0
+      pargs.merge!({'files-unwanted' => punwanted}) if punwanted.size != 0
+
+      request = RTransmission::Request.new('torrent-set', {'ids' => @id}.merge(pargs), 'Torrent.wanted=') do
+        wanted
+      end
+
+      @session.client.call(request)
+    end
   end
 end

data/lib/rtransmission/type.rb

@@ -0,0 +1,55 @@
+# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
+# All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
+
+module RTransmission
+  class Type
+    def self.type_to_class(type)
+      type = type.to_s
+      type = '_' + type
+      type.gsub!(/_./) { |x| x[1].upcase }
+
+      RTransmission::Types.const_get(type)
+    end
+
+    def self.unmap(value, type)
+      if type
+        if type.class == Array
+          type = RTransmission::Type.type_to_class(type[0])
+          value.map! { |v| type.unmap(v) }
+        else
+          type = RTransmission::Type.type_to_class(type)
+          value = type.unmap(value)
+        end
+      end
+
+      value 
+    end
+
+    def self.map(value, type)
+      if type
+        if type.class == Array
+          type = RTransmission::Type.type_to_class(type[0])
+          value.map! { |v| type.map(v) }
+        else
+          type = RTransmission::Type.type_to_class(type)
+          value = type.map(value)
+        end
+      end
+
+      value 
+    end
+
+    def self.attribute(rpc_name, args = {})
+      name = args[:name] || RTransmission::Client.rpc_name_to_ruby_name(rpc_name)
+        
+      self.send :define_method, name.to_s do
+        RTransmission::Type.unmap(@hash[rpc_name], args[:type])
+      end
+    end
+
+    def initialize(hash)
+      @hash = hash
+    end
+  end
+end

data/lib/rtransmission/types.rb

@@ -0,0 +1,22 @@
+# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
+# All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
+
+require 'rtransmission/types/error'
+require 'rtransmission/types/eta'
+require 'rtransmission/types/priority'
+require 'rtransmission/types/time'
+require 'rtransmission/types/file'
+require 'rtransmission/types/file_stat'
+require 'rtransmission/types/peer'
+require 'rtransmission/types/peers_from'
+require 'rtransmission/types/seed_idle_mode'
+require 'rtransmission/types/seed_ratio_mode'
+require 'rtransmission/types/status'
+require 'rtransmission/types/tracker'
+require 'rtransmission/types/tracker_state'
+require 'rtransmission/types/tracker_stat'
+require 'rtransmission/types/day'
+require 'rtransmission/types/encryption'
+require 'rtransmission/types/traffic_stats'
+require 'rtransmission/types/stats'

data/lib/rtransmission/{fields → types}/day.rb

@@ -3,8 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
 
 module RTransmission
-  module Fields
-    class Day
+  module Types
+    class Day < RTransmission::Type
       MAP = {1 => :sunday, 2 => :monday, 4 => :tuesday, 8 => :wednesday, 16 => :thursday, 32 => :friday, 64 => :saturday}
 
       def self.unmap(value)

data/lib/rtransmission/{fields → types}/encryption.rb

@@ -3,8 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
 
 module RTransmission
-  module Fields
-    class Encryption
+  module Types
+    class Encryption < RTransmission::Type
       def self.unmap(value)
         value.to_sym
       end

data/lib/rtransmission/{fields → types}/error.rb

@@ -3,8 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
 
 module RTransmission
-  module Fields
-    class Error
+  module Types
+    class Error < RTransmission::Type
       MAP = {0 => :ok, 1 => :tracker_warning, 2 => :tracker_error, 3 => :local_error}
 
       def self.unmap(value)

data/lib/rtransmission/{fields → types}/eta.rb

@@ -3,8 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
 
 module RTransmission
-  module Fields
-    class ETA
+  module Types
+    class Eta < RTransmission::Type
       MAP = {-1 => :not_available, -2 => :unknown}
 
       def self.unmap(value)

data/lib/rtransmission/{fields/percent.rb → types/file.rb}

@@ -3,14 +3,14 @@
 # Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
 
 module RTransmission
-  module Fields
-    class Percent
-      def self.unmap(value)
-        value
-      end
+  module Types
+    class File < RTransmission::Type
+      attribute 'name'
+      attribute 'length'
+      attribute 'bytesCompleted'
 
-      def self.map(value)
-        value
+      def self.unmap(value)
+        RTransmission::Types::File.new(value)
       end
     end
   end

data/lib/rtransmission/types/file_stat.rb

@@ -0,0 +1,17 @@
+# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
+# All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
+
+module RTransmission
+  module Types
+    class FileStat < RTransmission::Type
+      attribute 'bytesCompleted'
+      attribute 'wanted', :name => :wanted?
+      attribute 'priority', :type => :priority
+
+      def self.unmap(value)
+        RTransmission::Types::FileStat.new(value)
+      end
+    end
+  end
+end

data/lib/rtransmission/types/peer.rb

@@ -0,0 +1,30 @@
+# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
+# All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
+
+module RTransmission
+  module Types
+    class Peer < RTransmission::Type
+      attribute 'address'
+      attribute 'clientIsChoked', :name => :client_choked?
+      attribute 'clientIsInterested', :name => :client_interested?
+      attribute 'clientName'
+      attribute 'flagStr'
+      attribute 'isDownloadingFrom', :name => :downloading_from? 
+      attribute 'isEncrypted', :name => :encrypted?
+      attribute 'isIncoming', :name => :incoming?
+      attribute 'isUTP', :name => :utp?
+      attribute 'isUploadingTo', :name => :uploading_to?
+      attribute 'peerIsChoked', :name => :peer_choked?
+      attribute 'peerIsInterested', :name => :peer_interested?
+      attribute 'port'
+      attribute 'progress'
+      attribute 'rateToClient'
+      attribute 'rateToPeer'
+
+      def self.unmap(value)
+        RTransmission::Types::Peer.new(value)
+      end
+    end
+  end
+end

data/lib/rtransmission/types/peers_from.rb

@@ -0,0 +1,20 @@
+# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
+# All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
+
+module RTransmission
+  module Types
+    class PeersFrom < RTransmission::Type
+      attribute 'fromCache', :name => :cache
+      attribute 'fromDht', :name => :dht
+      attribute 'fromIncoming', :name => :incoming
+      attribute 'fromLtep', :name => :ltep
+      attribute 'fromPex', :name => :pex
+      attribute 'fromTracker', :name => :tracker
+
+      def self.unmap(value)
+        RTransmission::Types::PeersFrom.new(value)
+      end
+    end
+  end
+end

data/lib/rtransmission/{fields → types}/priority.rb

@@ -3,8 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
 
 module RTransmission
-  module Fields
-    class Priority
+  module Types
+    class Priority < RTransmission::Type
       MAP = {-1 => :low, 0 => :normal, 1 => :high}
 
       def self.unmap(value)

data/lib/rtransmission/{fields → types}/seed_idle_mode.rb

@@ -3,8 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
 
 module RTransmission
-  module Fields
-    class SeedIdleMode
+  module Types
+    class SeedIdleMode < RTransmission::Type
       MAP = {0 => :global, 1 => :single, 2 => :unlimited}
 
       def self.unmap(value)

data/lib/rtransmission/{fields → types}/seed_ratio_mode.rb

@@ -3,8 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
 
 module RTransmission
-  module Fields
-    class SeedRatioMode
+  module Types
+    class SeedRatioMode < RTransmission::Type
       MAP = {0 => :global, 1 => :single, 2 => :unlimited}
 
       def self.unmap(value)

data/lib/rtransmission/types/stats.rb

@@ -0,0 +1,21 @@
+# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
+# All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
+
+module RTransmission
+  module Types
+    class Stats < RTransmission::Type
+      attribute 'activeTorrentCount'
+      attribute 'downloadSpeed'
+      attribute 'pausedTorrentCount'
+      attribute 'torrentCount'
+      attribute 'uploadSpeed'
+      attribute 'cumulative-stats', :type => :traffic_stats
+      attribute 'current-stats', :type => :traffic_stats
+
+      def self.unmap(value)
+        RTransmission::Types::Stats.new(value)
+      end
+    end
+  end
+end

data/lib/rtransmission/{fields → types}/status.rb

@@ -3,8 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
 
 module RTransmission
-  module Fields
-    class Status
+  module Types
+    class Status < RTransmission::Type
       MAP = {1 => :check_wait, 2 => :check, 4 => :download, 8 => :seed, 16 => :stopped}
 
       def self.unmap(value)

data/lib/rtransmission/{fields → types}/time.rb

@@ -3,8 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
 
 module RTransmission
-  module Fields
-    class Time
+  module Types
+    class Time < RTransmission::Type
       def self.unmap(value)
         value == 0 ? nil : ::Time.at(value)
       end

data/lib/rtransmission/types/tracker.rb

@@ -0,0 +1,18 @@
+# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
+# All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
+
+module RTransmission
+  module Types
+    class Tracker < RTransmission::Type
+      attribute 'id'
+      attribute 'announce'
+      attribute 'scrape'
+      attribute 'tier'
+
+      def self.unmap(value)
+        RTransmission::Types::Tracker.new(value)
+      end
+    end
+  end
+end

data/lib/rtransmission/types/tracker_stat.rb

@@ -0,0 +1,41 @@
+# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
+# All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
+
+# FIXME: add types where needed
+module RTransmission
+  module Types
+    class TrackerStat < RTransmission::Type
+      attribute 'id'
+      attribute 'announce'
+      attribute 'announceState', :type => :tracker_state
+      attribute 'downloadCount'
+      attribute 'hasAnnounced', :name => :announced?
+      attribute 'hasScraped', :name => :scraped?
+      attribute 'host'
+      attribute 'isBackup', :name => :backup?
+      attribute 'lastAnnouncePeerCount'
+      attribute 'lastAnnounceResult'
+      attribute 'lastAnnounceStartTime', :type => :time
+      attribute 'lastAnnounceSucceeded', :name => :last_announce_succeeded?
+      attribute 'lastAnnounceTime', :type => :time
+      attribute 'lastAnnounceTimedOut', :name => :last_announce_timed_out?
+      attribute 'lastScrapeResult'
+      attribute 'lastScrapeStartTime', :type => :time
+      attribute 'lastScrapeSucceeded', :name => :last_scrape_succeeded?
+      attribute 'lastScrapeTime', :type => :time
+      attribute 'lastScrapeTimedOut', :name => :last_scrape_timed_out?
+      attribute 'leecherCount'
+      attribute 'nextAnnounceTime', :type => :time
+      attribute 'nextScrapeTime', :type => :time
+      attribute 'scrape'
+      attribute 'scrapeState', :type => :tracker_state
+      attribute 'seederCount'
+      attribute 'tier'
+
+      def self.unmap(value)
+        RTransmission::Types::TrackerStat.new(value)
+      end
+    end
+  end
+end

data/lib/rtransmission/types/tracker_state.rb

@@ -0,0 +1,15 @@
+# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
+# All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
+
+module RTransmission
+  module Types
+    class TrackerState < RTransmission::Type
+      MAP = {0 => :inactive, 1 => :waiting, 2 => :queued, 3 => :active}
+
+      def self.unmap(value)
+        MAP[value]
+      end
+    end
+  end
+end

data/lib/rtransmission/types/traffic_stats.rb

@@ -0,0 +1,19 @@
+# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
+# All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
+
+module RTransmission
+  module Types
+    class TrafficStats < RTransmission::Type
+      attribute 'uploadedBytes'
+      attribute 'downloadedBytes'
+      attribute 'filesAdded'
+      attribute 'sessionCount'
+      attribute 'secondsActive'
+
+      def self.unmap(value)
+        RTransmission::Types::TrafficStats.new(value)
+      end
+    end
+  end
+end

data/lib/rtransmission/version.rb

@@ -5,7 +5,7 @@
 module RTransmission
   module VERSION
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
 
     STRING = [MAJOR, MINOR].join('.')
   end

metadata

@@ -2,7 +2,7 @@
 name: rtransmission
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Andrew Kirilenko
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 +03:00
+date: 2011-06-07 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -26,34 +26,33 @@ files:
 - COPYING
 - README.md
 - rtransmission.gemspec
-- lib/rtransmission/fields.rb
 - lib/rtransmission/client.rb
 - lib/rtransmission/session.rb
+- lib/rtransmission/types/eta.rb
+- lib/rtransmission/types/time.rb
+- lib/rtransmission/types/tracker_stat.rb
+- lib/rtransmission/types/encryption.rb
+- lib/rtransmission/types/error.rb
+- lib/rtransmission/types/tracker.rb
+- lib/rtransmission/types/stats.rb
+- lib/rtransmission/types/peers_from.rb
+- lib/rtransmission/types/file_stat.rb
+- lib/rtransmission/types/tracker_state.rb
+- lib/rtransmission/types/file.rb
+- lib/rtransmission/types/status.rb
+- lib/rtransmission/types/seed_ratio_mode.rb
+- lib/rtransmission/types/peer.rb
+- lib/rtransmission/types/priority.rb
+- lib/rtransmission/types/traffic_stats.rb
+- lib/rtransmission/types/seed_idle_mode.rb
+- lib/rtransmission/types/day.rb
 - lib/rtransmission/version.rb
 - lib/rtransmission/torrent.rb
+- lib/rtransmission/types.rb
 - lib/rtransmission/response.rb
+- lib/rtransmission/type.rb
 - lib/rtransmission/exception.rb
 - lib/rtransmission/request.rb
-- lib/rtransmission/fields/eta.rb
-- lib/rtransmission/fields/time.rb
-- lib/rtransmission/fields/tracker_stat.rb
-- lib/rtransmission/fields/encryption.rb
-- lib/rtransmission/fields/error.rb
-- lib/rtransmission/fields/tracker.rb
-- lib/rtransmission/fields/stats.rb
-- lib/rtransmission/fields/peers_from.rb
-- lib/rtransmission/fields/file_stat.rb
-- lib/rtransmission/fields/percent.rb
-- lib/rtransmission/fields/pieces.rb
-- lib/rtransmission/fields/file.rb
-- lib/rtransmission/fields/status.rb
-- lib/rtransmission/fields/seed_ratio_mode.rb
-- lib/rtransmission/fields/peer.rb
-- lib/rtransmission/fields/priority.rb
-- lib/rtransmission/fields/traffic_stats.rb
-- lib/rtransmission/fields/seed_idle_mode.rb
-- lib/rtransmission/fields/day.rb
-- lib/rtransmission/field.rb
 - lib/rtransmission.rb
 has_rdoc: true
 homepage: http://github.com/iced/rtransmission

data/lib/rtransmission/field.rb

@@ -1,24 +0,0 @@
-# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
-
-module RTransmission
-  class Field
-    def self.unmap(value)
-      value
-    end
-
-    def self.define_attribute(name, rpc_name, args = {})
-      self.send :define_method, name.to_s do
-        value = @hash[rpc_name]
-        value = args[:type].unmap(value) if args[:type]
-
-        value
-      end
-    end
-
-    def initialize(hash)
-      @hash = hash
-    end
-  end
-end

data/lib/rtransmission/fields.rb

@@ -1,23 +0,0 @@
-# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
-
-require 'rtransmission/fields/error'
-require 'rtransmission/fields/eta'
-require 'rtransmission/fields/percent'
-require 'rtransmission/fields/priority'
-require 'rtransmission/fields/time'
-require 'rtransmission/fields/file'
-require 'rtransmission/fields/file_stat'
-require 'rtransmission/fields/peer'
-require 'rtransmission/fields/peers_from'
-require 'rtransmission/fields/pieces'
-require 'rtransmission/fields/seed_idle_mode'
-require 'rtransmission/fields/seed_ratio_mode'
-require 'rtransmission/fields/status'
-require 'rtransmission/fields/tracker'
-require 'rtransmission/fields/tracker_stat'
-require 'rtransmission/fields/day'
-require 'rtransmission/fields/encryption'
-require 'rtransmission/fields/traffic_stats'
-require 'rtransmission/fields/stats'

data/lib/rtransmission/fields/file.rb

@@ -1,17 +0,0 @@
-# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
-
-module RTransmission
-  module Fields
-    class File < RTransmission::Field
-      define_attribute :name, 'name'
-      define_attribute :length, 'length'
-      define_attribute :bytes_completed, 'bytesCompleted'
-
-      def self.unmap(value)
-        RTransmission::Fields::File.new(value)
-      end
-    end
-  end
-end

data/lib/rtransmission/fields/file_stat.rb

@@ -1,17 +0,0 @@
-# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
-
-module RTransmission
-  module Fields
-    class FileStat < RTransmission::Field
-      define_attribute :bytes_completed, 'bytesCompleted'
-      define_attribute :wanted?, 'wanted'
-      define_attribute :priority, 'priority', :type => RTransmission::Fields::Priority
-
-      def self.unmap(value)
-        RTransmission::Fields::FileStat.new(value)
-      end
-    end
-  end
-end

data/lib/rtransmission/fields/peer.rb

@@ -1,30 +0,0 @@
-# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
-
-module RTransmission
-  module Fields
-    class Peer < RTransmission::Field
-      define_attribute :address, 'address'
-      define_attribute :client_choked?, 'clientIsChoked'
-      define_attribute :client_interested?, 'clientIsInterested'
-      define_attribute :client_name, 'clientName'
-      define_attribute :flag_str, 'flagStr'
-      define_attribute :downloading_from?, 'isDownloadingFrom'
-      define_attribute :encrypted?, 'isEncrypted'
-      define_attribute :incoming?, 'isIncoming'
-      define_attribute :utp?, 'isUTP'
-      define_attribute :uploading_to?, 'isUploadingTo'
-      define_attribute :peer_choked?, 'peerIsChoked'
-      define_attribute :peer_interested?, 'peerIsInterested'
-      define_attribute :port, 'port'
-      define_attribute :progress, 'progress', :type => RTransmission::Fields::Percent
-      define_attribute :rate_to_client, 'rateToClient'
-      define_attribute :rate_to_peer, 'rateToPeer'
-
-      def self.unmap(value)
-        RTransmission::Fields::Peer.new(value)
-      end
-    end
-  end
-end

data/lib/rtransmission/fields/peers_from.rb

@@ -1,20 +0,0 @@
-# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
-
-module RTransmission
-  module Fields
-    class PeersFrom < RTransmission::Field
-      define_attribute :cache, 'fromCache'
-      define_attribute :dht, 'fromDht'
-      define_attribute :incoming, 'fromIncoming'
-      define_attribute :ltep, 'fromLtep'
-      define_attribute :pex, 'fromPex'
-      define_attribute :tracker, 'fromTracker'
-
-      def self.unmap(value)
-        RTransmission::Fields::PeersFrom.new(value)
-      end
-    end
-  end
-end

data/lib/rtransmission/fields/pieces.rb

@@ -1,13 +0,0 @@
-# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
-
-module RTransmission
-  module Fields
-    class Pieces
-      def self.unmap(value)
-        value
-      end
-    end
-  end
-end

data/lib/rtransmission/fields/stats.rb

@@ -1,21 +0,0 @@
-# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
-
-module RTransmission
-  module Fields
-    class Stats < RTransmission::Field
-      define_attribute :active_torrent_count, 'activeTorrentCount'
-      define_attribute :download_speed, 'downloadSpeed'
-      define_attribute :paused_torrent_count, 'pausedTorrentCount'
-      define_attribute :torrent_count, 'torrentCount'
-      define_attribute :upload_speed, 'uploadSpeed'
-      define_attribute :cumulative_stats, 'cumulative-stats', :type => RTransmission::Fields::TrafficStats
-      define_attribute :current_stats, 'current-stats', :type => RTransmission::Fields::TrafficStats
-
-      def self.unmap(value)
-        RTransmission::Fields::Stats.new(value)
-      end
-    end
-  end
-end

data/lib/rtransmission/fields/tracker.rb

@@ -1,18 +0,0 @@
-# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
-
-module RTransmission
-  module Fields
-    class Tracker < RTransmission::Field
-      define_attribute :id, 'id'
-      define_attribute :announce, 'announce'
-      define_attribute :scrape, 'scrape'
-      define_attribute :tier, 'tier'
-
-      def self.unmap(value)
-        RTransmission::Fields::Tracker.new(value)
-      end
-    end
-  end
-end

data/lib/rtransmission/fields/tracker_stat.rb

@@ -1,41 +0,0 @@
-# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
-
-# FIXME: add types where needed
-module RTransmission
-  module Fields
-    class TrackerStat < RTransmission::Field
-      define_attribute :id, 'id'
-      define_attribute :announce, 'announce'
-      define_attribute :announce_state, 'announceState'
-      define_attribute :download_count, 'downloadCount'
-      define_attribute :has_announced, 'hasAnnounced'
-      define_attribute :has_scraped, 'hasScraped'
-      define_attribute :host, 'host'
-      define_attribute :is_backup, 'isBackup'
-      define_attribute :last_announce_peer_count, 'lastAnnouncePeerCount'
-      define_attribute :last_announce_result, 'lastAnnounceResult'
-      define_attribute :last_announce_start_time, 'lastAnnounceStartTime'
-      define_attribute :last_announce_succeeded, 'lastAnnounceSucceeded'
-      define_attribute :last_announce_time, 'lastAnnounceTime'
-      define_attribute :last_announce_timed_out, 'lastAnnounceTimedOut'
-      define_attribute :last_scrape_result, 'lastScrapeResult'
-      define_attribute :last_scrape_start_time, 'lastScrapeStartTime'
-      define_attribute :last_scrape_succeeded, 'lastScrapeSucceeded'
-      define_attribute :last_scrape_time, 'lastScrapeTime'
-      define_attribute :last_scrape_timed_out, 'lastScrapeTimedOut'
-      define_attribute :leecher_count, 'leecherCount'
-      define_attribute :next_announce_time, 'nextAnnounceTime'
-      define_attribute :next_scrape_time, 'nextScrapeTime'
-      define_attribute :scrape, 'scrape'
-      define_attribute :scrape_state, 'scrapeState'
-      define_attribute :seeder_count, 'seederCount'
-      define_attribute :tier, 'tier'
-
-      def self.unmap(value)
-        RTransmission::Fields::TrackerStat.new(value)
-      end
-    end
-  end
-end

data/lib/rtransmission/fields/traffic_stats.rb

@@ -1,19 +0,0 @@
-# Copyright (c) 2011, Andrew Kirilenko <andrew.kirilenko@gmail.com>
-# All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be found in the COPYING file.
-
-module RTransmission
-  module Fields
-    class TrafficStats < RTransmission::Field
-      define_attribute :uploaded_bytes, 'uploadedBytes'
-      define_attribute :downloaded_bytes, 'downloadedBytes'
-      define_attribute :files_added, 'filesAdded'
-      define_attribute :session_count, 'sessionCount'
-      define_attribute :seconds_active, 'secondsActive'
-
-      def self.unmap(value)
-        RTransmission::Fields::TrafficStats.new(value)
-      end
-    end
-  end
-end