exchange-offline-address-book 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e75fd2c8c924ed74a3402e343ad13cbbd5ac50a
-  data.tar.gz: e58fd3f5ae214dff0b166b92f932cdce8d62e41d
+  metadata.gz: 01f25de3bcac4f14eb4d86e16ccdbb374f22b278
+  data.tar.gz: f27e58b29d365d8eb2ec5646a6cccf1fdb1a19e2
 SHA512:
-  metadata.gz: aa2eb09bf305753d02a37b60e8cd200627672d68a552cc6a320ff1c08b4c9f6600738cd04ed836c993cddd361271d1402ae403acc892f9c5f3946fad5a77fe46
-  data.tar.gz: a42cac43468946d1d91a6fcf993c1034683af628b2fe29250f111de3621afc1ba8326a4343f52c5d4a57a95d298e8f7dc124dad99ee354751f2369b55ea81ce3
+  metadata.gz: caf89146265979fededa91f135c99684b4470efb643ac900d3e02255573243bf60016a29b51d21d5ba26f0b2976b6789fb835829c0ea3be37b8ea811c66fdac8
+  data.tar.gz: d83224e032ceffcce72962e50060c5187c74109da26861754716c756d5cee108e009d408cd08f51cd264d4112bce16fecf1755a2fa11e7eb929124fc34c2218c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    exchange-offline-address-book (0.0.15)
+    exchange-offline-address-book (0.0.16)
       autodiscover (~> 1)
       curb (~> 0.9)
       libmspack (~> 0.1)

data/lib/exchange-offline-address-book.rb

@@ -3,15 +3,15 @@
 require 'dotenv/load'
 
 require 'autodiscover'
-#require "autodiscover/debug"
 
+require "autodiscover/debug" if ENV['DEBUG']
 require 'yaml'
 require 'nokogiri'
 require 'tempfile'
 require 'json'
 require 'ostruct'
+require 'shellwords'
 
-require 'curb'
 require_relative 'exchange-offline-address-book/parser'
 require_relative 'exchange-offline-address-book/mspack'
 
@@ -25,18 +25,16 @@ class OfflineAddressBook
     @baseurl = baseurl
   end
 
-  def download(file, target = nil)
-    client = Curl::Easy.new(baseurl + file)
-    client.http_auth_types = :ntlm
-    client.username = @username
-    client.password = @password
-    client.perform
-
-    raise client.status unless client.response_code.to_s[0] == '2'
-
-    return client.body_str if target.nil?
+  def path(name)
+    @files ||= {}
+    @files[name] ||= (@cachedir ? File.join(@cachedir, name) : Tempfile.new(name).path)
+  end
 
-    open(target, 'wb'){|f| f.write(client.body_str) }
+  def download(name)
+    if !@cachedir || @update || !File.file?(path(name))
+      system "curl --#{ENV['DEBUG'] ? 'verbose' : 'silent'} --ntlm --user #{[@username, @password].join(':').shellescape} #{[baseurl, name].join('').shellescape} -o #{path(name).shellescape}"
+    end
+    return path(name)
   end
 
   def baseurl
@@ -56,35 +54,26 @@ class OfflineAddressBook
         lzx = File.basename(oab, File.extname(oab)) + '.lzx' if oab
       end
 
-      lzx ||= Nokogiri::XML(download('oab.xml')).at('//Full').inner_text
+      lzx ||= Nokogiri::XML(open(download('oab.xml'))).at('//Full').inner_text
       oab = File.basename(lzx, File.extname(lzx)) + '.oab'
 
-      if @cachedir && File.file?(File.join(@cachedir, oab))
-        oab = File.join(@cachedir, oab)
-      else
+      if !File.file?(path(oab))
         if @cachedir
           %w{*.oab *.lzx *.yml *.json}.each{|ext|
             Dir[File.join(@cachedir, ext)].each{|f| File.unlink(f) }
           }
-          download(lzx, File.join(@cachedir, lzx))
-          lzx = File.join(@cachedir, lzx)
-          @oab = File.join(@cachedir, oab)
-        else
-          _lzx = Tempfile.new('lzx')
-          download(lzx, _lzx.path)
-          lzx = _lzx.path
-          oab = Tempfile.new('oab').path
         end
 
-        LibMsPack.oab_decompress(lzx, oab)
+        download(lzx)
+        LibMsPack.oab_decompress(path(lzx), path(oab))
       end
 
-      oab
+      path(oab)
     end
   end
 
   def cache
-    @cache ||= File.join(File.dirname(addressbook), File.basename(addressbook, File.extname(addressbook)) + '.json')
+    @cache ||= path(File.basename(addressbook, File.extname(addressbook)) + '.json')
   end
 
   def header

data/lib/exchange-offline-address-book/version.rb

@@ -1,3 +1,3 @@
 class OfflineAddressBook
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

data/test/test_exchange-offline-address-book.rb

@@ -3,6 +3,8 @@ require 'dotenv/load'
 require 'minitest/autorun'
 require 'exchange-offline-address-book'
 
+ENV['DEBUG'] = 'true'
+
 class EOABTest < Minitest::Test
   def test_downlod
     oab = OfflineAddressBook.new(username: ENV['USERNAME'], password: ENV['PASSWORD'], email: ENV['EMAIL'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exchange-offline-address-book
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Emiliano Heyns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler