memotoo 2.0.0 → 2.0.1

data/Gemfile

@@ -4,6 +4,8 @@ source "http://rubygems.org"
 gem "i18n"
 gem "activesupport", ">= 2.3.5"
 gem "savon", "~> 0.9.2"
+gem 'httpi', "0.9.4" # for ruby 1.9.2 support
+gem 'rake', '0.8.7' # probs in 0.9.2
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -13,4 +15,10 @@ group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.5.2"
   gem "rcov", ">= 0"
+  
+  # needed for switching between ruby 1.8.7 and 1.9.2 for debugging
+  #gem 'ruby-debug19', :require => 'ruby-debug'
+  #gem 'linecache', "0.43"
+  #gem 'ruby-debug'
+  
 end

data/Gemfile.lock

@@ -4,10 +4,10 @@ GEM
     activesupport (3.0.8)
     builder (3.0.0)
     git (1.2.5)
-    gyoku (0.4.3)
+    gyoku (0.4.4)
       builder (>= 2.1.2)
-    httpi (0.9.3)
-      ntlm-http (>= 0.1.1)
+    httpi (0.9.4)
+      pyu-ntlm-http (>= 0.1.3.1)
       rack
     i18n (0.6.0)
     jeweler (1.5.2)
@@ -15,8 +15,8 @@ GEM
       git (>= 1.2.5)
       rake
     nokogiri (1.4.4)
-    nori (0.2.0)
-    ntlm-http (0.1.1)
+    nori (0.2.3)
+    pyu-ntlm-http (0.1.3.1)
     rack (1.1.2)
     rake (0.8.7)
     rcov (0.9.9)
@@ -34,9 +34,11 @@ PLATFORMS
 DEPENDENCIES
   activesupport (>= 2.3.5)
   bundler (~> 1.0.0)
+  httpi (= 0.9.4)
   i18n
   jeweler (~> 1.5.2)
   rack (~> 1.1.2)
+  rake (= 0.8.7)
   rcov
   savon (~> 0.9.2)
   shoulda

data/README.rdoc

@@ -4,7 +4,9 @@
 
 The memotoo-gem is a soap(savon)-wrapper to (easy) access your {memotoo}[https://www.memotoo.com/index-saleshype.php] contacts.
 
-Add, get, search, modify and delete your memotoo contacts, contact-groups and bookmarks.
+Add, get, search, modify, sync and delete your memotoo contacts, bookmarks, notes, event and tasks.
+
+<b>Works now an Ruby 1.8.7 and Ruby 1.9.2 !!!</b>
 
 == You need
 you need a memotoo-credential (username/passwd) to use this gem 
@@ -77,9 +79,7 @@ bookmarks:
     @connect.deleteBookmark(12345)
 
 
-Requirements:
-
- for the objects:
+Requirements for the objects:
 
 Contact:: :lastname
 ContactGroup:: :name
@@ -91,15 +91,15 @@ Event:: :title, :dateBegin, :dateEnd
 Holiday:: :description, :dateBegin, :dateEnd
 Task:: :title
 
- for the methods:
+Requirements for the methods:
 
-searchmethod:: {search=>" "}, a hash
+searchmethod:: minimum a hash with a symbol search and your searchstring
 id:: id of record, integer
 get...Sync:: datetime, format YYYY-MM-DD HH:MM:SS - "2010-02-23 10:00:00"
 modify:: id of record, integer
 add and modify:: need always the object requirements 
 
- hint:
+Be careful with used dates:
  
 Holiday::
 dateBegin::    "2011-01-01", Format: YYYY-MM-DD
@@ -120,9 +120,12 @@ You can now use the gem rubygems-test for easy testing this gem.
 
     gem test memotoo
 
-See my testresult here: http://test.rubygems.org/gems/memotoo/v/2.0.0/test_results/1663
+See my testresult here: http://test.rubygems.org/gems/memotoo/v/2.0.1/test_results/1682
+
+my testresult for ruby 1.9.2 here:
+http://test.rubygems.org/gems/memotoo/v/2.0.1/test_results/1681
 
-(To make a fast functional test only contact will be tested - goto test_soapobjects.rb line 8 and uncomment for all soapobject-tests)
+(To make a fast functional test only contact will be tested - goto test_soapobjects.rb line 9 and uncomment it for all soapobject-tests)
 
 ==Documentation
 
@@ -132,6 +135,10 @@ and memotoo api-documentation
 
 https://www.memotoo.com/index.php?rub=api#SOAP-server.php
 
+== Changelog V. 2.0.1
+
+some code refactoring and support for ruby >=1.9.2
+
 == Changelog V. 2.0.0
 
 I create all methods now dynamically. This reduced the code dramatically.

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/lib/memotoo.rb

@@ -3,7 +3,6 @@ require 'active_support/inflector'
 require "savon"
 require "memotoo/main"
 require "memotoo/core-ext/hash"
-require "memotoo/core-ext/kernel"
 
 class Memotoo
 
@@ -55,21 +54,20 @@ module Savon # :nodoc: all
   end
 end
 
-#Finished in 12.361502 seconds.
+#Finished in 41.165241 seconds.
 
-#14 tests, 14 assertions, 0 failures, 0 errors
+#74 tests, 74 assertions, 0 failures, 0 errors
 #+----------------------------------------------------+-------+-------+--------+
 #|                  File                              | Lines |  LOC  |  COV   |
 #+----------------------------------------------------+-------+-------+--------+
-#|lib/memotoo.rb                                      |    59 |    34 | 100.0% |
-#|lib/memotoo/core-ext/hash.rb                        |    41 |    25 | 100.0% |
-#|lib/memotoo/core-ext/kernel.rb                      |    10 |     6 | 100.0% |
-#|lib/memotoo/main.rb                                 |   280 |    77 | 100.0% |
+#|lib/memotoo.rb                                      |    74 |    33 | 100.0% |
+#|lib/memotoo/core-ext/hash.rb                        |    39 |    25 | 100.0% |
+#|lib/memotoo/main.rb                                 |   291 |    88 | 100.0% |
 #+----------------------------------------------------+-------+-------+--------+
-#|Total                                               |   390 |   142 | 100.0% |
+#|Total                                               |   404 |   146 | 100.0% |
 #+----------------------------------------------------+-------+-------+--------+
-#100.0%   4 file(s)   390 Lines   142 LOC
+#100.0%   3 file(s)   404 Lines   146 LOC
 
-#Generated on Sun Jun 12 07:03:59 +0200 2011 with rcov 0.9.8
+#Generated on Thu Jun 16 02:15:11 +0200 2011 with rcov 0.9.8
 
 

data/lib/memotoo/core-ext/hash.rb

@@ -24,18 +24,16 @@ class Hash # :nodoc: all
     sought_value
   end 
   
-      # Returns a new Hash with +self+ and +other_hash+ merged recursively.
-      # Modifies the receiver in place.
-      # => see this function also in savon gem 
-      # got problems in my test and had to include it here...
-      def deep_merge_me!(other_hash)
-        other_hash.each_pair do |k,v|
-          tv = self[k]
-          self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge_me!(v) : v
-        end
-        self
-      end unless defined? deep_merge!
-  
-  
+	# Returns a new Hash with +self+ and +other_hash+ merged recursively.
+	# Modifies the receiver in place.
+	# => see this function also in savon gem 
+	# got problems in my test and had to include it here...
+	def deep_merge_me!(other_hash)
+	other_hash.each_pair do |k,v|
+	  tv = self[k]
+	  self[k] = tv.is_a?(Hash) && v.is_a?(Hash) ? tv.deep_merge_me!(v) : v
+	end
+	self
+	end unless defined? deep_merge!
   
 end

data/lib/memotoo/main.rb

@@ -32,73 +32,79 @@ class Memotoo
 	
 	# the accessible soap objects
 	soapobjects = %w{Contact ContactGroup Bookmark BookmarkFolder Note CalendarCategory Event Holiday Task}
+	methods = %w{add search get modify sync delete }
 	
 		soapobjects.each do |soapobject|
-		symbol=soapobject.underscore.to_sym
-	
-		# add method
-		methodname="add"+soapobject	
-		selfclass.send(:define_method, methodname) { |details| output(detailsApicall({symbol => details}), :id) if fields?(details, NEEDS[symbol]) }
+			symbol=soapobject.underscore.to_sym # Contact -> :contact
+			
+			action={} # action = generated method names in a hash e.g. {:add=>"addContact", :get=>"getContact"} for this soapobject
+			methods.each do |newmethod|
+				action[newmethod.to_sym]=newmethod+soapobject
+				action[newmethod.to_sym]="get" << soapobject << "Sync" if newmethod=="sync"
+			end
 		
-		# search
-		methodname="search"+soapobject	
-		selfclass.send(:define_method, methodname) { |params| output(searchApiCall(params), :return, symbol) if fields?(params, [:search]) }
+			selfclass.send(:define_method, action[:add]) do |details| 
+				detailsApicall(action[:add],{symbol => details},[:id]) if fields?(details, NEEDS[symbol]) 
+			end
 		
-		# get
-		methodname="get"+soapobject	
-		selfclass.send(:define_method, methodname) { |id| output(idApicall(id), :return, symbol) }
-
-		# get...Sync
-		methodname="get"+soapobject+"Sync"	
-		selfclass.send(:define_method, methodname) { |datetime| output(getSyncApiCall(datetime), :return, symbol) }
-
-		# modify
-		methodname="modify"+soapobject	
-		selfclass.send(:define_method, methodname) { |details| output(detailsApicall({symbol => details}), :ok) if fields?(details, [NEEDS[symbol], :id].flatten!) }
+			selfclass.send(:define_method, action[:modify]) do |details| 
+				detailsApicall(action[:modify],{symbol => details},[:ok]) if fields?(details, [NEEDS[symbol], :id].flatten!) 
+			end
+		
+			selfclass.send(:define_method, action[:search]) do |params| 
+				searchCall(action[:search],params,[:return, symbol]) if fields?(params, [:search]) 
+			end
 		
-		# delete
-		methodname="delete"+soapobject	
-		selfclass.send(:define_method, methodname) { |id| output(idApicall(id), :ok) }
+			selfclass.send(:define_method, action[:sync]) do |datetime| 
+				getSyncApiCall(action[:sync],datetime,[:return, symbol]) 
+			end
 
+			selfclass.send(:define_method, action[:get]) do |id| 
+				idApicall(action[:get],id,[:return, symbol]) 
+			end
+
+			selfclass.send(:define_method, action[:delete]) do |id|
+				idApicall(action[:delete],id,[:ok]) 
+			end
 		end
 	end
 	
-    def searchApiCall(searchparameter)
-		search = SEARCHDEFAULTS.merge!(searchparameter)
-		apicall(calling_method.to_sym, search)
+    def searchCall(method, searchparameter, outputkeys)
+        search = SEARCHDEFAULTS.merge!(searchparameter)
+        output(method,apicall(method,search), outputkeys)
     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 })
+    def getSyncApiCall(method, datetime, outputkeys)
+        formated_date=Date.parse(datetime).strftime("%Y-%m-%d %H:%M:%S")
+        output(method,apicall(method, {:date => formated_date}), outputkeys) 
     end
     
-    def idApicall(id)
-        apicall(calling_method.to_sym, { :id => id })
+    def idApicall(method, id, outputkeys)
+        output(method,apicall(method,{:id => id}), outputkeys) 
     end
     
-    def detailsApicall(details)
-		apicall(calling_method.to_sym, details )
+    def detailsApicall(method, details, outputkeys)
+        output(method,apicall(method,details), outputkeys)
     end
-    
-    # used internally for a request
+
+    # used for a savon-soap request
     def apicall(action, parameter)
+    
 		response=@client.request :wsdl, action do 
 			soap.body = { :param => parameter }.deep_merge_me!(self.opts)
 		end	
 		response
 		rescue Savon::Error => error
-			raise ArgumentError, "Memotoo::Connect #invalid username/password" if error.message.nil?
+			raise ArgumentError, "Memotoo - invalid username/password" if error.message.nil?
 	end
 
-	def output(response, *_keys_)
-		output_key = [(calling_method.underscore+"_response").to_sym] | _keys_
+	def output(method, response, keys=[])
+		output_key = [(method.to_s.underscore+"_response").to_sym] | keys # e.g. [:addContact, :return, :contact]
 		response.nil? ? nil : response.to_hash.seek(output_key) 
     end
 	
 	def go_home(message)
-		raise ArgumentError, "Memotoo::Connect #missing fields: " + message.to_s
+		raise ArgumentError, "Memotoo - missing fields: " + message.to_s
 	end
 	
 	def fields?(thehash, args=[])
@@ -208,7 +214,11 @@ class Memotoo
 # id_bookmark_folder_parent:: "363174"
 # ---------------------
 
-
+#--
+#
+# for the other object make a search and analyze the first result
+#
+#++
 
 # ---------------------
 # :section: Contact fields

data/memotoo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memotoo}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Karsten Redmer"]
-  s.date = %q{2011-06-12}
+  s.date = %q{2011-06-16}
   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)
@@ -36,7 +36,6 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/memotoo.rb",
     "lib/memotoo/core-ext/hash.rb",
-    "lib/memotoo/core-ext/kernel.rb",
     "lib/memotoo/main.rb",
     "memotoo.gemspec",
     "test/helper.rb",
@@ -61,6 +60,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_runtime_dependency(%q<savon>, ["~> 0.9.2"])
+      s.add_runtime_dependency(%q<httpi>, ["= 0.9.4"])
+      s.add_runtime_dependency(%q<rake>, ["= 0.8.7"])
       s.add_development_dependency(%q<rack>, ["~> 1.1.2"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -71,6 +72,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<activesupport>, [">= 2.3.5"])
       s.add_dependency(%q<savon>, ["~> 0.9.2"])
+      s.add_dependency(%q<httpi>, ["= 0.9.4"])
+      s.add_dependency(%q<rake>, ["= 0.8.7"])
       s.add_dependency(%q<rack>, ["~> 1.1.2"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -82,6 +85,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<activesupport>, [">= 2.3.5"])
     s.add_dependency(%q<savon>, ["~> 0.9.2"])
+    s.add_dependency(%q<httpi>, ["= 0.9.4"])
+    s.add_dependency(%q<rake>, ["= 0.8.7"])
     s.add_dependency(%q<rack>, ["~> 1.1.2"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/test/test_memotoo.rb

@@ -1,19 +1,19 @@
-require 'helper'
+require File.expand_path('./test/helper')
 
 class TestMemotoo < Test::Unit::TestCase
   
   context "Memotoo-Soap Api basic tests" do
   
 		setup do
-			@connect=Memotoo.new(MEMOTOO_USERNAME,MEMOTOO_PASSWORD)
+			@connect=Memotoo.new(MEMOTOO_USERNAME,MEMOTOO_PASSWORD,false)
 		end
-		  
+		
 		should "have a connect-instance" do
 			assert_equal Memotoo, @connect.class
 		end
-		  
+		
 		should "write a message if username/password is not correct" do
-		    @connect=Memotoo.new(MEMOTOO_USERNAME,"wrongpasswd")
+			@connect=Memotoo.new(MEMOTOO_USERNAME,"wrongpasswd")
 			assert_raises ArgumentError do
 					response = @connect.searchContact(TESTSEARCHDEFAULTS)
 			end

data/test/test_soapobjects.rb

@@ -1,16 +1,13 @@
-require 'helper'
+require File.expand_path('./test/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}
+# uncomment this to test all soapobjects
 #soapobjects = %w{Contact ContactGroup Bookmark Note CalendarCategory Event Task}
 
-
-
-
 fixure = {  :contact => {	:new => {:lastname => "Testcontact123456"},
 							:mod => {:lastname => "Testcontact123456xyz"}},
 			:contact_group => {	:new=>{:name => "TestcontactGroup123456"},

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memotoo
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Karsten Redmer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 +02:00
+date: 2011-06-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,8 +65,40 @@ dependencies:
   version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 9
+        - 4
+        version: 0.9.4
+  name: httpi
+  version_requirements: *id004
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  name: rake
+  version_requirements: *id005
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,11 +110,11 @@ dependencies:
         - 2
         version: 1.1.2
   name: rack
-  version_requirements: *id004
+  version_requirements: *id006
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,11 +124,11 @@ dependencies:
         - 0
         version: "0"
   name: shoulda
-  version_requirements: *id005
+  version_requirements: *id007
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -108,11 +140,11 @@ dependencies:
         - 0
         version: 1.0.0
   name: bundler
-  version_requirements: *id006
+  version_requirements: *id008
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -124,11 +156,11 @@ dependencies:
         - 2
         version: 1.5.2
   name: jeweler
-  version_requirements: *id007
+  version_requirements: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -138,11 +170,11 @@ dependencies:
         - 0
         version: "0"
   name: rcov
-  version_requirements: *id008
+  version_requirements: *id010
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -152,7 +184,7 @@ dependencies:
         - 0
         version: "0"
   name: savon
-  version_requirements: *id009
+  version_requirements: *id011
   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.Features of memotoo:
@@ -184,7 +216,6 @@ files:
 - VERSION
 - lib/memotoo.rb
 - lib/memotoo/core-ext/hash.rb
-- lib/memotoo/core-ext/kernel.rb
 - lib/memotoo/main.rb
 - memotoo.gemspec
 - test/helper.rb

data/lib/memotoo/core-ext/kernel.rb

@@ -1,10 +0,0 @@
-module Kernel # :nodoc: all
-private
-#  def this_method
-#    caller[0] =~ /`([^']*)'/ and $1
-#  end
-  def calling_method
-    caller[1] =~ /`([^']*)'/ and $1
-  end
-end
-