memotoo 1.0.4 → 1.0.5

data/.rvmrc-old

@@ -0,0 +1 @@
+rvm use 1.8.7@memotoo

data/Gemfile

@@ -1,9 +1,9 @@
 source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
-#   gem "activesupport", ">= 2.3.5"
-gem "savon"
-#, "~> 0.9.2"
+gem "i18n"
+gem "activesupport", ">= 2.3.5"
+gem "savon", "~> 0.9.2"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.0.8)
     builder (3.0.0)
     git (1.2.5)
     gyoku (0.4.3)
@@ -8,6 +9,7 @@ GEM
     httpi (0.9.3)
       ntlm-http (>= 0.1.1)
       rack
+    i18n (0.6.0)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
@@ -30,9 +32,11 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport (>= 2.3.5)
   bundler (~> 1.0.0)
+  i18n
   jeweler (~> 1.5.2)
   rack (~> 1.1.2)
   rcov
-  savon
+  savon (~> 0.9.2)
   shoulda

data/README.rdoc

@@ -35,7 +35,7 @@ get a contact from id:
    
 search for contacts:
 
-   @response = @connect.searchContact("ka")
+   @response = @connect.searchContact({:search=>"ka"})
      
 modify a contact:
 
@@ -44,18 +44,30 @@ modify a contact:
 get contact modified after a date
 
     @response = @connect.getContactSync("2011-01-01 10:00:00")
+    
+playing with contactgroups
+
+    @connect.addContactGroup({:name=>"Testgroup"})
+    
+    @connect.searchContactGroup({:search=>"ka", :limit_nb=>50})
+    
+    @connect.getContactGroup(12345)
+     
+    @connect.getContactGroupSync("2010-02-23 10:00:00")
+    
+    @connect.deleteContactGroup(12345)
 
     
 ==Testing
 
-I added tests for all possible functions. (rcov 100%)
+I added tests for all implemented functions. (rcov 100%)
 You can add your own credential to /test/test_memotoo.rb
 
 I also added support for {http://test.rubygems.org}[http://test.rubygems.org]
 
 You can now use the gem rubygems-test for easy testing this gem.
 
-See my testresult here: http://test.rubygems.org/gems/memotoo/v/1.0.1/test_results/1645
+See my testresult here: http://test.rubygems.org/gems/memotoo/v/1.0.5/test_results/1650
 
 ==Documentation
 
@@ -63,8 +75,8 @@ see rdoc
 
 ==To-Dos
 
-1. Exception handling should be done
-2. I only implemented contacts - these soap-objects are missing: bookmark, bookmark's folder, contact's group, event, holiday, task, note
+1. Exception handling should be done - fetched problem are written to console
+2. I only implemented contacts and contact's group - these soap-objects are missing: bookmark, bookmark's folder, event, holiday, task, note
 
 It would be nice if *someone* could help me with the missing parts .
 

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/memotoo.rb

@@ -1,4 +1,7 @@
 require "memotoo/connect"
+require 'rubygems'
+require 'active_support/inflector'
+
 
 module Memotoo
 

data/lib/memotoo/connect.rb

@@ -1,6 +1,8 @@
 require "savon"
 require "memotoo/core-ext/hash"
+require "memotoo/core-ext/kernel"
 require "memotoo/contact/contact"
+require "memotoo/contact/contact_group"
 
 module Memotoo
 
@@ -13,6 +15,8 @@ module Memotoo
 
     # will hold username and password in a hash style (used for all requests)
     attr_accessor :opts
+    
+    SEARCHDEFAULTS = { :limit_start => '0', :limit_nb => '100' }
      
      #[https] default:true for the SOAP service.
      # example: @connect=Memotoo::Connect.new("myusername","mypassword")
@@ -33,26 +37,52 @@ module Memotoo
    # Creates the <tt>Savon::Client</tt>.
     def client(https=true)
 		#--
-		# TODO: dont fetch wdsl-file - make setting by myself - it's faster
-		#   # Directly accessing a SOAP endpoint
-		#   client = Savon::Client.new do
-		#     wsdl.endpoint = "http://example.com/UserService"
-		#     wsdl.namespace = "http://users.example.com"
-		#   end
+		# 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
+	
+		@client ||= Savon::Client.new do
+          wsdl.namespace="urn:memotooSoap"
 		  if https
-				wsdl.document = "https://www.memotoo.com/SOAP-server.php?wsdl"
+				wsdl.endpoint="https://www.memotoo.com/SOAP-server.php"
 				http.auth.ssl.verify_mode = :none 
 		  else
-		        wsdl.document = "https://www.memotoo.com/SOAP-server.php?wsdl"
+				wsdl.endpoint="http://www.memotoo.com/SOAP-server.php"
 		  end
 		  http.auth.basic self.opts[:param][:login], self.opts[:param][:password]
 		end
-		
     end
     
+    
+    def searchApiCall(searchparameter)
+		search = SEARCHDEFAULTS.merge!(searchparameter)
+		apicall(calling_method.to_sym, search)
+    end
+    
+    def getApiCall(id)
+    	apicall(calling_method.to_sym, { :id => id })
+    end
+    
+    def getSyncApiCall(datetime)
+    	date2time=Time.mktime(*ParseDate.parsedate(datetime))
+    	formated_date=date2time.strftime("%Y-%m-%d %H:%M:%S")
+    	apicall(calling_method.to_sym, { :date => formated_date })
+    end
+    
+    def deleteApiCall(id)
+	    apicall(calling_method.to_sym, { :id => id })
+    end
+    
+    def modifyApiCall(details)
+		apicall(calling_method.to_sym, details )    
+    end
+    
+    def addApiCall(details)
+		apicall(calling_method.to_sym, details )    
+    end
+    
+    
     # used internally for a request
     def apicall(action, parameter)
 		
@@ -75,23 +105,137 @@ module Memotoo
 		end
     end
     
+	def format_result(response, *_keys_)
+		output_key = [(calling_method.underscore+"_response").to_sym] | _keys_
+		response.nil? ? nil : response.to_hash.seek(output_key) 
+    end
+    
+    	
+	
+	private
+	
+	def go_home(message)
+	#-- 
+	# TODO: raising errors instead of writing to STDOUT
+	#++
+		puts "missing fields: " + message.to_s
+		false
+	end
+	
+	def has_needed_fields(thehash, *args)
+		valid=true
+		retarr=[]
+		args.each do |arg_item|
+			unless thehash.has_key?(arg_item)
+				valid = false
+				retarr << arg_item
+			end
+		end
+		valid ? true : go_home(retarr.join(", "))
+	end
+	
+	def has_needed_search_parameter(searchparameter)
+		has_needed_fields(searchparameter, :search)
+	end
     
   end # class
 
 end # module
 
-# stop savon logging and raising errors
+# stop savon logging 
 
 module Savon
   module Global
-
     def log?
       false
     end
-    
       def raise_errors?
       @raise_errors = true
     end
    
   end
 end
+
+#-- available memotoo soap actions !!!!!!!!!!
+
+#event
+
+#:get_event,
+#:delete_event,    
+#:get_event_sync, 
+#:modify_event,    
+#:search_event,
+#:add_event,
+
+#calendar_category
+
+#:search_calendar_category,
+#:add_calendar_category,
+#:delete_calendar_category,
+#:get_calendar_category,
+#:modify_calendar_category,
+#:get_calendar_category_sync,
+
+#holiday
+
+#:get_holiday, 
+#:delete_holiday,
+#:get_holiday_sync,
+#:modify_holiday,
+#:search_holiday,
+#:add_holiday,
+# 
+
+#contact - ready implemented
+#:add_contact,    
+#:modify_contact, 
+#:search_contact,    
+#:delete_contact,    
+#:get_contact_sync,
+#:get_contact,
+
+#contact-group - ready implemented
+#     
+#:search_contact_group,
+#:add_contact_group,    
+#:delete_contact_group,
+#:get_contact_group,
+#:get_contact_group_sync
+#:modify_contact_group
+#     
+#bookmark
+#     
+#:get_bookmark,
+#:modify_bookmark,
+#:search_bookmark
+#:add_bookmark, 
+#:delete_bookmark,
+#:get_bookmark_sync,  
+# 
+#bookmarkfolder
+# 
+#:search_bookmark_folder,
+#:add_bookmark_folder,     
+#:delete_bookmark_folder,
+#:get_bookmark_folder,      
+#:get_bookmark_folder_sync,
+#:modify_bookmark_folder, 
+
+#task
+
+#:modify_task,     
+#:get_task, 
+#:get_task_sync,
+#:search_task,       
+#:add_task,    
+#:delete_task, 
+
+#note
+
+#:get_note_sync
+#:modify_note,
+#:search_note,
+#:delete_note,
+#:add_note, 
+#:get_note,
+#++

data/lib/memotoo/contact/contact.rb

@@ -12,7 +12,7 @@ module Memotoo
     # @connect=Memotoo::Connect.new("myusername","mypassword")
     
     #   # retrieving search results
-    # @response = @connect.searchContact("ka")
+    # @response = @connect.searchContact({:search=>"ka"})
     
     #   # get a contact from id
     # @response = @connect.getContact(12345)
@@ -29,6 +29,16 @@ module Memotoo
     #++ @response.each {|contact|puts contact[:id]+"-"+contact[:firstname]+" "+contact[:lastname]}
 
 
+    	# required: lastname 
+    	#
+    	# optional: all other contact_details - see below
+    def addContact(details={})
+		if has_needed_fields(details, :lastname)
+			format_result(addApiCall({:contact => details}), :id)
+		end
+	end
+
+
 		#[searchparameter:]
 		#   {:search=>"something", :limit_start=>0, :limit_nb=>100}
     	#*   required:
@@ -37,85 +47,48 @@ module Memotoo
     	#       limit_start
     	#       limit_nb
     	#e.g. @connect.searchContact({:search=>"ka", :limit_nb=>50})
-
+    	#
+    	# returns nil or a hash of one contact or an array of contacts
+    	#
     def searchContact(searchparameter={})
-    	check=has_fields(searchparameter, :search)
-    	if check[0]
-			search = { 	:limit_start => '0',
-						:limit_nb => '100'
-			 		}.merge!(searchparameter)
-			search_response = apicall(:searchContact, search)
-		# returns an array of contacts from search result
-		if search_response.nil? || search_response==""
-			 nil
-		else
-			search_response.to_hash.seek :search_contact_response, :return, :contact
-		end
-		
-		else
-			# returns false and a message
-			go_home(check[1])
+    	if has_needed_search_parameter(searchparameter)
+			format_result(searchApiCall(searchparameter), :return, :contact)
 		end
     end
     
 		# id = integer
 		# e.g. @connect.getContact(12345)
+		#
+		# returns the contact or nil
+		#
     def getContact(id)
-    	contact = apicall(:getContact, { :id => id })
-		# returns the contact
-		contact.to_hash.seek :get_contact_response, :return, :contact
+    	format_result(getApiCall(id), :return, :contact)
     end
     
-    
     	# get modified contacts since date
     	# datetime = "2010-02-23 10:00:00" or just "2010-02-23"
     	# e.g. @connect.getContactSync("2010-02-23 10:00:00")
     def getContactSync(datetime)
-    	date2time=Time.mktime(*ParseDate.parsedate(datetime))
-    	formated_date=date2time.strftime("%Y-%m-%d %H:%M:%S")
-    	#datetime=datetime.to_time.strftime("%Y-%m-%d %H:%M:%S")
-    	contacts = apicall(:getContactSync, { :date => formated_date })
-    	contacts.to_hash.seek :get_contact_sync_response, :return, :contact
-    end
-
-
-		# id = integer
-		# e.g. @connect.deleteContact(12345)
-    def deleteContact(id)
-        contact = apicall(:deleteContact, { :id => id })
-		# deletes the contact - returns true when contact is deleted
-		contact.to_hash.seek :delete_contact_response, :ok
+    	format_result(getSyncApiCall(datetime), :return, :contact)
     end
 
     	# required: lastname and id
     	#
     	# optional: all other \contact_details - see contact fields at bottom
+    	# return true if the changed happened
     def modifyContact(details={})
-    	check=has_fields(details, :lastname, :id) 
-    	if check[0]
-			contact = apicall(:modifyContact, { :contact => details })
-			# return true if the changed happened
-			contact.to_hash.seek :modify_contact_response, :ok
-		else
-		# returns false, if lastname and id is not given
-			go_home(check[1])		
+		if has_needed_fields(details, :lastname, :id)
+			format_result(modifyApiCall({:contact => details}), :ok)
 		end
     end
 
-    	# required: lastname 
-    	#
-    	# optional: all other contact_details
-    def addContact(details={})
-    	check=has_fields(details, :lastname)
-		if check[0]
-			contact = apicall(:addContact, { :contact => details })
-			# return the id from the new contact -> get it in my own db? maybe
-			contact.to_hash.seek :add_contact_response, :id
-		else
-		# returns false, if lastname is not given
-			go_home(check[1])		
-		end
-	end
+		# id = integer
+		# e.g. @connect.deleteContact(12345)
+		# return true when contact is deleted
+    def deleteContact(id)
+		format_result(deleteApiCall(id), :ok)
+    end
+
 	
 	# ----------------------------------------
 #:section: contact_details
@@ -180,26 +153,6 @@ module Memotoo
 #			:photo => '', // Photo encoded with Base64
 # ----------------------------------------
 	
-	
-	private
-	
-	def go_home(message)
-		puts "missing fields: " + message.to_s
-		false
-	end
-	
-	def has_fields(thehash, *args)
-		valid=true
-		retarr=[]
-		args.each do |arg_item|
-			unless thehash.has_key?(arg_item)
-				valid = false
-				retarr << arg_item
-			end
-		end
-		[valid, retarr]
-	end
-	
     
   end # class