exchange-offline-address-book 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fac082f0845c31c11f73e65eaf9813fc24dda020
-  data.tar.gz: b42740d5fd7262e9d4516c62993a4b74c30e95ef
+  metadata.gz: c55abcbbc07e7d39590701b7f2ec5709be800391
+  data.tar.gz: 3ab636736cfbc68dd0a59e1adc43773f5a4e91f6
 SHA512:
-  metadata.gz: e3ce63e305279799ec36e6bd3beeaa62a48242401e9a17c208ed8c55149940720b2f3f7bfcf113f5675d6dfc0309209c62091c2048b3726b557813d40056f080
-  data.tar.gz: 70eb56ef0b4a2e159d6653da624cbb9d7c80fb0eb443220a8418158e086f9f2bb68e442b56ec258eb0b5d432d87622db96e480ca7fd8dfd0f8db6720d52ed9d8
+  metadata.gz: fbc1e9847734ae88a8692439e50609e3b4942f598be4f541a5340e058c54641d133ffd56df926d8d7fc8f7220b0f72f7b6e4458e4aed76f38cd67d50dfb2a5ae
+  data.tar.gz: 896827f3141bf08128b62eacf10a90226f0de383f10e9497e4d49e8d1e3cd75de996dbe3bf311e0fc0799354d5e5c1e3f335dba02b362d70942944ce9c698dd0

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    exchange-offline-address-book (0.0.17)
+    exchange-offline-address-book (0.0.18)
       autodiscover (~> 1)
       curb (~> 0.9)
+      hashie
       libmspack (~> 0.1)
       nokogiri (~> 1.8)
 
@@ -23,6 +24,7 @@ GEM
       ffi (>= 1.0.0)
       rake
     gem-release (1.0.0)
+    hashie (3.5.5)
     httpclient (2.8.3)
     libmspack (0.1.0)
       ffi

data/exchange-offline-address-book.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'autodiscover', '~> 1'
   spec.add_runtime_dependency 'libmspack', '~> 0.1'
   spec.add_runtime_dependency 'curb', '~> 0.9'
+  spec.add_runtime_dependency 'hashie'
 end

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

@@ -7,14 +7,25 @@ require 'autodiscover'
 require "autodiscover/debug" if ENV['DEBUG']
 require 'yaml'
 require 'nokogiri'
-require 'tempfile'
 require 'json'
-require 'ostruct'
+require 'hashie'
 require 'shellwords'
+require 'tmpdir'
 
 require_relative 'exchange-offline-address-book/parser'
 require_relative 'exchange-offline-address-book/mspack'
 
+# https://github.com/intridea/hashie/pull/416
+if Hashie::VERSION == '3.5.5'
+  module Hashie
+    class Mash
+      def self.disable_warnings?
+        @disable_warnings ||= false
+      end
+    end
+  end
+end
+
 class OfflineAddressBook
   def initialize(email: nil, password: nil, username: nil, cachedir: nil, baseurl: nil, update: true)
     @email = email
@@ -23,20 +34,16 @@ class OfflineAddressBook
     @cachedir = cachedir
     @update = update
     @baseurl = baseurl
-  end
-
-  def path(name)
-    @files ||= {}
-    @files[name] ||= (@cachedir ? File.join(@cachedir, name) : Tempfile.new(name).path)
-  end
 
-  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}"
+    if cachedir
+      fetch_to(cachedir)
+    else
+      Dir.mktmpdir{|dir| fetch_to(dir) }
     end
-    return path(name)
   end
 
+  attr_reader :records
+
   def baseurl
     @baseurl ||= begin
       client = Autodiscover::Client.new(email: @email, password: @password, username: @username)
@@ -46,59 +53,70 @@ class OfflineAddressBook
     end
   end
 
-  def addressbook
-    @addressbook ||= begin
-      lzx = nil
-      if !@update & @cachedir
-        oab = Dir[File.join(@cachedir, '*.oab')][0]
-        lzx = File.basename(oab, File.extname(oab)) + '.lzx' if oab
-      end
+  def header
+    @parsed ||= Parser.new(addressbook)
+    @parsed.header
+  end
 
-      lzx ||= Nokogiri::XML(open(download('oab.xml'))).at('//Full').inner_text
-      oab = File.basename(lzx, File.extname(lzx)) + '.oab'
+  def fetch_to(dir)
+    begin
+      @dir = dir
 
-      if !File.file?(path(oab))
-        if @cachedir
-          %w{*.oab *.lzx *.yml *.json}.each{|ext|
-            Dir[File.join(@cachedir, ext)].each{|f| File.unlink(f) }
-          }
-        end
+      if File.file?(cache)
+        @records = JSON.parse(open(cache).read, object_class: Hashie::Mash)
+        return
+      end
 
+      if !File.file?(addressbook)
+        %w{json oab lzx}.each{|ext|
+          Dir[File.join(@dir, "*.#{ext}")].each{|f| File.delete(f) }
+        }
+        lzx = File.basename(addressbook, File.extname(addressbook)) + '.lzx'
+        puts "OfflineAddressBook: Downloading #{lzx}" if ENV['DEBUG']
         download(lzx)
-        LibMsPack.oab_decompress(path(lzx), path(oab))
+        puts "OfflineAddressBook: Decompressing #{lzx} to #{addressbook}" if ENV['DEBUG']
+        LibMsPack.oab_decompress(File.join(@dir, lzx), addressbook)
       end
+      puts "OfflineAddressBook: Addressbook ready at #{addressbook}" if ENV['DEBUG']
 
-      path(oab)
+      parsed = Parser.new(addressbook)
+      @records = parsed.records.collect{|record|
+        record.to_h.each_pair{|k, v|
+          record[k] = v[0] if v.length == 1
+        }
+        # no idea what's going on here
+        record.AddressBookObjectGuid = record.AddressBookObjectGuid.inspect if record.AddressBookObjectGuid
+        record
+      }
+      open(cache, 'w'){|f| f.write(JSON.pretty_generate(@records.collect{|r| r.to_h}))} if @cachedir # this can ditch the collect with hashie
+    ensure
+      @dir = nil
     end
   end
 
-  def cache
-    @cache ||= path(File.basename(addressbook, File.extname(addressbook)) + '.json')
-  end
+  private
 
-  def header
-    @parsed ||= Parser.new(addressbook)
-    @parsed.header
+  def download(name)
+    puts "curl --#{ENV['DEBUG'] ? 'verbose' : 'silent'} --ntlm --user #{[@username, @password].join(':').shellescape} #{[baseurl, name].join('').shellescape} -o #{File.join(@dir, name).shellescape}" if ENV['DEBUG']
+    system "curl --#{ENV['DEBUG'] ? 'verbose' : 'silent'} --ntlm --user #{[@username, @password].join(':').shellescape} #{[baseurl, name].join('').shellescape} -o #{File.join(@dir, name).shellescape}"
+    return File.join(@dir, name)
   end
 
-  def records
-    @records ||= begin
-      if File.file?(cache)
-        parsed = JSON.parse(open(cache).read).collect{|record| OpenStruct.new(record) }
+  def addressbook
+    @addressbook ||= begin
+      if !@update && Dir[File.join(@dir, '*.oab')].length > 0
+        oab = File.basename(Dir[File.join(@dir, '*.oab')][0])
+        puts "OfflineAddressBook: Reusing #{oab}" if ENV['DEBUG']
       else
-        @parsed ||= Parser.new(addressbook)
-        parsed = @parsed.records.collect{|record|
-          record.to_h.each_pair{|k, v|
-            record[k] = v[0] if v.length == 1
-          }
-          # no idea what's going on here
-          record.AddressBookObjectGuid = record.AddressBookObjectGuid.inspect if record.AddressBookObjectGuid
-          record
-        }
-        open(cache, 'w'){|f| f.write(JSON.pretty_generate(parsed.collect{|r| r.to_h}))} if @cachedir
+        lzx = Nokogiri::XML(open(download('oab.xml'))).at('//Full').inner_text
+        oab = File.basename(lzx, File.extname(lzx)) + '.oab'
       end
 
-      parsed
+      File.join(@dir, oab)
     end
   end
+
+  def cache
+    @cache ||= File.join(@dir, File.basename(addressbook, File.extname(addressbook)) + '.json')
+  end
 end

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

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'ostruct'
+require 'hashie'
 
-MapiPropertyDataType = OpenStruct.new({
+MapiPropertyDataType = Hashie::Mash.new({
   Unspecified: 0,
   Null: 1,
   Short: 2,
@@ -648,7 +648,7 @@ class OfflineAddressBook
     def _propertyTypes
       n = _uint32
       return 1.upto(n).collect{|i|
-        prop = OpenStruct.new
+        prop = Hashie::Mash.new
         prop.pos = pos
   
         id = _uint32
@@ -689,12 +689,12 @@ class OfflineAddressBook
       else
         value = _scalar(prop.type)
       end
-      p = OpenStruct.new(type: prop.type, id: prop.id, name: prop.name, value: value)
+      p = Hashie::Mash.new(type: prop.type, id: prop.id, name: prop.name, value: value)
       return p
     end
   
     def _scalar(type)
-      case type
+      case type.to_sym
         when :Long    then return _integer
         when :Boolean then return (_ubyte > 0)
         when :Binary  then return @oab.read(_integer)
@@ -713,7 +713,7 @@ class OfflineAddressBook
     def _record(headerRecord = false)
       initialPosition = @oab.pos
       recordSize = 0
-      record = OpenStruct.new
+      record = Hashie::Mash.new
       begin
         properties = headerRecord ? @headerProperties : @oabProperties
         recordSize = _uint32

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

@@ -1,3 +1,3 @@
 class OfflineAddressBook
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

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

@@ -4,16 +4,20 @@ require 'minitest/autorun'
 require 'exchange-offline-address-book'
 
 class EOABTest < Minitest::Test
-  def test_downlod
+#  def test_downlod
+#    oab = OfflineAddressBook.new(username: ENV['EWS_USERNAME'], password: ENV['EWS_PASSWORD'], email: ENV['EWS_EMAIL'])
+#    puts oab.addressbook
+#  end
+#  def test_baseurl
+#    oab = OfflineAddressBook.new(username: ENV['EWS_USERNAME'], password: ENV['EWS_PASSWORD'], email: ENV['EWS_EMAIL'])
+#    puts oab.baseurl
+#  end
+#  def test_given_baseurl
+#    oab = OfflineAddressBook.new(username: ENV['EWS_USERNAME'], password: ENV['EWS_PASSWORD'], email: ENV['EWS_EMAIL'], baseurl: ENV['EWS_BASEURL'])
+#    puts oab.addressbook
+#  end
+  def test_records
     oab = OfflineAddressBook.new(username: ENV['EWS_USERNAME'], password: ENV['EWS_PASSWORD'], email: ENV['EWS_EMAIL'])
-    puts oab.addressbook
-  end
-  def test_baseurl
-    oab = OfflineAddressBook.new(username: ENV['EWS_USERNAME'], password: ENV['EWS_PASSWORD'], email: ENV['EWS_EMAIL'])
-    puts oab.baseurl
-  end
-  def test_given_baseurl
-    oab = OfflineAddressBook.new(username: ENV['EWS_USERNAME'], password: ENV['EWS_PASSWORD'], email: ENV['EWS_EMAIL'], baseurl: ENV['EWS_BASEURL'])
-    puts oab.addressbook
+    puts oab.records.length
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exchange-offline-address-book
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Emiliano Heyns
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Get Exchange Offline Address Book
 email:
 - Emiliano.Heyns@iris-advies.com