retort 0.0.5 → 0.0.6

data/lib/retort/core_ext.rb

@@ -10,7 +10,7 @@ class Float
   end
 
   def percent
-    "#{sprintf('%.2f', percent_raw)}"
+    "#{percent_raw}%"
   end
 end
 

data/lib/retort/rtorrent.rb

@@ -0,0 +1,39 @@
+class Retort::Rtorrent
+
+    TYPES = {
+      time: 'to_time',
+      date: 'to_date',
+      size: 'to_xb'
+    }
+
+    class << self
+
+      attr_accessor :prefix, :attr_mappings, :attributes, :attributes_raw
+
+      def setup(prefix="", &block)
+        self.prefix = prefix
+        self.attributes = {}
+        self.attributes_raw = {}
+
+        instance_eval(&block)
+      end
+
+      def attribute(property, options = {}, &block)
+        type = options[:type]
+        method_name = options[:name] || property
+        method_name = "#{self.prefix}.#{method_name}" unless self.prefix.empty?
+        self.attributes_raw[property] = method_name
+
+        if TYPES.member? type
+          #Syntax is 'to_*=$.....'. Example : 'to_date=$d.get_creation_date'.
+          self.attributes[property] = "#{TYPES[type]}=$#{method_name}"
+          property = "#{property}_raw"
+        end
+        self.attributes[property] = method_name
+      end
+
+      alias method_missing attribute
+    end
+
+end
+

data/lib/retort/torrent.rb

@@ -4,35 +4,34 @@ module Retort
 
   class Torrent < Rtorrent
 
+    setup :d do
+      info_hash           name: 'hash'
+      name
+      connection_current
+      size                name: 'size_bytes',       type: :size
+      completed           name: 'completed_bytes',  type: :size
+      creation_date       name: 'creation_date',    type: :date
+      downloaded          name: 'bytes_done',       type: :size
+      up_rate             name: 'up.rate',          type: :size
+      down_rate           name: 'down.rate',        type: :size
+      message             name: 'get_message'
+      seeders             name: 'peers_complete'
+      leechers            name: 'peers_connected'
+      state
+      complete
+      is_active
+      is_hash_checked
+      is_hash_checking
+      is_multi_file
+      is_open
+    end
+
     class << self
-      def attr_mappings
-        @@mappings ||= build(:d) do
-          info_hash           name: 'hash'
-          name
-          connection_current
-          size                name: 'size_bytes',       type: :size
-          completed           name: 'completed_bytes',  type: :size
-          creation_date       name: 'creation_date',    type: :date
-          downloaded          name: 'bytes_done',       type: :size
-          up_rate             name: 'up.rate',          type: :size
-          down_rate           name: 'down.rate',        type: :size
-          message             name: 'get_message'
-          seeders             name: 'peers_complete'
-          leechers            name: 'peers_connected'
-          state
-          complete
-          is_active
-          is_hash_checked
-          is_hash_checking
-          is_multi_file
-          is_open
-        end
-      end
 
       def all(view="main")
-        methods = attr_mappings.map {|key,value| "#{value}="}
+        methods = attributes.map {|key,value| "#{value}="}
         Service.call("d.multicall", view, *methods).map do |r|
-          attributes = Hash[attr_mappings.keys.zip(r)]
+          attributes = Hash[self.attributes.keys.zip(r)]
           Torrent.new attributes
         end
       end
@@ -50,7 +49,7 @@ module Retort
       end
     end
 
-    attr_accessor *(attr_mappings.keys)
+    attr_accessor *(attributes.keys)
 
     def initialize(attributes)
 
@@ -66,6 +65,10 @@ module Retort
 
     end
 
+    def completed_ratio
+      self.completed_raw/(self.size_raw.to_f)
+    end
+
     def status
       return "complete" if @complete.truth
     end

data/lib/retort/version.rb

@@ -1,3 +1,3 @@
 module Retort
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/retort.rb

@@ -2,7 +2,7 @@ require 'retort/version'
 require 'retort/core_ext'
 require 'retort/xmlrpc_client'
 require 'retort/service'
-require 'retort/conversion'
+require 'retort/rtorrent'
 require 'retort/torrent'
 
 module Retort

data/spec/rtorrent/methods_spec.rb

@@ -2,9 +2,8 @@ require 'spec_helper'
 
 describe Retort::Torrent do
   it "has all methods listed" do
-    all_methods = Retort::Service.call "system.listMethods"
-    torrent_methods = Retort::Torrent.attr_mappings.values.reject {|x| x =~ /\$/}
-    x = torrent_methods.reject {|m| all_methods.include?(m)}
-    x.size.should == 0
+    all_methods = Retort::Service.call("system.listMethods").to_set
+    torrent_methods = Retort::Torrent.attributes_raw.values.to_set
+    torrent_methods.subset?(all_methods).should == true
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retort
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-11 00:00:00.000000000Z
+date: 2011-09-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &11591600 !ruby/object:Gem::Requirement
+  requirement: &16031180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *11591600
+  version_requirements: *16031180
 description: An rTorrent xmlrpc wrapper written in ruby
 email:
 - marcel.morgan@gmail.com
@@ -38,8 +38,8 @@ files:
 - Rakefile
 - autotest/discover.rb
 - lib/retort.rb
-- lib/retort/conversion.rb
 - lib/retort/core_ext.rb
+- lib/retort/rtorrent.rb
 - lib/retort/service.rb
 - lib/retort/torrent.rb
 - lib/retort/version.rb

data/lib/retort/conversion.rb

@@ -1,40 +0,0 @@
-class Retort::Rtorrent
-
-    TYPES = {
-      time: 'to_time',
-      date: 'to_date',
-      size: 'to_xb'
-    }
-
-    attr_accessor :attributes, :attributes_raw
-
-    def initialize(prefix)
-      @attributes = {}
-      @attributes_raw = {}
-      @prefix = prefix
-    end
-
-    def attribute(property, options = {}, &block)
-      type = options[:type]
-      method_name = options[:name] || property
-      method_name = "#{@prefix}.#{method_name}" unless @prefix.empty?
-      @attributes_raw[property] = method_name
-
-      if TYPES.member? type
-        #Syntax is 'to_*=$.....'. Example : 'to_date=$d.get_creation_date'.
-        @attributes[property] = "#{TYPES[type]}=$#{method_name}"
-        property = "#{property}_raw"
-      end
-      @attributes[property] = method_name
-    end
-
-    alias method_missing attribute
-
-    def self.build(prefix="", &block)
-      c = new(prefix)
-      c.instance_eval(&block)
-      c.attributes
-    end
-
-end
-