dimelo_ccp_api 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4962e1ddaa81b7ef970c119cbd677c7fc3a59fc1
-  data.tar.gz: 34a481ab52fcea68f15dce8208b0c77b24ae51f2
+  metadata.gz: 8d0e8f60e484353d7ad6eba299f41ae62ab14810
+  data.tar.gz: 8d75f69d236b5409a1e48007fa95d0597f63b676
 SHA512:
-  metadata.gz: 0ed9b3e676d8ad3f03370e33099b8d93e12f04f6768e49fb067db1689073da37db7deed45f0a9e9fd7af7e3fc4d924bf94baefb1dc479c2349b2a3b337efa233
-  data.tar.gz: c6db38d30585780a991826a384532b8f89a049ed4c8a5f56cfc507b8034c63f1a61df1aebbc8782fe9efb92a3c0cc92bf4a4366a4931924614eb1bdb8d7698ad
+  metadata.gz: 1a4f2ee8939da3f420f967f26915d7d5fcc5f628e26d779a1e5fb26058fba60c8102fbb29ee6d67168f4814bf386bf5efe9af138d513c774f3f37ac77bfcb71b
+  data.tar.gz: eda7aa6d80330e16b177424701a4759d807c5e44896306c0ffda312dd1a7359f8fdf0f7d67160df1bd15f585641067f52f598ab173772091915be8233ef6e6c9

data/.travis.yml

@@ -1,9 +1,9 @@
 language: ruby
 rvm:
+  - ruby-head
   - 2.2
   - 2.1
   - 2.0
-  - ruby-head
   - jruby-head
 gemfile:
   - gemfiles/Gemfile.activesupport-3.2.x
@@ -13,3 +13,4 @@ gemfile:
 matrix:
   allow_failures:
     - gemfile: gemfiles/Gemfile.activesupport-edge
+    - rvm: jruby-head

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.4.2
+
+Fix created_at edition
+Fix user password/custom_field edition
+Fix avatar_url edition
+
 # 0.3.3
 
 Remove warning when attribute is present in api but not defined in model

data/README.md

@@ -1,4 +1,4 @@
-# Dimelo CCP API [![Build Status](https://travis-ci.org/dimelo/dimelo_ccp_api.svg?branch=master)](https://travis-ci.org/dimelo/dimelo_ccp_api) [![Code Climate](https://codeclimate.com/github/dimelo/dimelo_ccp_api.png)](https://codeclimate.com/github/dimelo/dimelo_ccp_api)
+# Dimelo CCP API [![Build Status](https://travis-ci.org/dimelo/dimelo_ccp_api.svg?branch=master)](https://travis-ci.org/dimelo/dimelo_ccp_api) [![Code Climate](https://codeclimate.com/github/dimelo/dimelo_ccp_api.png)](https://codeclimate.com/github/dimelo/dimelo_ccp_api) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dimelo/dimelo_ccp_api)
 
 Ruby client for the Dimelo Customer Community Platform
 
@@ -28,9 +28,9 @@ gem 'dimelo_ccp_api'
 require 'dimelo_ccp_api'
 
 
-users_client = Dimelo::CCP::API::Client.new('https://domain-test.api.users.dimelo.com/1.0', 'access_token' => ENV['DIMELO_CCP_TOKEN'])
-answers_client = Dimelo::CCP::API::Client.new('https://domain-test.api.answers.dimelo.com/1.0', 'access_token' => ENV['DIMELO_CCP_TOKEN'])
-feedbacks_client = Dimelo::CCP::API::Client.new('https://domain-test.api.ideas.dimelo.com/1.0', 'access_token' => ENV['DIMELO_CCP_TOKEN'])
+users_client = Dimelo::CCP::API::Client.new('https://domain-test.api.users.dimelo.com/1.0', 'access_token' => ENV['DIMELO_API_KEY'])
+answers_client = Dimelo::CCP::API::Client.new('https://domain-test.api.answers.dimelo.com/1.0', 'access_token' => ENV['DIMELO_API_KEY'])
+feedbacks_client = Dimelo::CCP::API::Client.new('https://domain-test.api.ideas.dimelo.com/1.0', 'access_token' => ENV['DIMELO_API_KEY'])
 
 user = Dimelo::CCP::User.find(1, users_client)
 questions = user.questions(answers_client)

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/examples/dimelo_api_test

@@ -3,8 +3,7 @@
 require 'rubygems'
 require 'bundler'
 $LOAD_PATH.unshift "#{File.dirname(__FILE__)}/../lib"
-require 'dimelo_api'
-require 'pp'
+require 'dimelo_ccp_api'
 
 unless ENV['DIMELO_API_KEY'].present?
   puts "Don't forget to set your api key"
@@ -16,7 +15,7 @@ users_client = Dimelo::CCP::API::Client.new('https://domain-test.api.users.dimel
 answers_client = Dimelo::CCP::API::Client.new('https://domain-test.api.answers.dimelo.com/1.0', 'access_token' => ENV['DIMELO_API_KEY'])
 feedbacks_client = Dimelo::CCP::API::Client.new('https://domain-test.api.ideas.dimelo.com/1.0', 'access_token' => ENV['DIMELO_API_KEY'])
 
-user = Dimelo::API::User.find(1, users_client)
+user = Dimelo::CCP::User.find(1, users_client)
 questions = user.questions(answers_client)
 puts "question count: #{questions.count}"
 
@@ -28,7 +27,7 @@ questions.each do |question, i|
   end
 end
 
-feedbacks = Dimelo::API::Feedback.find({ :order => 'updated_at.desc' }, feedbacks_client)
+feedbacks = Dimelo::CCP::Feedback.find({ :order => 'updated_at.desc' }, feedbacks_client)
 puts "feedbacks count: #{feedbacks.count}"
 puts "feedbacks not by anonymous and superadmin: #{feedbacks.select{|f| f.user_id.present?}.count}"
 

data/lib/dimelo/ccp/api/model/answer.rb

@@ -8,7 +8,7 @@ module Dimelo::CCP
                 :attachments_count, :comments_count,
                 :created_at, :updated_at, :question_id, :ipaddr, :question_flow_state
 
-    submit_attributes :body, :body_format, :user_id, :question_id
+    submit_attributes :body, :body_format, :user_id, :question_id, :created_at
 
     belongs_to :user
     belongs_to :question

data/lib/dimelo/ccp/api/model/feedback.rb

@@ -9,7 +9,7 @@ module Dimelo::CCP
                :closed, :attachments_count, :comments_count, :positive_votes_count, :negative_votes_count,
                :permalink, :ipaddr, :created_at, :updated_at
 
-    submit_attributes :title, :body, :body_format, :category_ids, :user_id
+    submit_attributes :title, :body, :body_format, :category_ids, :user_id, :created_at
 
     belongs_to :user
     belongs_to :category

data/lib/dimelo/ccp/api/model/feedback_comment.rb

@@ -8,7 +8,7 @@ module Dimelo::CCP
     path COMMENT_PATH
 
     attributes :id, :feedback_id, :body, :body_format, :flow_state, :user_id, :type, :status_id, :attachments_count, :created_at, :updated_at, :permalink, :ipaddr
-    submit_attributes :body, :body_format, :user_id, :feedback_id, :status_id
+    submit_attributes :body, :body_format, :user_id, :feedback_id, :status_id, :created_at
 
     belongs_to :user
     belongs_to :feedback

data/lib/dimelo/ccp/api/model/membership.rb

@@ -3,7 +3,7 @@ module Dimelo::CCP
 
     path 'users/%{user_id}/memberships/%{id}'
 
-    attributes :id, :user_id, :role, :domain, :domain_application_id
+    attributes :id, :user_id, :role, :domain, :domain_application_id, :team
     submit_attributes :user_id, :role, :domain
 
     belongs_to :user

data/lib/dimelo/ccp/api/model/question.rb

@@ -9,7 +9,7 @@ module Dimelo::CCP
                :answers_count, :attachments_count, :usefulnesses_yes_count, :usefulnesses_no_count,
                :star, :closed, :permalink, :created_at, :updated_at
 
-    submit_attributes :title, :body, :body_format, :category_ids, :user_id
+    submit_attributes :title, :body, :body_format, :category_ids, :user_id, :created_at
 
     belongs_to :user
     belongs_to :category

data/lib/dimelo/ccp/api/model/user.rb

@@ -3,10 +3,10 @@ module Dimelo::CCP
     CUSTOM_FIELD_COUNT = 10
     CUSTOM_FIELD_ATTRIBUTES = (1..CUSTOM_FIELD_COUNT).map { |i| "custom_field_#{i}".to_sym }.freeze
 
-    attributes :id, :firstname, :lastname, :signature, :email, :private_message, :type, :username, :flow_state, :about, :avatar, :created_at, :updated_at, :blocked, :team
+    attributes :id, :firstname, :lastname, :signature, :email, :private_message, :type, :username, :flow_state, :about, :avatar, :created_at, :updated_at, :blocked, :team, :avatar_url
     attributes *CUSTOM_FIELD_ATTRIBUTES
 
-    submit_attributes :type, :firstname, :lastname, :email, :username, :avatar_url, :about
+    submit_attributes :type, :firstname, :lastname, :email, :username, :avatar_url, :about, :password, :created_at, :confirmed_at, *CUSTOM_FIELD_ATTRIBUTES
 
     has_many :memberships
     has_many :questions
@@ -14,7 +14,7 @@ module Dimelo::CCP
     has_many :feedbacks
 
     def avatar_url(size='normal')
-      avatar.try(:[], size).try(:[], 'url')
+      @avatar_url || avatar.try(:[], size).try(:[], 'url')
     end
 
     # Blocks the specified user

data/spec/lib/dimelo/ccp/api/model/user_spec.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Dimelo::CCP::User do
+  describe "#avatar_url" do
+    before :each do
+      @user = Dimelo::CCP::User.new
+    end
+    describe "with avatar" do
+      before :each do
+        @user.avatar = {
+          "id" => 1076212,
+          "original" => {
+            "height" => 960,
+            "width" => 640,
+            "url" => "http://dimelo.machin.amazonaws.com/identity_avatars/c567/avata.png"
+          },
+          "small" => {
+            "height" => 32,
+            "width" => 32,
+            "url" => "http://dimelo.machin.amazonaws.com/identity_avatars/c567/avatar_small.png"
+          },
+          "normal" => {
+            "height" => 48,
+            "width" => 48,
+            "url" => "http://dimelo.machin.amazonaws.com/identity_avatars/c567/avatar_normal.png"
+          }
+        }
+      end
+
+      describe "with avatar_url" do
+        before :each do
+          @user.avatar_url = "http://dimelo.machin/other_avatar.png"
+        end
+
+        it "should return avatar_url" do
+          expect(@user.avatar_url).to eq("http://dimelo.machin/other_avatar.png")
+        end
+      end
+
+      it "should return normal avatar" do
+        expect(@user.avatar_url).to eq("http://dimelo.machin.amazonaws.com/identity_avatars/c567/avatar_normal.png")
+      end
+
+      it "should return asked size avatar" do
+        expect(@user.avatar_url("small")).to eq("http://dimelo.machin.amazonaws.com/identity_avatars/c567/avatar_small.png")
+      end
+    end
+
+    describe "without avatar" do
+      describe "with avatar_url" do
+        before :each do
+          @user.avatar_url = "http://dimelo.machin/other_avatar.png"
+        end
+
+        it "should return avatar_url" do
+          expect(@user.avatar_url).to eq("http://dimelo.machin/other_avatar.png")
+        end
+      end
+
+      it "should return nil" do
+        expect(@user.avatar_url).to eq(nil)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dimelo_ccp_api
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Jean Boussier
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -90,7 +90,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -136,6 +135,7 @@ files:
 - spec/lib/dimelo/ccp/api/model/attachment_spec.rb
 - spec/lib/dimelo/ccp/api/model/feedback_spec.rb
 - spec/lib/dimelo/ccp/api/model/question_spec.rb
+- spec/lib/dimelo/ccp/api/model/user_spec.rb
 - spec/lib/dimelo/ccp/api/model_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dimelo_ccp_api
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Dimelo CCP v2 API client
@@ -170,5 +170,6 @@ test_files:
 - spec/lib/dimelo/ccp/api/model/attachment_spec.rb
 - spec/lib/dimelo/ccp/api/model/feedback_spec.rb
 - spec/lib/dimelo/ccp/api/model/question_spec.rb
+- spec/lib/dimelo/ccp/api/model/user_spec.rb
 - spec/lib/dimelo/ccp/api/model_spec.rb
 - spec/spec_helper.rb

data/.ruby-version

@@ -1 +0,0 @@
-2.1.1