social_stream-ostatus 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e04e19ab067d7cbc857e27bb92db09f52d5dd7d9
-  data.tar.gz: 1a29190052fc309a9cafc141ab647d027c4aeea4
+  metadata.gz: 82c84261282dfad32e15cdfe05c4d1b91d7027c8
+  data.tar.gz: b85a6cb8e5bcbedea545cc37d62170fec3aefd3b
 SHA512:
-  metadata.gz: 3639669fa718cd7d292eb4e1e59243ffa24bef34bc11a614139e1305c8181064bd04c2ab7c273118a13cf230b448a88f0231c1f023d0bf634cff16a94844e549
-  data.tar.gz: 3898c16226a6dd9c10c8b72f2ddeadb1c2ee83929b33bda3e1bba85bb11215414e58939a40c1ee5429d35155c4219339adacf2bb014f148ee30b34931389faa0
+  metadata.gz: b2fa3ce0c5439b5d52fadb331ff72f648634163dcf1da79d5d3318bac269ca81020305d54dfb3d9fe38e299ed11b4ade6a4c7fbaaa828c3c0cd12fd3747dbea6
+  data.tar.gz: b785ba2b50454646d2637c34e8bf0464d4b6839120c8fa150ad9b636a689604584dfcd3ef658b7e8ba1e93aadc36e7fe2d2387a6e2b8e3423694ed34258f3a52

data/Rakefile

@@ -3,12 +3,7 @@ require 'bundler/gem_tasks'
 
 require 'rdoc/task'
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec
+task :default => :rdoc
 
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'

data/config/locales/zh.yml

@@ -4,32 +4,32 @@ zh:
     verb:
       follow:
         RemoteSubject:
-          title: '%{subject} added %{contact} as contact.'
           message: '%{name} added you as contact.'
           notification:
-            subject: '%{name} added you as contact.'
             body: '%{name} added you as contact.'
+            subject: '%{name} added you as contact.'
+          title: '%{subject} added %{contact} as contact.'
       like:
         RemoteSubject:
-          title: '%{subject} is a fan of %{contact}.'
           message: '%{name} is now your fan.'
           notification:
-            subject: '%{name} is now your fan.'
             body: '%{name} is now your fan.'
+            subject: '%{name} is now your fan.'
+          title: '%{subject} is a fan of %{contact}.'
       make-friend:
         RemoteSubject:
-          title: '%{subject} and %{contact} are now connected.'
           message: '%{name} also added you as contact.'
           notification:
-            subject: '%{name} also added you as contact.'
             body: '%{name} also added you as contact.'
+            subject: '%{name} also added you as contact.'
+          title: '%{subject} and %{contact} are now connected.'
       post:
         RemoteSubject:
           notification:
-            subject: '%{name} has posted something(%{direct_object}) in your wall'
             body: '%{name} has posted something(%{direct_object}) in your wall'
+            subject: '%{name} has posted something(%{direct_object}) in your wall'
       update:
         RemoteSubject:
           notification:
-            subject: '%{name} has updated %{direct_object} in your wall'
             body: '%{name} has updated something(%{direct_object}) in your wall'
+            subject: '%{name} has updated %{direct_object} in your wall'

data/lib/social_stream-ostatus.rb

@@ -45,6 +45,9 @@ module SocialStream
     module Controllers
       autoload :DebugRequests, 'social_stream/ostatus/controllers/debug_requests'
     end
+
+    # Include route_subject in routes
+    SocialStream.routed_subjects << :remote_subject
   end
 end
 

data/lib/social_stream/ostatus/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Ostatus
-    VERSION = "2.1.0".freeze
+    VERSION = "2.2.0".freeze
   end
 end

data/social_stream-ostatus.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.1.0')
+  s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
   s.add_runtime_dependency('proudhon','>= 0.3.6')
   s.add_runtime_dependency('nokogiri','> 1.4.4')
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-ostatus
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Antonio Tapiador
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: proudhon
   requirement: !ruby/object:Gem::Requirement
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Provides a Social Stream node with social network federation support via