social_stream-ostatus 0.0.1 → 0.1.0

data/app/controllers/pshb_controller.rb

@@ -1,34 +1,26 @@
 class PshbController < ApplicationController
-  
-  def callback
-    #sync subscription verification
-    if params['hub.mode']=='subscribe'   
+  include SocialStream::Ostatus::Controllers::DebugRequests
+
+  skip_before_filter :verify_authenticity_token
+
+  def index
+    case params['hub.mode']
+    #TODO check PuSH specification about subscribe or async
+    when 'subscribe', 'async'
       render :text => params['hub.challenge'], :status => 200
-      # TO-DO: confirm that params['hub.topic'] is a real 
+      # TODO: confirm that params['hub.topic'] is a real 
       # requested subscription by someone in this node
       return
-    end
-    
-    #sync unsubscription verification
-    if params['hub.mode']=='unsubscribe'
+    when 'unsubscribe'
       render :text => params['hub.challenge'], :status => 200
-      # TO-DO: confirm that params['hub.topic'] is a real 
+      # TODO: confirm that params['hub.topic'] is a real 
       # requested unsubscription by someone in this node
       # and delete permissions/remote actor if necessary
       return
     end  
 
-    #If we got here we are receiving an XML Activity Feed
-    doc = Nokogiri::XML(request.body.read)
-    origin = doc.xpath("//xmlns:link[@rel='self']").first['href'].split('/')
-    webfinger_id = origin[5]+"@"+origin[2]
-    
-    activity_texts = doc.xpath("//xmlns:content")
-    activity_texts.each do |activity_text|
-      r_user = RemoteSubject.find_by_webfinger_id(webfinger_id)
-      if r_user != nil
-        Post.create!(:text => activity_text.content, :_activity_tie_id => r_user.public_tie)
-      end
-    end
+    SocialStream::ActivityStreams.from_pshb_callback(request.body.read)
+
+    render text: "Success!"
   end
 end

data/app/controllers/remote_subjects_controller.rb

@@ -0,0 +1,19 @@
+class RemoteSubjectsController < ApplicationController
+  def index
+    raise ActiveRecord::NotFound if params[:q].blank?
+
+    @remote_subject =
+      RemoteSubject.find_or_create_by_webfinger_uri!(params[:q])
+      
+    redirect_to @remote_subject
+  end
+
+  def show
+    @remote_subject =
+      RemoteSubject.find_by_slug!(params[:id])
+
+    if params[:refresh]
+      @remote_subject.refresh_webfinger!
+    end
+  end
+end

data/app/controllers/salmon_controller.rb

@@ -0,0 +1,15 @@
+class SalmonController < ApplicationController
+  include SocialStream::Ostatus::Controllers::DebugRequests
+
+  skip_before_filter :verify_authenticity_token
+
+  def index
+    actor = Actor.find_by_slug! params[:slug]
+
+    SocialStream::ActivityStreams.from_salmon_callback request.body.read, actor
+
+    # TODO handle errors
+    
+    render text: "Success!"
+  end
+end

data/app/controllers/webfinger_controller.rb

@@ -5,9 +5,18 @@ class WebfingerController < ActionController::Metal
   def index
     actor = Actor.find_by_webfinger!(params[:q])
 
-    finger = Proudhon::Finger.new :links => {
-      :profile => polymorphic_url([actor.subject, :profile])
-    }
+    finger = Proudhon::Finger.new(
+      :subject => actor.webfinger_uri,
+      :alias   => [polymorphic_url(actor.subject)],
+      :links   => {
+        avatar: root_url + actor.logo.url(:original),
+        profile: polymorphic_url([actor.subject, :profile]),
+        updates_from: polymorphic_url([actor.subject, :activities], :format => :atom),
+        salmon: salmon_url(actor.slug),
+        replies: salmon_url(actor.slug),
+        mention: salmon_url(actor.slug),
+        magic_key: actor.magic_public_key
+      })
 
     self.response_body = finger.to_xml
     self.content_type  = Mime::XML

data/app/decorators/social_stream/base/activity_decorator.rb

@@ -0,0 +1,3 @@
+Activity.class_eval do
+  include SocialStream::Ostatus::Models::Activity
+end

data/app/decorators/social_stream/base/actor_decorator.rb

@@ -0,0 +1,3 @@
+Actor.class_eval do
+  include SocialStream::Ostatus::Models::Actor
+end

data/app/decorators/social_stream/base/audience_decorator.rb

@@ -0,0 +1,3 @@
+Audience.class_eval do
+  include SocialStream::Ostatus::Models::Audience
+end

data/app/decorators/social_stream/base/relation/custom_decorator.rb

@@ -0,0 +1,3 @@
+Relation::Custom.class_eval do
+  include SocialStream::Ostatus::Models::Relation::Custom
+end

data/app/decorators/social_stream/base/tie_decorator.rb

@@ -0,0 +1,3 @@
+Tie.class_eval do
+  include SocialStream::Ostatus::Models::Tie
+end

data/app/models/actor_key.rb

@@ -0,0 +1,30 @@
+require 'openssl'
+
+# Store OStatus private and public key
+class ActorKey < ActiveRecord::Base
+  KEY_SIZE = 1024
+
+  belongs_to :actor
+
+  validates_presence_of :key_der
+
+  before_validation :generate_key, on: :create
+
+  def key
+    @key ||=
+      OpenSSL::PKey::RSA.new(key_der)
+  end
+
+  def key= new_key
+    @key = new_key
+    self.key_der = new_key.to_der
+  end
+
+  private
+
+  def generate_key
+    return if key_der.present?
+
+    self.key = OpenSSL::PKey::RSA.generate(KEY_SIZE)
+  end
+end

data/app/models/remote_subject.rb

@@ -1,27 +1,53 @@
 class RemoteSubject < ActiveRecord::Base
-  attr_accessible :name, :webfinger_id, :origin_node_url
+  include SocialStream::Models::Subject
+  # Create absolute routes
+  include Rails.application.routes.url_helpers
+
+  attr_reader :url_helper
+  attr_accessible :webfinger_id
+
+  # Save webfinger_info hash into the database
+  serialize :webfinger_info
+
+  validates_uniqueness_of :webfinger_id
+
+  before_validation :fill_information,
+                    :on => :create
+
+  after_create  :subscribe_to_public_feed
+  after_destroy :unsubscribe_to_public_feed
+
+  scope :webfinger_alias, lambda { |uri|
+    where('webfinger_info LIKE ?', "%aliases%#{ uri }%")
+  }
   
   #validates_format_of :webfinger_slug, :with => Devise.email_regexp, :allow_blank => true
   
   class << self
-    def find_or_create_using_webfinger_id(id)
-      subject = RemoteSubject.find_by_webfinger_id(id)
+    def find_or_create_by_webfinger_uri!(uri)
+      if uri =~ /^https?:\/\//
+        records = webfinger_alias(uri)
 
-      return subject if subject.present?
+        # SQL scope is not reliable
+        if records.present?
+          return records.find{ |r| r.webfinger_aliases.include?(uri) }
+        end
 
-      RemoteSubject.create! :name => id,
-                            :webfinger_id => id
+        # TODO: create by http uri?
+
+        raise ::ActiveRecord::RecordNotFound
+      end
+
+      id = uri.dup
+
+      if id =~ /^acct:/
+        id.gsub!('acct:', '')
+      end
+
+      find_or_create_by_webfinger_id!(id)
     end
   end
   
-  # Public feed url for this RemoteSubject
-  #
-  # TODO: get from webfinger?
-  # It does not work for every remote user!
-  def public_feed_url
-    "http://#{ webfinger_url }/api/user/#{ name }/public.atom"                       
-  end
-
   # Return the slug in the webfinger_id
   def webfinger_slug
     splitted_webfinger_id.first
@@ -32,12 +58,82 @@ class RemoteSubject < ActiveRecord::Base
     splitted_webfinger_id.last
   end
 
-  protected
+  # URL of the activity feed from this {RemoteSubject}
+  def public_feed_url
+    webfinger_info[:updates_from]
+  end
+
+  # URL of the Salmon endpoint for this {RemoteSubject}
+  def salmon_url
+    webfinger_info[:salmon]
+  end
+
+  # Webfinger Alias
+  def webfinger_aliases
+    webfinger_info[:aliases]
+  end
+
+  # Fetch the webfinger again
+  def refresh_webfinger!
+    fill_webfinger_info
+
+    save!
+  end
+
+  private
 
   def splitted_webfinger_id
     @splitted_webfinger_id ||=
       webfinger_id.split('@')
   end
 
+  def fill_information
+    fill_webfinger_info
+
+    self.name = webfinger_id
+  end
+
+  def fill_webfinger_info
+    self.webfinger_info = build_webfinger_info
+    self.rsa_key = finger.magic_key
+  end
+
+  def build_webfinger_info
+    {
+      updates_from: finger.links[:updates_from],
+      salmon:       finger.links[:salmon],
+      aliases:      finger.alias
+    }
+  end
+
+  def finger
+    @finger ||=
+      fetch_finger
+  end
+
+  def fetch_finger
+    finger = 
+      Proudhon::Finger.fetch webfinger_id
 
+    # FIXME custom error
+    raise ::ActiveRecord::RecordNotFound if finger.blank?
+
+    finger
+  end
+
+  def subscribe_to_public_feed
+    return if public_feed_url.blank?
+
+    atom = Proudhon::Atom.from_uri(public_feed_url)
+
+    atom.subscribe(pshb_url(:host => SocialStream::Ostatus.pshb_host))
+  end
+
+  def unsubscribe_to_public_feed
+    return if public_feed_url.blank?
+
+    atom = Proudhon::Atom.from_uri(public_feed_url)
+
+    atom.unsubscribe(pshb_url(:host => SocialStream::Ostatus.pshb_host))
+  end
 end

data/app/views/remote_subjects/_show.html.erb

@@ -0,0 +1,6 @@
+<% toolbar :profile, subject: @remote_subject %>
+
+<%= render partial: "activities/index",
+           locals:  { activities: @remote_subject.wall(:profile, for: current_subject).
+                                              page(params[:page]),
+                         owner: @remote_subject } %>

data/app/views/remote_subjects/show.html.erb

@@ -0,0 +1,5 @@
+<% content_for :title do %>
+  <%= @remote_subject.name+" | "+t('site.name') %>
+<% end %>
+
+<%= render :partial => 'show' %>

data/config/routes.rb

@@ -1,10 +1,13 @@
 Rails.application.routes.draw do
-  # Webfinger
+  # Host Meta
   match '/.well-known/host-meta', :to => HostMetaController.action(:index)
 
-  # Find subjects by slug
+  # Webfinger
   match '/webfinger' => 'webfinger#index', :as => 'webfinger'
 
-  match 'pshb/callback' => 'pshb#callback', :as => :pshb_callback
-  match 'remoteuser/' => 'remoteusers#index', :as => :add_remote_user
+  # PushSubHubBub callback
+  match 'pshb' => 'pshb#index', as: :pshb
+
+  # Salmon callback
+  match 'salmon/:slug' => 'salmon#index', as: :salmon
 end

data/db/migrate/20120905145030_create_social_stream_ostatus.rb

@@ -3,7 +3,8 @@ class CreateSocialStreamOstatus < ActiveRecord::Migration
   def self.up
     create_table :remote_subjects, :force => true do |t|
       t.integer :actor_id
-      t.string :webfinger_id
+      t.string  :webfinger_id
+      t.text    :webfinger_info
       t.timestamps
     end
     

data/db/migrate/20120918194708_create_actor_keys.rb

@@ -0,0 +1,18 @@
+class CreateActorKeys < ActiveRecord::Migration
+  def up
+    create_table :actor_keys do |t|
+      t.integer :actor_id
+      t.binary  :key_der
+
+      t.timestamps
+    end
+
+    add_index "actor_keys", "actor_id"
+    add_foreign_key "actor_keys", "actors", :name => "actor_keys_on_actor_id"
+  end
+
+  def down
+    remove_foreign_key "actor_keys", :name => "actor_keys_on_actor_id"
+    drop_table :actor_keys
+  end
+end

data/lib/generators/social_stream/ostatus/install_generator.rb

@@ -13,10 +13,4 @@ class SocialStream::Ostatus::InstallGenerator < Rails::Generators::Base
   def config_initializer
     copy_file 'initializer.rb', 'config/initializers/social_stream-ostatus.rb'
   end
-  
-  def inject_remote_user_relation
-    append_file 'config/relations.yml',
-                     "\nremote_subject:\n  friend:\n    name: friend\n    permissions:\n      - [ follow ]\n    sphere: personal\n"+
-                                        "  public:\n    name: public\n    permissions:\n      - [ read, tie, star_tie ]\n    sphere: personal"  
-  end
 end

data/lib/generators/social_stream/ostatus/templates/initializer.rb

@@ -1,4 +1,18 @@
 SocialStream::Ostatus.setup do |config|
-  config.hub = 'http://localhost:4567/'
-  config.node_base_url = 'http://localhost:3000'
+  # Default to the PuSH reference Hub server
+  #
+  # config.hub = 'http://pubsubhubbub.appspot.com'
+
+  # The host where the hub should take the activity feed from
+  #
+  # Local subjects will publish their public activities there
+  config.activity_feed_host = 'localhost:3000'
+
+  # The host where the PuSH should send the callbacks to
+  #
+  # Remote subjects get their local activities updates with the PuSH callback
+  config.pshb_host = 'localhost:3000'
+
+  # Debug OStatus requests
+  # config.debug_requests = true
 end

data/lib/social_stream/ostatus/activity_streams.rb

@@ -0,0 +1,79 @@
+module SocialStream
+  module Ostatus
+    module ActivityStreams
+      # Parses the body from a {PshbController#index} and dispatches
+      # entries for parsing to {#record_from_entry!}
+      def from_pshb_callback(body)
+        atom = Proudhon::Atom.parse body
+
+        atom.entries.each do |entry|
+          # FIXME: get author from feed
+          # https://github.com/shf/proudhon/issues/8
+          entry.author.uri ||= feed.author.uri
+
+          activity_from_entry! entry
+        end
+      end
+
+      # Parses an activity form a PuSH or Salmon notification
+      # Decides what action should be taken from an ActivityStreams entry
+      def activity_from_entry! entry, receiver = nil
+        # FIXME: should not use to_sym
+        # https://github.com/shf/proudhon/issues/7
+        case entry.verb.to_sym
+        when :follow
+          Tie.from_entry! entry, receiver
+        else
+          # :post is the default verb
+          r = record_from_entry! entry, receiver
+          r.post_activity
+        end
+      end
+
+      # Redirects parsing to the suitable SocialStream's model
+      def record_from_entry! entry, receiver
+        model!(entry.objtype).from_entry! entry, receiver
+      end
+
+      # Finds or creates a {RemoteSubject} from an ActivityStreams entry
+      #
+      def actor_from_entry! entry
+        webfinger_id = entry.author.uri
+
+        if webfinger_id.blank?
+          raise "Entry author without uri: #{ entry.to_xml }"
+        end
+
+        RemoteSubject.find_or_create_by_webfinger_uri! webfinger_id
+      end
+
+      # Parses the body from a {Salmon#index} and receiving actor
+      def from_salmon_callback(body, receiver)
+        salmon = Proudhon::Salmon.new body
+
+        validate_salmon salmon
+
+        activity_from_entry! salmon.to_entry, receiver
+      end
+
+      def validate_salmon salmon
+        remote_subject = RemoteSubject.find_or_create_by_webfinger_uri!(salmon.to_entry.author.uri)
+        key = remote_subject.rsa_key
+
+        unless salmon.verify(key)
+          raise "Invalid salmon: #{ salmon }"
+        end
+      end
+
+      # Translate SocialStream activity verb to Proudhon verb
+      def verb orig
+        case orig
+        when 'make-friend'
+          :follow
+        else
+          orig.to_sym
+        end
+      end
+    end
+  end
+end

data/lib/social_stream/ostatus/controllers/debug_requests.rb

@@ -0,0 +1,24 @@
+module SocialStream
+  module Ostatus
+    module Controllers
+      module DebugRequests
+        extend ActiveSupport::Concern
+
+        included do
+          before_filter :debug_request
+        end
+
+        private
+
+        def debug_request
+          return unless SocialStream::Ostatus.debug_requests
+
+          logger.info request.body.read
+
+          # Set StringIO to initial state for the action to get the content
+          request.body.rewind
+        end
+      end
+    end
+  end
+end

data/lib/social_stream/ostatus/engine.rb

@@ -1,15 +1,15 @@
 module SocialStream
   module Ostatus
     class Engine < Rails::Engine
-      initializer 'social_stream-ostatus.actor' do
-        ActiveSupport.on_load(:actor) do
-          include SocialStream::Ostatus::Models::Actor
+      initializer 'social_stream-ostatus.activity_streams' do
+        SocialStream::ActivityStreams.class_eval do
+          extend SocialStream::Ostatus::ActivityStreams
         end
       end
 
-      initializer 'social_stream-ostatus.audience' do
-        ActiveSupport.on_load(:audience) do
-          include SocialStream::Ostatus::Models::Audience
+      initializer 'social_stream-ostatus.models.object' do
+        SocialStream::Models::Object::ClassMethods.module_eval do
+          include SocialStream::Ostatus::Models::Object::ClassMethods
         end
       end
 

data/lib/social_stream/ostatus/models/activity.rb

@@ -0,0 +1,41 @@
+module SocialStream
+  module Ostatus
+    module Models
+      module Activity
+        extend ActiveSupport::Concern
+
+        included do
+          after_commit :send_salmon
+        end
+
+        private
+
+        # Send Salmon notification to remote subject
+        def send_salmon
+          return if sender.subject_type == "RemoteSubject" ||
+                      receiver.subject_type != "RemoteSubject"
+
+          entry =
+            Proudhon::Entry.new id: "tag:#{ SocialStream::Ostatus.activity_feed_host },2005:activity-#{ id }",
+                                title: stream_title,
+                                content: stream_content,
+                                verb: SocialStream::ActivityStreams.verb(verb),
+                                author: Proudhon::Author.new(name: sender.name,
+                                                             uri: sender.webfinger_uri)
+          salmon = entry.to_salmon
+
+          if SocialStream::Ostatus.debug_requests
+            logger.info entry.to_xml
+          end
+
+          # FIXME: Rails 4 queues
+          Thread.new do
+            salmon.deliver receiver_subject.salmon_url, sender.rsa_key
+
+            ActiveRecord::Base.connection.close
+          end
+        end
+      end
+    end
+  end
+end

data/lib/social_stream/ostatus/models/actor.rb

@@ -6,9 +6,15 @@ module SocialStream
     module Models 
       module Actor
         extend ActiveSupport::Concern
+
+        include Rails.application.routes.url_helpers
         
         included do
-          after_create :init_feeds_to_hub
+          has_one :actor_key, dependent: :destroy,
+                              validate:  true,
+                              autosave:  true
+
+          after_commit :publish_feed
         end
 
         module ClassMethods
@@ -20,21 +26,61 @@ module SocialStream
             find_by_slug! $2
           end
         end
-        
-        def init_feeds_to_hub
-          publish_or_update_public_feed
-          #TO-DO: add calls to other public feeds if any
+
+        # The Webfinger ID for this {Actor}
+        def webfinger_id
+          "#{ slug }@#{ SocialStream::Ostatus.activity_feed_host }"
         end
-        
-        def publish_or_update_public_feed
-          t = Thread.new do
-            hub = SocialStream::Ostatus.hub 
-            topic = SocialStream::Ostatus.node_base_url+'/api/user/'+self.slug+'/public.atom'
+
+        # The Webfinger URI for this {Actor}
+        def webfinger_uri
+          "acct:#{ webfinger_id }"
+        end
+
+        # Fetch or create the associated {ActorKey}
+        def actor_key!
+          actor_key ||
+            create_actor_key!
+        end
+
+        # OpenSSL::PKey::RSA key
+        #
+        # The key is generated if it does not exist
+        def rsa_key
+          actor_key!.key
+        end
+
+        # Set OpenSSL::PKey::RSA key
+        def rsa_key= key
+          k = actor_key || build_actor_key
+          k.key = key
+        end
+
+        # Public RSA instance of {#rsa_key}
+        def rsa_public_key
+          rsa_key.public_key
+        end
+
+        # MagicKey string from public key
+        def magic_public_key
+          Proudhon::MagicKey.to_s rsa_public_key
+        end
+
+        def publish_feed
+          return if subject_type == "RemoteSubject"
+
+          # FIXME: Rails 4 queues
+          Thread.new do
+            uri = URI.parse(SocialStream::Ostatus.hub)
+            topic = polymorphic_url [subject, :activities],
+                                    :format => :atom,
+                                    :host => SocialStream::Ostatus.activity_feed_host
             
-            uri = URI.parse(hub)
-            response = Net::HTTP::post_form(uri,{ 'hub.mode' => 'publish',
-                                                  'hub.url'  => topic})
-            #TO-DO: process 4XX look at: response.status
+            response = Net::HTTP::post_form uri, { 'hub.mode' => 'publish',
+                                                   'hub.url'  => topic }
+            #TODO: process 4XX look at: response.status
+
+            ActiveRecord::Base.connection.close
           end
         end
       end 

data/lib/social_stream/ostatus/models/audience.rb

@@ -9,8 +9,8 @@ module SocialStream
         end
         
         def update_feed_to_hub
-          if relation.is_a?(Relation::Public)
-            activity.owner.publish_or_update_public_feed
+          if relation.is_a?(::Relation::Public)
+            activity.owner.publish_feed
           end
         end
       end

data/lib/social_stream/ostatus/models/object.rb

@@ -0,0 +1,28 @@
+module SocialStream
+  module Ostatus
+    module Models
+      module Object
+        module ClassMethods
+          # Creates an new instance from ActivityStreams entry
+          #
+          def from_entry! entry, receiver
+            create! do |obj|
+              obj.author =
+                obj.user_author = 
+                SocialStream::ActivityStreams.actor_from_entry!(entry)
+
+              obj.owner = receiver || obj.author
+
+              obj.title = entry.title
+              obj.description = entry.summary || entry.content
+
+              obj.relation_ids = [ ::Relation::Public.instance.id ]
+
+              yield obj if block_given?
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/social_stream/ostatus/models/relation/custom.rb

@@ -0,0 +1,22 @@
+module SocialStream
+  module Ostatus
+    module Models
+      module Relation
+        module Custom
+          extend ActiveSupport::Concern
+
+          included do
+            const_get("DEFAULT")['remote_subject'] = {
+              'default' => {
+                'name' => 'default',
+                'permissions' => [
+                  [ 'read', 'activity' ]
+                ]
+              }
+            }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/social_stream/ostatus/models/tie.rb

@@ -0,0 +1,24 @@
+module SocialStream
+  module Ostatus
+    module Models
+      module Tie
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # Create a new {Tie} from OStatus entry
+          def from_entry! entry, receiver
+            # Sender must be remote
+            sender = RemoteSubject.find_or_create_by_webfinger_uri! entry.author.uri
+
+            contact = sender.contact_to!(receiver)
+
+            # FIXME: hack
+            contact.user_author = sender
+            
+            contact.relation_ids = [::Relation::Public.instance.id]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/social_stream/ostatus/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Ostatus
-    VERSION = "0.0.1".freeze
+    VERSION = "0.1.0".freeze
   end
 end

data/lib/social_stream-ostatus.rb

@@ -5,21 +5,48 @@ require 'proudhon'
 
 module SocialStream
   module Ostatus
+    # PuSH hub
     mattr_accessor :hub
-    @@hub = :hub
-    
-    mattr_accessor :node_base_url
-    @@node_base_url = :node_base_url
+    # Default to the PubSubHubbub reference Hub server
+    @@hub = 'http://pubsubhubbub.appspot.com'
     
+    # The host where the hub should take the activity feed from
+    mattr_accessor :activity_feed_host
+    @@activity_feed_host = 'localhost:3000'
+
+    # The host where the PuSH should send the callbacks to
+    mattr_accessor :pshb_host
+    @@pshb_host = 'localhost:3000'
+
+    # Debug OStatus request with logger.info
+    mattr_accessor :debug_requests
+    @@debug_requests = false
+  
     class << self
       def setup 
         yield self
       end
     end
 
+    autoload :ActivityStreams, 'social_stream/ostatus/activity_streams'
+
     module Models
+      autoload :Activity, 'social_stream/ostatus/models/activity'
       autoload :Actor, 'social_stream/ostatus/models/actor'
       autoload :Audience, 'social_stream/ostatus/models/audience'
+      autoload :Tie, 'social_stream/ostatus/models/tie'
+
+      module Object
+        autoload :ClassMethods, 'social_stream/ostatus/models/object'
+      end
+
+      module Relation
+        autoload :Custom, 'social_stream/ostatus/models/relation/custom'
+      end
+    end
+    
+    module Controllers
+      autoload :DebugRequests, 'social_stream/ostatus/controllers/debug_requests'
     end
   end
 end

data/social_stream-ostatus.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base','~> 0.22.0')
-  s.add_runtime_dependency('proudhon','>= 0.3')
+  s.add_runtime_dependency('social_stream-base', '~> 0.23.0')
+  s.add_runtime_dependency('proudhon','>= 0.3.5')
   s.add_runtime_dependency('nokogiri','> 1.4.4')
   
   # Development Gem dependencies

data/spec/controllers/host_meta_controller_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe HostMetaController do
+  render_views
+
+  it "should render host_meta" do
+    get :index, :format => :all
+    assert_response :success
+  end
+end

data/spec/controllers/remote_subjects_controller_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe RemoteSubjectsController do
+  render_views
+
+  context "with remote subject" do
+    before do
+      @remote_subject = Factory(:remote_subject)
+    end
+
+    it "should redirect index to show" do
+      get :index, q: @remote_subject.webfinger_id
+
+      response.should redirect_to(@remote_subject)
+    end
+
+    it "should render show" do
+      get :show, id: @remote_subject.slug
+
+      response.should be_success
+    end
+
+
+    describe "refreshing show" do
+      before do
+        RemoteSubject.should_receive(:find_by_slug!).with(@remote_subject.slug) { @remote_subject }
+        @remote_subject.should_receive(:refresh_webfinger!)
+      end
+
+      it "should refresh remote_subject" do
+        get :show, id: @remote_subject.slug, refresh: true
+
+        response.should be_success
+      end
+    end
+  end
+end

data/spec/controllers/webfinger_controller_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe WebfingerController do
+  before do
+    @user = Factory(:user)
+  end
+
+  it "should render index" do
+    get :index, q: @user.webfinger_id
+
+    response.should be_success
+  end
+end

data/spec/factories/remote_subject.rb

@@ -0,0 +1,39 @@
+class << Proudhon::Finger
+  def fetch id
+    obj = Object.new
+    def obj.links
+      { updates_from: 'feed' }
+    end
+
+    def obj.magic_key
+      OpenSSL::PKey::RSA.generate 256
+    end
+
+    obj
+  end
+end
+
+class << Proudhon::Atom
+  def from_uri uri
+    obj = Object.new
+
+    def obj.subscribe(callback)
+      true
+    end
+
+    obj
+  end
+end
+
+RemoteSubject.class_eval do
+  def build_webfinger_info
+    {
+      aliases: [ "http://example.com/#{ webfinger_id.split('@').first }" ]
+    }
+
+  end
+end
+
+Factory.define :remote_subject do |s|
+  s.sequence(:webfinger_id) { |n| "remote_subject-#{ n }@example.com" }
+end

data/spec/models/actor_key_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe ActorKey do
+  it "should generate openssl key" do
+    actor_key = ActorKey.create! actor_id: 1
+
+    actor_key.key.class.should == OpenSSL::PKey::RSA
+  end
+end

data/spec/models/post_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Post do
+  describe "from_entry!" do
+    before do
+      @remote_subject = Factory(:remote_subject)
+      @entry = double("Proudhon::Entry")
+
+      SocialStream::ActivityStreams.should_receive(:actor_from_entry!) { @remote_subject }
+
+      @entry.should_receive(:title) { "testing" } 
+      @entry.should_receive(:summary) { "testing" }
+
+    end
+    it "should create post" do
+      post_count = Post.count
+
+      post = Post.from_entry! @entry, nil
+
+      post.author.should == @remote_subject.actor
+
+      Post.count.should == post_count + 1
+    end
+  end
+end

data/spec/models/remote_subject_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe RemoteSubject do
+  describe "find_or_create_by_webfinger_uri" do
+    before do
+      @remote_subject = Factory(:remote_subject)
+    end
+
+    it "should find without acct:" do
+      RemoteSubject.find_or_create_by_webfinger_uri!(@remote_subject.webfinger_id).should == @remote_subject
+    end
+
+    it "should find with acct:" do
+      RemoteSubject.find_or_create_by_webfinger_uri!("acct:#{ @remote_subject.webfinger_id}").should == @remote_subject
+    end
+
+    it "should find with alias" do
+      splt = @remote_subject.webfinger_id.split('@')
+      uri = "http://#{ splt.last }/#{ splt.first }"
+
+      RemoteSubject.find_or_create_by_webfinger_uri!(uri)
+    end
+  end
+end

data/spec/social_stream_ostatus_activity_streams.spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe SocialStream::Ostatus::ActivityStreams do
+  describe "from_pshb_callback" do
+    before do
+      @entry = double("Proudhon::Entry")
+
+      @remote_subject = double("RemoteSubject")
+
+      Proudhon::Atom.should_receive(:parse) { [ @entry ] }
+    end
+
+    describe "with post note" do
+      before do
+        @entry.should_receive(:verb) { :post }
+        @entry.should_receive(:objtype) { :note }
+
+        @post = double "post"
+
+        @post.should_receive :post_activity
+
+        Post.should_receive(:from_entry!).with(@entry) { @post }
+      end
+
+      it "should call stubs" do
+        SocialStream::ActivityStreams.from_pshb_callback "test"
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-ostatus
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-05 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: proudhon
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.5
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -152,25 +152,46 @@ files:
 - README.rdoc
 - Rakefile
 - app/assets/images/logos/actor/remote_subject.png
+- app/assets/images/logos/contact/remote_subject.png
+- app/assets/images/logos/original/remote_subject.png
+- app/assets/images/logos/profile/remote_subject.png
 - app/controllers/host_meta_controller.rb
 - app/controllers/pshb_controller.rb
-- app/controllers/remoteusers_controller.rb
+- app/controllers/remote_subjects_controller.rb
+- app/controllers/salmon_controller.rb
 - app/controllers/subjects_controller.rb
 - app/controllers/webfinger_controller.rb
+- app/decorators/social_stream/base/activity_decorator.rb
+- app/decorators/social_stream/base/actor_decorator.rb
+- app/decorators/social_stream/base/audience_decorator.rb
+- app/decorators/social_stream/base/relation/custom_decorator.rb
+- app/decorators/social_stream/base/tie_decorator.rb
+- app/models/actor_key.rb
 - app/models/remote_subject.rb
-- app/views/remoteusers/index.html.erb
+- app/views/remote_subjects/_show.html.erb
+- app/views/remote_subjects/show.html.erb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20120905145030_create_social_stream_ostatus.rb
+- db/migrate/20120918194708_create_actor_keys.rb
 - lib/generators/social_stream/ostatus/install_generator.rb
 - lib/generators/social_stream/ostatus/templates/initializer.rb
 - lib/social_stream-ostatus.rb
 - lib/social_stream/migrations/ostatus.rb
+- lib/social_stream/ostatus/activity_streams.rb
+- lib/social_stream/ostatus/controllers/debug_requests.rb
 - lib/social_stream/ostatus/engine.rb
+- lib/social_stream/ostatus/models/activity.rb
 - lib/social_stream/ostatus/models/actor.rb
 - lib/social_stream/ostatus/models/audience.rb
+- lib/social_stream/ostatus/models/object.rb
+- lib/social_stream/ostatus/models/relation/custom.rb
+- lib/social_stream/ostatus/models/tie.rb
 - lib/social_stream/ostatus/version.rb
 - social_stream-ostatus.gemspec
+- spec/controllers/host_meta_controller_spec.rb
+- spec/controllers/remote_subjects_controller_spec.rb
+- spec/controllers/webfinger_controller_spec.rb
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
@@ -202,8 +223,13 @@ files:
 - spec/dummy/public/javascripts/rails.js
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
+- spec/factories/remote_subject.rb
 - spec/integration/navigation_spec.rb
+- spec/models/actor_key_spec.rb
+- spec/models/post_spec.rb
+- spec/models/remote_subject_spec.rb
 - spec/social_stream_ostatus.spec.rb
+- spec/social_stream_ostatus_activity_streams.spec.rb
 - spec/spec_helper.rb
 homepage: http://social-stream.dit.upm.es
 licenses: []

data/app/controllers/remoteusers_controller.rb

@@ -1,30 +0,0 @@
-class RemoteusersController < ApplicationController
-  before_filter :authenticate_user!
-  
-  def index
-    if params[:slug].present?
-      #Selecting the remote subject
-      u = RemoteSubject.find_or_create_using_wslug(params[:slug])
-      
-      #Creating the tie between me and the remote subject
-      t = Tie.create!(:sender => current_user.actor,
-                      :receiver => u.actor,
-                      :relation_name => "friend") 
-      
-      #Requesting a subscription to the hub
-      t = Thread.new do
-        uri = URI.parse(SocialStream::Ostatus.hub)   
-        response = Net::HTTP::post_form(uri,{ 'hub.callback' => pshb_callback_url, 
-                                              'hub.mode'     => "subscribe",
-                                              'hub.topic'    => u.public_feed_url,
-                                              'hub.verify'   => 'sync'})
-                                                                                          
-      end                                                         
-    end
-    
-    respond_to do |format|
-      format.html
-    end
-  end
-  
-end

data/app/views/remoteusers/index.html.erb

@@ -1,8 +0,0 @@
-<h2> Follow remote user: </h2>
-<br/>
-
-<%= form_tag(add_remote_user_url, :method => "post") do %>
-  <%= label_tag(:slug, "Remote user slug:") %>
-  <%= text_field_tag(:slug) %>
-  <%= submit_tag("Follow") %>
-<% end %>