finance_sync 0.0.1 → 0.0.2

data/README.rdoc

@@ -6,7 +6,7 @@ require 'finance_sync'
 
 Instancie a classe FinanceSync::Client passando a url do servidor e a versão dos dados que estão na máquina cliente:
 
-  @client = FinanceSync::Client.new(:services_url=>"https://services.myfreecomm.com.br/, :version=>22)
+  @client = FinanceSync::Client.new(:services_url => "services.myfreecomm.com.br", :version => 22, :user => "foo", :password => "bar")
 
 Para sincronizar, você deve mandar um hash com os dados que você alterou desde a última versão:
 

data/lib/finance_sync.rb

@@ -9,12 +9,14 @@ module FinanceSync
   
   class Client
     attr_reader :version, :entities, :conflicts, :error
+    attr_accessor :auth_type
 
     def initialize(params)
       @services_url = params[:services_url]
       @version = params[:version]
       @user = params[:user]
       @password = params[:password]
+      @auth_type = params[:auth_type] || :new
       raise ArgumentError if @user.nil? or @password.nil?
       raise TypeError unless @version.is_a? Fixnum
 
@@ -22,7 +24,7 @@ module FinanceSync
       @conflicts = []
     end
 
-    def synchronize(data)
+    def synchronize(data={})
       data = request_sync(data)
       return false if data == false
       @version = data['version']
@@ -42,7 +44,9 @@ module FinanceSync
         errors = {"400"=>"bad data", "500"=>"sync server error",
                   "423"=>"locked", "401"=> "login error"}
 
-        put = Net::HTTP::Put.new("/financedesktop/sync/synchronize")
+        path = "/financedesktop/sync/synchronize"
+        path += "?auth=myfc_id" if @auth_type == :new
+        put = Net::HTTP::Put.new(path)
         put.basic_auth(@user, @password)
         put.content_type = 'application/json'
         begin

data/lib/finance_sync/version.rb

@@ -1,3 +1,3 @@
 module FinanceSync
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/finance_sync_spec.rb

@@ -2,20 +2,20 @@
 require 'spec_helper'
 
 ENTITIES = [
-              {"entity"=>
-                {"currency"=> "BRL", "payee"=> nil, "amount"=> "100.00000000",
-                 "imported"=> false, "description"=> "Novo lançamento",
-                  "payer"=> "Rendimento aplicação", "base_date"=> "2010-03-16T11=>29=>02.354014",
-                  "document_number"=> 1, "guid"=> "ffffffffffffffffffffffffffffffff"
-                }
-              }
-            ]
+  {"entity"=>
+    {"currency"=> "BRL", "payee"=> nil, "amount"=> "100.00000000",
+     "imported"=> false, "description"=> "Novo lançamento",
+      "payer"=> "Rendimento aplicação", "base_date"=> "2010-03-16T11=>29=>02.354014",
+      "document_number"=> 1, "guid"=> "ffffffffffffffffffffffffffffffff"
+    }
+  }
+]
 
 
 UPDATED_VERSION = '{"conflicts": [], "version": 49, "data": [{"entity": {"imported": "true",
-                "description": "roupa", "document-number": 111, "amount": "200.00000000",
-                "date": "2010-10-11", "guid": "22a648b0-2fe1-4888-96a4-caa27a4c27d7",
-                "type": "transaction"}}]}'
+                    "description": "roupa", "document-number": 111, "amount": "200.00000000",
+                    "date": "2010-10-11", "guid": "22a648b0-2fe1-4888-96a4-caa27a4c27d7",
+                    "type": "transaction"}}]}'
 
 USER = 'jalim'
 PASSWORD = 'habei'
@@ -29,20 +29,25 @@ describe FinanceSync::Client do
       credentials = ""
     end
     FakeWeb.register_uri(
-        :put,
-        "http://#{credentials}services.myfreecomm.com.br/financedesktop/sync/synchronize",
-        response)
+      :put,
+      "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::Client.new(:services_url => @services_url, :version => 2,
-                                    :user=>USER, :password=>PASSWORD)
+    @finance_sync = FinanceSync::Client.new(
+      :services_url => @services_url, :version => 2,
+      :user => USER, :password => PASSWORD
+    )
   end
 
   it "should have .version" do
-    @finance_sync = FinanceSync::Client.new(:services_url=>@services_url, :version => 4,
-                                    :user=>USER, :password=>PASSWORD)
+    @finance_sync = FinanceSync::Client.new(
+      :services_url=>@services_url, :version => 4,
+      :user => USER, :password => PASSWORD
+    )
     @finance_sync.version.should == 4
   end
 
@@ -50,35 +55,72 @@ describe FinanceSync::Client do
     it "should store version" do
       @finance_sync.instance_variable_get(:@version).should == 2
     end
-
     it "should store services_url" do
       @finance_sync.instance_variable_get(:@services_url).should == 'services.myfreecomm.com.br'
     end
+    it "should store default auth_type" do
+      @finance_sync.instance_variable_get(:@auth_type).should == :new
+    end
   end
 
-
   describe "synchronizer" do
-    it "should send the params formed correctly" do
-      @finance_sync = FinanceSync::Client.new(:services_url => @services_url, :version => 48,
-                                      :user=>USER, :password=>PASSWORD)
+    it "should authenticate using the old method (drupal accounts)" do
+      @finance_sync = FinanceSync::Client.new(
+        :services_url => @services_url, :version => 48,
+        :user=>USER, :password=>PASSWORD, :auth_type => :old
+      )
       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)
       put.should_receive(:content_type=).with('application/json')
-
       http = mock()
       http.should_receive(:request).with(put, correct_json)
-
       http_success_mock = mock(Net::HTTPSuccess)
       http_success_mock.stub!(:code).and_return("200")
       http_success_mock.stub!(:body).and_return(UPDATED_VERSION)
-
       Net::HTTP.should_receive(:start).with(@services_url).and_yield(http).and_return(http_success_mock)
-     @finance_sync.synchronize(ENTITIES)
+      @finance_sync.synchronize(ENTITIES)
     end
-
+    it "should authenticate using the new method (passaporte web accounts)" do
+      @finance_sync = FinanceSync::Client.new(
+        :services_url => @services_url, :version => 48,
+        :user=>USER, :password=>PASSWORD, :auth_type => :new
+      )
+      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?auth=myfc_id").once.and_return(put)
+      put.should_receive(:basic_auth).with(USER, PASSWORD)
+      put.should_receive(:content_type=).with('application/json')
+      http = mock()
+      http.should_receive(:request).with(put, correct_json)
+      http_success_mock = mock(Net::HTTPSuccess)
+      http_success_mock.stub!(:code).and_return("200")
+      http_success_mock.stub!(:body).and_return(UPDATED_VERSION)
+      Net::HTTP.should_receive(:start).with(@services_url).and_yield(http).and_return(http_success_mock)
+      @finance_sync.synchronize(ENTITIES)
+    end
+    it "should change authentication methods via attr_writer" do
+      @finance_sync = FinanceSync::Client.new(
+        :services_url => @services_url, :version => 48,
+        :user=>USER, :password=>PASSWORD, :auth_type => :old
+      )
+      @finance_sync.auth_type = :new
+      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?auth=myfc_id").once.and_return(put)
+      put.should_receive(:basic_auth).with(USER, PASSWORD)
+      put.should_receive(:content_type=).with('application/json')
+      http = mock()
+      http.should_receive(:request).with(put, correct_json)
+      http_success_mock = mock(Net::HTTPSuccess)
+      http_success_mock.stub!(:code).and_return("200")
+      http_success_mock.stub!(:body).and_return(UPDATED_VERSION)
+      Net::HTTP.should_receive(:start).with(@services_url).and_yield(http).and_return(http_success_mock)
+      @finance_sync.synchronize(ENTITIES)
+    end
+    
     describe "with not found url" do
       before(:each) do
         @invalid_url = 'invalid_url'
@@ -87,7 +129,7 @@ describe FinanceSync::Client do
         @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)
+        Net::HTTP::Put.should_receive(:new).with("/financedesktop/sync/synchronize?auth=myfc_id").once.and_return(@put)
         @put.should_receive(:basic_auth).with(USER, PASSWORD)
         @put.should_receive(:content_type=).with('application/json')
         http = mock()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: finance_sync
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,12 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-08 00:00:00.000000000 -03:00
+date: 2011-07-20 00:00:00.000000000 -03:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157289460 !ruby/object:Gem::Requirement
+  requirement: &2171450960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2157289460
+  version_requirements: *2171450960
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2157288960 !ruby/object:Gem::Requirement
+  requirement: &2171450360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,7 +34,7 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2157288960
+  version_requirements: *2171450360
 description: Ruby client to the FinanceSync API
 email:
 - vanderson.mota@myfreecomm.com.br