memotoo 1.0.6 → 2.0.0

data/memotoo.gemspec

@@ -5,12 +5,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memotoo}
-  s.version = "1.0.6"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Karsten Redmer"]
-  s.date = %q{2011-06-08}
-  s.description = %q{Unofficial gem for connecting to memotoo.com with their soap-api and handle your contact needs. Memotoo lets your synchronize all your contacts, events and tasks with yahoo, gmail, facebook, xing, outlook, your mobile-phone and more. You can also get your e-mails in one place.}
+  s.date = %q{2011-06-12}
+  s.description = %q{Unofficial gem for connecting to memotoo.com with their soap-api and handle your contact needs. Memotoo lets your synchronize all your contacts, events and tasks with yahoo, gmail, facebook, xing, outlook, your mobile-phone and more. You can also get your e-mails in one place.Features of memotoo:
+  New mobile? Transfer all your data to your new device!
+  Synchronise your data with your mobile phone (with SyncML)
+  Access all your e-mail in a single page from Google, Yahoo, Hotmail / MSN, ...!
+  View your data on your mobile phone (WAP / XHTML)
+  Access your contacts using a LDAP directory
+  Access your files via a Web Folder
+  Access your files via FTP
+  Add Memotoo widgets to iGoogle, Netvibes, Windows Vista, Apple Dashboard, ...
+  Memotoo plugins for your browser}
   s.email = %q{k.redmer@yahoo.de}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -19,7 +28,6 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".gemtest",
-    ".rvmrc-old",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
@@ -27,20 +35,13 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/memotoo.rb",
-    "lib/memotoo/bookmark/bookmark.rb",
-    "lib/memotoo/connect.rb",
-    "lib/memotoo/contact/contact.rb",
-    "lib/memotoo/contact/contact_group.rb",
     "lib/memotoo/core-ext/hash.rb",
     "lib/memotoo/core-ext/kernel.rb",
-    "lib/memotoo/wsdl/http.xml",
-    "lib/memotoo/wsdl/https.xml",
+    "lib/memotoo/main.rb",
     "memotoo.gemspec",
     "test/helper.rb",
-    "test/test_bookmark.rb",
-    "test/test_contact.rb",
-    "test/test_contact_group.rb",
-    "test/test_memotoo.rb"
+    "test/test_memotoo.rb",
+    "test/test_soapobjects.rb"
   ]
   s.homepage = %q{http://github.com/kredmer/memotoo}
   s.licenses = ["MIT"]
@@ -49,10 +50,8 @@ Gem::Specification.new do |s|
   s.summary = %q{Unofficial gem for connecting to memotoo.com with their given soap-api}
   s.test_files = [
     "test/helper.rb",
-    "test/test_bookmark.rb",
-    "test/test_contact.rb",
-    "test/test_contact_group.rb",
-    "test/test_memotoo.rb"
+    "test/test_memotoo.rb",
+    "test/test_soapobjects.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/test_memotoo.rb

@@ -1,23 +1,21 @@
 require 'helper'
 
-
 class TestMemotoo < Test::Unit::TestCase
   
   context "Memotoo-Soap Api basic tests" do
   
 		setup do
-			@connect=Memotoo::Connect.new(MEMOTOO_USERNAME,MEMOTOO_PASSWORD)
+			@connect=Memotoo.new(MEMOTOO_USERNAME,MEMOTOO_PASSWORD)
 		end
 		  
 		should "have a connect-instance" do
-			assert_equal Memotoo::Connect, @connect.class
+			assert_equal Memotoo, @connect.class
 		end
 		  
 		should "write a message if username/password is not correct" do
-		    @connect=Memotoo::Connect.new(MEMOTOO_USERNAME,"wrongpasswd")
-			response = @connect.searchContact(TESTSEARCHDEFAULTS)
-			assert_raise RuntimeError do
-			  raise 'Boom!!!'			
+		    @connect=Memotoo.new(MEMOTOO_USERNAME,"wrongpasswd")
+			assert_raises ArgumentError do
+					response = @connect.searchContact(TESTSEARCHDEFAULTS)
 			end
 		end
 
@@ -28,7 +26,7 @@ class TestMemotoo < Test::Unit::TestCase
 		
 		
 		should "also use http request instead of https" do
-			@connect=Memotoo::Connect.new(MEMOTOO_USERNAME,MEMOTOO_PASSWORD, false)
+			@connect=Memotoo.new(MEMOTOO_USERNAME,MEMOTOO_PASSWORD, false)
 			response = @connect.searchContact(TESTSEARCHDEFAULTS)
 			assert_not_nil response
 		end

data/test/test_soapobjects.rb

@@ -0,0 +1,123 @@
+require 'helper'
+
+class TestMemotoo < Test::Unit::TestCase
+
+# api-problem in: BookmarkFolder, Holiday -> reportet to Thomas Pequet on 12.July 2011
+
+# uncomment this to test all soapobjects
+soapobjects = %w{Contact}
+#soapobjects = %w{Contact ContactGroup Bookmark Note CalendarCategory Event Task}
+
+
+
+
+fixure = {  :contact => {	:new => {:lastname => "Testcontact123456"},
+							:mod => {:lastname => "Testcontact123456xyz"}},
+			:contact_group => {	:new=>{:name => "TestcontactGroup123456"},
+								:mod => {:name => "TestcontactGroup123456xyz"}},
+			:bookmark => {	:new=>{:url => "Testbookmark.com"},
+							:mod => {:url => "Testbookmark123.com"}},
+			:bookmark_folder => {:new=>{:name => "Testbookmarkfolder123456"},
+						:mod => {:name => "Testbookmarkfolder123456xyz"}},
+			:note => {	:new => {:description => "TestNote12345"},
+						:mod => {:description => "TestNote12345xyz"}},
+			:calendar_category => {:new=>{:name => "TestCalendarCategory123456"},
+						:mod => {:name => "TestCalendarCategory123456xyz"}},
+			:event => {	:new => {:title=> "Testevent1234", :dateBegin=>"2011-06-12T10:00:00", :dateEnd=>"2011-06-12T15:00:00"},
+						:mod => {:title=> "Testevent1234xyz", :dateBegin=>"2011-06-12T10:00:00", :dateEnd=>"2011-06-12T15:00:00"}},
+			:holiday => {:new => {:description=> "Testholiday1234", :dateBegin=>"2011-07-12", :dateEnd=>"2011-07-20"},
+						:mod => {:description=> "Testholiday1234xyz", :dateBegin=>"2011-07-12", :dateEnd=>"2011-07-20"}},
+			:task => {	:new => {:title=> "Testtask1234"},
+						:mod => {:title=> "Testtask1234xyz"}} }
+
+needs = Memotoo::NEEDS
+
+soapobjects.each do |soapobject|
+		symbol=soapobject.underscore.to_sym
+		objectfixure = fixure[symbol][:new][needs[symbol][0]]
+		addmethod=("add"+soapobject).to_sym
+		searchmethod=("search"+soapobject).to_sym
+		getmethod=("get"+soapobject).to_sym
+		getsyncmethod=("get"+soapobject+"Sync").to_sym
+		modifymethod=("modify"+soapobject).to_sym
+		deletemethod=("delete"+soapobject).to_sym
+
+
+   	context "what we could do with #{soapobject}'s" do
+   	
+   		setup do
+			@connect=Memotoo.new(MEMOTOO_USERNAME,MEMOTOO_PASSWORD, false)
+		end
+
+		context "Adding and finding #{soapobject}" do
+
+			should "add a new #{soapobject}" do
+				response= @connect.send(addmethod,fixure[symbol][:new])
+				assert_not_nil response
+			end
+			
+			should "add a new #{soapobject} (and look for needed params)" do
+				assert_raises ArgumentError do
+					response = @connect.send(addmethod,{})
+				end
+			end
+		
+			should "find the #{soapobject}" do
+				response = @connect.send(searchmethod,{:search => objectfixure})
+				assert_not_nil response
+			end
+			
+			should "not find a non existent #{soapobject}" do
+				response = @connect.send(searchmethod,{:search => objectfixure+"xyz"})
+				assert_nil response
+			end
+			
+			should "look for a search parameter in search for #{soapobject}" do
+				assert_raises ArgumentError do
+					response = @connect.send(searchmethod,{})
+				end
+			end
+			
+	  		should "get the test#{soapobject}" do
+	  			response = @connect.send(searchmethod,{:search => objectfixure})
+	  			contact = @connect.send(getmethod,response[:id])
+				assert_not_nil contact
+			end
+			
+			should "get the #{soapobject} changed since 2011-01-01" do
+				response = @connect.send(getsyncmethod,"2011-01-01 00:00:00")
+				assert_not_nil response
+			end
+		end
+		
+		
+		context "B Modifying #{soapobject}'s" do
+		
+			should "modify the test#{soapobject}" do
+				response = @connect.send(searchmethod,{:search => objectfixure})
+				params = {:id=>response[:id]}.merge(fixure[symbol][:mod])
+	 		    contact = @connect.send(modifymethod,params)
+				assert contact
+			end
+
+			should "modify the test#{soapobject} (and look for needed params)" do
+				response = @connect.send(searchmethod,{:search => fixure[symbol][:mod][needs[symbol][0]]})
+				assert_raises ArgumentError do
+					contact = @connect.send(modifymethod, {})
+				end
+			end
+		end
+		
+		
+		context "Deleting #{soapobject}" do
+		
+			should "delete the test#{soapobject}" do
+				response = @connect.send(searchmethod,{:search => fixure[symbol][:mod][needs[symbol][0]]})
+				contact = @connect.send(deletemethod,response[:id])
+				assert contact
+			end
+		end
+		
+	end #context
+	end # each
+end #class

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memotoo
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 15
   prerelease: 
   segments: 
-  - 1
+  - 2
   - 0
-  - 6
-  version: 1.0.6
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Karsten Redmer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 +02:00
+date: 2011-06-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,7 +154,17 @@ dependencies:
   name: savon
   version_requirements: *id009
   prerelease: false
-description: Unofficial gem for connecting to memotoo.com with their soap-api and handle your contact needs. Memotoo lets your synchronize all your contacts, events and tasks with yahoo, gmail, facebook, xing, outlook, your mobile-phone and more. You can also get your e-mails in one place.
+description: |-
+  Unofficial gem for connecting to memotoo.com with their soap-api and handle your contact needs. Memotoo lets your synchronize all your contacts, events and tasks with yahoo, gmail, facebook, xing, outlook, your mobile-phone and more. You can also get your e-mails in one place.Features of memotoo:
+    New mobile? Transfer all your data to your new device!
+    Synchronise your data with your mobile phone (with SyncML)
+    Access all your e-mail in a single page from Google, Yahoo, Hotmail / MSN, ...!
+    View your data on your mobile phone (WAP / XHTML)
+    Access your contacts using a LDAP directory
+    Access your files via a Web Folder
+    Access your files via FTP
+    Add Memotoo widgets to iGoogle, Netvibes, Windows Vista, Apple Dashboard, ...
+    Memotoo plugins for your browser
 email: k.redmer@yahoo.de
 executables: []
 
@@ -166,7 +176,6 @@ extra_rdoc_files:
 files: 
 - .document
 - .gemtest
-- .rvmrc-old
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -174,20 +183,13 @@ files:
 - Rakefile
 - VERSION
 - lib/memotoo.rb
-- lib/memotoo/bookmark/bookmark.rb
-- lib/memotoo/connect.rb
-- lib/memotoo/contact/contact.rb
-- lib/memotoo/contact/contact_group.rb
 - lib/memotoo/core-ext/hash.rb
 - lib/memotoo/core-ext/kernel.rb
-- lib/memotoo/wsdl/http.xml
-- lib/memotoo/wsdl/https.xml
+- lib/memotoo/main.rb
 - memotoo.gemspec
 - test/helper.rb
-- test/test_bookmark.rb
-- test/test_contact.rb
-- test/test_contact_group.rb
 - test/test_memotoo.rb
+- test/test_soapobjects.rb
 has_rdoc: true
 homepage: http://github.com/kredmer/memotoo
 licenses: 
@@ -224,7 +226,5 @@ specification_version: 3
 summary: Unofficial gem for connecting to memotoo.com with their given soap-api
 test_files: 
 - test/helper.rb
-- test/test_bookmark.rb
-- test/test_contact.rb
-- test/test_contact_group.rb
 - test/test_memotoo.rb
+- test/test_soapobjects.rb

data/.rvmrc-old

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

data/lib/memotoo/bookmark/bookmark.rb

@@ -1,72 +0,0 @@
-
-module Memotoo
-  
-    class Connect
-    
-	#  required: url
-	#
-	#  optional:
-	#  		description
-	#       tags
-	#       rank
-	#       id_bookmarkfolder 
-	# {:name=>groupname}
-	#   #e.g. @connect.addBookmark({:name=>"Testgroup"})
-    def addBookmark(details)
-		if has_needed_fields(details, :url)
-			format_result(addApiCall({:bookmark => details}), :id)
-		end
-	end
-
-    #[searchparameter:]
-		#   {:search=>"something", :limit_start=>0, :limit_nb=>100}
-    	#*   required:
-    	#        search
-    	#*   optional:
-    	#       limit_start
-    	#       limit_nb
-    	#e.g. @connect.searchBookmark({:search=>"ka", :limit_nb=>50})
-    	#
-    	# returns nil or a hash of one contactgroup or an array of contactgroups
-    	#
-    def searchBookmark(searchparameter={})
-		if has_needed_search_parameter(searchparameter)
-			format_result(searchApiCall(searchparameter), :return, :bookmark)
-		end
-    end
-
-		# id = integer
-		# e.g. @connect.getBookmark(12345)
-		#
-		# returns the contactgroup or nil
-		#
-	def getBookmark(id)
-		format_result(getApiCall(id), :return, :bookmark)
-	end
-
-    	# get modified contactgroups since date
-    	# datetime = "2010-02-23 10:00:00" or just "2010-02-23"
-    	# e.g. @connect.getBookmarkSync("2010-02-23 10:00:00")
-	def getBookmarkSync(datetime)
-		format_result(getSyncApiCall(datetime), :return, :bookmark)
-	end
-
-    	# required: name and id
-    	# note: you can only change the name
-    	# return true if the changed happened
-    def modifyBookmark(details={})
-		if has_needed_fields(details, :id)
-			format_result(modifyApiCall({:bookmark => details}), :ok)
-		end
-    end
-
-		# id = integer
-		# e.g. @connect.deleteBookmark(12345)
-		# return true when contactgroup is deleted
-    def deleteBookmark(id)
-		format_result(deleteApiCall(id), :ok)
-    end
-    
-  end # class
-
-end # module

data/lib/memotoo/connect.rb

@@ -1,244 +0,0 @@
-require 'parsedate'
-require "savon"
-require "memotoo/core-ext/hash"
-require "memotoo/core-ext/kernel"
-require "memotoo/contact/contact"
-require "memotoo/contact/contact_group"
-require "memotoo/bookmark/bookmark"
-
-
-module Memotoo
-
-  # = Memotoo::Connect
-  #
-  # Memotoo::Connect is the main object for connecting
-  # to the {memotoo}[http://www.memotoo.com/index-saleshype.php] SOAP service. 
-  
-    class Connect
-
-    # 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")
-    def initialize(username, password, https=true)
-    
-		# we will need it for every request - will be merged in
-		self.opts= {
-			:param => { 
-				:login => username,
-				:password => password,
-					}
-			}
-		
-		# creates client with memotoo settings 
-		client(https)
-	end
-	
-   # 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
-    
-    
-    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)
-		
-		response=@client.request :wsdl, action do 
-				soap.body = { :param => parameter }.deep_merge_me!(self.opts)
-			end	
-		response
-		
-		#--
-		# TODO: error-handling - I was tooo lazy.....
-		#++
-		
-		rescue Savon::Error => error
-			if error.message.nil?
-				puts "invalid username/password"
-				
-		# I don't know which error is still possible
-		#			else
-		#				puts error.to_s
-		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 
-
-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,
-#++