BtSync 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  data.tar.gz: 184a18c62f1a7ad68f7925a77bce8782cb25d247
-  metadata.gz: ce45b9891ffa8bae8c8b32ecb0f6910aea2a4236
 SHA512: 
-  data.tar.gz: b9c16407995447411d8babfdfb4e62ce9d3af3ba7a4a638a47a3a5a2c218008f6e0ce2da86c7f496fd8156b1bc453e3ad20baaadd8f379f7abecaf9ecb671d8c
-  metadata.gz: 6a096011dd2794ccaa9fdf4c0f363137e48b1b1dc4e9c1852f9fd725f10d55a65b7e402cf74c6b02fa10f49b8dd859451642b092d866e5b3c2a074c3b0cc771d
+  metadata.gz: 21b0171af7da2cd9b686d6259f5649fb520b643d001ec883130f1cdea188ff1e4377f802a1240a37d5a0f415b79e8caa804fe4ae65f43b4ec8365aba6a1a8821
+  data.tar.gz: a33fc44ae08d5e11c9f1509111440b59df349e9d23c07c20ab5244c462efda03d4a8ee018a3f99f8213286129a0fdcf75df007abfab6680cfc786c94a5ba6dc0
+SHA1: 
+  metadata.gz: 06ebccf1bf025cba4bbadec32ad28a64d5a6f796
+  data.tar.gz: 656fe16887a65e3f533ee54a511d92f90dc955c2

data/btsync.gemspec

@@ -25,5 +25,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
 
   spec.add_runtime_dependency "httparty"
-  spec.add_runtime_dependency "nokogiri"
 end

data/lib/btsync.rb

@@ -1,8 +1,8 @@
 require 'httparty'
-require 'nokogiri'
 
 class BtSync
   include HTTParty
+  default_params :output => 'json'
   def initialize uri=nil, port=nil
     @cache = {
       :folder => 0,
@@ -14,7 +14,7 @@ class BtSync
     }
     @uri = uri
     @port = port
-    secret
+    token
   end
   def get_folders
     get_folder_list["folders"]
@@ -29,7 +29,7 @@ class BtSync
   def get_settings
     time = DateTime.now.strftime("%s").to_i
     if time > @cache[:settings] + 600
-      res = self.class.get(path('getsettings'), :query => {:output => "json"}, :headers => {"Cookie" => cookies })
+      res = self.class.get(path('getsettings'), :headers => {"Cookie" => cookies })
       @settings = res.parsed_response["settings"]
       @cache[:settings] = time
     end
@@ -38,7 +38,7 @@ class BtSync
   def get_os_type
     time = DateTime.now.strftime("%s").to_i
     if time > @cache[:os_type] + 600
-      res = self.class.get(path('getostype'), :query => {:output => "json"}, :headers => {"Cookie" => cookies })
+      res = self.class.get(path('getostype'), :headers => {"Cookie" => cookies })
       @os_type = res.parsed_response["os"]
       @cache[:os_type] = time
     end
@@ -47,7 +47,7 @@ class BtSync
   def get_version
     time = DateTime.now.strftime("%s").to_i
     if time > @cache[:version] + 600
-      res = self.class.get(path('getversion'), :query => {:output => "json"}, :headers => {"Cookie" => cookies })
+      res = self.class.get(path('getversion'), :headers => {"Cookie" => cookies })
       @version = res.parsed_response["version"]
       @cache[:version] = time
     end
@@ -56,21 +56,21 @@ class BtSync
   def check_new_version
     time = DateTime.now.strftime("%s").to_i
     if time > @cache[:new_version] + 600
-      res = self.class.get(path('checknewversion'), :query => {:output => "json"}, :headers => {"Cookie" => cookies })
+      res = self.class.get(path('checknewversion'), :headers => {"Cookie" => cookies })
       @new_version = res.parsed_response["version"]
       @cache[:new_version] = time
     end
     @new_version
   end
   def get_dir with_dir
-    res = self.class.get(path('getdir'), :query => {:dir => with_dir, :output => "json"}, :headers => {"Cookie" => cookies })
+    res = self.class.get(path('getdir'), :query => {:dir => with_dir}, :headers => {"Cookie" => cookies })
     res.parsed_response["folders"]
   end
   private
   def get_folder_list
     time = DateTime.now.strftime("%s").to_i
     if time > @cache[:folder] + 600
-      res = self.class.get(path('getsyncfolders'), :query => {:output => "json"}, :headers => {"Cookie" => cookies })
+      res = self.class.get(path('getsyncfolders'), :headers => {"Cookie" => cookies })
       @folder_list = res.parsed_response
       @cache[:folder] = time
     end
@@ -83,21 +83,21 @@ class BtSync
   def uri
     @uri ||= "http://localhost"
   end
-  def secret
+  def token
     time = DateTime.now.strftime("%s").to_i
     if time > @cache[:secret] + 600
-      @secret = Nokogiri::HTML(request_token).search('#token').text
+      @token = request_token.gsub('</div></html>', '').gsub("<html><div id='token' style='display:none;'>", '')
       @cache[:secret] = time
     end
-    @secret
+    @token
   end
   def cookies
     @cookies ||= request_token.headers["set-cookie"].split("; ")[0]
   end
   def request_token
-    @request_token ||= self.class.get("#{uri}:#{port}/gui/token.html")
+    @request_token ||= self.class.get("#{uri}:#{port}/gui/token.html", :query => {:output => :text})
   end
   def path action_name
-    "#{uri}:#{port}/gui/?token=#{secret}&action=#{action_name}"
+    "#{uri}:#{port}/gui/?token=#{token}&action=#{action_name}"
   end
 end

data/lib/btsync/version.rb

@@ -1,3 +1,3 @@
 module BtsyncVersion
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: BtSync
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Chris MacNaughton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-04 00:00:00 Z
+date: 2013-06-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -64,14 +64,6 @@ dependencies:
     - *id003
   type: :runtime
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
-  type: :runtime
-  version_requirements: *id008
 description: Class to interact with BTSync's web interface using their unofficial API
 email: 
 - chmacnaughton@gmail.com