social_stream 0.16.3 → 0.17.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (91) hide show
  1. data/LICENSE +1 -1
  2. data/README.rdoc +1 -0
  3. data/base/LICENSE +1 -1
  4. data/base/README.rdoc +1 -1
  5. data/base/app/assets/stylesheets/header.css.scss +9 -7
  6. data/base/app/controllers/groups_controller.rb +3 -4
  7. data/base/app/controllers/settings_controller.rb +14 -3
  8. data/base/app/controllers/users_controller.rb +3 -4
  9. data/base/app/helpers/permissions_helper.rb +2 -1
  10. data/base/app/models/activity_object.rb +29 -28
  11. data/base/app/models/actor.rb +27 -19
  12. data/base/app/models/channel.rb +48 -0
  13. data/base/app/views/contacts/_pendings.html.erb +1 -1
  14. data/base/app/views/devise/registrations/_edit_user.html.erb +0 -25
  15. data/base/app/views/devise/registrations/edit.html.erb +1 -0
  16. data/base/app/views/layouts/_footer.html.erb +1 -1
  17. data/base/app/views/layouts/_header_dropdown_menu_sessions.html.erb +5 -2
  18. data/base/app/views/settings/_language.html.erb +32 -0
  19. data/base/app/views/settings/_notifications.html.erb +1 -1
  20. data/base/config/locales/en.yml +5 -0
  21. data/base/config/locales/es.yml +7 -0
  22. data/base/db/migrate/20120103103125_add_channels.rb +88 -0
  23. data/base/db/migrate/20120109081509_update_notify_permissions.rb +15 -0
  24. data/base/lib/social_stream-base.rb +7 -4
  25. data/base/lib/social_stream/base/engine.rb +10 -2
  26. data/base/lib/social_stream/base/version.rb +1 -1
  27. data/base/lib/social_stream/controllers/i18n_integration.rb +29 -0
  28. data/base/lib/social_stream/controllers/subjects.rb +19 -0
  29. data/base/lib/social_stream/models/object.rb +12 -26
  30. data/base/lib/social_stream/models/subject.rb +2 -24
  31. data/base/lib/social_stream/models/subtype.rb +80 -0
  32. data/base/lib/social_stream/models/supertype.rb +16 -3
  33. data/base/lib/social_stream/views/settings/base.rb +5 -0
  34. data/base/lib/tasks/db/populate.rake +1 -0
  35. data/base/spec/controllers/settings_controller_spec.rb +1 -1
  36. data/base/spec/spec_helper.rb +3 -0
  37. data/documents/app/assets/stylesheets/documents.css.scss +9 -0
  38. data/documents/app/controllers/documents_controller.rb +3 -2
  39. data/documents/app/models/document.rb +1 -1
  40. data/documents/app/views/documents/_new_activity_fields.html.erb +14 -0
  41. data/documents/app/views/videos/_video_show.html.erb +23 -19
  42. data/documents/config/locales/en.yml +6 -2
  43. data/documents/config/locales/es.yml +6 -2
  44. data/documents/db/migrate/20120109155431_document_object_type.rb +16 -0
  45. data/documents/lib/social_stream/documents/version.rb +1 -1
  46. data/documents/social_stream-documents.gemspec +2 -2
  47. data/documents/spec/dummy/Rakefile +1 -1
  48. data/documents/spec/dummy/app/assets/javascripts/application.js +9 -0
  49. data/documents/spec/dummy/app/assets/stylesheets/application.css +7 -0
  50. data/documents/spec/dummy/app/views/layouts/application.html.erb +3 -3
  51. data/documents/spec/dummy/config/application.rb +8 -8
  52. data/documents/spec/dummy/config/database.yml +3 -0
  53. data/documents/spec/dummy/config/environments/development.rb +7 -2
  54. data/documents/spec/dummy/config/environments/production.rb +23 -12
  55. data/documents/spec/dummy/config/environments/test.rb +5 -3
  56. data/documents/spec/dummy/config/initializers/secret_token.rb +1 -1
  57. data/documents/spec/dummy/config/initializers/wrap_parameters.rb +14 -0
  58. data/documents/spec/dummy/config/locales/en.yml +1 -1
  59. data/documents/spec/dummy/config/routes.rb +1 -1
  60. data/documents/spec/dummy/db/schema.rb +6 -0
  61. data/events/app/assets/stylesheets/events.css.scss +3 -0
  62. data/events/app/helpers/events_helper.rb +11 -1
  63. data/events/app/models/event.rb +12 -1
  64. data/events/lib/social_stream/events/models/actor.rb +6 -0
  65. data/events/lib/social_stream/events/version.rb +1 -1
  66. data/events/lib/social_stream/views/sidebar/events.rb +4 -2
  67. data/events/social_stream-events.gemspec +2 -2
  68. data/lib/generators/social_stream/install_generator.rb +1 -0
  69. data/lib/social_stream.rb +2 -0
  70. data/lib/social_stream/version.rb +1 -1
  71. data/lib/tasks/migrations.rake +14 -0
  72. data/linkser/app/assets/javascripts/linkser.js.erb +3 -3
  73. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  74. data/linkser/social_stream-linkser.gemspec +2 -2
  75. data/presence/lib/social_stream/presence/version.rb +1 -1
  76. data/presence/social_stream-presence.gemspec +1 -1
  77. data/social_stream.gemspec +9 -6
  78. data/spec/dummy/config/application.rb +5 -5
  79. data/spec/dummy/config/environments/development.rb +3 -0
  80. data/spec/dummy/config/environments/production.rb +10 -4
  81. data/spec/dummy/config/initializers/secret_token.rb +1 -1
  82. data/spec/dummy/config/initializers/wrap_parameters.rb +5 -3
  83. data/spec/dummy/db/schema.rb +2 -8
  84. data/spec/dummy/script/rails +0 -0
  85. data/spec/spec_helper.rb +3 -0
  86. data/spec/support/db.rb +1 -1
  87. metadata +51 -31
  88. data/base/spec/dummy/app/helpers/application_helper.rb +0 -2
  89. data/spec/dummy/app/helpers/application_helper.rb +0 -2
  90. data/spec/dummy/app/mailers/.gitkeep +0 -0
  91. data/spec/dummy/app/models/.gitkeep +0 -0
@@ -7,7 +7,11 @@ Dummy::Application.configure do
7
7
  # and recreated between test runs. Don't rely on the data there!
8
8
  config.cache_classes = true
9
9
 
10
- # Log error messages when you accidentally call methods on nil.
10
+ # Configure static asset server for tests with Cache-Control for performance
11
+ config.serve_static_assets = true
12
+ config.static_cache_control = "public, max-age=3600"
13
+
14
+ # Log error messages when you accidentally call methods on nil
11
15
  config.whiny_nils = true
12
16
 
13
17
  # Show full error reports and disable caching
@@ -32,6 +36,4 @@ Dummy::Application.configure do
32
36
 
33
37
  # Print deprecation notices to the stderr
34
38
  config.active_support.deprecation = :stderr
35
-
36
- config.assets.enabled = true
37
39
  end
@@ -4,4 +4,4 @@
4
4
  # If you change this key, all old signed cookies will become invalid!
5
5
  # Make sure the secret is at least 30 characters and all random,
6
6
  # no regular words or you'll be exposed to dictionary attacks.
7
- Dummy::Application.config.secret_token = 'a85ff3866549e818069e088bed435487038449bae9d3a31ca266f7b2670751908ea358d3120c787b2b86d9de39bb833b10a108b7b3d3460c4469e75f58be0259'
7
+ Dummy::Application.config.secret_token = '64ac9e68eea7ea0f6e41cd784aee79f12fa53b11e86b46e04d7e38cfb460df7156d5fbc09626fe621c9b3a0bd40b53f74404060639a71d630edf538f638026d4'
@@ -0,0 +1,14 @@
1
+ # Be sure to restart your server when you modify this file.
2
+ #
3
+ # This file contains settings for ActionController::ParamsWrapper which
4
+ # is enabled by default.
5
+
6
+ # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
7
+ ActiveSupport.on_load(:action_controller) do
8
+ wrap_parameters format: [:json]
9
+ end
10
+
11
+ # Disable root element in JSON by default.
12
+ ActiveSupport.on_load(:active_record) do
13
+ self.include_root_in_json = false
14
+ end
@@ -1,5 +1,5 @@
1
1
  # Sample localization file for English. Add more files in this directory for other locales.
2
- # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
2
+ # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
3
3
 
4
4
  en:
5
5
  hello: "Hello world"
@@ -50,7 +50,7 @@ Dummy::Application.routes.draw do
50
50
 
51
51
  # You can have the root of your site routed with "root"
52
52
  # just remember to delete public/index.html.
53
- # root :to => "welcome#index"
53
+ # root :to => 'welcome#index'
54
54
 
55
55
  # See how all your routes lay out with "rake routes"
56
56
 
@@ -0,0 +1,6 @@
1
+ require 'social_stream/migrations/documents'
2
+
3
+ ActiveRecord::Schema.define(:version => 0) do
4
+ SocialStream::Migrations::Base.new.up
5
+ SocialStream::Migrations::Documents.new.up
6
+ end
@@ -44,6 +44,9 @@
44
44
  background-color: #F2F2F2;
45
45
  }
46
46
 
47
+ #sidebar_calendar td.busy {
48
+ font-weight: bold;
49
+ }
47
50
  .sidebar_calendar_month {
48
51
  text-align: center;
49
52
  padding: 5px;
@@ -1,5 +1,13 @@
1
1
  module EventsHelper
2
2
  def event_class(day)
3
+ begin_date = Time.now.beginning_of_week.to_date
4
+ end_date = begin_date + 28
5
+
6
+ busy_dates =
7
+ profile_or_current_subject.
8
+ events.
9
+ ocurrences(begin_date, end_date)
10
+
3
11
  [].tap { |css|
4
12
  css <<
5
13
  if day < Date.today
@@ -10,7 +18,9 @@ module EventsHelper
10
18
  "next_month"
11
19
  end
12
20
 
13
- #TODO: event ocurrence
21
+
22
+ css << "busy" if busy_dates.include?(day)
23
+
14
24
  }.join(" ")
15
25
  end
16
26
  end
@@ -9,12 +9,23 @@ class Event < ActiveRecord::Base
9
9
 
10
10
  validate :room_belongs_to_receiver
11
11
 
12
+ class << self
13
+ def ocurrences(start_date, end_date)
14
+ between(start_date, end_date).
15
+ map { |e|
16
+ e.ocurrences(start_date, end_date)
17
+ }.
18
+ flatten.
19
+ uniq
20
+ end
21
+ end
22
+
12
23
  def to_json(options = {})
13
24
  if recurrence
14
25
  st = options[:start].try(:to_date)
15
26
  en = (options[:end] || end_at.end_of_month + 7.days).to_date
16
27
 
17
- recurrence.events(:starts => st, :until => en).map do |d|
28
+ ocurrences(st, en).map do |d|
18
29
 
19
30
  start_diff = d - start_at.to_date
20
31
  end_diff = d - end_at.to_date
@@ -7,6 +7,12 @@ module SocialStream
7
7
  included do
8
8
  has_many :rooms
9
9
  end
10
+
11
+ module InstanceMethods
12
+ def events
13
+ Event.authored_by(self)
14
+ end
15
+ end
10
16
  end
11
17
  end
12
18
  end
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Events
3
- VERSION = "0.3.2".freeze
3
+ VERSION = "0.4.0".freeze
4
4
  end
5
5
  end
@@ -4,8 +4,10 @@ module SocialStream
4
4
  module Events
5
5
  def sidebar_items type
6
6
  super.tap do |items|
7
- items.unshift :key => 'calendar',
8
- :html => render(:partial => 'events/sidebar_calendar')
7
+ if profile_or_current_subject
8
+ items.unshift :key => 'calendar',
9
+ :html => render(:partial => 'events/sidebar_calendar')
10
+ end
9
11
  end
10
12
  end
11
13
  end
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
12
12
  s.files = `git ls-files`.split("\n")
13
13
 
14
14
  # Gem dependencies
15
- s.add_runtime_dependency('social_stream-base', '~> 0.11.2')
16
- s.add_runtime_dependency('rails-scheduler', '~> 0.0.4')
15
+ s.add_runtime_dependency('social_stream-base', '~> 0.12.0')
16
+ s.add_runtime_dependency('rails-scheduler', '~> 0.0.5')
17
17
  s.add_runtime_dependency('coffee-rails', '> 3.1.0')
18
18
 
19
19
  # Development Gem dependencies
@@ -3,4 +3,5 @@ class SocialStream::InstallGenerator < Rails::Generators::Base #:nodoc:
3
3
  hook_for :documents
4
4
  hook_for :events
5
5
  hook_for :linkser
6
+ hook_for :chat
6
7
  end
data/lib/social_stream.rb CHANGED
@@ -2,6 +2,7 @@ require 'social_stream-base'
2
2
  require 'social_stream-documents'
3
3
  require 'social_stream-events'
4
4
  require 'social_stream-linkser'
5
+ require 'social_stream-presence'
5
6
 
6
7
  module SocialStream
7
8
  class Engine < ::Rails::Engine #:nodoc:
@@ -9,5 +10,6 @@ module SocialStream
9
10
  config.app_generators.documents 'social_stream:documents'
10
11
  config.app_generators.events 'social_stream:events'
11
12
  config.app_generators.linkser 'social_stream:linkser'
13
+ config.app_generators.chat 'social_stream:presence'
12
14
  end
13
15
  end
@@ -1,3 +1,3 @@
1
1
  module SocialStream
2
- VERSION = "0.16.3".freeze
2
+ VERSION = "0.17.0".freeze
3
3
  end
@@ -0,0 +1,14 @@
1
+ namespace :social_stream do
2
+ namespace :migrations do
3
+ desc "Copy pending migrations from all the social_stream components"
4
+ task "update" do
5
+ File.read(File.expand_path("../../../social_stream.gemspec", __FILE__)).
6
+ scan(/dependency.*social_stream-(\w*)/).
7
+ flatten.
8
+ each do |d|
9
+ Rake::Task['railties:install:migrations'].reenable
10
+ Rake::Task["social_stream_#{ d }_engine:install:migrations"].invoke
11
+ end
12
+ end
13
+ end
14
+ end
@@ -1,19 +1,19 @@
1
1
  var SocialStream = SocialStream || {};
2
2
  SocialStream.Linkser = SocialStream.Linkser || {};
3
3
  SocialStream.Linkser.initiate = function() {
4
- $.preloadImages("assets/loading.gif");
4
+ $.preloadImages("<%= asset_path('loading.gif') %>");
5
5
  var urlDetect = function() {
6
6
  this.currentValue = $("#input_activities").val();
7
7
  if(this.lastValue == null)
8
8
  this.lastValue = "";
9
9
 
10
- var regexp = /(http|ftp|https):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&amp;:\/~+#-]*[\w@?^=%&amp;\/~+#-])?/
10
+ var regexp = /^(http|ftp|https):\/\/[\w-]+(\.[\w-]+)+([\w.,@?^=%&;:\/~+#-]*[\w@?^=%&;\/~+#-])?$/
11
11
  if(regexp.test($("#input_activities").val())) {
12
12
  $("#link_url").val($("#input_activities").val());
13
13
  $("#link_loaded").val(false);
14
14
  $("#new_post").attr("action", "/links");
15
15
  if(this.currentValue != this.lastValue) {
16
- $("#link_preview").html($('<img>').attr('src', 'assets/loading.gif').addClass('loading'));
16
+ $("#link_preview").html($('<img>').attr('src', '<%= asset_path('loading.gif') %>').addClass('loading'));
17
17
  this.lastValue = this.currentValue;
18
18
  var url = this.currentValue;
19
19
  var urlDetect = this;
@@ -1,5 +1,5 @@
1
1
  module SocialStream
2
2
  module Linkser
3
- VERSION = "0.1.1".freeze
3
+ VERSION = "0.2.0".freeze
4
4
  end
5
5
  end
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
12
12
  s.files = `git ls-files`.split("\n")
13
13
 
14
14
  # Gem dependencies
15
- s.add_runtime_dependency('social_stream-base', '~> 0.11.1')
16
- s.add_runtime_dependency('linkser', '~> 0.0.9')
15
+ s.add_runtime_dependency('social_stream-base', '~> 0.12.0')
16
+ s.add_runtime_dependency('linkser', '~> 0.0.10')
17
17
  # Development Gem dependencies
18
18
  s.add_development_dependency('sqlite3-ruby')
19
19
  if RUBY_VERSION < '1.9'
@@ -1,5 +1,5 @@
1
1
  module Socialstream
2
2
  module Presence
3
- VERSION = "0.2.1"
3
+ VERSION = "0.3.0"
4
4
  end
5
5
  end
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
19
19
  s.require_paths = ["lib"]
20
20
 
21
21
  # Gem dependencies
22
- s.add_runtime_dependency('social_stream-base','~> 0.11.0')
22
+ s.add_runtime_dependency('social_stream-base', '~> 0.12.0')
23
23
 
24
24
  s.add_runtime_dependency "xmpp4r"
25
25
 
@@ -11,10 +11,11 @@ Gem::Specification.new do |s|
11
11
  s.files = `git ls-files`.split("\n")
12
12
 
13
13
  # Gem dependencies
14
- s.add_runtime_dependency('social_stream-base', '~> 0.11.2')
15
- s.add_runtime_dependency('social_stream-documents', '~> 0.6.1')
16
- s.add_runtime_dependency('social_stream-events', '~> 0.3.2')
17
- s.add_runtime_dependency('social_stream-linkser', '~> 0.1.1')
14
+ s.add_runtime_dependency('social_stream-base', '~> 0.12.0')
15
+ s.add_runtime_dependency('social_stream-documents', '~> 0.7.0')
16
+ s.add_runtime_dependency('social_stream-events', '~> 0.4.0')
17
+ s.add_runtime_dependency('social_stream-linkser', '~> 0.2.0')
18
+ s.add_runtime_dependency('social_stream-presence', '~> 0.3.0')
18
19
 
19
20
  # Development Gem dependencies
20
21
  #
@@ -25,7 +26,9 @@ Gem::Specification.new do |s|
25
26
  when 'mysql'
26
27
  s.add_development_dependency('mysql2')
27
28
  when 'postgres'
28
- s.add_development_dependency('pg')
29
+ # Freeze pg version to 0.12.0
30
+ # https://t.co/zKY52Efr
31
+ s.add_development_dependency('pg', '0.12.0')
29
32
  else
30
33
  s.add_development_dependency('sqlite3')
31
34
  end
@@ -40,7 +43,7 @@ Gem::Specification.new do |s|
40
43
  # Fixtures
41
44
  s.add_development_dependency('factory_girl', '~> 1.3.2')
42
45
  # Population
43
- s.add_development_dependency('forgery', '~> 0.3.6')
46
+ s.add_development_dependency('forgery', '~> 0.4.2')
44
47
  # Continous integration
45
48
  s.add_development_dependency('ci_reporter', '~> 1.6.4')
46
49
  end
@@ -1,10 +1,6 @@
1
1
  require File.expand_path('../boot', __FILE__)
2
2
 
3
- require "active_model/railtie"
4
- require "active_record/railtie"
5
- require "action_controller/railtie"
6
- require "action_view/railtie"
7
- require "action_mailer/railtie"
3
+ require 'rails/all'
8
4
 
9
5
  Bundler.require
10
6
  require "social_stream"
@@ -41,5 +37,9 @@ module Dummy
41
37
 
42
38
  # Enable the asset pipeline
43
39
  config.assets.enabled = true
40
+
41
+ # Version of your assets, change this if you want to expire all your assets
42
+ config.assets.version = '1.0'
44
43
  end
45
44
  end
45
+
@@ -24,4 +24,7 @@ Dummy::Application.configure do
24
24
 
25
25
  # Do not compress assets
26
26
  config.assets.compress = false
27
+
28
+ # Expands the lines which load the assets
29
+ config.assets.debug = true
27
30
  end
@@ -14,12 +14,18 @@ Dummy::Application.configure do
14
14
  # Compress JavaScripts and CSS
15
15
  config.assets.compress = true
16
16
 
17
- # Specify the default JavaScript compressor
18
- config.assets.js_compressor = :uglifier
17
+ # Don't fallback to assets pipeline if a precompiled asset is missed
18
+ config.assets.compile = false
19
+
20
+ # Generate digests for assets URLs
21
+ config.assets.digest = true
22
+
23
+ # Defaults to Rails.root.join("public/assets")
24
+ # config.assets.manifest = YOUR_PATH
19
25
 
20
26
  # Specifies the header that your server uses for sending files
21
- # (comment out if your front-end server doesn't support this)
22
- config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx
27
+ # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
28
+ # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
23
29
 
24
30
  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
25
31
  # config.force_ssl = true
@@ -4,4 +4,4 @@
4
4
  # If you change this key, all old signed cookies will become invalid!
5
5
  # Make sure the secret is at least 30 characters and all random,
6
6
  # no regular words or you'll be exposed to dictionary attacks.
7
- Dummy::Application.config.secret_token = '6b2e621f2d394ff60baf61b1a514c5768287b1ba6bea8b39c962de3415c27b3c6c3cac409f8fbe708b2fbbbf833bf421a3691387fefcc47d6933107e4703fe8d'
7
+ Dummy::Application.config.secret_token = 'b107331810e5cd1eeab9a78955df0b44ac92de68aa09122d2c634881fdc652caf915f541207414da069a65bd56bd3db1503587acc67615e1a12e2cbcd91720ba'
@@ -4,9 +4,11 @@
4
4
  # is enabled by default.
5
5
 
6
6
  # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
7
- ActionController::Base.wrap_parameters :format => [:json]
7
+ ActiveSupport.on_load(:action_controller) do
8
+ wrap_parameters :format => [:json]
9
+ end
8
10
 
9
11
  # Disable root element in JSON by default.
10
- if defined?(ActiveRecord)
11
- ActiveRecord::Base.include_root_in_json = false
12
+ ActiveSupport.on_load(:active_record) do
13
+ self.include_root_in_json = false
12
14
  end
@@ -1,9 +1,3 @@
1
- require File.join(File.dirname(__FILE__), '..', '..', 'support', 'migrations')
1
+ require 'social_stream/migrations/base'
2
2
 
3
- ActiveRecord::Schema.define(:version => 0) do
4
- CreateMailboxer.up
5
- CreateSocialStream.up
6
- ActsAsTaggableOnMigration.up
7
- CreateSocialStreamDocuments.up
8
- CreateSocialStreamLinkser.up
9
- end
3
+ SocialStream::Migrations::Base.new.up
File without changes
data/spec/spec_helper.rb CHANGED
@@ -2,6 +2,9 @@
2
2
  ENV["RAILS_ENV"] ||= "test"
3
3
  ENV["RAILS_ENV"] = "#{ ENV["RAILS_ENV"] }_#{ ENV['DB'] }" if ENV['DB']
4
4
 
5
+ # Do not check ImageMagick<=>Rmagick versions
6
+ RMAGICK_BYPASS_VERSION_TEST = true
7
+
5
8
  require File.expand_path("../dummy/config/environment.rb", __FILE__)
6
9
  require "rspec/rails"
7
10
 
data/spec/support/db.rb CHANGED
@@ -1,4 +1,4 @@
1
- gems = %w{ documents events linkser }
1
+ gems = %w{ documents events linkser presence }
2
2
 
3
3
  gems.each do |g|
4
4
  require "social_stream/migrations/#{ g }"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: social_stream
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.16.3
4
+ version: 0.17.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,55 +10,66 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2011-12-23 00:00:00.000000000Z
13
+ date: 2012-01-11 00:00:00.000000000Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: social_stream-base
17
- requirement: &78705980 !ruby/object:Gem::Requirement
17
+ requirement: &70413200 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ~>
21
21
  - !ruby/object:Gem::Version
22
- version: 0.11.2
22
+ version: 0.12.0
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *78705980
25
+ version_requirements: *70413200
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: social_stream-documents
28
- requirement: &78705280 !ruby/object:Gem::Requirement
28
+ requirement: &70412910 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
- version: 0.6.1
33
+ version: 0.7.0
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *78705280
36
+ version_requirements: *70412910
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: social_stream-events
39
- requirement: &78704450 !ruby/object:Gem::Requirement
39
+ requirement: &70412610 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ~>
43
43
  - !ruby/object:Gem::Version
44
- version: 0.3.2
44
+ version: 0.4.0
45
45
  type: :runtime
46
46
  prerelease: false
47
- version_requirements: *78704450
47
+ version_requirements: *70412610
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: social_stream-linkser
50
- requirement: &78703180 !ruby/object:Gem::Requirement
50
+ requirement: &70412250 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ~>
54
54
  - !ruby/object:Gem::Version
55
- version: 0.1.1
55
+ version: 0.2.0
56
56
  type: :runtime
57
57
  prerelease: false
58
- version_requirements: *78703180
58
+ version_requirements: *70412250
59
+ - !ruby/object:Gem::Dependency
60
+ name: social_stream-presence
61
+ requirement: &70411770 !ruby/object:Gem::Requirement
62
+ none: false
63
+ requirements:
64
+ - - ~>
65
+ - !ruby/object:Gem::Version
66
+ version: 0.3.0
67
+ type: :runtime
68
+ prerelease: false
69
+ version_requirements: *70411770
59
70
  - !ruby/object:Gem::Dependency
60
71
  name: capybara
61
- requirement: &78698930 !ruby/object:Gem::Requirement
72
+ requirement: &70411290 !ruby/object:Gem::Requirement
62
73
  none: false
63
74
  requirements:
64
75
  - - ~>
@@ -66,10 +77,10 @@ dependencies:
66
77
  version: 0.3.9
67
78
  type: :development
68
79
  prerelease: false
69
- version_requirements: *78698930
80
+ version_requirements: *70411290
70
81
  - !ruby/object:Gem::Dependency
71
82
  name: sqlite3
72
- requirement: &78698390 !ruby/object:Gem::Requirement
83
+ requirement: &70410410 !ruby/object:Gem::Requirement
73
84
  none: false
74
85
  requirements:
75
86
  - - ! '>='
@@ -77,10 +88,10 @@ dependencies:
77
88
  version: '0'
78
89
  type: :development
79
90
  prerelease: false
80
- version_requirements: *78698390
91
+ version_requirements: *70410410
81
92
  - !ruby/object:Gem::Dependency
82
93
  name: rspec-rails
83
- requirement: &78696920 !ruby/object:Gem::Requirement
94
+ requirement: &70409910 !ruby/object:Gem::Requirement
84
95
  none: false
85
96
  requirements:
86
97
  - - ~>
@@ -88,10 +99,10 @@ dependencies:
88
99
  version: 2.5.0
89
100
  type: :development
90
101
  prerelease: false
91
- version_requirements: *78696920
102
+ version_requirements: *70409910
92
103
  - !ruby/object:Gem::Dependency
93
104
  name: factory_girl
94
- requirement: &78695390 !ruby/object:Gem::Requirement
105
+ requirement: &70409500 !ruby/object:Gem::Requirement
95
106
  none: false
96
107
  requirements:
97
108
  - - ~>
@@ -99,21 +110,21 @@ dependencies:
99
110
  version: 1.3.2
100
111
  type: :development
101
112
  prerelease: false
102
- version_requirements: *78695390
113
+ version_requirements: *70409500
103
114
  - !ruby/object:Gem::Dependency
104
115
  name: forgery
105
- requirement: &78694610 !ruby/object:Gem::Requirement
116
+ requirement: &70408970 !ruby/object:Gem::Requirement
106
117
  none: false
107
118
  requirements:
108
119
  - - ~>
109
120
  - !ruby/object:Gem::Version
110
- version: 0.3.6
121
+ version: 0.4.2
111
122
  type: :development
112
123
  prerelease: false
113
- version_requirements: *78694610
124
+ version_requirements: *70408970
114
125
  - !ruby/object:Gem::Dependency
115
126
  name: ci_reporter
116
- requirement: &78693480 !ruby/object:Gem::Requirement
127
+ requirement: &70400070 !ruby/object:Gem::Requirement
117
128
  none: false
118
129
  requirements:
119
130
  - - ~>
@@ -121,7 +132,7 @@ dependencies:
121
132
  version: 1.6.4
122
133
  type: :development
123
134
  prerelease: false
124
- version_requirements: *78693480
135
+ version_requirements: *70400070
125
136
  description: Social Stream is a Ruby on Rails engine for building social network websites.
126
137
  It supports contacts, posts, file uploads, private messages and many more.
127
138
  email:
@@ -401,6 +412,7 @@ files:
401
412
  - base/app/models/actor.rb
402
413
  - base/app/models/audience.rb
403
414
  - base/app/models/authentication.rb
415
+ - base/app/models/channel.rb
404
416
  - base/app/models/comment.rb
405
417
  - base/app/models/contact.rb
406
418
  - base/app/models/group.rb
@@ -576,6 +588,7 @@ files:
576
588
  - base/app/views/settings/_api_key.html.erb
577
589
  - base/app/views/settings/_destroy.html.erb
578
590
  - base/app/views/settings/_index.html.erb
591
+ - base/app/views/settings/_language.html.erb
579
592
  - base/app/views/settings/_notifications.html.erb
580
593
  - base/app/views/settings/index.html.erb
581
594
  - base/app/views/settings/index.js.erb
@@ -612,6 +625,8 @@ files:
612
625
  - base/db/migrate/20110912074426_add_reject_relation.rb
613
626
  - base/db/migrate/20111124100618_object_actors.rb
614
627
  - base/db/migrate/20111221103509_add_language_field.rb
628
+ - base/db/migrate/20120103103125_add_channels.rb
629
+ - base/db/migrate/20120109081509_update_notify_permissions.rb
615
630
  - base/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
616
631
  - base/lib/acts_as_taggable_on/social_stream.rb
617
632
  - base/lib/generators/social_stream/base/install_generator.rb
@@ -628,12 +643,15 @@ files:
628
643
  - base/lib/social_stream/base/version.rb
629
644
  - base/lib/social_stream/controllers/cancan_devise_integration.rb
630
645
  - base/lib/social_stream/controllers/helpers.rb
646
+ - base/lib/social_stream/controllers/i18n_integration.rb
631
647
  - base/lib/social_stream/controllers/objects.rb
648
+ - base/lib/social_stream/controllers/subjects.rb
632
649
  - base/lib/social_stream/d3.rb
633
650
  - base/lib/social_stream/migrations/base.rb
634
651
  - base/lib/social_stream/migrations/components.rb
635
652
  - base/lib/social_stream/models/object.rb
636
653
  - base/lib/social_stream/models/subject.rb
654
+ - base/lib/social_stream/models/subtype.rb
637
655
  - base/lib/social_stream/models/supertype.rb
638
656
  - base/lib/social_stream/populate.rb
639
657
  - base/lib/social_stream/test_helpers.rb
@@ -666,7 +684,6 @@ files:
666
684
  - base/spec/dummy/app/assets/javascripts/application.js
667
685
  - base/spec/dummy/app/assets/stylesheets/application.css
668
686
  - base/spec/dummy/app/controllers/application_controller.rb
669
- - base/spec/dummy/app/helpers/application_helper.rb
670
687
  - base/spec/dummy/config.ru
671
688
  - base/spec/dummy/config/application.rb
672
689
  - base/spec/dummy/config/boot.rb
@@ -875,6 +892,7 @@ files:
875
892
  - documents/db/migrate/20110615143707_create_social_stream_documents.rb
876
893
  - documents/db/migrate/20110922173707_add_file_processing_to_document.rb
877
894
  - documents/db/migrate/20111005112707_add_title_and_description_to_document.rb
895
+ - documents/db/migrate/20120109155431_document_object_type.rb
878
896
  - documents/lib/generators/social_stream/documents/install_generator.rb
879
897
  - documents/lib/social_stream-documents.rb
880
898
  - documents/lib/social_stream/documents/engine.rb
@@ -886,6 +904,8 @@ files:
886
904
  - documents/spec/controllers/pictures_controller_spec.rb
887
905
  - documents/spec/dummy/.gitignore
888
906
  - documents/spec/dummy/Rakefile
907
+ - documents/spec/dummy/app/assets/javascripts/application.js
908
+ - documents/spec/dummy/app/assets/stylesheets/application.css
889
909
  - documents/spec/dummy/app/controllers/application_controller.rb
890
910
  - documents/spec/dummy/app/helpers/application_helper.rb
891
911
  - documents/spec/dummy/app/views/layouts/application.html.erb
@@ -903,11 +923,13 @@ files:
903
923
  - documents/spec/dummy/config/initializers/mime_types.rb
904
924
  - documents/spec/dummy/config/initializers/secret_token.rb
905
925
  - documents/spec/dummy/config/initializers/session_store.rb
926
+ - documents/spec/dummy/config/initializers/wrap_parameters.rb
906
927
  - documents/spec/dummy/config/locales/en.yml
907
928
  - documents/spec/dummy/config/navigation.rb
908
929
  - documents/spec/dummy/config/relations.yml
909
930
  - documents/spec/dummy/config/routes.rb
910
931
  - documents/spec/dummy/db/.gitkeep
932
+ - documents/spec/dummy/db/schema.rb
911
933
  - documents/spec/dummy/public/404.html
912
934
  - documents/spec/dummy/public/422.html
913
935
  - documents/spec/dummy/public/500.html
@@ -1005,6 +1027,7 @@ files:
1005
1027
  - lib/social_stream/release/global/release.rb
1006
1028
  - lib/social_stream/release/global/version_file.rb
1007
1029
  - lib/social_stream/version.rb
1030
+ - lib/tasks/migrations.rake
1008
1031
  - linkser/.gitignore
1009
1032
  - linkser/.rspec
1010
1033
  - linkser/Gemfile
@@ -1265,9 +1288,6 @@ files:
1265
1288
  - spec/dummy/app/assets/javascripts/application.js
1266
1289
  - spec/dummy/app/assets/stylesheets/application.css
1267
1290
  - spec/dummy/app/controllers/application_controller.rb
1268
- - spec/dummy/app/helpers/application_helper.rb
1269
- - spec/dummy/app/mailers/.gitkeep
1270
- - spec/dummy/app/models/.gitkeep
1271
1291
  - spec/dummy/config.ru
1272
1292
  - spec/dummy/config/application.rb
1273
1293
  - spec/dummy/config/boot.rb