omniauth-expressov3 1.0.4 → 1.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmQ0OGM2MmVlMTEzZmQ0ZDlkMjdiY2FhYjFlZDQ1ZGE3ZTQ1NDI2Nw==
+    YjA2YjZhZThlN2QyMzUwYWFjMGVkNTczNDliMzNkNjc5YzlkMDY4Ng==
   data.tar.gz: !binary |-
-    OTg3MDI1MmMwODQ0ZmViMTk2Y2JjNTg1OWI1MmIyYmZmMTQ3Nzg5Mw==
+    MjM3OWIwNzk2MDczODE3YWM0OTg0ZDhhOWI5OTlmYWE4MmVkODc2NQ==
 SHA512:
   metadata.gz: !binary |-
-    NjBiZDA3NmVjM2Y1ODllNTM0ZGFmNWZkYTUwYWE4N2U4YmJhOGI3MmU5MDI5
-    Y2NlYzc1ODNlNGI3NTY1MWRiZGI1MDZmY2YyMWY2MmJkMmM1YjYxOWRiNDA1
-    NWZkYjU0MzNjMTc5YTNlMzYyNDMwM2M4ZWY2Zjk1NTFjZDI4MTU=
+    MGFlZmJmZTk1OTBjMjkwMTZjMmEzNmZkZWU5OWQ2ZDE1Nzc3MzZkN2YxYjll
+    Yjk1MGNkMmUzZjE5NWU1MmE0YmFjMzYyYjFlZmMxODg1Y2IyNTQyOWU5ZTBl
+    YmFiOWI0OGUzODJiNGJkYzRlZGUxOTM0ODJhNDhjNWU5YTY0Mzc=
   data.tar.gz: !binary |-
-    YmUwZTA1NDNmNjYyOTlmM2JiYTk1YmM4YjhkYTVlZDk5YWI2YjIxMmYwYmYw
-    MjZmZjRlNzAzNjQ5ZTg4MTA5MTA1ZGUyYTFjM2E5YTE3NmEwNjc3MGJjZmEw
-    YTQ1ZDMzNjAyYWEzNThiMThmN2I3ZjUwMjRkNDVkMzQxNzc5OTU=
+    OWE4NjIyODUyOTFkNWJjNmRjOTg2NmM0YWE1MGI0NTU0Yzk4MGJmODU5NGI4
+    MGU2NDkwY2JjYWM5YWI5MzRlMjBhY2U2NTExNThhNWJhMzJkMzRiMWZiMjA4
+    NDI1ZGM3NDJiOWZiYzg2NGE1OTRjZTNiN2M0YjA1YWM2N2FmYzY=

data/Gemfile

@@ -8,6 +8,11 @@ group :development, :test do
     gem 'guard-bundler'
     gem 'growl'
     gem 'rb-fsevent'
+    gem 'highline'
+    gem "codeclimate-test-reporter", group: :test, require: nil
+    gem 'awesome_print'
+    gem 'debugger'
 end
 
-gem "codeclimate-test-reporter", group: :test, require: nil
+
+gem 'recursive-open-struct'

data/Gemfile.lock

@@ -1,17 +1,25 @@
 PATH
   remote: .
   specs:
-    omniauth-expressov3 (1.0.3)
+    omniauth-expressov3 (1.0.5)
       omniauth (~> 1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    awesome_print (1.6.1)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     codeclimate-test-reporter (0.4.6)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
+    columnize (0.9.0)
+    debugger (1.6.8)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.5)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.7)
     diff-lcs (1.2.5)
     docile (1.1.5)
     ffi (1.9.6)
@@ -36,6 +44,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashie (3.4.0)
+    highline (1.6.21)
     hitimes (1.2.2)
     listen (2.8.5)
       celluloid (>= 0.15.2)
@@ -63,6 +72,7 @@ GEM
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
+    recursive-open-struct (0.5.0)
     rspec (2.99.0)
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
@@ -86,15 +96,19 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  awesome_print
   codeclimate-test-reporter
+  debugger
   growl
   guard
   guard-bundler
   guard-rspec
+  highline
   maruku (~> 0.6)
   omniauth-expressov3!
   rack-test (~> 0.5)
   rake (~> 0.8)
   rb-fsevent
+  recursive-open-struct
   rspec (~> 2.7)
   simplecov (~> 0.4)

data/lib/omniauth/strategies/expressov3.rb

@@ -79,11 +79,10 @@ module OmniAuth
         user = {}
         mapper.each do |key, value|
           values_keys = value.split('::')
-          value_key = values_keys[0]
-          sub_value_key = values_keys[1]
-
-          if object && object.has_key?(value_key) && object[value_key] && object[value_key].has_key?(sub_value_key)
-            user[key] = object[value_key][sub_value_key]
+          value_key = values_keys[0].to_sym
+          sub_value_key = values_keys[1].to_sym
+          if object && object.respond_to?(value_key) && object.send(value_key) && object.send(value_key).respond_to?(sub_value_key)
+            user[key] = object.send(value_key).send(sub_value_key)
           else
             user[key] = nil
           end

data/lib/omniauth-expressov3/expressov3_auth_client.rb

@@ -1,3 +1,4 @@
+require 'recursive-open-struct'
 module OmniAuth
   module ExpressoV3
     class AuthClient
@@ -30,23 +31,22 @@ module OmniAuth
         # check if user is authenticated,  raises an authentication if not
         validate_login(@json_tine.result)
         #return user data
-        @json_tine.result
+        build_struct @json_tine.result
       end
 
       def send method, args=nil
           @json_tine.send method, args
-          @json_tine.result
+          build_struct @json_tine.result
       end
 
       def get_user_data
         #request to get user data
         @json_tine.send 'Tinebase.getAllRegistryData'
-        #hash with user data
-        { 'keys' => @json_tine.result['keys'],
-          'currentAccount' => @json_tine.result['Tinebase']['currentAccount'],
-          'userContact'    => @json_tine.result['Tinebase']['userContact'],
-          'expressoAccount'    => @json_tine.result['Expressomail']['accounts']['results'][0]
-        }
+        # hash with user data
+        build_struct :keys => @json_tine.result['keys'],
+            :currentAccount => @json_tine.result['Tinebase']['currentAccount'],
+            :userContact    => @json_tine.result['Tinebase']['userContact'],
+            :expressoAccount    => @json_tine.result['Expressomail']['accounts']['results'][0]
       end
 
       def last_raw_data
@@ -57,7 +57,9 @@ module OmniAuth
         @json_tine.close if @json_tine
       end
   protected
-
+      def build_struct hash
+        RecursiveOpenStruct.new hash,  :recurse_over_arrays => true
+      end
       def validate_arguments(username, password)
         if username.nil? or password.nil?
           raise MissingArgumentsError.new('missing credentials arguments')

data/lib/omniauth-expressov3/jsonrpc_tine_connection.rb

@@ -1,6 +1,8 @@
 require 'net/http'
 require 'rubygems'
 require 'json'
+require 'ostruct'
+require 'forwardable'
 module OmniAuth
   module ExpressoV3
     #classe para fazer a conexão com o expresso3/tine20
@@ -37,7 +39,6 @@ module OmniAuth
       end
 
       def send(tine_method, args=nil)
-        puts "STARTING METHOD: #{tine_method} - WITH PARAMS: #{args.inspect}" if @debug
         response = execute_http_call(tine_method, args)
         hash_response = parse_response(response)
         @json_return = hash_response[:json_object]
@@ -59,6 +60,7 @@ module OmniAuth
         @last_body
       end
 
+
       def result
         if @json_return['result']
           keys.merge(@json_return['result'])
@@ -83,6 +85,7 @@ module OmniAuth
       end
 
 private
+
   def execute_http_call(tine_method, args=nil)
     @req = Net::HTTP::Post.new(@uri.request_uri, initheader = {'Content-Type'=>'application/json'})
     json_body = {:jsonrpc => '2.0', :method => tine_method, :id => next_cont}
@@ -90,21 +93,19 @@ private
 
     #puts "REQUEST BODY: #{json_body.to_json}" if @debug
 
-    @req.body = uri_escape_sanely( json_body.to_json )
+    @req.body = json_body.to_json #uri_escape_sanely( json_body.to_json )
     add_request_fields #headers e cookies
     unless @http
       @http = Net::HTTP.new(@uri.host, @uri.port)
       @http.use_ssl = true
       @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     end
+    @http.set_debug_output($stdout) if @debug
     return @http.start {|http| @http.request(@req) }
   end
 
   def parse_response response
-    # puts "BODY: #{response.body}" if @debug
     json_obj = JSON.parse(response.body)
-    # puts json_obj.inspect if @debug
-
 
     if json_obj['result'] and json_obj['result'].is_a? Hash
       json_key = json_obj['result']['jsonKey']  if  json_obj['result']['jsonKey']
@@ -130,6 +131,7 @@ private
 
   def output_debug_response_and_vars(response)
     if @debug
+      puts response.body
       #puts "Response #{response.code} #{response.message}: #{response.body}"
       puts "TINE_KEY: "+@tine_key if @tine_key
       puts "JSON_KEY: "+@json_key if @json_key

data/lib/omniauth-expressov3/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
     module ExpressoV3
-      VERSION = '1.0.4'
+      VERSION = '1.0.5'
     end
 end

data/spec/omniauth/strategies/expressov3_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 require 'json'
 describe "OmniAuth::Strategies::ExpressoV3" do
 
+  before :all do
+    display_label 'TESTING EXPRESSO V3 AUTHCLIENT'
+    ENV['EXPRESSO_USERNAME'] ||= ask('Expresso Username: ')
+    ENV['EXPRESSO_PASSWORD'] ||= ask("Expresso password for #{ENV['EXPRESSO_USERNAME']}: ") { |q| q.echo = false }
+  end
+
   class ExpressoV3Provider < OmniAuth::Strategies::ExpressoV3; end
 
   let(:app) do
@@ -109,7 +115,7 @@ describe "OmniAuth::Strategies::ExpressoV3" do
 
       it 'should redirect to error page' do
         post('/auth/expressov3/callback', {:username => "ping", :password => "password"})
-
+        #require 'debugger'; debugger
         expect(last_response).to be_redirect
         expect(last_response.headers['Location']).to match(%r{expressov3_error})
       end

data/spec/omniauth-expressov3/expressov3_auth_client_2_spec.rb

@@ -1,16 +1,24 @@
 require 'spec_helper'
 describe "OmniAuth::ExpressoV3::AuthClient" do
 
+  before :all do
+    display_label 'TESTING EXPRESSO V3 AUTHCLIENT'
+    ENV['EXPRESSO_USERNAME'] ||= ask('Expresso Username: ')
+    ENV['EXPRESSO_PASSWORD'] ||= ask("Expresso password for #{ENV['EXPRESSO_USERNAME']}: ") { |q| q.echo = false }
+    #unmute!  - habilita os outputs de debug do test
+  end
+
   describe 'authenticate' do
     it 'should authenticate' do
-      auth = OmniAuth::ExpressoV3::AuthClient.new
+      auth = OmniAuth::ExpressoV3::AuthClient.new :debug => false
       auth_data = auth.authenticate(ENV['EXPRESSO_USERNAME'], ENV['EXPRESSO_PASSWORD'])
       expect(auth_data).not_to be(nil)
-      expect(auth_data['keys']).not_to be(nil)
+
+      expect(auth_data.keys).not_to be(nil)
       data = auth.get_user_data
 
-      expect(data['currentAccount']).not_to be(nil)
-      expect(data['userContact']).not_to be(nil)
+      expect(data.currentAccount).not_to be(nil)
+      expect(data.userContact).not_to be(nil)
       auth.close
     end
   end
@@ -33,58 +41,73 @@ describe "OmniAuth::ExpressoV3::AuthClient" do
         args = {
           filter:
             [
-              {field: "account_id", operator: "equals", value: @user_data["expressoAccount"]["id"]},
+              {field: "account_id", operator: "equals", value: @user_data.expressoAccount.id},
               {field: "globalname", operator: "equals", value: ""}
 
             ]
         }
         result = @auth.send("Expressomail.searchFolders", args)
-        puts "----------------------------------------------------------"
-        puts "PRINTING FOLDERS"
-        puts "----------------------------------------------------------"
-        result['results'].each do |folder|
-          puts "FOLDER: #{folder['id']} - #{folder['globalname']} (#{folder['cache_totalcount']}) emails (#{folder['cache_unreadcount']}) unread"
-          puts "FOLDER DATA: #{folder.inspect}"
-          puts "----------------------------------------------------------"
+        display_label "PRINTING FOLDERS"
+        result.results.each do |folder|
+          p "FOLDER: #{folder.id} - #{folder.globalname} (#{folder.cache_totalcount}) emails (#{folder.cache_unreadcount}) unread"
+          p "FOLDER DATA: "
+          puts_object folder
+          display_line
         end
       end
