social_stream 0.26.2 → 0.27.0

data/events/social_stream-events.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', '~> 0.20.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.21.0')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.8')
 
   # Development Gem dependencies

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.26.2".freeze
+  VERSION = "0.27.0".freeze
 end

data/linkser/lib/social_stream/linkser/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Linkser
-    VERSION = "0.11.1".freeze
+    VERSION = "0.12.0".freeze
   end
 end

data/linkser/social_stream-linkser.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', '~> 0.20.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.21.0')
   s.add_runtime_dependency('linkser', '~> 0.0.12')
   # Development Gem dependencies
   s.add_development_dependency('sqlite3-ruby')

data/presence/lib/social_stream/presence/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Presence
-    VERSION = "0.13.3"
+    VERSION = "0.14.0"
   end
 end

data/presence/social_stream-presence.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.20.1')
+  s.add_runtime_dependency('social_stream-base', '~> 0.21.0')
   
   s.add_runtime_dependency "xmpp4r"
 

data/social_stream.gemspec

@@ -11,11 +11,11 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.20.2')
-  s.add_runtime_dependency('social_stream-documents', '~> 0.14.1')
-  s.add_runtime_dependency('social_stream-events', '~> 0.12.1')
-  s.add_runtime_dependency('social_stream-linkser', '~> 0.11.1')
-  s.add_runtime_dependency('social_stream-presence', '~> 0.13.3')
+  s.add_runtime_dependency('social_stream-base', '~> 0.21.0')
+  s.add_runtime_dependency('social_stream-documents', '~> 0.15.0')
+  s.add_runtime_dependency('social_stream-events', '~> 0.13.0')
+  s.add_runtime_dependency('social_stream-linkser', '~> 0.12.0')
+  s.add_runtime_dependency('social_stream-presence', '~> 0.14.0')
  
   # Development Gem dependencies
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.26.2
+  version: 0.27.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2012-05-27 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.20.2
+        version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.20.2
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
   requirement: !ruby/object:Gem::Requirement
@@ -35,7 +35,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: social_stream-events
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.1
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: social_stream-presence
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +83,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -280,7 +280,6 @@ files:
 - base/app/assets/images/btn/btn_profile.png
 - base/app/assets/images/btn/btn_rank.png
 - base/app/assets/images/btn/btn_read.png
-- base/app/assets/images/btn/btn_security.png
 - base/app/assets/images/btn/btn_send.png
 - base/app/assets/images/btn/btn_spam.png
 - base/app/assets/images/btn/btn_star.png
@@ -320,6 +319,8 @@ files:
 - base/app/assets/images/btn/point_blue.png
 - base/app/assets/images/btn/point_gray.png
 - base/app/assets/images/btn/post.png
+- base/app/assets/images/btn/public.png
+- base/app/assets/images/btn/restricted.png
 - base/app/assets/images/btn/search.png
 - base/app/assets/images/btn/search_icon.png
 - base/app/assets/images/btn/shadow.png
@@ -454,6 +455,7 @@ files:
 - base/app/controllers/activities_controller.rb
 - base/app/controllers/activity_actions_controller.rb
 - base/app/controllers/api_controller.rb
+- base/app/controllers/audience_controller.rb
 - base/app/controllers/authentications_controller.rb
 - base/app/controllers/cheesecake_controller.rb
 - base/app/controllers/comments_controller.rb
@@ -505,7 +507,6 @@ files:
 - base/app/models/actor.rb
 - base/app/models/audience.rb
 - base/app/models/authentication.rb
-- base/app/models/channel.rb
 - base/app/models/comment.rb
 - base/app/models/contact.rb
 - base/app/models/group.rb
@@ -542,6 +543,8 @@ files:
 - base/app/views/actors/_actor.html.erb
 - base/app/views/actors/_actor_cheesecake.html.erb
 - base/app/views/api/activity_atom_feed.atom.builder
+- base/app/views/audience/_list.html.erb
+- base/app/views/audience/index.js.erb
 - base/app/views/avatars/index.html.erb
 - base/app/views/avatars/update.js.erb
 - base/app/views/cheesecake/_cheesecake.html.erb
@@ -739,6 +742,7 @@ files:
 - base/db/migrate/20120403175913_create_activity_object_audiences.rb
 - base/db/migrate/20120411132550_add_visit_count_to_activity_object.rb
 - base/db/migrate/20120411151413_relation_public_permissions.rb
+- base/db/migrate/20120526171311_remove_activity_channels.rb
 - base/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - base/lib/acts_as_taggable_on/social_stream.rb
 - base/lib/generators/social_stream/base/install_generator.rb
@@ -793,7 +797,6 @@ files:
 - base/lib/social_stream/d3.rb
 - base/lib/social_stream/migrations/base.rb
 - base/lib/social_stream/migrations/components.rb
-- base/lib/social_stream/models/channeled.rb
 - base/lib/social_stream/models/object.rb
 - base/lib/social_stream/models/subject.rb
 - base/lib/social_stream/models/subtype.rb
@@ -816,6 +819,7 @@ files:
 - base/lib/tasks/workers.rake
 - base/lib/thinking-sphinx/social_stream.rb
 - base/social_stream-base.gemspec
+- base/spec/controllers/audience_controller_spec.rb
 - base/spec/controllers/comments_controller_spec.rb
 - base/spec/controllers/contacts_controller_spec.rb
 - base/spec/controllers/followers_controller_spec.rb

data/base/app/models/channel.rb

@@ -1,64 +0,0 @@
-# A {Channel} is the union of the three {Actors} that are involved in an {Activity}:
-#
-# * The author that creates a post, comment, etc. This can be a {User}, {Group}
-#   or any kind of {SocialStream::Models::Subject subject}
-# * The user_author representing the author. When users change session and
-#   act in behalf of a {Group}, Social Stream still records which user is responsible
-#   for an {Activity}
-# * The owner in whose wall the Activity is performed.
-#
-class Channel < ActiveRecord::Base
-  # Author can be any type of Actor: User, Group, etc.
-  belongs_to :author,
-             :class_name => "Actor"
-  # Owner is the wall's subject this object is posted to
-  belongs_to :owner,
-             :class_name => "Actor"
-
-  # UserAuthor is the real user behind the Author
-  belongs_to :user_author,
-             :class_name => "Actor"
-
-  has_many :activities, :dependent => :destroy
-
-  validates_uniqueness_of :author_id,      :scope => [ :owner_id,  :user_author_id ]
-  validates_uniqueness_of :owner_id,       :scope => [ :author_id, :user_author_id ]
-  validates_uniqueness_of :user_author_id, :scope => [ :author_id, :owner_id ]
-
-  scope :authored_by, lambda { |subject|
-    id = Actor.normalize_id subject
-
-    where(arel_table[:author_id].eq(id).or(arel_table[:user_author_id].eq(id)))
-  }
-
-  scope :subject_authored_by, lambda { |subject|
-    id = Actor.normalize_id subject
-
-    where(:author_id => id)
-  }
-
-  # The {SocialStream::Models::Subject subject} author
-  def author_subject
-    author.subject
-  end
-
-  # The {SocialStream::Models::Subject subject} owner
-  def owner_subject
-    owner.subject
-  end
-
-  # The {SocialStream::Models::Subject subject} user actor
-  def user_author_subject
-    user_author.subject
-  end
-
-  # Does this {Channel} have the same sender and receiver?
-  def reflexive?
-    author_id == owner_id
-  end
-
-  # Is the author represented in this {Channel}?
-  def represented_author?
-    author_id != user_author_id
-  end
-end

data/base/lib/social_stream/models/channeled.rb

@@ -1,56 +0,0 @@
-module SocialStream
-  module Models
-    # Models that have author, user_author and owner, properties saved in {Channel}.
-    # Currently {Activity} and {ActivityObject}
-    module Channeled
-      # Add the method {#channeled} to ActiveRecord
-      module ActiveRecord
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          # This class is channeled. See {Channel}
-          def channeled
-            include SocialStream::Models::Channeled
-          end
-        end
-      end
-
-      extend ActiveSupport::Concern
-
-      included do
-        # Channeled models are subtypes of {Channel}
-        # Author, owner and user_author are defined in its channel
-        subtype_of :channel,
-                   :belongs => { :dependent => nil }
-
-        # before_validation :set_owner_id, :on => :create
-
-        before_validation :check_existing_channel
-      end
-
-      protected
-
-      # Use existing channel, do not create a new one
-      def check_existing_channel
-        return unless channel!.new_record?
-
-        existing_channel =
-          Channel.
-            where(:author_id      => author_id,
-                  :owner_id       => owner_id,
-                  :user_author_id => user_author_id).
-            first
-
-        return if existing_channel.blank?
-
-        self.channel = existing_channel
-      end
-
-      private
-
-      def set_owner_id
-        self.owner_id ||= author_id
-      end
-    end
-  end
-end