memotoo 2.0.1 → 2.0.2

data/README.rdoc

@@ -108,6 +108,16 @@ dateEnd::    "2011-01-01", Format: YYYY-MM-DD
 Task and Event::
 dateBegin::    "2011-06-18T10:00:00", Format: YYYY-MM-DDTHH:II:SS - ISO8601 time format GMT
 dateEnd::    "2011-06-18T10:00:00", Format: YYYY-MM-DDTHH:II:SS - ISO8601 time format GMT
+
+==Logging
+
+Enable/Disable Savon and HTTPI - Logging 
+
+@connect=Memotoo.new(username, password, https=true, log=false, requestlog=true)
+
+log = Savon logging on/off
+
+requestlog = HTTPI loggin on/off
  
 ==Testing
 
@@ -135,6 +145,10 @@ and memotoo api-documentation
 
 https://www.memotoo.com/index.php?rub=api#SOAP-server.php
 
+== Changelog V. 2.0.2
+
+Easy configuring logging options
+
 == Changelog V. 2.0.1
 
 some code refactoring and support for ruby >=1.9.2

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/memotoo.rb

@@ -23,35 +23,54 @@ class Memotoo
 				 :task => [:title]}
      
      #[https] default:true for the SOAP service. Use false to use http-connection
+     #[log] default:false - set to true to see savons logging
+     #[requeslog] default:false - set to 
      # example:(use https) 
      #     @connect=Memotoo::Connect.new("myusername","mypassword")
      # example:(use http) 
      #     @connect=Memotoo::Connect.new("myusername","mypassword", false)
-    def initialize(username, password, https=true)
+     # example:(set loggin on and http-request-logging off)
+     #     @connect=Memotoo::Connect.new("myusername","mypassword", true, true, false)
+    def initialize(username, password, https=true, log=false, requestlog=true)
 
-		# we will need it for every request - will be merged in
+		# need it for every request - will be merged in
 		self.opts= { :param => { :login => username, :password => password}}
 		
+		# set savon logging and erros
+		Savon.configure do |config|
+			config.raise_errors = true # raise SOAP faults and HTTP errors
+			config.log = log # enable/disable logging
+			config.log_level = :debug # changing the log level
+		end
+		
+		HTTPI.log=requestlog
+		
 		# build dynamically all methods - some magic :-)
 		make_methods
 		
 		# creates client with memotoo settings 
 		client(https)
 	end
-end
-
-# stop savon logging 
-
-module Savon # :nodoc: all
-  module Global
-    def log?
-      false
-    end
-      def raise_errors?
-      @raise_errors = true
+	
+	   # Creates the <tt>Savon::Client</tt>.
+    def client(https=true)
+		#--
+		# in any case problems switch back to receiving the wsdl file from memotoo
+		# https: wsdl.document = "https://www.memotoo.com/SOAP-server.php?wsdl"
+		# http:  wsdl.document = "http://www.memotoo.com/SOAP-server.php?wsdl"
+		#++
+		@client ||= Savon::Client.new do
+          wsdl.namespace="urn:memotooSoap"
+		  if https
+				wsdl.endpoint="https://www.memotoo.com/SOAP-server.php"
+				http.auth.ssl.verify_mode = :none 
+		  else
+				wsdl.endpoint="http://www.memotoo.com/SOAP-server.php"
+		  end
+		  http.auth.basic self.opts[:param][:login], self.opts[:param][:password]
+		end
     end
-   
-  end
+	
 end
 
 #Finished in 41.165241 seconds.

data/lib/memotoo/main.rb

@@ -1,26 +1,6 @@
 class Memotoo
-
-	private	
-	
-   # Creates the <tt>Savon::Client</tt>.
-    def client(https=true)
-		#--
-		# in any case problems switch back to receiving the wsdl file from memotoo
-		# https: wsdl.document = "https://www.memotoo.com/SOAP-server.php?wsdl"
-		# http:  wsdl.document = "http://www.memotoo.com/SOAP-server.php?wsdl"
-		#++
-	
-		@client ||= Savon::Client.new do
-          wsdl.namespace="urn:memotooSoap"
-		  if https
-				wsdl.endpoint="https://www.memotoo.com/SOAP-server.php"
-				http.auth.ssl.verify_mode = :none 
-		  else
-				wsdl.endpoint="http://www.memotoo.com/SOAP-server.php"
-		  end
-		  http.auth.basic self.opts[:param][:login], self.opts[:param][:password]
-		end
-    end
+    
+    private	
     
 	def selfclass
 	(class << self; self; end)

data/memotoo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memotoo}
-  s.version = "2.0.1"
+  s.version = "2.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Karsten Redmer"]

data/test/test_memotoo.rb

@@ -5,7 +5,7 @@ class TestMemotoo < Test::Unit::TestCase
   context "Memotoo-Soap Api basic tests" do
   
 		setup do
-			@connect=Memotoo.new(MEMOTOO_USERNAME,MEMOTOO_PASSWORD,false)
+			@connect=Memotoo.new(MEMOTOO_USERNAME,MEMOTOO_PASSWORD, true, false, false)
 		end
 		
 		should "have a connect-instance" do
@@ -13,7 +13,7 @@ class TestMemotoo < Test::Unit::TestCase
 		end
 		
 		should "write a message if username/password is not correct" do
-			@connect=Memotoo.new(MEMOTOO_USERNAME,"wrongpasswd")
+			@connect=Memotoo.new(MEMOTOO_USERNAME,"wrongpasswd", true, false, false)
 			assert_raises ArgumentError do
 					response = @connect.searchContact(TESTSEARCHDEFAULTS)
 			end
@@ -26,7 +26,7 @@ class TestMemotoo < Test::Unit::TestCase
 		
 		
 		should "also use http request instead of https" do
-			@connect=Memotoo.new(MEMOTOO_USERNAME,MEMOTOO_PASSWORD, false)
+			@connect=Memotoo.new(MEMOTOO_USERNAME,MEMOTOO_PASSWORD, false, false, false)
 			response = @connect.searchContact(TESTSEARCHDEFAULTS)
 			assert_not_nil response
 		end
@@ -35,27 +35,6 @@ class TestMemotoo < Test::Unit::TestCase
 		
 end
 
-
-# uncomment this if you want to see everything in log what happens...it's a lot
-#module Savon
-#  module Global
-#    def log?
-#      true
-#    end
-#    
-#  end
-#end
-
-# comment this to see http requests logged
-module HTTPI
-  class << self
-    def log?
-      @log = false
-    end
-  end
-end
-
-
 ################## rcov-result ######################
 
 #Generated on Wed Jun 08 22:39:46 +0200 2011 with rcov 0.9.8

data/test/test_soapobjects.rb

@@ -43,7 +43,7 @@ soapobjects.each do |soapobject|
    	context "what we could do with #{soapobject}'s" do
    	
    		setup do
-			@connect=Memotoo.new(MEMOTOO_USERNAME,MEMOTOO_PASSWORD, false)
+			@connect=Memotoo.new(MEMOTOO_USERNAME,MEMOTOO_PASSWORD, true, false, false)
 		end
 
 		context "Adding and finding #{soapobject}" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memotoo
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Karsten Redmer