zimbra_intercepting_proxy 0.0.4.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c252b4d3f6a2006058703ec346b5079e8643a85
-  data.tar.gz: a3844422f82a76f3f58ea75870840de0a507da59
+  metadata.gz: b534962352a26c91cff6e4d3d26d4dc32b19e748
+  data.tar.gz: 31bcc78a7af08640193d35afb7ad6597c3a57de5
 SHA512:
-  metadata.gz: 102e74a21d901310d8e40053a5bc1a5c72fda1489ad971c05d6eb701311dd9ae986f3c066edd5e4a88d0417c6366bcb51c64def3cf9e31cdaad5c733ea8dd8e6
-  data.tar.gz: 9f6be220d1d03645118d5dd608c2062edb7585b807f64aa5c8cb211a4d6e2f344219399c99c42ca1eb5dcf46c43a822063b05fe20e7b57d603af319b812a44af
+  metadata.gz: f23053a8336cf6754cfca338692c294caa388fe209c88ddcd79540288bdf99b3ffb1df9a515545976291540e39455d188769b6f4f39dc4c5f2ffcdbadd96cce5
+  data.tar.gz: a3015c1dcdd6f7795b46549d9aeca17b0083ac07503900ef9b425590321d8f54e0a8f5e3050ef47d82717c49fb9f28812132d048914331877134a367a40a79fe

data/.gitignore

@@ -13,6 +13,7 @@ pkg
 rdoc
 spec/reports
 test/tmp
+test/fixtures/*.org
 test/version_tmp
 tmp
 *.bundle

data/README.md

@@ -129,12 +129,21 @@ watson@example.com: "251b1902-2250-4477-bdd1-8a101f7e7e4e"
 sherlock@example.com: "7b562dd0-be97-0132-9a66-482a1423458f"
 ```
 
+Updating the file does **not require** a restart.
+
 You can get the `zimbraId` with:
 
 ```
 $ zmprov ga watson@example.com zimbraId
 ```
 
+##### Error in Map File
+If you have an error in your file, `ZIP` will return the on memory Map, this way we can keep the service up. In this event you should see this on `STDOUT`:
+
+```shel
+ERROR Yaml File: (./test/fixtures/users.yml): could not find expected ':' while scanning a simple key at line 7
+```
+
 ## Thanks
 
 * To the Zimbra folks for a great product, and

data/lib/zimbra_intercepting_proxy.rb

@@ -13,6 +13,7 @@ require "zimbra_intercepting_proxy/request"
 require "zimbra_intercepting_proxy/server"
 require "zimbra_intercepting_proxy/debug"
 require "zimbra_intercepting_proxy/connection"
+require "zimbra_intercepting_proxy/yamler"
 
 module ZimbraInterceptingProxy
   

data/lib/zimbra_intercepting_proxy/user.rb

@@ -3,6 +3,8 @@ module ZimbraInterceptingProxy
   class User
     attr_accessor :email, :zimbraId
     
+    @@db = {}
+    
     # user_identifier can be an email address, zimbraId UUID or just the
     # local part of an email address, like user in user@example.com
     def initialize(user_identifier)
@@ -34,12 +36,16 @@ module ZimbraInterceptingProxy
       !zimbraId.nil?
     end
 
+    # Return the old DB if the YAML file has error
     def self.load_migrated_users
-      YAML.load_file ZimbraInterceptingProxy::Config.migrated_users_file
+      data = ZimbraInterceptingProxy::Yamler.db
+      return @@db unless data
+      @@db = data
     end
     
     def self.DB
       load_migrated_users
+      @@db
     end
     
     private

data/lib/zimbra_intercepting_proxy/version.rb

@@ -1,3 +1,3 @@
 module ZimbraInterceptingProxy
-  VERSION = "0.0.4.4"
+  VERSION = "0.0.5"
 end

data/lib/zimbra_intercepting_proxy/yamler.rb

@@ -0,0 +1,18 @@
+module ZimbraInterceptingProxy
+  
+  module Yamler
+    require 'pp'
+    
+    def self.db
+      begin
+        YAML.load_file ZimbraInterceptingProxy::Config.migrated_users_file  
+      rescue Psych::SyntaxError => e
+        puts "ERROR Yaml File: #{e}"
+        return false
+      end
+      
+    end
+    
+  end
+  
+end

data/test/fixtures/users.yml

@@ -3,4 +3,4 @@ max@example.com: "7b562c60-be97-0132-9a66-482a1423458f"
 moliery@example.com: "7b562ce0-be97-0132-9a66-482a1423458f"
 watson@example.com: "251b1902-2250-4477-bdd1-8a101f7e7e4e"
 sherlock@example.com: "7b562dd0-be97-0132-9a66-482a1423458f"
-pbruna@itlinux.cl: "cfd6e914-4f00-440c-9a57-e1a9327128b9"
+pbruna@itlinux.cl: "cfd6e914-4f00-440c-9a57-e1a9327128b9"

data/test/test_helper.rb

@@ -9,4 +9,21 @@ Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new # spec-like progr
 ZimbraInterceptingProxy::Config.domain="example.com"
 ZimbraInterceptingProxy::Config.migrated_users_file="./test/fixtures/users.yml"
 ZimbraInterceptingProxy::Config.old_backend = "old-mailbox.example.com"
-ZimbraInterceptingProxy::Config.new_backend = "new-mailbox.zboxapp.com"
+ZimbraInterceptingProxy::Config.new_backend = "new-mailbox.zboxapp.com"
+
+def add_error_line
+  f = File.open ZimbraInterceptingProxy::Config.migrated_users_file, "a"
+  f.puts "juan :94949494-9494949-040404"
+  f.close
+end
+
+def restore_map_file
+  backup_file = "./test/fixtures/users.yml.org"
+  FileUtils.cp(backup_file, ZimbraInterceptingProxy::Config.migrated_users_file)
+  FileUtils.rm "./test/fixtures/users.yml.org"
+end
+
+def backup_map_file
+  backup_file = "./test/fixtures/users.yml.org"
+  FileUtils.cp(ZimbraInterceptingProxy::Config.migrated_users_file, backup_file)
+end

data/test/test_user.rb

@@ -57,4 +57,15 @@ class User < Minitest::Test
     assert(!u.migrated?, "Failure message.")
   end
   
+  
+  def test_return_old_db_if_yamler_db_is_false
+    backup_map_file # backup users.yml
+    yaml_1 = ZimbraInterceptingProxy::User.DB.inspect
+    add_error_line
+    yaml_2 = ZimbraInterceptingProxy::User.DB.inspect
+    restore_map_file
+    assert_equal(Digest::MD5.digest(yaml_1), Digest::MD5.digest(yaml_2))
+  end
+  
+    
 end

data/test/test_yamler.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+require 'digest'
+
+class Yamler < Minitest::Test
+  
+  def setup
+    backup_map_file
+  end
+  
+  def teardown
+    restore_map_file
+  end
+
+  def test_yamler_db_must_return_the_yaml_file_hash
+    db = ZimbraInterceptingProxy::Yamler.db
+    assert_equal("251b1902-2250-4477-bdd1-8a101f7e7e4e", db["watson@example.com"])
+  end
+  
+  def test_return_false_if_updated_files_has_error
+    add_error_line
+    assert(!ZimbraInterceptingProxy::Yamler.db, "Failure message.")
+  end
+  
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zimbra_intercepting_proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.4.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Patricio Bruna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-proxy
@@ -159,6 +159,7 @@ files:
 - lib/zimbra_intercepting_proxy/server.rb
 - lib/zimbra_intercepting_proxy/user.rb
 - lib/zimbra_intercepting_proxy/version.rb
+- lib/zimbra_intercepting_proxy/yamler.rb
 - test/fixtures/auth_80.txt
 - test/fixtures/route_7072.txt
 - test/fixtures/users.yml
@@ -167,6 +168,7 @@ files:
 - test/test_helper.rb
 - test/test_request.rb
 - test/test_user.rb
+- test/test_yamler.rb
 - zimbra_intercepting_proxy.gemspec
 homepage: https://github.com/pbruna/zimbra_intercepting_proxy
 licenses:
@@ -201,4 +203,5 @@ test_files:
 - test/test_helper.rb
 - test/test_request.rb
 - test/test_user.rb
+- test/test_yamler.rb
 has_rdoc: