Merge branch 'tag_stream_api'

.travis.yml

@@ -2,7 +2,6 @@ branches:
   only:
     - 'master'
 
-
 rvm:
   - 1.8.7
   - ree

app/controllers/api/v0/tags_controller.rb

@@ -0,0 +1,9 @@
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+class Api::V0::TagsController < ApplicationController
+  def show
+    render :json => Api::V0::Serializers::Tag.new(params[:name])
+  end
+end

app/controllers/api/v0/users_controller.rb

@@ -1,3 +1,7 @@
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
 class Api::V0::UsersController < ApplicationController
   def show
     if user = User.find_by_username(params[:username])

app/models/api/v0/serializers/tag.rb

@@ -0,0 +1,19 @@
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+class Api::V0::Serializers::Tag
+
+  def initialize(tag)
+    @stream = Stream::Tag.new(nil, tag)
+  end
+
+  def as_json(opts={})
+    {
+      "name" => @stream.tag_name,
+      "person_count" => @stream.people_count,
+      "followed_count" => @stream.tag_follow_count,
+      "posts" => []
+    }
+  end
+end

app/models/api/v0/serializers/user.rb

@@ -1,8 +1,9 @@
-class Api::V0::Serializers::User
-  attr_accessor :user
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
 
+class Api::V0::Serializers::User
   def initialize(user)
-    @user = user
     @person = user.person
     @profile = @person.profile
   end

config/routes.rb

@@ -168,6 +168,7 @@ Diaspora::Application.routes.draw do
   namespace :api do
     namespace :v0 do
       get "/users/:username" => 'users#show', :as => 'user'
+      get "/tags/:name" => 'tags#show', :as => 'tag'
     end
   end
 

lib/stream/base.rb

@@ -120,7 +120,7 @@ class Stream::Base
   def post_is_from_contact?(post)
     @can_comment_cache ||= {}
     @can_comment_cache[post.id] ||= contacts_in_stream.find{|contact| contact.person_id == post.author.id}.present?
-    @can_comment_cache[post.id] ||= user.person.id == post.author.id
+    @can_comment_cache[post.id] ||= (user.person.id == post.author.id)
     @can_comment_cache[post.id]
   end
 end

lib/stream/tag.rb

@@ -1,3 +1,7 @@
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
 class Stream::Tag < Stream::Base
   attr_accessor :tag_name, :people_page
 

spec/controllers/api/v0/tags_controller_spec.rb

@@ -0,0 +1,20 @@
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+require 'spec_helper'
+
+describe Api::V0::TagsController do
+  describe '#show' do
+    it 'succeeds' do
+      get :show, :name => 'alice'
+      response.should be_success
+    end
+
+    it "returns the basic tag data" do
+      get :show, :name => 'alice'
+      parsed_json = JSON.parse(response.body)
+      parsed_json.keys.should =~ %w(name person_count followed_count posts)
+    end
+  end
+end

spec/lib/stream/base_spec.rb

@@ -11,22 +11,22 @@ describe Stream::Base do
       @stream.stub(:people).and_return([bob.person, eve.person, @person])
     end
 
-    it 'returns true if user is a contact of the post author' do
+    it 'allows me to comment on my local contacts post' do
       post = Factory(:status_message, :author => bob.person)
       @stream.can_comment?(post).should be_true
     end
 
-    it 'returns true if a user is the author of the post' do
+    it 'allows me to comment on my own post' do
       post = Factory(:status_message, :author => alice.person)
       @stream.can_comment?(post).should be_true
     end
 
-    it 'returns true if the author of the post is local' do
+    it 'allows me to comment on any local public post' do
       post = Factory(:status_message, :author => eve.person)
       @stream.can_comment?(post).should be_true
     end
 
-    it 'returns true if person is remote and is a contact' do
+    it 'allows me to comment on a remote contacts post' do
       Contact.create!(:user => @stream.user, :person => @person)
       post = Factory(:status_message, :author => @person)
       @stream.can_comment?(post).should be_true

spec/lib/stream/tag_spec.rb

@@ -1,3 +1,7 @@
+#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
 require 'spec_helper'
 require File.join(Rails.root, 'spec', 'shared_behaviors', 'stream')