rhosync 2.1.7 → 2.1.10

data/CHANGELOG

@@ -1,3 +1,15 @@
+## 2.1.10
+* #16001227 - raise exceptions on c2dm errors
+* #1018 - delete read state for user as well
+
+## 2.1.9
+* #15143911 - Fix for incident schema changed message
+
+## 2.1.8
+* #1018 - added functionality to delete user source data on user delete
+* updated to rake 0.9.2
+* #14911833 - Add support for rolling back updates on sync errors
+
 ## 2.1.7
 * #14021681 - check for client on client_sync class methods
 * #14082861 - expose Store.lock timeout to high-level functions

data/Rakefile

@@ -73,7 +73,7 @@ begin
     gemspec.add_dependency "rest-client", "~>1.6.1"
     gemspec.add_dependency "sinatra", "~>1.2"
     gemspec.add_dependency "templater", "~>1.0.0"
-    gemspec.add_dependency "rake", "~>0.8.7"
+    gemspec.add_dependency "rake", "~>0.9.2"
     gemspec.add_development_dependency "log4r", "~>1.1.7"
     gemspec.add_development_dependency "jeweler", ">=1.4.0"
     gemspec.add_development_dependency "rspec", ">=1.3.0"

data/lib/rhosync/api/delete_user.rb

@@ -1,5 +1,9 @@
 Server.api :delete_user do |params,user|
   User.load(params[:user_id]).delete
   App.load(APP_NAME).users.delete(params[:user_id])
+  params = {:app_id => APP_NAME,:user_id => params[:user_id]}
+  App.load(APP_NAME).sources.members.each{ |source|
+    Source.load(source, params).flash_store_data
+  }
   "User deleted"
 end

data/lib/rhosync/client_sync.rb

@@ -102,18 +102,22 @@ module Rhosync
     
     # Checks if schema changed
     def schema_changed?
-      schema_sha1 = @source.get_value(:schema_sha1)
+      if @source_sync.adapter.respond_to?(:schema)
+        schema_sha1 = @source.get_value(:schema_sha1)
+      
+        if @client.get_value(:schema_sha1).nil?
+          @client.put_value(:schema_sha1,schema_sha1)
+          return false
+        elsif @client.get_value(:schema_sha1) == schema_sha1
+          return false
+        end
       
-      if @client.get_value(:schema_sha1).nil?
         @client.put_value(:schema_sha1,schema_sha1)
-        return false
-      elsif @client.get_value(:schema_sha1) == schema_sha1
+        @client.put_value(:schema_page,schema_sha1)
+        return true
+      else
         return false
       end
-      
-      @client.put_value(:schema_sha1,schema_sha1)
-      @client.put_value(:schema_page,schema_sha1)
-      true
     end
     
     # Computes the metadata sha1 and returns metadata if client's sha1 doesn't 
@@ -185,6 +189,9 @@ module Rhosync
           c.rename("#{operation}_errors","#{operation}_errors_page")
         end
       end
+      @client.lock("update_rollback") do |c|
+        c.rename("update_rollback","update_rollback_page")
+      end
     end
     
     # Computes create links for a client and stores a copy as links page
@@ -344,6 +351,7 @@ module Rhosync
       ['create','update','delete'].each do |operation|
         @client.flash_data("#{operation}_errors_page")
       end
+      @client.flash_data("update_rollback_page")
     end
     
     def _send_errors
@@ -352,6 +360,7 @@ module Rhosync
         res["#{operation}-error"] = @client.get_data("#{operation}_errors_page")
       end
       res["source-error"] = @source.lock(:errors) { |s| s.get_data(:errors) }
+      res["update-rollback"] = @client.get_data(:update_rollback_page)
       res.reject! {|key,value| value.nil? or value.empty?}
       res
     end

data/lib/rhosync/license.rb

@@ -22,7 +22,8 @@ module Rhosync
         end
         _decrypt
       rescue Exception => e
-        #puts e.backtrace.join('\n')
+        log e.message
+        log e.backtrace.join("\n")
         raise LicenseException.new("Error verifying license.")
       end
     end

data/lib/rhosync/ping/android.rb

@@ -1,24 +1,42 @@
-require 'net/https'
+require 'rest_client'
 require 'uri'
+
 module Rhosync
   class Android
+    class StaleAuthToken < Exception; end
+    class InvalidAuthToken < Exception; end
+    class AndroidPingError < Exception; end
+    
     def self.ping(params)
       begin
         settings = get_config(Rhosync.base_directory)[Rhosync.environment]
         authtoken = settings[:authtoken]
-
-        url = URI.parse('https://android.apis.google.com/c2dm/send')
-
-        req = Net::HTTP::Post.new url.path, 'Authorization' => "GoogleLogin auth=#{authtoken}" 
-        req.set_form_data c2d_message(params)
-
-        http = Net::HTTP.new(url.host, url.port)
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        res = http.request(req)
-
+              
+        RestClient.post(
+          'https://android.apis.google.com/c2dm/send', c2d_message(params), 
+          :authorization => "GoogleLogin auth=#{authtoken}"
+        ) do |response, request, result, &block|
+          # return exceptions based on response code & body
+          case response.code
+          when 200
+            # TODO: Automate authtoken updates
+            if response[:update_client_auth]
+              raise StaleAuthToken.new(
+                "Stale auth token, please update :authtoken: in settings.yml."
+              )
+            # body will contain the exception class
+            elsif response.body =~ /^Error=(.*)$/
+              raise AndroidPingError.new("Android ping error: #{$1 || ''}")
+            else
+              response.return!(request, result, &block)
+            end
+          when 401, 403
+            raise InvalidAuthToken.new("Invalid auth token, please update :authtoken: in settings.yml.")
+          end
+        end
       rescue Exception => error
-        log "Error while sending ping: #{error}"
+        log error
+        log error.backtrace.join("\n")
         raise error
       end
     end

data/lib/rhosync/read_state.rb

@@ -18,6 +18,11 @@ module Rhosync
     def self.delete(app_id)
       Store.flash_data("#{class_prefix(self)}:#{app_id}:*")
     end
+    
+    def self.delete_user(params)
+      puts "#{class_prefix(self)}:#{params[:app_id]}:#{params[:user_id]}:#{params[:source_name]}:*"
+      Store.flash_data("#{class_prefix(self)}:#{params[:app_id]}:#{params[:user_id]}:#{params[:source_name]}:*")
+    end
 
     private
     def self.get_id(params)

data/lib/rhosync/source.rb

@@ -215,7 +215,19 @@ module Rhosync
     def read_state
       id = {:app_id => self.app_id,:user_id => user_by_partition,
         :source_name => self.name}
-      ReadState.load(id) || ReadState.create(id)  
+      load_read_state || ReadState.create(id)
+    end
+    
+    def load_read_state
+      id = {:app_id => self.app_id,:user_id => user_by_partition,
+        :source_name => self.name}
+      ReadState.load(id)
+    end
+    
+    def delete_user_read_state
+      id = {:app_id => self.app_id,:user_id => user_by_partition,
+        :source_name => self.name}
+      ReadState.delete_user(id)
     end
     
     def doc_suffix(doctype)
@@ -236,6 +248,12 @@ module Rhosync
       self.partition_type = value
     end
     
+    def flash_store_data
+      delete_user_read_state
+      flash_data('*')
+      flash_data(poll_interval_key)
+    end
+    
     def user_by_partition
       self.partition.to_sym == :user ? self.user_id : '__shared__'
     end

data/lib/rhosync/source_sync.rb

@@ -117,7 +117,7 @@ module Rhosync
       true
     end
     
-    def _process_create(client_id,key,value,links,creates,deletes)
+    def _process_create(client,key,value,links,creates,deletes)
       # Perform operation
       link = @adapter.create value
       # Store object-id link for the client
@@ -134,14 +134,21 @@ module Rhosync
       end
     end
     
-    def _process_update(client_id,key,value)
-      # Add id to object hash to forward to backend call
-      value['id'] = key
-      # Perform operation
-      @adapter.update value
+    def _process_update(client,key,value)
+      begin
+        # Add id to object hash to forward to backend call
+        value['id'] = key
+        # Perform operation
+        @adapter.update value
+      rescue Exception => e
+        # TODO: This will be slow!
+        cd = client.get_data(:cd)
+        client.put_data(:update_rollback,{key => cd[key]},true) if cd[key]
+        raise e
+      end
     end
     
-    def _process_delete(client_id,key,value,dels)
+    def _process_delete(client,key,value,dels)
       value['id'] = key
       # Perform operation
       @adapter.delete value
@@ -167,14 +174,15 @@ module Rhosync
           # Call on source adapter to process individual object
           case operation
           when 'create'
-            _process_create(client_id,key,value,links,creates,deletes)
+            _process_create(client,key,value,links,creates,deletes)
           when 'update'
-            _process_update(client_id,key,value)
+            _process_update(client,key,value)
           when 'delete'
-            _process_delete(client_id,key,value,dels)
+            _process_delete(client,key,value,dels)
           end
         rescue Exception => e
           log "SourceAdapter raised #{operation} exception: #{e}"
+          log e.backtrace.join("\n")
           errors ||= {}
           errors[key] = value
           errors["#{key}-error"] = {'message'=>e.message}

data/lib/rhosync/version.rb

@@ -1,3 +1,3 @@
 module Rhosync
-  VERSION = '2.1.7'
+  VERSION = '2.1.10'
 end

data/spec/api/delete_user_spec.rb

@@ -1,18 +1,37 @@
 require File.join(File.dirname(__FILE__),'api_helper')
 
 describe "RhosyncApiDeleteUser" do
-  it_should_behave_like "ApiHelper"
+  it_should_behave_like "ApiHelper" 
   
   it "should delete user" do
     params = {:api_token => @api_token,
-      :attributes => {:login => 'testuser1', :password => 'testpass1'}}
-    post "/api/create_user", params
-    last_response.should be_ok
-    User.is_exist?(params[:attributes][:login]).should == true
-    post "/api/delete_user", {:api_token => @api_token, 
-      :user_id => params[:attributes][:login]}  
-      last_response.should be_ok
-    User.is_exist?(params[:attributes][:login]).should == false
-    App.load(@test_app_name).users.members.should == ["testuser"]
+       :attributes => {:login => 'testuser1', :password => 'testpass1'}}
+     post "/api/create_user", params
+     last_response.should be_ok
+     User.is_exist?(params[:attributes][:login]).should == true
+
+     #set up two users with data for the same source
+     params2 = {:app_id => APP_NAME,:user_id => 'testuser1'}
+     params3 = {:app_id => APP_NAME,:user_id => 'testuser'}
+     s  = Source.load('SampleAdapter', params2)
+     s2 = Source.load('SampleAdapter', params3)
+     time = Time.now.to_i
+     s.read_state.refresh_time = time
+     s2.read_state.refresh_time = time
+     set_state(s.docname(:delete) => {'4'=>@product4})
+     set_state(s2.docname(:delete) => {'4'=>@product4})
+     verify_result(s.docname(:delete) => {'4'=>@product4})
+     verify_result(s2.docname(:delete) => {'4'=>@product4})
+
+
+     post "/api/delete_user", {:api_token => @api_token, :user_id => params[:attributes][:login]}  
+     last_response.should be_ok
+     verify_result(s.docname(:delete) => {})
+     verify_result(s2.docname(:delete) => {'4'=>@product4})
+     s.load_read_state.should == nil
+     s2.load_read_state.refresh_time.should == time
+     User.is_exist?(params[:attributes][:login]).should == false
+     App.load(APP_NAME).users.members.should == ["testuser"]
+   
   end
 end

data/spec/client_sync_spec.rb

@@ -68,6 +68,9 @@ describe "ClientSync" do
       end
       
       it "should handle update errors" do
+        broken_object = { ERROR => { 'price' => '99.99' } }
+        set_state(@c.docname(:cd) => broken_object)
+        set_test_data('test_db_storage',broken_object)
         receive_and_send_cud('update')
       end
       
@@ -97,10 +100,19 @@ describe "ClientSync" do
       def receive_and_send_cud(operation)
         msg = "Error #{operation} record"
         op_data = {operation=>{ERROR=>{'an_attribute'=>msg,'name'=>'wrongname'}}}
-        @cs.receive_cud(op_data)
-        @cs.send_cud.should == [{"version"=>ClientSync::VERSION},
-          {"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},
-          {"#{operation}-error"=>{"#{ERROR}-error"=>{"message"=>msg},ERROR=>op_data[operation][ERROR]}}]
+        @cs.receive_cud(op_data) 
+        if operation == 'update'
+          @cs.send_cud.should == [{"version"=>ClientSync::VERSION},
+            {"token"=>""}, {"count"=>0}, {"progress_count"=>1}, {"total_count"=>1},
+            {
+              "update-rollback"=>{"0_broken_object_id"=>{"price"=>"99.99"}},
+              "#{operation}-error"=>{"#{ERROR}-error"=>{"message"=>msg},ERROR=>op_data[operation][ERROR]}
+            }]
+        else
+          @cs.send_cud.should == [{"version"=>ClientSync::VERSION},
+            {"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},
+            {"#{operation}-error"=>{"#{ERROR}-error"=>{"message"=>msg},ERROR=>op_data[operation][ERROR]}}]
+        end
       end
     end
   

data/spec/doc/doc_spec.rb

@@ -173,6 +173,11 @@ eol
   
   ['create','update','delete'].each do |operation|
     it "client #{operation} object(s) with error" do
+      if operation == 'update'
+        broken_object = { ERROR => { 'price' => '99.99' } }
+        set_state(@c.docname(:cd) => broken_object)
+        set_test_data('test_db_storage',broken_object)
+      end
       params = {operation=>{ERROR=>{'an_attribute'=>"error #{operation}",'name'=>'wrongname'}},
                 :client_id => @c.id,
                 :source_name => @s.name}

data/spec/ping/android_spec.rb

@@ -8,28 +8,56 @@ describe "Ping Android" do
     @params = {"device_pin" => @c.device_pin,
       "sources" => [@s.name], "message" => 'hello world', 
       "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
-    post = mock('post')
-    post.stub!(:new).and_return(post)
-    post.stub!(:set_form_data)
-    Net::HTTP::Post.stub!(:new).and_return(post)
-    
-    @http = mock('http')
-    @http.stub!(:request)
-    @http.stub!(:use_ssl=)
-    @http.stub!(:verify_mode=)
-    @http.stub!(:start).and_yield(@http)
-    Net::HTTP.stub!(:new).and_return(@http)
+    @response = mock('response')
   end
   
-  it "should ping android" do
-    Android.ping(@params)
+  it "should ping android successfully" do
+    result = 'id=0:34234234134254%abc123\n'
+    @response.stub!(:code).and_return(200)
+    @response.stub!(:body).and_return(result)
+    @response.stub!(:[]).and_return(false)
+    @response.stub!(:return!).and_return(@response)
+    RestClient.stub!(:post).and_yield(@response)
+    Android.ping(@params).body.should == result
   end
   
-  it "should ping android with connection error" do
+  it "should ping android with 503 connection error" do
     error = 'Connection refused'
-    @http.stub!(:request).and_return { raise SocketError.new(error) }
-    Android.should_receive(:log).once.with("Error while sending ping: #{error}")
-    lambda { Android.ping(@params) }.should raise_error(SocketError,error)
+    @response.stub!(:body).and_return(error)
+    RestClient.stub!(:post).and_return { raise RestClient::Exception.new(@response,503) }
+    Android.should_receive(:log).twice
+    lambda { Android.ping(@params) }.should raise_error(RestClient::Exception)
+  end
+  
+  it "should ping android with 200 error message" do
+    error = 'Error=QuotaExceeded'
+    @response.stub!(:code).and_return(200)
+    @response.stub!(:body).and_return(error)
+    @response.stub!(:[]).and_return(nil)
+    RestClient.stub!(:post).and_yield(@response)
+    Android.should_receive(:log).twice
+    lambda { Android.ping(@params) }.should raise_error(Android::AndroidPingError, "Android ping error: QuotaExceeded")
+  end
+  
+  it "should ping android with stale auth token" do
+    @response.stub!(:code).and_return(200)
+    @response.stub!(:body).and_return('')
+    @response.stub!(:[]).and_return({:update_client_auth => 'abc123'})
+    RestClient.stub!(:post).and_yield(@response)
+    Android.should_receive(:log).twice
+    lambda { Android.ping(@params) }.should raise_error(
+      Android::StaleAuthToken, "Stale auth token, please update :authtoken: in settings.yml."
+    )
+  end
+  
+  it "should ping android with 401 error message" do
+    @response.stub!(:code).and_return(401)
+    @response.stub!(:body).and_return('')
+    RestClient.stub!(:post).and_yield(@response)
+    Android.should_receive(:log).twice
+    lambda { Android.ping(@params) }.should raise_error(
+      Android::InvalidAuthToken, "Invalid auth token, please update :authtoken: in settings.yml."
+    )
   end
   
   it "should compute c2d_message" do

data/spec/read_state_spec.rb

@@ -22,4 +22,13 @@ describe "ReadState" do
     ReadState.delete(@a_fields[:name])
     Store.db.keys("read_state*").should == []
   end
+  
+  it "should delete read_state from source" do
+    time = Time.now.to_i
+    @s.read_state.refresh_time = time
+    @s.load_read_state.refresh_time.should == time
+    
+    @s.delete_user_read_state
+    @s.load_read_state.should == nil
+  end
 end

data/spec/source_sync_spec.rb

@@ -145,11 +145,15 @@ describe "SourceSync" do
       it "should do update with errors" do
         msg = "Error updating record"
         data = add_error_object({'4'=> { 'price' => '199.99' }},msg)
-        set_state(@c.docname(:update) => data)
+        set_state(@c.docname(:update) => data,
+          @c.docname(:cd) => { ERROR => { 'price' => '99.99' } }
+        )
         @ss.update(@c.id)
-        verify_result(@c.docname(:update_errors) =>
-          {"#{ERROR}-error"=>{"message"=>msg}, ERROR=>data[ERROR]},
-            @c.docname(:update) => {'4'=> { 'price' => '199.99'}})
+        verify_result(
+          @c.docname(:update_errors) =>
+            {"#{ERROR}-error"=>{"message"=>msg}, ERROR=>data[ERROR]},
+          @c.docname(:update) => {'4'=> { 'price' => '199.99'}},
+          @c.docname(:update_rollback) => {ERROR=>{"price"=>"99.99"}})
       end
     end
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 31
   prerelease: 
   segments: 
   - 2
   - 1
-  - 7
-  version: 2.1.7
+  - 10
+  version: 2.1.10
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-27 00:00:00 Z
+date: 2011-08-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -168,12 +168,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 63
         segments: 
         - 0
-        - 8
-        - 7
-        version: 0.8.7
+        - 9
+        - 2
+        version: 0.9.2
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
@@ -540,9 +540,6 @@ files:
 - spec/testdata/upload2.txt
 - spec/user_spec.rb
 - tasks/redis.rake
-- examples/simple/application.rb
-- examples/simple/sources/sample_adapter.rb
-- examples/simple/sources/simple_adapter.rb
 homepage: http://rhomobile.com/products/rhosync
 licenses: []
 
@@ -572,77 +569,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: RhoSync Synchronization Framework
-test_files: 
-- examples/simple/application.rb
-- examples/simple/sources/sample_adapter.rb
-- examples/simple/sources/simple_adapter.rb
-- spec/api/api_helper.rb
-- spec/api/create_client_spec.rb
-- spec/api/create_user_spec.rb
-- spec/api/delete_client_spec.rb
-- spec/api/delete_user_spec.rb
-- spec/api/get_api_token_spec.rb
-- spec/api/get_client_params_spec.rb
-- spec/api/get_db_doc_spec.rb
-- spec/api/get_license_info_spec.rb
-- spec/api/get_source_params_spec.rb
-- spec/api/list_client_docs_spec.rb
-- spec/api/list_clients_spec.rb
-- spec/api/list_source_docs_spec.rb
-- spec/api/list_sources_spec.rb
-- spec/api/list_users_spec.rb
-- spec/api/ping_spec.rb
-- spec/api/push_deletes_spec.rb
-- spec/api/push_objects_spec.rb
-- spec/api/reset_spec.rb
-- spec/api/rhosync_api_spec.rb
-- spec/api/set_db_doc_spec.rb
-- spec/api/set_refresh_time_spec.rb
-- spec/api/stats_spec.rb
-- spec/api/update_user_spec.rb
-- spec/api/upload_file_spec.rb
-- spec/api_token_spec.rb
-- spec/app_spec.rb
-- spec/apps/rhotestapp/application.rb
-- spec/apps/rhotestapp/sources/base_adapter.rb
-- spec/apps/rhotestapp/sources/fixed_schema_adapter.rb
-- spec/apps/rhotestapp/sources/sample_adapter.rb
-- spec/apps/rhotestapp/sources/simple_adapter.rb
-- spec/apps/rhotestapp/sources/sub_adapter.rb
-- spec/apps/rhotestapp/vendor/mygem-0.1.0/lib/mygem.rb
-- spec/apps/rhotestapp/vendor/mygem-0.1.0/lib/mygem/mygem.rb
-- spec/bulk_data/bulk_data_spec.rb
-- spec/client_spec.rb
-- spec/client_sync_spec.rb
-- spec/doc/doc_spec.rb
-- spec/document_spec.rb
-- spec/generator/generator_spec.rb
-- spec/generator/generator_spec_helper.rb
-- spec/jobs/bulk_data_job_spec.rb
-- spec/jobs/ping_job_spec.rb
-- spec/jobs/source_job_spec.rb
-- spec/license_spec.rb
-- spec/model_spec.rb
-- spec/perf/bulk_data_perf_spec.rb
-- spec/perf/perf_spec_helper.rb
-- spec/perf/store_perf_spec.rb
-- spec/ping/android_spec.rb
-- spec/ping/apple_spec.rb
-- spec/ping/blackberry_spec.rb
-- spec/read_state_spec.rb
-- spec/rhosync_spec.rb
-- spec/server/server_spec.rb
-- spec/source_adapter_spec.rb
-- spec/source_spec.rb
-- spec/source_sync_spec.rb
-- spec/spec_helper.rb
-- spec/stats/middleware_spec.rb
-- spec/stats/record_spec.rb
-- spec/store_spec.rb
-- spec/sync_states_spec.rb
-- spec/test_methods_spec.rb
-- spec/user_spec.rb
+test_files: []
+

data/examples/simple/application.rb

@@ -1,27 +0,0 @@
-class Application < Rhosync::Base
-  class << self
-    def authenticate(username,password,session)
-      true # do some interesting authentication here...
-    end
-    
-    # Add hooks for application startup here
-    # Don't forget to call super at the end!
-    def initializer(path)
-      super
-    end
-    
-    # Calling super here returns rack tempfile path:
-    # i.e. /var/folders/J4/J4wGJ-r6H7S313GEZ-Xx5E+++TI
-    # Note: This tempfile is removed when server stops or crashes...
-    # See http://rack.rubyforge.org/doc/Multipart.html for more info
-    # 
-    # Override this by creating a copy of the file somewhere
-    # and returning the path to that file (then don't call super!):
-    # i.e. /mnt/myimages/soccer.png
-    def store_blob(obj,field_name,blob)
-      super #=> returns blob[:tempfile]
-    end
-  end
-end
-
-Application.initializer(ROOT_PATH)

data/examples/simple/sources/sample_adapter.rb

@@ -1,5 +0,0 @@
-class SimpleAdapter < SourceAdapter
-  def initialize(source,credential)
-    super(source,credential)
-  end
-end

data/examples/simple/sources/simple_adapter.rb

@@ -1,5 +0,0 @@
-class SimpleAdapter < SourceAdapter
-  def initialize(source,credential)
-    super(source,credential)
-  end
-end