social_stream-ostatus 0.1.0 → 0.2.0

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

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

data/lib/social_stream-ostatus.rb

@@ -34,6 +34,7 @@ module SocialStream
       autoload :Activity, 'social_stream/ostatus/models/activity'
       autoload :Actor, 'social_stream/ostatus/models/actor'
       autoload :Audience, 'social_stream/ostatus/models/audience'
+      autoload :Contact, 'social_stream/ostatus/models/contact'
       autoload :Tie, 'social_stream/ostatus/models/tie'
 
       module Object

data/lib/social_stream/ostatus/activity_streams.rb

@@ -21,8 +21,10 @@ module SocialStream
         # 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
+        when :follow, :subscribe, :join
+          Tie.create_from_entry! entry, receiver
+        when :unsubscribe, :leave, 'http://ostatus.org/schema/1.0/unfollow'
+          Tie.destroy_from_entry! entry, receiver
         else
           # :post is the default verb
           r = record_from_entry! entry, receiver

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

@@ -0,0 +1,64 @@
+module SocialStream
+  module Ostatus
+    module Models
+      module Contact
+        extend ActiveSupport::Concern
+
+        included do
+          # FIXME: hack, this overwrites base definition, see there
+          # for the reasons related to after_destroy callbacks
+          alias_method_chain :unset_follow_action, :salmon
+        end
+
+        module ClassMethods
+          # Find contact 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
+          end
+        end
+
+        # Send Salmon notification
+        #
+        # FIXME DRY with activity.rb
+        def unset_follow_action_with_salmon(relation)
+          unset_follow_action_without_salmon(relation)
+
+          return if sender.subject_type == "RemoteSubject" ||
+                      receiver.subject_type != "RemoteSubject"
+
+          title = I18n.t "activity.stream.title.unfollow",
+                         author: sender_subject.name,
+                         activity_object: receiver_subject.name
+
+          entry =
+            Proudhon::Entry.new id: "tag:#{ SocialStream::Ostatus.activity_feed_host },2005:contact-destroy-#{ id }",
+                                title: title,
+                                content: title,
+                                verb: 'http://ostatus.org/schema/1.0/unfollow',
+                                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/tie.rb

@@ -6,16 +6,17 @@ module SocialStream
 
         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
+          def create_from_entry! entry, receiver
+            contact = ::Contact.from_entry! entry, receiver
+           
+            contact.relation_ids = [::Relation::Public.instance.id]
+          end
 
-            contact = sender.contact_to!(receiver)
+          # Remove all {Tie} from OStatus entry
+          def destroy_from_entry! entry, receiver
+            contact = ::Contact.from_entry! entry, receiver
 
-            # FIXME: hack
-            contact.user_author = sender
-            
-            contact.relation_ids = [::Relation::Public.instance.id]
+            contact.relation_ids = []
           end
         end
       end

data/lib/social_stream/ostatus/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Ostatus
-    VERSION = "0.1.0".freeze
+    VERSION = "0.2.0".freeze
   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.23.0')
-  s.add_runtime_dependency('proudhon','>= 0.3.5')
+  s.add_runtime_dependency('social_stream-base', '~> 0.24.0')
+  s.add_runtime_dependency('proudhon','>= 0.3.6')
   s.add_runtime_dependency('nokogiri','> 1.4.4')
   
   # Development Gem dependencies

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-ostatus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-03 00:00:00.000000000 Z
+date: 2012-10-23 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.23.0
+        version: 0.24.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.24.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.5
+        version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.5
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,7 @@ files:
 - 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/contact_decorator.rb
 - app/decorators/social_stream/base/relation/custom_decorator.rb
 - app/decorators/social_stream/base/tie_decorator.rb
 - app/models/actor_key.rb
@@ -184,6 +185,7 @@ files:
 - 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/contact.rb
 - lib/social_stream/ostatus/models/object.rb
 - lib/social_stream/ostatus/models/relation/custom.rb
 - lib/social_stream/ostatus/models/tie.rb
@@ -257,3 +259,4 @@ specification_version: 3
 summary: Provides a Social Stream node with social network federation support via
   OStatus protocol
 test_files: []
+has_rdoc: