social2social 0.0.3 → 0.0.4

data/.gitignore

@@ -5,3 +5,5 @@ spec/dummy/db/*.sqlite3
 spec/dummy/log/*.log
 spec/dummy/tmp/
 *.DS_Store
+**.*swp
+Gemfile.lock

data/Rakefile

@@ -25,3 +25,5 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+Bundler::GemHelper.install_tasks

data/config/routes.rb

@@ -0,0 +1,4 @@
+Rails.application.routes.draw do
+  match 'pshb/callback' => 'pshb#callback', :as => :pshb_callback
+  match 'remoteuser/' => 'remoteusers#index', :as => :add_remote_user
+end

data/lib/generators/social2social/install_generator.rb

@@ -1,18 +1,8 @@
 class Social2social::InstallGenerator < Rails::Generators::Base
   include Rails::Generators::Migration
   
-  hook_for :social_stream
-  
   source_root File.expand_path('../templates', __FILE__)
   
-  def route_pshb
-    route "match 'pshb/callback' => 'pshb#callback', :as => :pshb_callback"
-  end
-  
-  def route_ru
-    route "match 'remoteuser/' => 'remoteusers#index', :as => :add_remote_user"
-  end
-  
   def config_initializer
     copy_file 'initializer.rb', 'config/initializers/social2social.rb'
   end
@@ -22,11 +12,7 @@ class Social2social::InstallGenerator < Rails::Generators::Base
                      "\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
-  
-  def inject_translations
-    copy_file 'en.yml', 'config/locales/s2s.en.yml'
-  end
-  
+
   def copy_public
     directory "public"
   end

data/lib/social2social/engine.rb

@@ -1,7 +1,5 @@
 module Social2social
   class Engine < Rails::Engine
-    config.app_generators.social_stream :social_stream
-
     config.to_prepare do
       #Patching Actor
       Actor.class_eval do

data/lib/social2social.rb

@@ -1,4 +1,4 @@
-require 'social_stream'
+require 'social_stream-base'
 
 module Social2social
   

data/social2social.gemspec

@@ -1,25 +1,25 @@
 Gem::Specification.new do |s|
-	s.name = "social2social"
-	s.version = "0.0.3"
-	s.authors = ["Víctor Sánchez Belmar"]
-	s.summary = "Provides a social stream node able to decentralize contents with the OStatus protocol"
-	s.description = "This gem allow you to connect several social stream nodes using PSHB hubs, also allows to follow, and share streams with social stream users in any node."
-	s.email = "v.sanchezbelmar@gmail.com"
-	s.homepage = "http://github.com/ging/social2social"
-	s.files = `git ls-files`.split("\n")
+  s.name = "social2social"
+  s.version = "0.0.4"
+  s.authors = ["Víctor Sánchez Belmar"]
+  s.summary = "Provides a Social Stream node able to decentralize contents with the OStatus protocol"
+  s.description = "This gem allow you to connect several social stream nodes using PSHB hubs, also allows to follow, and share streams with social stream users in any node."
+  s.email = "v.sanchezbelmar@gmail.com"
+  s.homepage = "http://github.com/ging/social2social"
+  s.files = `git ls-files`.split("\n")
 
-	# Gem dependencies
-  s.add_runtime_dependency('social_stream','~> 0.4.4')
+  # Gem dependencies
+  s.add_runtime_dependency('social_stream-base','~> 0.5.1')
   s.add_runtime_dependency('nokogiri','~> 1.4.4')
   
-	# Development Gem dependencies
-	s.add_development_dependency('rails', '~> 3.0.7')
-	s.add_development_dependency('sqlite3-ruby')
-	if RUBY_VERSION < '1.9'
-		s.add_development_dependency('ruby-debug', '~> 0.10.3')
-	end
-	s.add_development_dependency('rspec-rails', '~> 2.5.0')
-	s.add_development_dependency('factory_girl', '~> 1.3.2')
-	s.add_development_dependency('forgery', '~> 0.3.6')
-	s.add_development_dependency('capybara', '~> 0.3.9')
+  # Development Gem dependencies
+  s.add_development_dependency('rails', '~> 3.0.7')
+  s.add_development_dependency('sqlite3-ruby')
+  if RUBY_VERSION < '1.9'
+    s.add_development_dependency('ruby-debug', '~> 0.10.3')
+  end
+  s.add_development_dependency('rspec-rails', '~> 2.5.0')
+  s.add_development_dependency('factory_girl', '~> 1.3.2')
+  s.add_development_dependency('forgery', '~> 0.3.6')
+  s.add_development_dependency('capybara', '~> 0.3.9')
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social2social
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - "V\xC3\xADctor S\xC3\xA1nchez Belmar"
@@ -15,28 +15,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 +02:00
+date: 2011-06-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: social_stream
   prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 9
         segments: 
         - 0
-        - 4
-        - 4
-        version: 0.4.4
-  type: :runtime
+        - 5
+        - 1
+        version: 0.5.1
+  name: social_stream-base
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +48,11 @@ dependencies:
         - 4
         - 4
         version: 1.4.4
-  type: :runtime
+  name: nokogiri
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,11 +64,11 @@ dependencies:
         - 0
         - 7
         version: 3.0.7
-  type: :development
+  name: rails
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,11 +78,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  name: sqlite3-ruby
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,11 +94,11 @@ dependencies:
         - 10
         - 3
         version: 0.10.3
-  type: :development
+  name: ruby-debug
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
+  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -110,11 +110,11 @@ dependencies:
         - 5
         - 0
         version: 2.5.0
-  type: :development
+  name: rspec-rails
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: factory_girl
   prerelease: false
+  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,11 +126,11 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  type: :development
+  name: factory_girl
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: forgery
   prerelease: false
+  type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,11 +142,11 @@ dependencies:
         - 3
         - 6
         version: 0.3.6
-  type: :development
+  name: forgery
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: capybara
   prerelease: false
+  type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -158,7 +158,7 @@ dependencies:
         - 3
         - 9
         version: 0.3.9
-  type: :development
+  name: capybara
   version_requirements: *id009
 description: This gem allow you to connect several social stream nodes using PSHB hubs, also allows to follow, and share streams with social stream users in any node.
 email: v.sanchezbelmar@gmail.com
@@ -172,7 +172,6 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -180,8 +179,9 @@ files:
 - app/controllers/remoteusers_controller.rb
 - app/models/remote_subject.rb
 - app/views/remoteusers/index.html.erb
+- config/locales/en.yml
+- config/routes.rb
 - lib/generators/social2social/install_generator.rb
-- lib/generators/social2social/templates/en.yml
 - lib/generators/social2social/templates/initializer.rb
 - lib/generators/social2social/templates/migration.rb
 - lib/generators/social2social/templates/public/images/logos/actor/remote_user.png
@@ -254,9 +254,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Provides a social stream node able to decentralize contents with the OStatus protocol
+summary: Provides a Social Stream node able to decentralize contents with the OStatus protocol
 test_files: []
 

data/Gemfile.lock

@@ -1,237 +0,0 @@
-PATH
-  remote: .
-  specs:
-    social2social (0.0.2)
-      nokogiri (~> 1.4.4)
-      social_stream (~> 0.4.4)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.5.0)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.14)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
-    acts-as-taggable-on (2.0.6)
-    addressable (2.2.5)
-    ancestry (1.2.3)
-      activerecord (>= 2.2.2)
-    arel (2.0.9)
-    bcrypt-ruby (2.1.4)
-    builder (2.1.2)
-    cancan (1.6.4)
-    capybara (0.3.9)
-      culerity (>= 0.2.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.3)
-    childprocess (0.1.8)
-      ffi (~> 1.0.6)
-    columnize (0.3.2)
-    culerity (0.2.15)
-    devise (1.3.1)
-      bcrypt-ruby (~> 2.1.2)
-      orm_adapter (~> 0.0.3)
-      warden (~> 1.0.3)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    factory_girl (1.3.3)
-    faraday (0.6.1)
-      addressable (~> 2.2.4)
-      multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
-    ffi (1.0.7)
-      rake (>= 0.8.7)
-    foreigner (0.9.2)
-    forgery (0.3.7)
-      nokogiri (~> 1.4)
-    has_scope (0.5.0)
-    i18n (0.5.0)
-    inherited_resources (1.1.2)
-      has_scope (~> 0.5.0)
-      responders (~> 0.6.0)
-    jquery-rails (0.2.7)
-      rails (~> 3.0)
-      thor (~> 0.14.4)
-    json_pure (1.5.1)
-    linecache (0.43)
-    mail (2.2.17)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mailboxer (0.0.16)
-      foreigner (~> 0.9.1)
-    mime-types (1.16)
-    multi_json (0.0.5)
-    multipart-post (1.1.0)
-    net-ldap (0.1.1)
-    nokogiri (1.4.4)
-    oa-basic (0.2.2)
-      multi_json (~> 0.0.2)
-      nokogiri (~> 1.4.2)
-      oa-core (= 0.2.2)
-      rest-client (~> 1.6.0)
-    oa-core (0.2.2)
-      rack (~> 1.1)
-    oa-enterprise (0.2.2)
-      net-ldap (~> 0.1.1)
-      nokogiri (~> 1.4.2)
-      oa-core (= 0.2.2)
-      pyu-ruby-sasl (~> 0.0.3.1)
-      rubyntlm (~> 0.1.1)
-    oa-more (0.2.2)
-      multi_json (~> 0.0.2)
-      oa-core (= 0.2.2)
-      rest-client (~> 1.6.0)
-    oa-oauth (0.2.2)
-      faraday (~> 0.6.1)
-      multi_json (~> 0.0.2)
-      nokogiri (~> 1.4.2)
-      oa-core (= 0.2.2)
-      oauth (~> 0.4.0)
-      oauth2 (~> 0.3.0)
-    oa-openid (0.2.2)
-      oa-core (= 0.2.2)
-      rack-openid (~> 1.2.0)
-      ruby-openid-apps-discovery
-    oauth (0.4.4)
-    oauth-plugin (0.4.0.pre4)
-      oauth (>= 0.4.4)
-    oauth2 (0.3.0)
-      faraday (~> 0.6.0)
-      multi_json (~> 0.0.4)
-    omniauth (0.2.2)
-      oa-basic (= 0.2.2)
-      oa-core (= 0.2.2)
-      oa-enterprise (= 0.2.2)
-      oa-more (= 0.2.2)
-      oa-oauth (= 0.2.2)
-      oa-openid (= 0.2.2)
-    orm_adapter (0.0.4)
-    paperclip (2.3.11)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
-    polyglot (0.3.1)
-    pyu-ruby-sasl (0.0.3.2)
-    rack (1.2.2)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-openid (1.2.0)
-      rack (>= 1.1.0)
-      ruby-openid (>= 2.1.8)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
-      bundler (~> 1.0)
-      railties (= 3.0.7)
-    rails_css_themes (1.0.0)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    responders (0.6.2)
-    rest-client (1.6.1)
-      mime-types (>= 1.16)
-    rmagick (2.13.1)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      rspec (~> 2.5.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-openid (2.1.8)
-    ruby-openid-apps-discovery (1.2.0)
-      ruby-openid (>= 2.1.7)
-    rubyntlm (0.1.1)
-    rubyzip (0.9.4)
-    selenium-webdriver (0.1.4)
-      childprocess (>= 0.1.7)
-      ffi (>= 1.0.7)
-      json_pure
-      rubyzip
-    social_stream (0.4.4)
-      acts-as-taggable-on (~> 2.0.6)
-      ancestry (~> 1.2.3)
-      cancan (~> 1.6.4)
-      devise (~> 1.2.rc)
-      foreigner (~> 0.9.1)
-      inherited_resources (~> 1.1.2)
-      jquery-rails (~> 0.2.5)
-      mailboxer (~> 0.0.16)
-      oauth-plugin (~> 0.4.0.pre1)
-      omniauth (~> 0.2.0.beta5)
-      paperclip (~> 2.3.4)
-      rails_css_themes (~> 1.0.0)
-      rmagick (~> 2.13.1)
-      stringex (~> 1.2.0)
-      will_paginate (~> 3.0.pre2)
-    sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    stringex (1.2.1)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.26)
-    warden (1.0.3)
-      rack (>= 1.0.0)
-    will_paginate (3.0.pre2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  capybara (~> 0.3.9)
-  factory_girl (~> 1.3.2)
-  forgery (~> 0.3.6)
-  rails (~> 3.0.7)
-  rspec-rails (~> 2.5.0)
-  ruby-debug (~> 0.10.3)
-  social2social!
-  sqlite3-ruby