rexpense 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f21c2f5b3e950742713bdee6d9c8c265a7ae216a
-  data.tar.gz: 3af1a2b7c5082658bdeaf281c2d4d6cd27958ca9
+SHA256:
+  metadata.gz: 55e9deebd7e25be0c9da4e15c3b9c29452f414a7c5b0735cc820e163f99b55bc
+  data.tar.gz: afed1cf1bf3f8bbf3b3ff7adf4521ffb277676c6351cc6f76081a4e6f86f9d56
 SHA512:
-  metadata.gz: 31f3c8775ac13a5d8e28556764bd944a70e83a12cae8f75f4d1acdd357b7c3c6a110937b4ddd3ba3436c3fbec754564754230347fee38ed6463a39c5a4ea3da8
-  data.tar.gz: 0bcea44ab789a99742de6b4233e98117c1a73686399e00311aeb5bc3b87b3fcbd4bd052244c8e031646b6f0299500ff42d52b070b32662f6a322f7754d672bac
+  metadata.gz: 88027f7ed94044babfba5ace6bbc9bc2f96b3c5d2303b87abb0b420cd052649da3fafbea99737598b563aa0391ecd92d51b7f03710d3c013408f1782bbd5c19f
+  data.tar.gz: 539867a8b331f32ab1f5665e46e065ebe2b5cf757323e3ae64a2fe0df9f1d3af5ad92d25c4640d3d2bd0eee5c0b8743674453252b1c93b66bcd78c29b952ceb0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+### 2.1.0 - 2018-07-19
+* Feature
+  * Add missing group information in tag entity object [#2](https://github.com/myfreecomm/rexpense-client-ruby/pull/2)
+  * Add email information to user entity object [#3](https://github.com/myfreecomm/rexpense-client-ruby/pull/3)
+
 ### 2.0.0 - 2017-10-09
 * Enhancement (Breaking change)
   * Change how to configure URL of the endpoints [#1](https://github.com/myfreecomm/rexpense-client-ruby/pull/1)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rexpense (2.0.0)
+    rexpense (2.1.0)
       mime-types (~> 2.99)
       require_all (~> 1.4.0)
       typhoeus (~> 0.8)
@@ -29,9 +29,9 @@ GEM
     diff-lcs (1.3)
     docile (1.1.5)
     equalizer (0.0.11)
-    ethon (0.10.1)
+    ethon (0.11.0)
       ffi (>= 1.3.0)
-    ffi (1.9.18)
+    ffi (1.9.25)
     ice_nine (0.11.2)
     json (2.0.3)
     method_source (0.8.2)
@@ -94,4 +94,4 @@ DEPENDENCIES
   webmock (~> 1.9.3)
 
 BUNDLED WITH
-   1.15.4
+   1.16.3

data/README.md

@@ -4,7 +4,7 @@ A Ruby client for the [Rexpense](http://www.rexpense.com) REST API
 
 [![Gem version](https://badge.fury.io/rb/rexpense.png)](https://rubygems.org/gems/rexpense)
 [![Build status](https://travis-ci.org/myfreecomm/rexpense-client-ruby.png?branch=master)](https://travis-ci.org/myfreecomm/rexpense-client-ruby)
-[![Test coverage](https://codeclimate.com/github/myfreecomm/rexpense-client-ruby/badges/coverage.svg)](https://codeclimate.com/github/myfreecomm/v-client-ruby)
+[![Test coverage](https://codeclimate.com/github/myfreecomm/rexpense-client-ruby/badges/coverage.svg)](https://codeclimate.com/github/myfreecomm/rexpense-client-ruby)
 [![Code Climate grade](https://codeclimate.com/github/myfreecomm/rexpense-client-ruby.png)](https://codeclimate.com/github/myfreecomm/rexpense-client-ruby)
 
 Rexpense API docs: http://developers.rexpense.com

data/lib/rexpense/entities/tag.rb

@@ -3,6 +3,7 @@ module Rexpense
     class Tag < Base
       attribute :id, Integer
       attribute :name, String
+      attribute :group, String
     end
   end
 end

data/lib/rexpense/entities/user.rb

@@ -9,6 +9,20 @@ module Rexpense
       attribute :name, String
       attribute :avatar, Array[Hash]
       attribute :default_avatar, Boolean
+      attribute :emails, Array[Hash]
+      attribute :email, String, default: lambda { |page, attribute| select_email(page.emails) }
+
+      private
+
+      def self.select_email(emails_list)
+        main_email = nil
+        emails_list.each do |email_data|
+          if email_data['main']
+            main_email = email_data['email']; break
+          end
+        end
+        main_email
+      end
     end
   end
 end

data/lib/rexpense/resources/tag.rb

@@ -11,11 +11,11 @@ module Rexpense
       # Get organization tags
       #
       # [API]
-      #   Method: <tt>GET /api/v1/organization/:id/tags</tt>
+      #   Method: <tt>GET /api/v1/organization/:organization_id/tags</tt>
       #
       #   Documentation: http://developers.rexpense.com/api/tags#index
-      def find_all(id)
-        http.get(endpoint_base(id)) do |response|
+      def find_all(organization_id)
+        http.get(endpoint_base(organization_id)) do |response|
           Rexpense::Entities::TagCollection.build response
         end
       end
@@ -24,11 +24,11 @@ module Rexpense
       # Find a organization tag
       #
       # [API]
-      #   Method: <tt>GET /api/v1/organization/:id/tags/:tag_id</tt>
+      #   Method: <tt>GET /api/v1/organization/:organization_id/tags/:tag_id</tt>
       #
       #   Documentation: http://developers.rexpense.com/api/tags#show
-      def find(id, tag_id)
-        http.get("#{endpoint_base(id)}/#{tag_id}") do |response|
+      def find(organization_id, id)
+        http.get("#{endpoint_base(organization_id)}/#{id}") do |response|
           Rexpense::Entities::Tag.new response.parsed_body
         end
       end
@@ -37,11 +37,11 @@ module Rexpense
       # Create a organization tag
       #
       # [API]
-      #   Method: <tt>POST /api/v1/organization/:id/tags</tt>
+      #   Method: <tt>POST /api/v1/organization/:organization_id/tags</tt>
       #
       #   Documentation: http://developers.rexpense.com/api/tags#create
-      def create(id, params={})
-        http.post(endpoint_base(id), body: params) do |response|
+      def create(organization_id, params={})
+        http.post(endpoint_base(organization_id), body: params) do |response|
           Rexpense::Entities::Tag.new response.parsed_body
         end
       end
@@ -50,11 +50,11 @@ module Rexpense
       # Update a organization tag
       #
       # [API]
-      #   Method: <tt>PUT /api/v1/organization/:id/tags/:tag_id</tt>
+      #   Method: <tt>PUT /api/v1/organization/:organization_id/tags/:id</tt>
       #
       #   Documentation: http://developers.rexpense.com/api/tags#update
-      def update(id, tag_id, params={})
-        http.put("#{endpoint_base(id)}/#{tag_id}", body: params) do |response|
+      def update(organization_id, id, params={})
+        http.put("#{endpoint_base(organization_id)}/#{id}", body: params) do |response|
           Rexpense::Entities::Tag.new response.parsed_body
         end
       end
@@ -63,11 +63,11 @@ module Rexpense
       # Create a organization tag
       #
       # [API]
-      #   Method: <tt>DELETE /api/v1/organization/:id/tags/:tag_id</tt>
+      #   Method: <tt>DELETE /api/v1/organization/:organization_id/tags/:id</tt>
       #
       #   Documentation: http://developers.rexpense.com/api/tags#destroy
-      def destroy(id, tag_id)
-        http.delete("#{endpoint_base(id)}/#{tag_id}") do |response|
+      def destroy(organization_id, id)
+        http.delete("#{endpoint_base(organization_id)}/#{id}") do |response|
           true
         end
       end

data/lib/rexpense/version.rb

@@ -1,3 +1,3 @@
 module Rexpense
-  VERSION = "2.0.0".freeze
+  VERSION = "2.1.0".freeze
 end

data/spec/lib/rexpense/entities/tag_collection_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Rexpense::Entities::TagCollection do
+  it_behaves_like :entity_collection, Rexpense::Entities::Tag, 'tags'
+end

data/spec/lib/rexpense/entities/tag_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+describe Rexpense::Entities::Tag do
+  subject { described_class.new({}) }
+
+  it_behaves_like "entity_attributes", [:id, :name, :group]
+end

data/spec/lib/rexpense/entities/user_spec.rb

@@ -5,6 +5,7 @@ describe Rexpense::Entities::User do
 
   it_behaves_like "entity_attributes", [
     :id, :first_name, :last_name, :mention_name,
-    :default_currency, :name, :avatar, :default_avatar
+    :default_currency, :name, :avatar, :default_avatar,
+    :email, :emails
   ]
 end

data/spec/lib/rexpense/resources/organization_spec.rb

@@ -126,7 +126,25 @@ describe Rexpense::Resources::Organization, vcr: true do
 
       it 'find a membership in organization' do
         expect(subject.class).to eq(Rexpense::Entities::Membership)
-        expect(subject.user.id).to eq(64)
+      end
+
+      it 'sets user informations correctly' do
+        expect(subject.user.attributes).to eq({
+          avatar: [{"style"=>"original", "url"=>"https://s3.amazonaws.com/rexpense-sandbox-uploads/users/64/f3a7eab501d4296ab7573788495933148d753e7e/original/DM-980-147802948420161101-3-81b6ab.png", "width"=>nil, "height"=>nil, "expiration"=>nil}, {"style"=>"medium", "url"=>"https://s3.amazonaws.com/rexpense-sandbox-uploads/users/64/238b1f41ebdf10c2aeacfa92aea857209c823357/medium/DM-980-147802948420161101-3-81b6ab.png", "width"=>nil, "height"=>nil, "expiration"=>nil}, {"style"=>"thumb", "url"=>"https://s3.amazonaws.com/rexpense-sandbox-uploads/users/64/c62a31737b9e2f0d0c2f14cc5449232bcfc0bd95/thumb/DM-980-147802948420161101-3-81b6ab.png", "width"=>nil, "height"=>nil, "expiration"=>nil}, {"style"=>"tiny", "url"=>"https://s3.amazonaws.com/rexpense-sandbox-uploads/users/64/0dc1c022cde836cf4ed00692028dc49fba56641f/tiny/DM-980-147802948420161101-3-81b6ab.png", "width"=>nil, "height"=>nil, "expiration"=>nil}],
+          default_avatar: true, default_currency: 'BRL',
+          email: 'dante.miranda@nexaas.com',
+          emails: [
+            { "email" => "dante.alighierimds@gmail.com", "main" => false },
+            { "email" => "dante.miranda@myfreecomm.com.br", "main" => false },
+            { "email" => "dante.miranda+int@nexaas.com", "main" => false },
+            { "email" => "dante.miranda+test@nexaas.com", "main" => false },
+            { "email" => "dante.alg@live.com", "main" => false },
+            { "email" => "dante.miranda@nexaas.com", "main" => true }
+          ],
+          first_name: 'Dante',
+          id: 64, last_name: 'Miranda', mention_name: 'DanteMiranda',
+          name: nil
+        })
       end
     end
 

data/spec/lib/rexpense/resources/{tag_specs.rb → tag_spec.rb}

@@ -25,9 +25,26 @@ describe Rexpense::Resources::Tag, vcr: true do
   describe '#find' do
     subject { client.tags.find(35, 64) }
 
-    it "returns a category successfully" do
+    it "returns a tag object" do
       expect(subject.class).to eq(tag_klass)
-      expect(subject.id).to eq(64)
+    end
+
+    it "returns a tag with correct data" do
+      expect(subject.attributes).to eq({
+        name: "updated tag",
+        id: 64, group: nil
+      })
+    end
+
+    context 'when a tag has group' do
+      subject { client.tags.find(35, 77) }
+
+      it 'returns tag with group field filled' do
+        expect(subject.attributes).to eq({
+          id: 77, name: 'ônibus',
+          group: 'transporte'
+        })
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexpense
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Eduardo Hertz
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2018-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -291,6 +291,8 @@ files:
 - spec/lib/rexpense/entities/pre_expense_spec.rb
 - spec/lib/rexpense/entities/reimbursement_collection_spec.rb
 - spec/lib/rexpense/entities/reimbursement_spec.rb
+- spec/lib/rexpense/entities/tag_collection_spec.rb
+- spec/lib/rexpense/entities/tag_spec.rb
 - spec/lib/rexpense/entities/user_collection_spec.rb
 - spec/lib/rexpense/entities/user_spec.rb
 - spec/lib/rexpense/entities/webhook_collection_spec.rb
@@ -304,7 +306,7 @@ files:
 - spec/lib/rexpense/resources/organization_spec.rb
 - spec/lib/rexpense/resources/pre_expense_spec.rb
 - spec/lib/rexpense/resources/reimbursement_spec.rb
-- spec/lib/rexpense/resources/tag_specs.rb
+- spec/lib/rexpense/resources/tag_spec.rb
 - spec/lib/rexpense/resources/webhook_spec.rb
 - spec/lib/rexpense/response_spec.rb
 - spec/lib/rexpense_spec.rb
@@ -337,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A Ruby client for the Rexpense REST API
@@ -363,6 +365,8 @@ test_files:
 - spec/lib/rexpense/entities/pre_expense_spec.rb
 - spec/lib/rexpense/entities/reimbursement_collection_spec.rb
 - spec/lib/rexpense/entities/reimbursement_spec.rb
+- spec/lib/rexpense/entities/tag_collection_spec.rb
+- spec/lib/rexpense/entities/tag_spec.rb
 - spec/lib/rexpense/entities/user_collection_spec.rb
 - spec/lib/rexpense/entities/user_spec.rb
 - spec/lib/rexpense/entities/webhook_collection_spec.rb
@@ -376,7 +380,7 @@ test_files:
 - spec/lib/rexpense/resources/organization_spec.rb
 - spec/lib/rexpense/resources/pre_expense_spec.rb
 - spec/lib/rexpense/resources/reimbursement_spec.rb
-- spec/lib/rexpense/resources/tag_specs.rb
+- spec/lib/rexpense/resources/tag_spec.rb
 - spec/lib/rexpense/resources/webhook_spec.rb
 - spec/lib/rexpense/response_spec.rb
 - spec/lib/rexpense_spec.rb