lastpass 1.2.1 → 1.3.0

data/.ruby-version

@@ -1 +1 @@
-1.9.3-p484
+1.9.3-p551

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.5

data/CHANGELOG.md

@@ -1,8 +1,15 @@
+Version 1.3.0
+-------------
+
+- Added proxy support
+
+
 Version 1.2.1
 -------------
 
 - Fixed the decryption bug on long shared folder names.
 
+
 Version 1.2.0
 -------------
 

data/README.md

@@ -33,7 +33,7 @@ end
 ```
 
 
-A multifactor password (YubiKey, Google Authenticator) can optionally be appended to 
+A multifactor password (YubiKey, Google Authenticator) can optionally be appended to
 the login credentials:
 
 ```ruby
@@ -61,6 +61,12 @@ Contribution in any form and shape is very welcome.  Have comments,
 suggestions, patches, pull requests?  All of the above are welcome.
 
 
+Thanks
+------
+
+ - [Chris D'Ambrosio](https://github.com/chrisdambrosio) for adding proxy support
+
+
 License
 -------
 

data/Rakefile

@@ -7,7 +7,7 @@ task :default => :spec
 
 # Spec
 RSpec::Core::RakeTask.new :spec do |task|
-    task.rspec_opts = "--format nested --color"
+    task.rspec_opts = "--format documentation --color"
 end
 
 # Example

data/lastpass.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
     s.add_dependency "httparty", "~> 0.13.0"
     s.add_dependency "pbkdf2-ruby", "~> 0.2.0"
 
-    s.add_development_dependency "rake", "~> 10.3.0"
-    s.add_development_dependency "rspec", "~> 2.14.0"
+    s.add_development_dependency "rake", "~> 10.4.0"
+    s.add_development_dependency "rspec", "~> 3.1.0"
+    s.add_development_dependency "rspec-its", "~> 1.1.0"
     s.add_development_dependency "coveralls", "~> 0.7.0"
 
     s.files         = `git ls-files`.split "\n"

data/lib/lastpass.rb

@@ -11,6 +11,7 @@ require "lastpass/account"
 require "lastpass/blob"
 require "lastpass/chunk"
 require "lastpass/exceptions"
+require "lastpass/http"
 require "lastpass/fetcher"
 require "lastpass/parser"
 require "lastpass/session"

data/lib/lastpass/fetcher.rb

@@ -8,7 +8,7 @@ module LastPass
             request_login username, password, key_iteration_count, multifactor_password
         end
 
-        def self.fetch session, web_client = HTTParty
+        def self.fetch session, web_client = http
             response = web_client.get "https://lastpass.com/getaccts.php?mobile=1&b64=1&hash=0.0&hasplugin=3.0.23&requestsrc=android",
                                       format: :plain,
                                       cookies: {"PHPSESSID" => URI.encode(session.id)}
@@ -18,7 +18,7 @@ module LastPass
             Blob.new decode_blob(response.parsed_response), session.key_iteration_count
         end
 
-        def self.request_iteration_count username, web_client = HTTParty
+        def self.request_iteration_count username, web_client = http
             response = web_client.post "https://lastpass.com/iterations.php",
                                        query: {email: username}
 
@@ -39,7 +39,7 @@ module LastPass
                                password,
                                key_iteration_count,
                                multifactor_password = nil,
-                               web_client = HTTParty
+                               web_client = http
 
             body = {
                 method: "mobile",
@@ -131,6 +131,14 @@ module LastPass
             end
         end
 
+        def self.http
+          @http ||= HTTP
+        end
+
+        def self.http= client
+          @http = client
+        end
+
         # Can't instantiate Fetcher
         private_class_method :new
     end

data/lib/lastpass/http.rb

@@ -0,0 +1,8 @@
+# Copyright (C) 2013 Dmitry Yakimenko (detunized@gmail.com).
+# Licensed under the terms of the MIT license. See LICENCE for details.
+
+module LastPass
+  class HTTP
+    include HTTParty
+  end
+end

data/lib/lastpass/version.rb

@@ -2,5 +2,5 @@
 # Licensed under the terms of the MIT license. See LICENCE for details.
 
 module LastPass
-    VERSION = "1.2.1"
+    VERSION = "1.3.0"
 end

data/spec/http_spec.rb

@@ -0,0 +1,17 @@
+# Copyright (C) 2013 Dmitry Yakimenko (detunized@gmail.com).
+# Licensed under the terms of the MIT license. See LICENCE for details.
+
+require "spec_helper"
+
+describe LastPass::HTTP do
+  let(:http) { LastPass::HTTP }
+
+  it 'can set the proxy options' do
+    http.http_proxy('proxy.fazbearentertainment.com', 1987, 'ffazbear', 'itsme')
+    options = http.instance_variable_get(:@default_options)
+    expect(options[:http_proxyaddr]).to eq('proxy.fazbearentertainment.com')
+    expect(options[:http_proxyport]).to eq(1987)
+    expect(options[:http_proxyuser]).to eq('ffazbear')
+    expect(options[:http_proxypass]).to eq('itsme')
+  end
+end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ end
 
 require "base64"
 require "lastpass"
+require "rspec/its"
 
 class String
     def decode64

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lastpass
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: 10.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.3.0
+        version: 10.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +132,7 @@ files:
 - lib/lastpass/chunk.rb
 - lib/lastpass/exceptions.rb
 - lib/lastpass/fetcher.rb
+- lib/lastpass/http.rb
 - lib/lastpass/parser.rb
 - lib/lastpass/session.rb
 - lib/lastpass/vault.rb
@@ -124,6 +141,7 @@ files:
 - spec/blob_spec.rb
 - spec/chunk_spec.rb
 - spec/fetcher_spec.rb
+- spec/http_spec.rb
 - spec/parser_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb
@@ -150,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: Unofficial LastPass API
@@ -159,6 +177,7 @@ test_files:
 - spec/blob_spec.rb
 - spec/chunk_spec.rb
 - spec/fetcher_spec.rb
+- spec/http_spec.rb
 - spec/parser_spec.rb
 - spec/session_spec.rb
 - spec/spec_helper.rb