Merge branch 'master' of github.com:diaspora/diaspora

Conflicts:
	config/routes.rb

config/locales/diaspora/nb.yml

+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: "Hallo, verden!"
+  application:
+      helper:
+          unknown_person: "ukjent person"
+          new_requests: "nye forespørsler"
+  dashboards:
+      helper:
+          home: "hjem"
+  error_messages:
+      helper:
+          invalid_fields: "Ugyldige felter"
+          correct_the_following_errors_and_try_again: "Rett opp de følgende feilene og prøv igjen."
+  people:
+      helper:
+           results_for: " resultater for %{params}"
+           people_on_pod_are_aware_of: " folk i belgen er oppmerksomme på"
+  layouts:
+      application:
+          edit_profile: "endre profil"
+          logout: "logg ut"
+  shared:
+      aspect_nav:
+          all_aspects: "Alle aspekter"
+          manage: "Organisere"
+          manage_your_aspects: "Organiser aspektene dine"
+      sub_header:
+          all_aspects: "Alle aspekter"
+          manage_aspects: "Organiser aspekter"
+      publisher:
+          share: "Del"
+      aspect_friends:
+          add_friends: "legg til venner"
+  albums:
+      album:
+          you: "deg"
+      new_album:
+          create: "Opprett"
+          add_a_new_album: "Legg til et nytt album"
+      show:
+          edit_album: "Endre album"
+          albums: "album"
+          updated: "oppdatert"
+          by: "av"
+      edit:
+          editing: "Redigerer"
+          updated: "oppdatert"
+          are_you_sure: "Er du sikker?"
+          delete_album: "Slett album"
+          cancel: "Avbryt"
+      index:
+          home: "hjem"
+          new_album: "Nytt album"
+      create:
+          success: "Du har oppretta albumet %{name}."
+      update:
+          success: "Albumet %{name} er endra."
+          failure: "Greide ikke å endre albumet %{name}."
+      destroy:
+          success: "Albumet %{name} er sletta."
+      helper:
+          friends_albums: "Venners album"
+          your_albums: "Dine album"
+  aspects:
+      index:
+          photos: "bilder"
+      show:
+          photos: "bilder"
+      manage:
+          add_a_new_aspect: "Legg til et nytt aspekt"
+          add_a_new_friend:  "Legg til en ny venn"
+          show: "Vis"
+          update_aspects: "Oppdater aspekter"
+          requests: "Forespørsler"
+          ignore_remove: "Ignorer/fjern"
+      new_aspect:
+          add_a_new_aspect: "Legg til et nytt aspekt"
+          create: "Opprett"
+      create:
+          success: "Klikk på plusstegnet på venstre side for å fortelle Diaspora hvem som kan se det nye aspektet ditt."
+          failure: "Greide ikke å opprette aspektet." 
+      destroy:
+          success: "%{name} har blitt fjerna."
+      update:
+          success: "Aspektet ditt, %{name}, har blitt endra."
+      move_friends:
+          failure: "Greide ikke å endre aspektet for vennen %{real_name}."
+          success: "Aspektene har blitt endra."
+      move_friend:
+          failure: "virka ikke %{inspect}"
+          success: "Vennen din ser nå et annet aspekt av deg."
+      helper:
+          remove: "fjern"
+          aspect_not_empty: "Aspektet er ikke tomt"
+  users:
+      edit:
+          editing_profile: "Redigerer profil"
+      profile:
+          cancel: "Avbryt"
+          update_profile: "Oppdater profil"
+          home: "Hjem"
+          diaspora_username: "DIASPORA-BRUKERNAVN"
+          info: "Informasjon"
+          picture: "Bilde"
+          editing_profile: "Redigerer profil"
+          albums: "Album"
+          you_dont_have_any_photos: "Du har ikke noen bilder! Gå til"
+          page_to_upload_some:  "for å laste opp noen."
+  comments:
+      comment:
+          ago: "sia"
+      new_comment:
+          comment: "Kommenter"
+  photos:
+      show:
+          prev: "forrige"
+          full_size: "full størrelse"
+          next: "neste"
+          edit_photo: "Rediger bilde"
+          delete_photo: "Slett bilde"
+          are_you_sure: "Er du sikker?"
+          comments: "kommentarer"
+      edit:
+          editing: "Redigerer"
+          are_you_sure: "Er du sikker?"
+          delete_photo: "Slett bilde"
+      photo:
+          show_comments: "vis kommentarer"
+          posted_a_new_photo_to: "la til ett nytt bilde i"
+      new:
+          new_photo: "Nytt bilde"
+          back_to_list: "Tilbake til lista"
+          post_it: "legg ut!"
+      create:
+          runtime_error: "Greide ikke å laste opp bildet. Er du sikker på at setebeltet er festa?"
+          integrity_error: "Greide ikke å laste opp bildet. Er du sikker på at det var et bilde?"
+          type_error: "Greide ikke å laste opp bildet. Er du sikker på at et bilde ble lagt til?"
+      update:
+          notice: "Bildet er oppdatert."
+          error:  "Greide ikke å endre bildet."
+      destroy:
+          notice: "Bildet er sletta."
+  registrations:
+      new:
+          sign_up: "Registrer deg"
+      create:
+          success: "Du er nå med i Diaspora!"
+  status_messages:
+      new_status_message:
+          tell_me_something_good: "Fortell noe tøft"
+          oh_yeah: "Ja da!"
+      status_message:
+          show_comments: "vis kommentarer"
+          delete: "Slett"
+          are_you_sure: "Er du sikker?"
+      show:
+          status_message: "Statusmelding"
+          comments: "kommentarer"
+          are_you_sure: "Er du sikker?"
+          destroy: "Utslett"
+          view_all: "Vis alle"
+          message: "Melding"
+          owner: "Eier"
+      helper:
+          no_message_to_display: "Ingen melding å vise."
+  people:
+      person:
+          add_friend: "legg til venn"
+          pending_request: "venter på svar"
+      index:
+          add_friend: "legg til venn"
+          real_name: "ekte navn"
+          diaspora_handle: "diaspora-bruker"
+          thats_you: "det er deg!"
+          friend_request_pending: "ubesvart venneforespørsel"
+          you_have_a_friend_request_from_this_person: "du har en venneforespørsel fra denne personen"
+      new:
+          new_person: "Ny person"
+          back_to_list: "Tilbake til lista"
+      show:
+          last_seen: "sist sett: %{how_long_ago}"
+          friends_since: "venner sia: %{how_long_ago}"
+          save: "lagre"
+          are_you_sure: "Er du sikker?"
+          remove_friend: "fjern venn"
+  requests:
+      new_request:
+          add_a_new_friend_to: "Legg til en ny venn i"
+          enter_a_diaspora_username: "Skriv en Diaspora-bruker:"
+          your_diaspora_username_is: "Din Diaspora-bruker er: %{diaspora_handle}"
+          friends_username: "Brukeren til vennen"
+      destroy:
+          success: "Dere er nå venner."
+          error: "Velg et aspekt først!"
+          ignore: "Ignorerte venneforespørsel"
+      create:
+          error: "Fant ingen diasporabruker med denne e-posten!"
+          already_friends: "Du er allerede venn med %{destination_url}!"
+          success: "Du sendte en venneforespørsel til %{destination_url}."
+          horribly_wrong: "Noe gikk forferdelig galt."

config/sprinkle/provision.rb

-#!/usr/bin/env sprinkle -s
+#
 #   Copyright (c) 2010, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3.  See
 #   the COPYRIGHT file.

features/step_definitions/web_steps.rb

 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
@@ -191,7 +191,7 @@ Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should not be checked$/ do |
     end
   end
 end
- 
+
 Then /^(?:|I )should be on (.+)$/ do |page_name|
   current_path = URI.parse(current_url).path
   if current_path.respond_to? :should
@@ -205,8 +205,8 @@ Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
   query = URI.parse(current_url).query
   actual_params = query ? CGI.parse(query) : {}
   expected_params = {}
-  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
-  
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
+
   if actual_params.respond_to? :should
     actual_params.should == expected_params
   else

features/support/env.rb

 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
@@ -24,7 +24,7 @@ Capybara.default_selector = :css
 
 WebMock.disable_net_connect!(:allow_localhost => true)
 
-# If you set this to false, any error raised from within your app will bubble 
+# If you set this to false, any error raised from within your app will bubble
 # up to your step definition and out to cucumber unless you catch it somewhere
 # on the way. You can make Rails rescue errors and render error pages on a
 # per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.

lib/diaspora/exporter.rb

+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3.  See
+#   the COPYRIGHT file.
+
+module Diaspora
+
+  def self.bone(user)
+    exporter = Diaspora::Exporter.new(Diaspora::Exporters::XML)
+    exporter.execute(user)
+  end
+
+  class Exporter
+    def initialize(strategy)
+      self.class.send(:include, strategy)
+    end
+  end
+
+  module Exporters
+    module XML
+      def execute(user)
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.user {
+            xml.username user.username
+            xml.serialized_private_key user.serialized_private_key 
+            xml.person user.person.to_xml
+
+            xml.aspects {
+              user.aspects.each do |aspect|
+                xml.aspect { 
+                  xml.id_ aspect.id
+                  xml.name aspect.name
+                
+                  xml.people {
+                    aspect.people.each do |person|
+                      xml.person person.to_xml
+                    end
+                  }
+                  xml.posts {
+                    aspect.posts.each do |post|
+                      xml.post post.to_xml if post.respond_to? :to_xml
+                    end
+                  }
+                }
+              end
+            }
+          }
+        end
+
+        # This is a hack.  Nokogiri interprets *.to_xml as a string.
+        # we want to inject document objects, instead.  See lines: 25,35,40.
+        # Solutions?
+        CGI.unescapeHTML(builder.to_xml.to_s)
+      end
+    end
+  end
+
+end

lib/diaspora/ostatus_builder.rb

@@ -62,9 +62,9 @@ module Diaspora
       @user.visible_posts(:person_id => @user.person.id, :public=>true).inject("") do |xml,curr|
         if curr.respond_to?(:to_activity)
           unless xml
-            curr.to_activity 
+            curr.to_activity
           else
-            xml + curr.to_activity 
+            xml + curr.to_activity
           end
         end
       end

lib/diaspora/user/friending.rb

@@ -38,7 +38,8 @@ module Diaspora
       end
 
       def dispatch_friend_acceptance(request, requester)
-        salmon request, :to => requester
+        friend_acceptance = salmon(request)
+        push_to_person requester, friend_acceptance.xml_for(requester)
         request.destroy unless request.callback_url.include? url
       end
 

lib/salmon/salmon.rb

@@ -53,7 +53,7 @@ module Salmon
       salmon.magic_sig = MagicSigEnvelope.create(user , user.person.aes_encrypt(activity, aes_key_hash))
       salmon
     end
-   
+
     def self.parse(xml, user)
       slap = self.new
       doc = Nokogiri::XML(xml)

lib/tasks/cucumber.rake

 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.