contaazul 0.1.0dev → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWM5YWE0NjhhYWM1OThkMTM5OTM2MzNiYjQ2NzA2NzlhZWZhZDMxYw==
+    MDFjMThlMDJlY2ZjMTBhZGI3MTkzY2JjODRmNmE3NzAxNjY0NmZiZg==
   data.tar.gz: !binary |-
-    NDFmODRiODhjNWI0MzMwMjNmYmNmMGE3MWRkNWE4ZWU5YjhjMTQ5Yg==
+    ZGU0YzU1ZTdhYzE0NjJhZjg3OTUyNWI4NzQ1NmZkNmYwMDEwOGQ4ZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTEwMzJlM2E2Y2VkY2ZlMmEzOTdmM2U3MWE4YmM5ZDYwNDBmOTdkMmQ5OGU1
-    MmVjZDlhM2I1MWFiNzI0NTYxNGY4N2M2MWY2MGRhM2FlY2ZhMjI5MDU2OTgx
-    MGIyM2U2MzM5NWY2ZDcyZjAyNTBjMzUyMDA3YjAwYzUxZDhkMGM=
+    ZDNmM2VjOTZmY2ZhMWRlNGNkN2FkZTBjMTcxOTlmNGMwYzk2YmQ4ZmY1YzJl
+    ZDJiNzg3MDllYTE5OTA5MWMwOWQzMDFiNDQxMWE2NTU5NGE5NmE2MTZkYWIy
+    MDE3ZjZmNWRlMTlmMWU4NWNiZmYxMWRlNTZiZTY2OWY5ODRjM2E=
   data.tar.gz: !binary |-
-    NDQzM2JkYjgyZmRkYTZhMTZmMTMzZTg5MWM2YjFlZWY3MWZhYzM4OGZiNTJi
-    YjAwYWNiY2M3NWE5YTBkYTBlZGIwZDE1NThiOGQ2ODBiZDYyZDEwYTFlZWZh
-    ZDYwYWE1YjJlMzc0NDA4ODhmNjk1OGEzOGRmNTJkNGRmZDMxMzM=
+    Y2Q5YWMwOGE3ZjEyMGJkZmJiNjhjMDdjMWQ2OTdkZDdiMTdjNjU2MjA5MWVk
+    YTI4OGZhNGI3OTk3YzE5ZjQyYTBkNzYyZTQ0ZGI2MDFhMmEwNjc0MDA4ZTJm
+    Y2Y5N2Y4ZmFiOGIwMDRiOTc0ZjNhZGNmZWNmMzVlOGJmNTZjYmU=

data/.travis.yml

@@ -1,9 +1,7 @@
 language: ruby
 bundler_args: --without development
 rvm:
-  - jruby-18mode # JRuby in 1.8 mode
   - jruby-19mode # JRuby in 1.9 mode
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - 2.0.0

data/README.md

@@ -1,5 +1,5 @@
 # contaazul
-[![Dependency Status](https://gemnasium.com/jnettome/contaazul.png)](https://gemnasium.com/jnettome/contaazul) [![Build Status](https://travis-ci.org/jnettome/contaazul.png?branch=master)](https://travis-ci.org/jnettome/contaazul)
+[![Dependency Status](https://gemnasium.com/ateliware/contaazul.png)](https://gemnasium.com/ateliware/contaazul) [![Build Status](https://travis-ci.org/ateliware/contaazul.png?branch=master)](https://travis-ci.org/ateliware/contaazul)
 
 A tiny *non-official* wrapper for [ContaAzul](http://contaazul.com.br)'s API.
 
@@ -39,6 +39,7 @@ dependency. Please require it explicitly if you're running Ruby 1.8
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+
 ## Copyright
 
 DO WHATEVER YOU WANT TO!

data/contaazul.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'addressable', '~> 2.3.4'
   spec.add_dependency 'faraday', '~> 0.8.7'
+  spec.add_dependency 'faraday_middleware', '~> 0.8'
   spec.add_dependency 'multi_json', '~> 1.7.6'
 
   spec.required_rubygems_version = '>= 1.8'

data/lib/contaazul/authentication.rb

@@ -1,30 +1,11 @@
 module Contaazul
   module Authentication
-    def authentication
-      if login && password
-        {:login => login, :password => password}
-      else
-        {}
-      end
-    end
-
     def authenticated?
-      !authentication.empty?
+      !company_token.empty?
     end
 
     def oauthed?
       !oauth_token.nil?
     end
-
-    def unauthed_rate_limited?
-      client_id && client_secret
-    end
-
-    def unauthed_rate_limit_params
-      {
-        :client_id => client_id,
-        :client_secret => client_secret
-      }
-    end
   end
 end

data/lib/contaazul/client.rb

@@ -1,9 +1,6 @@
 require 'contaazul/authentication'
-# require 'contaazul/connection'
-# require 'contaazul/repository'
-# require 'contaazul/request'
-
-# require 'contaazul/client/github'
+require 'contaazul/connection'
+require 'contaazul/request'
 
 module Contaazul
   class Client
@@ -15,12 +12,70 @@ module Contaazul
         send("#{key}=", options[key])
       end
 
+      Contaazul.company_token = options[:company_token] if options[:company_token]
     end
 
     include Contaazul::Authentication
-    # include Contaazul::Connection
-    # include Contaazul::Request
+    include Contaazul::Connection
+    include Contaazul::Request
+
+    def to_s
+      return create_link unless false #authenticated?
+      super
+    end
+
+    def create_link
+      response = Contaazul.get("pub/oauth/requestkey/#{self.external_token}")
+
+      "https://app.contaazul.com.br/authorization/request/#{response}?redirectTo=#{self.return_url}"
+    end
+
+    # Get all clients
+    #
+    # @return [Array(Hash)] Clients information
+    def clients
+      records = Contaazul.get("pub/contact/customer")
+      records
+    end
 
-    # include Contaazul::Client::GitHub
+    # Get a single client
+    #
+    # @param id [String] ID of client to fetch
+    # @return [Hash::Mash] Client information
+    def client(id, options={})
+      record = Contaazul.get("pub/contact/customer/#{id}")
+      record
+    end
+
+    # Create a client
+    #
+    # @param options [Hash] client information.
+    # @option options [String] :description
+    # @return [Hashie::Mash] Newly created client info
+    def create_client(options={})
+      record = Contaazul.post("pub/contact/customer", options)
+      record
+    end
+
+    # Edit a client
+    #
+    # @param id [String] Client ID
+    # @param options [Hash] Client information.
+    # @option options [String] :description
+    # @return
+    #   [Hashie::Mash] Newly updated client info
+    def edit_client(id, options={})
+      record = Contaazul.patch("pub/contact/customer/#{id}", options)
+      record
+    end
+
+    # Delete a client
+    #
+    # @param id [String] Client ID
+    # @return [Boolean] Indicating success of deletion
+    def delete_client(id, options={})
+      record = Contaazul.delete("pub/contact/customer/#{id}")
+      record
+    end
   end
 end

data/lib/contaazul/configuration.rb

@@ -8,22 +8,24 @@ module Contaazul
       :faraday_config_block,
       :api_version,
       :api_endpoint,
-      :login,
-      :password,
       :proxy,
       :oauth_token,
+      :company_token,
+      :external_token,
       :client_id,
       :client_secret,
       :user_agent,
       :request_host,
-      :netrc,
-      :auto_traversal,
+      :return_url,
       :per_page].freeze
 
     DEFAULT_ADAPTER             = Faraday.default_adapter
-    DEFAULT_API_VERSION         = 3
-    DEFAULT_API_ENDPOINT        = ENV['CONTAAZUL_API_ENDPOINT'] || 'http://api.contaazul.com.br/'
+    DEFAULT_API_VERSION         = 1
+    DEFAULT_API_ENDPOINT        = ENV['CONTAAZUL_API_ENDPOINT'] || 'https://api.contaazul.com.br/'
+    DEFAULT_COMPANY_TOKEN       = ENV['CONTAAZUL_API_COMPANY_TOKEN']
+    DEFAULT_EXTERNAL_TOKEN      = ENV['CONTAAZUL_API_EXTERNAL_TOKEN'] || "0000013f-1fa8-cd09-0000-004000000000"
     DEFAULT_USER_AGENT          = "Contaazul Non-Official Ruby Gem #{Contaazul::VERSION}".freeze
+    DEFAULT_RETURN_URL          = ENV['CONTAAZUL_API_RETURN_URL'] || "/"
     DEFAULT_AUTO_TRAVERSAL      = false
 
     attr_accessor(*VALID_OPTIONS_KEYS)
@@ -44,6 +46,18 @@ module Contaazul
       @api_endpoint = File.join(value, "")
     end
 
+    def company_token=(value)
+      @company_token = value
+    end
+
+    def return_url=(value)
+      @return_url = value
+    end
+
+    def external_token=(value)
+      @external_token = value
+    end
+
     def faraday_config(&block)
       @faraday_config_block = block
     end
@@ -52,16 +66,15 @@ module Contaazul
       self.adapter             = DEFAULT_ADAPTER
       self.api_version         = DEFAULT_API_VERSION
       self.api_endpoint        = DEFAULT_API_ENDPOINT
-      self.login               = nil
-      self.password            = nil
+      self.company_token       = DEFAULT_COMPANY_TOKEN
+      self.external_token      = DEFAULT_EXTERNAL_TOKEN
       self.proxy               = nil
       self.oauth_token         = nil
       self.client_id           = nil
       self.client_secret       = nil
       self.request_host        = nil
-      self.netrc               = false
       self.user_agent          = DEFAULT_USER_AGENT
-      self.auto_traversal      = DEFAULT_AUTO_TRAVERSAL
+      self.return_url          = DEFAULT_RETURN_URL
     end
   end
 end

data/lib/contaazul/connection.rb

@@ -0,0 +1,41 @@
+require 'faraday_middleware'
+
+module Contaazul
+  # @private
+  module Connection
+    private
+
+    def connection(options={})
+      options = {
+        :authenticate     => true,
+        :force_urlencoded => false,
+        :raw              => false
+      }.merge(options)
+
+      if !proxy.nil?
+        options.merge!(:proxy => proxy)
+      end
+
+      connection = Faraday.new(options) do |builder|
+
+        if options[:force_urlencoded]
+          builder.request :url_encoded
+        else
+          builder.request :json
+        end
+
+        builder.use FaradayMiddleware::FollowRedirects
+
+        builder.use FaradayMiddleware::ParseJson, :content_type => /\bjson$/
+
+        faraday_config_block.call(builder) if faraday_config_block
+
+        builder.adapter *adapter
+      end
+
+      connection.headers[:user_agent] = user_agent
+
+      connection
+    end
+  end
+end

data/lib/contaazul/request.rb

@@ -0,0 +1,73 @@
+require 'multi_json'
+
+module Contaazul
+  module Request
+    def get(path, options={})
+      conn = Faraday.new(:url => self.api_endpoint) do |faraday|
+        faraday.adapter Faraday.default_adapter
+      end
+      conn.headers["CompanyToken"] = self.company_token || "";
+      conn.headers["ExternalApplicationToken"] = self.external_token || "";
+
+      puts ""
+      puts "[ContaAzul] Endpoint/Path: #{self.api_endpoint}/#{path}"
+      puts "[ContaAzul] CompanyToken: #{self.company_token}"
+      puts "[ContaAzul] External: #{self.external_token}"
+      puts ""
+
+      response = conn.get(path)
+      response.body
+    end
+
+    def patch(path, options={})
+      conn = Faraday.new(:url => self.api_endpoint) do |faraday|
+        faraday.adapter Faraday.default_adapter
+      end
+      conn.headers["CompanyToken"] = self.company_token || "";
+      conn.headers["ExternalApplicationToken"] = self.external_token || "";
+
+      puts ""
+      puts "[ContaAzul] Endpoint/Path: #{self.api_endpoint}/#{path}"
+      puts "[ContaAzul] CompanyToken: #{self.company_token}"
+      puts "[ContaAzul] External: #{self.external_token}"
+      puts ""
+
+      response = conn.patch(path)
+      response.body
+    end
+
+    def post(path, options={})
+      conn = Faraday.new(:url => self.api_endpoint) do |faraday|
+        faraday.adapter Faraday.default_adapter
+      end
+      conn.headers["CompanyToken"] = self.company_token || "";
+      conn.headers["ExternalApplicationToken"] = self.external_token || "";
+
+      puts ""
+      puts "[ContaAzul] Endpoint/Path: #{self.api_endpoint}/#{path}"
+      puts "[ContaAzul] CompanyToken: #{self.company_token}"
+      puts "[ContaAzul] External: #{self.external_token}"
+      puts ""
+
+      response = conn.post(path, options)
+      response.body
+    end
+
+    def delete(path, options={})
+      conn = Faraday.new(:url => self.api_endpoint) do |faraday|
+        faraday.adapter Faraday.default_adapter
+      end
+      conn.headers["CompanyToken"] = self.company_token || "";
+      conn.headers["ExternalApplicationToken"] = self.external_token || "";
+
+      puts ""
+      puts "[ContaAzul] Endpoint/Path: #{self.api_endpoint}/#{path}"
+      puts "[ContaAzul] CompanyToken: #{self.company_token}"
+      puts "[ContaAzul] External: #{self.external_token}"
+      puts ""
+
+      response = conn.delete(path)
+      response.body
+    end
+  end
+end

data/lib/contaazul/version.rb

@@ -1,3 +1,3 @@
 module Contaazul
-  VERSION = "0.1.0dev"
+  VERSION = "0.1.1"
 end

data/spec/contaazul/client_spec.rb

@@ -0,0 +1,62 @@
+# -*- encoding: utf-8 -*-
+require 'spec_helper'
+require 'json'
+
+describe Contaazul::Client do
+
+  before do
+    Contaazul.reset
+  end
+
+  describe "api_endpoint" do
+
+    after(:each) do
+      Contaazul.reset
+    end
+
+    it "defaults to https://api.contaazul.com.br/" do
+      client = Contaazul::Client.new
+      expect(client.api_endpoint).to eq('https://api.contaazul.com.br/')
+    end
+
+    it "is set" do
+      Contaazul.api_endpoint = 'http://lvh.me/'
+      client = Contaazul::Client.new
+      expect(client.api_endpoint).to eq('http://lvh.me/')
+    end
+
+  end
+
+  context "when working with oauth tokens" do
+
+    before(:each) do
+      Contaazul.reset
+      @client = Contaazul::Client.new
+    end
+
+    # it "should request and return a public token" do
+    #   stub_request(:get, "#{Contaazul.api_endpoint}oauth/requestkey/#{Contaazul.external_token}").
+    #      with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Contaazul Non-Official Ruby Gem 0.1.0dev'}).
+    #      to_return(:status => 200, :body => '{ "publicToken" : "1f74b13f1e5c6c69cb5d7fbaabb1e2cb" }', :headers => {
+    #       :content_type => "application/json; charset=utf-8"
+    #       })
+
+    #   response = Contaazul.get("oauth/requestkey/#{Contaazul.external_token}")
+    #   expect(response["publicToken"]).to eq("1f74b13f1e5c6c69cb5d7fbaabb1e2cb")
+    # end
+
+    # it "should get a valid oauth2 instance" do
+    #   stub_request(:get, "#{Contaazul.api_endpoint}oauth/requestkey/#{Contaazul.external_token}").
+    #      with(:headers => {'Accept'=>'application/json', 'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'User-Agent'=>'Contaazul Non-Official Ruby Gem 0.1.0dev'}).
+    #      to_return(:status => 200, :body => '{ "publicToken" : "1f74b13f1e5c6c69cb5d7fbaabb1e2cb" }', :headers => {
+    #       :content_type => "application/json; charset=utf-8"
+    #       })
+
+    #   response = Contaazul.get "oauth/requestkey/#{Contaazul.external_token}"
+    #   # @client.to_s
+    #   # client = Contaazul::Client.new(:oauth_token => response)
+    # end
+
+  end
+
+end

data/spec/fixtures/requestkey.json

@@ -0,0 +1,3 @@
+{
+  "publicToken" : "1f74b13f1e5c6c69cb5d7fbaabb1e2cb"
+}

data/spec/spec_helper.rb

@@ -74,9 +74,7 @@ end
 def contaazul_url(url)
   if url =~ /^http/
     url
-  elsif @client && @client.authenticated?
-    "http://api.contaazul.com.br/pub#{url}"
   else
-    "http://api.contaazul.com.br#{url}"
+    "http://api.contaazul.com.br/pub/#{url}"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contaazul
 version: !ruby/object:Gem::Version
-  version: 0.1.0dev
+  version: 0.1.1
 platform: ruby
 authors:
 - João Netto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-06 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -98,9 +112,13 @@ files:
 - lib/contaazul/authentication.rb
 - lib/contaazul/client.rb
 - lib/contaazul/configuration.rb
+- lib/contaazul/connection.rb
 - lib/contaazul/error.rb
+- lib/contaazul/request.rb
 - lib/contaazul/version.rb
+- spec/contaazul/client_spec.rb
 - spec/contaazul_spec.rb
+- spec/fixtures/requestkey.json
 - spec/spec_helper.rb
 homepage: https://github.com/jnettome/contaazul
 licenses:
@@ -127,6 +145,7 @@ signing_key:
 specification_version: 4
 summary: Integrate your ruby app with ContaAzul's API (contaazul.com.br)
 test_files:
+- spec/contaazul/client_spec.rb
 - spec/contaazul_spec.rb
+- spec/fixtures/requestkey.json
 - spec/spec_helper.rb
-has_rdoc: