ecircle 0.1.4 → 0.1.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ecircle (0.1.4)
+    ecircle (0.1.5)
       activesupport
       i18n
       rake
@@ -28,7 +28,7 @@ GEM
     metaclass (0.0.1)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
-    multi_json (1.0.3)
+    multi_json (1.0.4)
     nokogiri (1.5.0)
     nori (1.0.2)
     rack (1.3.5)

data/lib/ecircle/api.rb

@@ -18,8 +18,8 @@ module Ecircle
     # @private
     def client
       @client ||= Savon::Client.new do
-        wsdl.document =  Ecircle.configuration.wsdl
-        wsdl.endpoint =  Ecircle.configuration.endpoint
+        wsdl.document  = Ecircle.configuration.wsdl
+        wsdl.endpoint  = Ecircle.configuration.endpoint
         wsdl.namespace = Ecircle.configuration.namespace
       end
     end
@@ -32,19 +32,16 @@ module Ecircle
     # @param [Boolean] send_message send a message by ecircle
     # @return [WrappedResponse]
     def create_member user_id, group_id, invite = false, send_message = false
-      response = client.request :createMember do
-        soap.body = {
-          :session     => obtain_auth_token,
-          :userId      => user_id,
-          :groupId     => group_id,
-          :invite      => invite.to_s,
-          :sendMessage => send_message.to_s
-        }
+      body = {
+        :userId      => user_id,
+        :groupId     => group_id,
+        :invite      => invite.to_s,
+        :sendMessage => send_message.to_s
+      }
+
+      request(:createMember, body) do |response|
+        { :ecircle_id => response.body[:create_member_response][:create_member_return].to_s }
       end
-      WrappedResponse.new :success => true,
-                          :ecircle_id => response.body[:create_member_response][:create_member_return].to_s
-    rescue Savon::SOAP::Fault => e
-      WrappedResponse.new(e)
     end
 
     # Create or update group
@@ -54,16 +51,13 @@ module Ecircle
     # @return [WrappedResponse]
     # Important note: `email` must be unique across all groups AND must be a subdomain of the system you registered at ecircle.
     def create_or_update_group group_attributes
-      response = client.request :createOrUpdateGroup do
-        soap.body = {
-          :session   => obtain_auth_token,
-          :groupXml  => Helper.build_group_xml(group_attributes)
-        }
+      body = {
+        :groupXml => Helper.build_group_xml(group_attributes)
+      }
+
+      request(:createOrUpdateGroup, body) do |response|
+        { :ecircle_id => response[:create_or_update_group_response][:create_or_update_group_return].to_i }
       end
-      WrappedResponse.new :success => true,
-                          :ecircle_id => response[:create_or_update_group_response][:create_or_update_group_return].to_i
-    rescue Savon::SOAP::Fault => e
-      WrappedResponse.new(e)
     end
 
     # Create or update user by email
@@ -72,17 +66,14 @@ module Ecircle
     # @param [Hash] user_xml, in it's most simple form a { :email => 'test@test.com' } is sufficient
     # @return [Integer] the user id
     def create_or_update_user_by_email user_attributes
-      response = client.request :createOrUpdateUserByEmail do
-        soap.body = {
-          :session     => obtain_auth_token,
-          :userXml     => Helper.build_user_xml(user_attributes),
-          :sendMessage => 0
-        }
+      body = {
+        :userXml     => Helper.build_user_xml(user_attributes),
+        :sendMessage => 0
+      }
+
+      request(:createOrUpdateUserByEmail, body) do |response|
+        { :ecircle_id => response.body[:create_or_update_user_by_email_response][:create_or_update_user_by_email_return].to_i }
       end
-      WrappedResponse.new :success => true,
-                          :ecircle_id => response.body[:create_or_update_user_by_email_response][:create_or_update_user_by_email_return].to_i
-    rescue Savon::SOAP::Fault => e
-      WrappedResponse.new(e)
     end
 
     # Delete a member.
@@ -90,15 +81,7 @@ module Ecircle
     # @param [Integer] group_id ecircle group id
     # @return [WrappedResponse]
     def delete_group group_id
-      response = client.request :deleteGroup do
-        soap.body = {
-          :session  => obtain_auth_token,
-          :memberId => group_id
-        }
-      end
-      WrappedResponse.new(:success => true)
-    rescue Savon::SOAP::Fault => e
-      WrappedResponse.new(e)
+      request(:deleteGroup, :memberId => group_id)
     end
 
     # Delete a member.
@@ -106,15 +89,25 @@ module Ecircle
     # @param [Integer] member_id ecircle member id
     # @return [WrappedResponse]
     def delete_member member_id
-      client.request :deleteMember do
-        soap.body = {
-          :session  => obtain_auth_token,
-          :memberId => member_id
-        }
-      end
-      WrappedResponse.new(:success => true)
-    rescue Savon::SOAP::Fault => e
-      WrappedResponse.new(e)
+      request(:deleteMember, :memberId => member_id)
+    end
+
+    # Send a parametrized single message to user - you need an existing ecircle template ID for this.
+    #
+    # @param [Integer] user_id ecircle user_id
+    # @param [Integer] message_id the ecircle template ID
+    # @param [Array] the names of the variables you want to interpolate in the template
+    # @param [Array] the values of the variables you want to interpolate in the template
+    # @return [WrappedResponse]
+    def send_parametrized_single_message_to_user user_id, message_id, names = [], values = []
+      body = {
+        :singleMessageId => message_id,
+        :userId          => user_id,
+        :names           => names,
+        :values          => values
+      }
+
+      request(:sendParametrizedSingleMessageToUser, body)
     end
 
     # Logon. You don't need to call this explicitly but it's useful for debugging.
@@ -145,32 +138,10 @@ module Ecircle
     def logout
       client.request :logout do
         soap.body = {
-          :session  => auth_token,
-        }
-      end
-      WrappedResponse.new(:success => true)
-    end
-
-    # Send a parametrized single message to user - you need an existing ecircle template ID for this.
-    #
-    # @param [Integer] user_id ecircle user_id
-    # @param [Integer] message_id the ecircle template ID
-    # @param [Array] the names of the variables you want to interpolate in the template
-    # @param [Array] the values of the variables you want to interpolate in the template
-    # @return [WrappedResponse]
-    def send_parametrized_single_message_to_user user_id, message_id, names = [], values = []
-      client.request :sendParametrizedSingleMessageToUser do
-        soap.body = {
-          :session           => obtain_auth_token,
-          :singleMessageId   => message_id,
-          :userId            => user_id,
-          :names             => names,
-          :values            => values
+          :session => auth_token,
         }
       end
       WrappedResponse.new(:success => true)
-    rescue Savon::SOAP::Fault => e
-      WrappedResponse.new(e)
     end
 
     def obtain_auth_token
@@ -182,5 +153,19 @@ module Ecircle
     def auth_token_valid?
       @auth_token_last_used_at && Time.now - @auth_token_last_used_at < AUTH_TOKEN_TIMEOUT
     end
+
+    private
+
+    def request function_name, body
+      body[:session] = obtain_auth_token
+      begin
+        response = client.request(function_name) { soap.body = body }
+        response_hash = block_given? ? yield(response) : {}
+        response_hash[:success] = true
+        WrappedResponse.new(response_hash)
+      rescue Savon::SOAP::Fault => e
+        WrappedResponse.new(e)
+      end
+    end
   end
 end

data/lib/ecircle/version.rb

@@ -1,3 +1,3 @@
 module Ecircle
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,126 +1,122 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ecircle
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.5
   prerelease: 
-  version: 0.1.4
 platform: ruby
-authors: 
-- "Timo R\xC3\xB6\xC3\x9Fner"
+authors:
+- Timo Rößner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-29 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &76855100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76855100
+- !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &76854560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76854560
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &76853770 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76853770
+- !ruby/object:Gem::Dependency
   name: savon
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &76853010 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76853010
+- !ruby/object:Gem::Dependency
   name: random_data
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &76851190 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76851190
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &76850300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76850300
+- !ruby/object:Gem::Dependency
   name: savon_spec
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &76849380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.1.6
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76849380
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &76848980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *76848980
+- !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &76825740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *76825740
 description: The ecircle gem aims to be a full-fledged client for all ecircle services.
-email: 
+email:
 - timo.roessner@googlemail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .rvmrc
@@ -144,39 +140,35 @@ files:
 - spec/fixtures/logon/success.xml
 - spec/job_package_spec.rb
 - spec/spec_helper.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -815952973
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 992601939
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -815952973
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 992601939
 requirements: []
-
 rubyforge_project: ecircle
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ecircle gem
 test_files: []
-
 has_rdoc: