social_stream-base 0.21.0 → 0.21.1

data/app/models/activity.rb

@@ -70,59 +70,6 @@ class Activity < ActiveRecord::Base
       merge(Audience.where(:relation_id => Relation.ids_shared_with(subject)))
   }
 
-  scope :wall, lambda { |args|
-    q =
-      select("DISTINCT activities.*").
-      joins(:audiences).
-      joins(:relations).
-      roots
-
-    if args[:object_type].present?
-      q = q.joins(:activity_objects).
-            where('activity_objects.object_type' => args[:object_type])
-    end
-
-    audiences  = Audience.arel_table
-    relations  = Relation.arel_table
-
-    owner_conditions =
-      arel_table[:author_id].eq(Actor.normalize_id(args[:owner])).
-        or(arel_table[:user_author_id].eq(Actor.normalize_id(args[:owner]))).
-        or(arel_table[:owner_id].eq(Actor.normalize_id(args[:owner])))
-
-    audience_conditions =
-      audiences[:relation_id].in(args[:relation_ids]).
-        or(relations[:type].eq('Relation::Public'))
-
-    conds =
-      case args[:type]
-      when :home
-        followed_conditions =
-          arel_table[:author_id].in(args[:followed]).
-            or(arel_table[:owner_id].in(args[:followed]))
-
-        owner_conditions.
-          or(followed_conditions.and(audience_conditions))
-      when :profile
-        if args[:for].present?
-          visitor_conditions =
-            arel_table[:author_id].eq(Actor.normalize_id(args[:for])).
-              or(arel_table[:owner_id].eq(Actor.normalize_id(args[:for])))
-
-          owner_conditions.
-            and(visitor_conditions.or(audience_conditions))
-        else
-          owner_conditions.
-            and(audience_conditions)
-        end
-      else
-        raise "Unknown wall type: #{ args[:type] }" 
-      end
-
-    q.where(conds).
-      order("created_at desc")
-  }
-
   after_create  :increment_like_count
   after_destroy :decrement_like_count, :delete_notifications
 

data/app/models/relation.rb

@@ -55,6 +55,8 @@ class Relation < ActiveRecord::Base
   has_many :audiences, :dependent => :destroy
   has_many :activities, :through => :audiences
 
+  has_many :activity_object_audiences, :dependent => :destroy
+
   scope :actor, lambda { |a|
     where(:actor_id => Actor.normalize_id(a))
   }

data/app/views/profiles/update.js.erb

@@ -1,6 +1,6 @@
 <% if @profile.valid? %>
   <% flash[:notice] = t('profile.update.success') %>
-  document.location.href="<%= resource_path(@profile) %>";
+  document.location.href="<%= polymorphic_path([ current_subject, :profile ]) %>";
 <% else %>
   if ($("#profile_notice").length == 0){
     $("#profile_form").prepend('<div id="profile_notice" class="notice"></div>');  

data/config/locales/en.yml

@@ -38,7 +38,7 @@ en:
       public:
         summary: "Public"
         full: "Shared with all the Internet"
-      show: "Mostrar"
+      show: "Show"
       visible:
         summary: "Restricted"
         full: "Shared with %{audience}"

data/config/locales/es.yml

@@ -38,7 +38,7 @@ es:
       public:
         summary: "Público"
         full: "Accesible por toda Internet"
-      show: "Show"
+      show: "Mostrar"
       visible:
         summary: "Restringido"
         full: "Compartido con %{audience}"

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.21.0".freeze
+    VERSION = "0.21.1".freeze
   end
 end

data/spec/controllers/profiles_controller_spec.rb

@@ -38,6 +38,13 @@ describe ProfilesController do
       response.should redirect_to([@user, :profile])
     end
 
+    it "should update via AJAX" do
+      put :update, :user_id => @user.to_param, :profile => { :organization => "Social Stream" }, :format => :js
+
+      response.should be_success
+    end
+
+
     it "should not update other's" do
       begin
         put :update, :user_id => Factory(:user).to_param, :profile => { :organization => "Social Stream" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream-base
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-27 00:00:00.000000000 Z
+date: 2012-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge