fsync-client 0.0.2.pre → 0.0.3.pre

data/VERSION

@@ -1 +1 @@
-0.0.2.pre
+0.0.3.pre

data/lib/fsync-client.rb

@@ -6,16 +6,13 @@ class FinanceSync
 
   attr_reader :version, :entities, :conflicts, :error
 
-  def initialize(params)
-    @services_url = params[:services_url]
-    @version = params[:version]
-    @user = params[:user]
-    @password = params[:password]
-    raise ArgumentError if @user.nil? or @password.nil?
-    raise TypeError unless @version.is_a? Fixnum
-
+  def initialize(url, version, token)
+    @services_url = url
+    @version = version
+    @token = token
     @error = nil
     @conflicts = []
+    raise TypeError unless @version.is_a? Fixnum
   end
 
   def synchronize(data)
@@ -38,8 +35,8 @@ class FinanceSync
       errors = {"400"=>"bad data", "500"=>"sync server error",
                 "423"=>"locked", "401"=> "login error"}
 
-      put = Net::HTTP::Put.new("/financedesktop/sync/synchronize")
-      put.basic_auth(@user, @password)
+      put = Net::HTTP::Put.new("/financedesktop/sync/synchronize?auth=myfc_id")
+      put.basic_auth('', @token)
       put.content_type = 'application/json'
       begin
         response = Net::HTTP.start(@services_url) {|http|

data/spec/lib/fsync-client_spec.rb

@@ -17,30 +17,30 @@ UPDATED_VERSION = '{"conflicts": [], "version": 49, "data": [{"entity": {"import
                 "date": "2010-10-11", "guid": "22a648b0-2fe1-4888-96a4-caa27a4c27d7",
                 "type": "transaction"}}]}'
 
-USER = 'jalim'
-PASSWORD = 'habei'
+TOKEN = 'ageneratedtoken'
 
 describe "Finance Sync API wrapper" do
 
-  def fake_sync_response(response, user='', password='')
-    if not (user.empty? and password.empty?)
-      credentials = "#{user}:#{password}@"
+  def fake_sync_response(response, token='')
+    if not (token.empty?)
+      credentials = ":#{token}@"
     else
       credentials = ""
     end
 
     FakeWeb.register_uri(
         :put,
-        "http://#{credentials}services.myfreecomm.com.br/financedesktop/sync/synchronize",
+        "http://#{credentials}services.myfreecomm.com.br/financedesktop/sync/synchronize?auth=myfc_id",
         response)
   end
 
   before(:each) do
     @services_url = "services.myfreecomm.com.br"
-    @finance_sync = FinanceSync.new(:services_url => @services_url, :version => 2,
-                                    :user=>USER, :password=>PASSWORD)
+    @finance_sync = FinanceSync.new(@services_url, version = 2,
+                                    token = TOKEN)
   end
 
+
   describe "initializer" do
 
     it "should store version" do
@@ -54,8 +54,8 @@ describe "Finance Sync API wrapper" do
   end
 
   it "should have .version" do
-    @finance_sync = FinanceSync.new(:services_url=>@services_url, :version => 4,
-                                    :user=>USER, :password=>PASSWORD)
+    @finance_sync = FinanceSync.new(@services_url, version = 4,
+                                    token = TOKEN)
     @finance_sync.version.should == 4
   end
 
@@ -63,13 +63,13 @@ describe "Finance Sync API wrapper" do
 
     it "should send the params formed correctly" do
 
-      @finance_sync = FinanceSync.new(:services_url => @services_url, :version => 48,
-                                      :user=>USER, :password=>PASSWORD)
+      @finance_sync = FinanceSync.new(@services_url, version = 48,
+                                      token = TOKEN)
       correct_json = {"version"=>@finance_sync.version, "data"=>ENTITIES}.to_json
 
       put = mock(Net::HTTP::Put)
-      Net::HTTP::Put.should_receive(:new).with("/financedesktop/sync/synchronize").once.and_return(put)
-      put.should_receive(:basic_auth).with(USER, PASSWORD)
+      Net::HTTP::Put.should_receive(:new).with("/financedesktop/sync/synchronize?auth=myfc_id").once.and_return(put)
+      put.should_receive(:basic_auth).with('', TOKEN)
       put.should_receive(:content_type=).with('application/json')
 
       http = mock()
@@ -88,13 +88,13 @@ describe "Finance Sync API wrapper" do
 
       before(:each) do
         @invalid_url = 'invalid_url'
-        @finance_sync = FinanceSync.new(:services_url => @invalid_url, :version => 48,
-                                        :user=>USER, :password=>PASSWORD)
+        @finance_sync = FinanceSync.new(@invalid_url, version = 48,
+                                        token = TOKEN)
         @correct_json = {"version"=>@finance_sync.version, "data"=>ENTITIES}.to_json
 
         @put = mock(Net::HTTP::Put)
-        Net::HTTP::Put.should_receive(:new).with("/financedesktop/sync/synchronize").once.and_return(@put)
-        @put.should_receive(:basic_auth).with(USER, PASSWORD)
+        Net::HTTP::Put.should_receive(:new).with("/financedesktop/sync/synchronize?auth=myfc_id").once.and_return(@put)
+        @put.should_receive(:basic_auth).with("", TOKEN)
         @put.should_receive(:content_type=).with('application/json')
         http = mock()
         Net::HTTP.should_receive(:start).with(@invalid_url).and_raise(SocketError)
@@ -116,8 +116,8 @@ describe "Finance Sync API wrapper" do
     describe "with invalid url" do
 
       before(:each) do
-        @finance_sync = FinanceSync.new(:services_url => nil, :version => 48,
-                                        :user=>USER, :password=>PASSWORD)
+        @finance_sync = FinanceSync.new(nil, version = 48,
+                                        token = TOKEN)
       end
 
       it "should return false" do
@@ -133,10 +133,10 @@ describe "Finance Sync API wrapper" do
 
     describe "with invalid version specified" do
       it "should raise TypeError if a non integer is passed " do
-        wrong_params = {:services_url => "services.myfreecomm.com.br",
-                        :version => "abcsd", :user=>USER, :password=>PASSWORD}
+        wrong_params = {:url => "services.myfreecomm.com.br",
+                        :version => "abcsd", :token => TOKEN}
         lambda {
-          FinanceSync.new(wrong_params)
+          FinanceSync.new(*wrong_params)
         }.should raise_exception(TypeError)
 
       end
@@ -145,9 +145,9 @@ describe "Finance Sync API wrapper" do
     describe "with wrong credentials provided" do
 
       before(:each) do
-        fake_sync_response({:status=>[401, "unauthorized"]}, 'wrong', 'credential' )
-        @finance_sync = FinanceSync.new(:services_url => @services_url, :version => 48,
-                                        :user=>'wrong', :password=>'credential')
+        fake_sync_response({:status=>[401, "unauthorized"]}, 'wrongtoken' )
+        @finance_sync = FinanceSync.new(@services_url, version = 48,
+                                        token = 'wrongtoken')
       end
 
       it "should return false " do
@@ -165,7 +165,7 @@ describe "Finance Sync API wrapper" do
 
       it "should raise 'Argument Error'" do
         lambda {
-          FinanceSync.new(:services_url => @services_url, :version => 48)
+          FinanceSync.new(@services_url, version = 48)
         }.should raise_exception(ArgumentError)
       end
     end
@@ -173,12 +173,11 @@ describe "Finance Sync API wrapper" do
     describe "with no conflicts and no new data" do
 
       before(:each) do
-        @finance_sync = FinanceSync.new(:services_url => "services.myfreecomm.com.br",
-                                        :version => 48, :user=>'wrong',
-                                        :password=>'credentials' )
+        @finance_sync = FinanceSync.new("services.myfreecomm.com.br",
+                                        version = 48, token ='atoken' )
         fake_sync_response({:status=>[200, "OK"],
                             :body=>'{"conflicts": [], "version": 48, "data": []}'},
-                            'wrong', 'credentials')
+                            'atoken')
       end
 
       it "should not update version" do
@@ -204,11 +203,10 @@ describe "Finance Sync API wrapper" do
 
       before(:each) do
 
-        @finance_sync = FinanceSync.new(:services_url => "services.myfreecomm.com.br",
-                                        :version => 48, :user=>'wrong',
-                                        :password=>'credentials')
+        @finance_sync = FinanceSync.new("services.myfreecomm.com.br",
+                                        version = 48, token = 'wrongtoken')
         fake_sync_response({:status=>[200, "OK"], :body=>UPDATED_VERSION},
-                           'wrong', 'credentials')
+                           'wrongtoken')
 
       end
 
@@ -241,7 +239,7 @@ describe "Finance Sync API wrapper" do
 
     before(:each) do
       fake_sync_response({:status=>[400, "Bad request"], :body=>"invalid data"},
-                         USER, PASSWORD)
+                         TOKEN)
       @bad_data = '{"version": 47, "entity":}'
     end
 
@@ -260,7 +258,7 @@ describe "Finance Sync API wrapper" do
 
     before(:each) do
       fake_sync_response({:status=>[500, "Server Error"], :body=>"Server Error"},
-                         USER, PASSWORD)
+                         TOKEN)
       @valid_data = '{"valid": "data"}'
     end
 
@@ -278,7 +276,7 @@ describe "Finance Sync API wrapper" do
   describe "on sync server lock" do
 
     before(:each) do
-      fake_sync_response({:status=>[423, "Locked"], :body=>"Locked"}, USER, PASSWORD)
+      fake_sync_response({:status=>[423, "Locked"], :body=>"Locked"}, TOKEN)
       @valid_data = '{"valid": "data"}'
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: fsync-client
 version: !ruby/object:Gem::Version 
-  hash: 961915980
+  hash: 961915976
   prerelease: true
   segments: 
   - 0
   - 0
-  - 2
+  - 3
   - pre
-  version: 0.0.2.pre
+  version: 0.0.3.pre
 platform: ruby
 authors: 
 - Vanderson Mota
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-03 00:00:00 -02:00
+date: 2010-12-16 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency