transmission-ng 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9ce2d6ed3c1b309a985a0e1a3683dd9b35d9a88
-  data.tar.gz: 2af1198dc15c2f845fc7cbb081b7e44b03466776
+  metadata.gz: 0f8bb080d7e8008dcabd02dc4c8dd994f4bdeb80
+  data.tar.gz: 32d5997714ab6ee21ea2d734b9d97eaaebecabfc
 SHA512:
-  metadata.gz: cb320b309c172da1eea5f970ecd52a5d99b47fe79c11ec6deeaf41b69888b63c0e4a21060e84bbb42d5a91343795b180823f1f477dfe1e16a995df3f00cce5c2
-  data.tar.gz: 8e0dc10e5161c001984ad44b45ade1cc1e47b1d1a77bfd589d8bcba56a1ce1c655ba8f585da209f398389e2689843dd79b82ee66d5f91525beb1b1cfdf591220
+  metadata.gz: d86f2c10b16bb4da77ad3c9a28e33b7b24683d14a358ee8525d759104fe02126c81fc672981a22956e78b6f0462fb0613aedb023d56a5695d3564e5b5e2fa776
+  data.tar.gz: fd2aab701760dfe7eea7e71b2edf50cb44b052cb860f367e0717e9c277b49c4654897979000b7ffd8398d724b939013015fa756f1fe33bf5b7604436f74683e4

data/lib/transmission.rb

@@ -1,5 +1,5 @@
 
-require 'net/http'
+require 'mechanize'
 require 'json'
 
 $rpc_version = 15
@@ -58,31 +58,34 @@ class Transmission
   end
 
   def rpc(method, args=[], session_id=nil)
-    url = URI.parse('http://' + @config[:host] + ':' + @config[:port].to_s + '/transmission/rpc')
-
-    http = Net::HTTP.new(url.host, url.port)
-
-    req = Net::HTTP::Post.new(url.path)
-    req.basic_auth @config[:user], @config[:pass]
-    req.body = {
-      'method' => method,
-      'arguments' => args
-    }.to_json
-    req['X-Transmission-Session-Id'] = session_id
-    req['Content-Type'] = 'application/json'
-
-    resp = http.request(req)
+    mech = Mechanize.new do |mech|
+      mech.user_agent_alias = 'Mac Safari'
+      mech.add_auth "http://#{@config[:host]}:#{@config[:port].to_s}", @config[:user], @config[:pass]
+    end
 
-    if resp.code == "409"
-      m = resp.body.match /X-Transmission-Session-Id: (.*?)</
-      return rpc(method, args, m[1])
+    begin
+      resp = mech.post 'http://' + @config[:host] + ':' + @config[:port].to_s + '/transmission/rpc', {
+          'method' => method,
+          'arguments' => args
+        }.to_json, {
+          'X-Transmission-Session-Id' => session_id,
+          'Content-Type' => 'application/json'
+        }
+    rescue Mechanize::ResponseCodeError => e
+      if e.response_code == "409"
+        session_id = e.page.search('code').text.match(/X-Transmission-Session-Id: ([a-zA-Z0-9]+)/)[1]
+        return rpc method, args, session_id
+      end
+      raise e
     end
 
-    if m = resp.body.match(/"result""([a-zA-Z]+)"/)
-      resp.body = resp.body.gsub /"result""([a-zA-Z]+)"/, ''
+    json = resp.body
+
+    if m = json.match(/"result""([a-zA-Z]+)"/)
+      json.gsub! /"result""([a-zA-Z]+)"/, ''
     end
 
-    response = JSON.parse(resp.body)
+    response = JSON.parse(json)
 
     if m
       response['result'] = m[1]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transmission-ng
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - m4rkw
@@ -9,7 +9,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2015-09-11 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mechanize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 description: A better API interface for the Transmission torrent client
 email: m@rkw.io
 executables: []