From 32cc0951bbcd95228a07eb50c2b8322e86e26ccf Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Fri, 15 Jul 2016 01:38:00 +0200 Subject: [PATCH] bump diaspora_federation --- Gemfile | 4 ++-- Gemfile.lock | 16 ++++++++-------- lib/diaspora/federation/entities.rb | 2 +- lib/diaspora/federation/receive.rb | 2 +- spec/lib/diaspora/federation/entities_spec.rb | 2 +- spec/lib/diaspora/federation/receive_spec.rb | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index f65e92688..ed39e91b1 100644 --- a/Gemfile +++ b/Gemfile @@ -13,7 +13,7 @@ gem "unicorn-worker-killer", "0.4.4" # Federation -gem "diaspora_federation-rails", "0.1.1" +gem "diaspora_federation-rails", "0.1.2" # API and JSON @@ -287,7 +287,7 @@ group :test do gem "webmock", "2.1.0", require: false gem "shoulda-matchers", "3.1.1" - gem "diaspora_federation-test", "0.1.1" + gem "diaspora_federation-test", "0.1.2" # Coverage gem 'coveralls', require: false diff --git a/Gemfile.lock b/Gemfile.lock index 0cb3b744d..4b7a56840 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -178,17 +178,17 @@ GEM devise rails (>= 3.0.4) diaspora-prosody-config (0.0.5) - diaspora_federation (0.1.1) + diaspora_federation (0.1.2) faraday (~> 0.9.0) faraday_middleware (~> 0.10.0) nokogiri (~> 1.6, >= 1.6.8) typhoeus (~> 1.0) valid (~> 1.0) - diaspora_federation-rails (0.1.1) - diaspora_federation (= 0.1.1) + diaspora_federation-rails (0.1.2) + diaspora_federation (= 0.1.2) rails (~> 4.2) - diaspora_federation-test (0.1.1) - diaspora_federation (= 0.1.1) + diaspora_federation-test (0.1.2) + diaspora_federation (= 0.1.2) factory_girl (~> 4.7) diff-lcs (1.2.5) docile (1.1.5) @@ -876,7 +876,7 @@ GEM url_safe_base64 (0.2.2) uuid (2.3.8) macaddr (~> 1.0) - valid (1.1.0) + valid (1.2.0) validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) @@ -932,8 +932,8 @@ DEPENDENCIES devise-token_authenticatable (= 0.4.6) devise_lastseenable (= 0.0.6) diaspora-prosody-config (= 0.0.5) - diaspora_federation-rails (= 0.1.1) - diaspora_federation-test (= 0.1.1) + diaspora_federation-rails (= 0.1.2) + diaspora_federation-test (= 0.1.2) entypo-rails (= 3.0.0.pre.rc2) eye (= 0.8.1) factory_girl_rails (= 4.7.0) diff --git a/lib/diaspora/federation/entities.rb b/lib/diaspora/federation/entities.rb index 643ca0d84..f0c373dee 100644 --- a/lib/diaspora/federation/entities.rb +++ b/lib/diaspora/federation/entities.rb @@ -222,7 +222,7 @@ module Diaspora DiasporaFederation::Entities::StatusMessage.new( author: status_message.diaspora_handle, guid: status_message.guid, - raw_message: status_message.raw_message, + text: status_message.raw_message, photos: status_message.photos.map {|photo| photo(photo) }, location: status_message.location ? location(status_message.location) : nil, poll: status_message.poll ? poll(status_message.poll) : nil, diff --git a/lib/diaspora/federation/receive.rb b/lib/diaspora/federation/receive.rb index 827aa2803..d8b75c2e6 100644 --- a/lib/diaspora/federation/receive.rb +++ b/lib/diaspora/federation/receive.rb @@ -248,7 +248,7 @@ module Diaspora StatusMessage.new( author: author_of(entity), guid: entity.guid, - raw_message: entity.raw_message, + raw_message: entity.text, public: entity.public, created_at: entity.created_at, provider_display_name: entity.provider_display_name diff --git a/spec/lib/diaspora/federation/entities_spec.rb b/spec/lib/diaspora/federation/entities_spec.rb index c2ba9f655..f5b13aba0 100644 --- a/spec/lib/diaspora/federation/entities_spec.rb +++ b/spec/lib/diaspora/federation/entities_spec.rb @@ -167,7 +167,7 @@ describe Diaspora::Federation::Entities do expect(federation_entity).to be_instance_of(DiasporaFederation::Entities::StatusMessage) expect(federation_entity.author).to eq(diaspora_entity.author.diaspora_handle) expect(federation_entity.guid).to eq(diaspora_entity.guid) - expect(federation_entity.raw_message).to eq(diaspora_entity.text) + expect(federation_entity.text).to eq(diaspora_entity.text) expect(federation_entity.public).to eq(diaspora_entity.public) expect(federation_entity.created_at).to eq(diaspora_entity.created_at) expect(federation_entity.provider_display_name).to eq(diaspora_entity.provider_display_name) diff --git a/spec/lib/diaspora/federation/receive_spec.rb b/spec/lib/diaspora/federation/receive_spec.rb index b9e01fe28..c3ffd0408 100644 --- a/spec/lib/diaspora/federation/receive_spec.rb +++ b/spec/lib/diaspora/federation/receive_spec.rb @@ -495,7 +495,7 @@ describe Diaspora::Federation::Receive do expect(received).to eq(status_message) expect(status_message.author).to eq(sender) - expect(status_message.raw_message).to eq(status_message_entity.raw_message) + expect(status_message.text).to eq(status_message_entity.text) expect(status_message.public).to eq(status_message_entity.public) expect(status_message.created_at.iso8601).to eq(status_message_entity.created_at.iso8601) expect(status_message.provider_display_name).to eq(status_message_entity.provider_display_name)