nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump diaspora_federation

Browse source
This commit is contained in:
Benjamin Neff 2016-07-15 01:38:00 +02:00
parent b3a06c1c58
commit 32cc0951bb
6 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -13,7 +13,7 @@ gem "unicorn-worker-killer", "0.4.4"
# Federation # Federation
gem "diaspora_federation-rails", "0.1.1" gem "diaspora_federation-rails", "0.1.2"
# API and JSON # API and JSON
@ -287,7 +287,7 @@ group :test do
gem "webmock", "2.1.0", require: false gem "webmock", "2.1.0", require: false
gem "shoulda-matchers", "3.1.1" gem "shoulda-matchers", "3.1.1"
gem "diaspora_federation-test", "0.1.1" gem "diaspora_federation-test", "0.1.2"
# Coverage # Coverage
gem 'coveralls', require: false gem 'coveralls', require: false

16
Gemfile.lock
View file

@ -178,17 +178,17 @@ GEM
devise devise
rails (>= 3.0.4) rails (>= 3.0.4)
diaspora-prosody-config (0.0.5) diaspora-prosody-config (0.0.5)
diaspora_federation (0.1.1) diaspora_federation (0.1.2)
faraday (~> 0.9.0) faraday (~> 0.9.0)
faraday_middleware (~> 0.10.0) faraday_middleware (~> 0.10.0)
nokogiri (~> 1.6, >= 1.6.8) nokogiri (~> 1.6, >= 1.6.8)
typhoeus (~> 1.0) typhoeus (~> 1.0)
valid (~> 1.0) valid (~> 1.0)
diaspora_federation-rails (0.1.1) diaspora_federation-rails (0.1.2)
diaspora_federation (= 0.1.1) diaspora_federation (= 0.1.2)
rails (~> 4.2) rails (~> 4.2)
diaspora_federation-test (0.1.1) diaspora_federation-test (0.1.2)
diaspora_federation (= 0.1.1) diaspora_federation (= 0.1.2)
factory_girl (~> 4.7) factory_girl (~> 4.7)
diff-lcs (1.2.5) diff-lcs (1.2.5)
docile (1.1.5) docile (1.1.5)
@ -876,7 +876,7 @@ GEM
url_safe_base64 (0.2.2) url_safe_base64 (0.2.2)
uuid (2.3.8) uuid (2.3.8)
macaddr (~> 1.0) macaddr (~> 1.0)
valid (1.1.0) valid (1.2.0)
validate_email (0.1.6) validate_email (0.1.6)
activemodel (>= 3.0) activemodel (>= 3.0)
mail (>= 2.2.5) mail (>= 2.2.5)
@ -932,8 +932,8 @@ DEPENDENCIES
devise-token_authenticatable (= 0.4.6) devise-token_authenticatable (= 0.4.6)
devise_lastseenable (= 0.0.6) devise_lastseenable (= 0.0.6)
diaspora-prosody-config (= 0.0.5) diaspora-prosody-config (= 0.0.5)
diaspora_federation-rails (= 0.1.1) diaspora_federation-rails (= 0.1.2)
diaspora_federation-test (= 0.1.1) diaspora_federation-test (= 0.1.2)
entypo-rails (= 3.0.0.pre.rc2) entypo-rails (= 3.0.0.pre.rc2)
eye (= 0.8.1) eye (= 0.8.1)
factory_girl_rails (= 4.7.0) factory_girl_rails (= 4.7.0)

2
lib/diaspora/federation/entities.rb
View file

@ -222,7 +222,7 @@ module Diaspora
DiasporaFederation::Entities::StatusMessage.new( DiasporaFederation::Entities::StatusMessage.new(
author: status_message.diaspora_handle, author: status_message.diaspora_handle,
guid: status_message.guid, guid: status_message.guid,
raw_message: status_message.raw_message, text: status_message.raw_message,
photos: status_message.photos.map {|photo| photo(photo) }, photos: status_message.photos.map {|photo| photo(photo) },
location: status_message.location ? location(status_message.location) : nil, location: status_message.location ? location(status_message.location) : nil,
poll: status_message.poll ? poll(status_message.poll) : nil, poll: status_message.poll ? poll(status_message.poll) : nil,

2
lib/diaspora/federation/receive.rb
View file

@ -248,7 +248,7 @@ module Diaspora
StatusMessage.new( StatusMessage.new(
author: author_of(entity), author: author_of(entity),
guid: entity.guid, guid: entity.guid,
raw_message: entity.raw_message, raw_message: entity.text,
public: entity.public, public: entity.public,
created_at: entity.created_at, created_at: entity.created_at,
provider_display_name: entity.provider_display_name provider_display_name: entity.provider_display_name

2
spec/lib/diaspora/federation/entities_spec.rb
View file

@ -167,7 +167,7 @@ describe Diaspora::Federation::Entities do
expect(federation_entity).to be_instance_of(DiasporaFederation::Entities::StatusMessage) expect(federation_entity).to be_instance_of(DiasporaFederation::Entities::StatusMessage)
expect(federation_entity.author).to eq(diaspora_entity.author.diaspora_handle) expect(federation_entity.author).to eq(diaspora_entity.author.diaspora_handle)
expect(federation_entity.guid).to eq(diaspora_entity.guid) 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.public).to eq(diaspora_entity.public)
expect(federation_entity.created_at).to eq(diaspora_entity.created_at) expect(federation_entity.created_at).to eq(diaspora_entity.created_at)
expect(federation_entity.provider_display_name).to eq(diaspora_entity.provider_display_name) expect(federation_entity.provider_display_name).to eq(diaspora_entity.provider_display_name)

2
spec/lib/diaspora/federation/receive_spec.rb
View file

@ -495,7 +495,7 @@ describe Diaspora::Federation::Receive do
expect(received).to eq(status_message) expect(received).to eq(status_message)
expect(status_message.author).to eq(sender) 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.public).to eq(status_message_entity.public)
expect(status_message.created_at.iso8601).to eq(status_message_entity.created_at.iso8601) 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) expect(status_message.provider_display_name).to eq(status_message_entity.provider_display_name)