-      it 'search Messages' do
-        args = {
-          filter:
-          [
-            {
-              condition: "OR",
-              filters: [
-                  {condition: "AND", filters: [{field: "query", operator: "contains", value: "", id: "ext-record-351"},
-                    { field: "path", operator: "in",
-                              value: ["/4e3f366969900893e80664b9c745a254f451aacb/NGUzZjM2Njk2OTkwMDg5M2U4MDY2NGI5Yzc0NWEyNTRmNDUxYWFjYjtJTkJPWA2"],
-                              id: "ext-record-368"}],
-              id: "ext-comp-1101", label: "Messages"}]}],
-          paging:
-                  {
-                      sort: "received", dir: "DESC", start: 0, limit: 5
-                  }
-        }
-        result = @auth.send("Expressomail.searchMessages", args)
-        puts "----------------------------------------------------------"
-        puts "LSITING LAST 5 MESSAGES"
-        puts "----------------------------------------------------------"
-        (0..4).each do |i|
-          puts "SUBJECT: #{result['results'][i]['subject']}"
-          puts "EMAIL DATA: #{result['results'][i].inspect}"
-          puts "----------------------------------------------------------"
+
+      context "messages" do
+        let(:inbox_folder) do
+          args = {
+            filter:
+              [
+                {field: "account_id", operator: "equals", value: @user_data.expressoAccount.id},
+                {field: "globalname", operator: "equals", value: ""}
+
+              ]
+          }
+          result = @auth.send("Expressomail.searchFolders", args)
+          folder = result.results.first
+        end
+        it 'search Messages' do
+          inbox_id = inbox_folder.id
+          account_id = @user_data.expressoAccount.id
+          args = {
+            filter:
+            [
+              {
+                condition: "OR",
+                filters: [
+                    {condition: "AND", filters: [{field: "query", operator: "contains", value: "", id: "ext-record-351"},
+                      { field: "path", operator: "in",
+                                value: ["/#{account_id}/#{inbox_id}"],
+                                id: "ext-record-368"}],
+                id: "ext-comp-1101", label: "Messages"}]}],
+            paging:
+                    {
+                        sort: "received", dir: "DESC", start: 0, limit: 5
+                    }
+          }
+          response = @auth.send("Expressomail.searchMessages", args)
+
+          display_label  "LISTING LAST 5 MESSAGES"
+
+          response.results.each do |msg|
+            p "SUBJECT: #{msg.subject}"
+            p "EMAIL DATA: "
+            puts_object msg
+            display_line
+          end
+        end
+        it 'query for Expressomail.updateMessageCache' do
+          args = {
+             folderId: inbox_folder.id,
+             time: 10
+           }
+          result = @auth.send("Expressomail.updateMessageCache", args)
+          display_label "UPDATING MESSAGES CACHE"
+          puts_object result
         end
-              end
-      it 'query for Expressomail.updateMessageCache' do
-        args = {
-           folderId: 'NGUzZjM2Njk2OTkwMDg5M2U4MDY2NGI5Yzc0NWEyNTRmNDUxYWFjYjtJTkJPWA2',
-           time: 10
-         }
-        result = @auth.send("Expressomail.updateMessageCache", args)
-        puts "----------------------------------------------------------"
-        puts "UPDATING MESSAGES CACHE"
-        puts "----------------------------------------------------------"
-        puts result
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,6 @@
 require "codeclimate-test-reporter"
+require  'highline/import'
+require  'awesome_print'
 CodeClimate::TestReporter.start
 
 $:.unshift File.expand_path('..', __FILE__)
@@ -16,3 +18,39 @@ RSpec.configure do |config|
 
   OmniAuth.config.logger = Logger.new(File.expand_path('../omniauth.log', __FILE__))
 end
+
+def muted?
+  @@mute
+end
+
+def mute!
+  @@mute = true
+end
+
+def unmute!
+  @@mute = false
+end
+
+@@mute = true
+
+def display_label label
+  return if muted?
+  puts ''
+  display_line
+  if label
+    puts label
+    display_line
+  end
+end
+
+def display_line
+  puts '-' * HighLine::SystemExtensions.terminal_size[0] unless muted?
+end
+
+def p msg
+  puts msg unless muted?
+end
+
+def puts_object object
+  ap object unless muted?
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-expressov3
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Abner Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth