social_stream-base 0.8.0 → 0.8.1

data/app/assets/javascripts/layouts.js

@@ -1,3 +1,4 @@
+//= require search
 //= require hoverIntent
 //= require superfish
 //

data/app/assets/javascripts/search.js

@@ -0,0 +1 @@
+

data/app/assets/stylesheets/base.css

@@ -48,7 +48,7 @@ input.other_blue{	background:#497FC1;	border:0px;	cursor:pointer;  font-size:1.0
   margin-right:4px;	color:white;	padding:1px;}
 textarea.new_contact_text_area{ height: 100px; color: #2A3890;}
 .colum_field_title{ text-align: center; }
-.needed{color:#D8000C;font-weight: normal;}
+.needed{color:#6C6D6F;font-weight: normal;}
 .select_relations select{ font-size: 12px; color: white; background-color:#1F4A75;} 
 
 /************ Forms - Buttons  SECTION ***************************/

data/app/controllers/contacts_controller.rb

@@ -9,7 +9,7 @@ class ContactsController < ApplicationController
     Contact.sent_by(current_subject).
             joins(:receiver).merge(Actor.alphabetic).
             merge(Actor.letter(params[:letter])).
-            merge(Actor.search(params[:search])).
+            merge(Actor.name_search(params[:search])).
             active
 
     respond_to do |format|

data/app/controllers/groups_controller.rb

@@ -11,7 +11,7 @@ class GroupsController < InheritedResources::Base
     @groups = Group.most(params[:most]).
                     alphabetic.
                     letter(params[:letter]).
-                    search(params[:search]).
+                    name_search(params[:search]).
                     tagged_with(params[:tag]).
                     page(params[:page]).per(10)
 

data/app/controllers/users_controller.rb

@@ -6,7 +6,7 @@ class UsersController < InheritedResources::Base
   def index
     @users = User.alphabetic.
                   letter(params[:letter]).
-                  search(params[:search]).
+                  name_search(params[:search]).
                   tagged_with(params[:tag]).
                   page(params[:page]).per(10)
 

data/app/models/actor.rb

@@ -21,6 +21,14 @@ class Actor < ActiveRecord::Base
   
   acts_as_messageable
   
+  define_index do
+    indexes name, :sortable => true
+    indexes email
+    indexes slug
+    
+    has created_at
+  end
+  
   acts_as_url :name, :url_attribute => :slug
   
   has_one :profile, :dependent => :destroy
@@ -67,7 +75,7 @@ class Actor < ActiveRecord::Base
     end
   }
 
-  scope :search, lambda { |param|
+  scope :name_search, lambda { |param|
     if param.present?
       where('actors.name LIKE ?', "%#{ param }%")
     end

data/app/models/contact.rb

@@ -63,11 +63,11 @@ class Contact < ActiveRecord::Base
   after_save :send_message
 
   def sender_subject
-    sender.try(:subject)
+    sender.subject
   end
 
   def receiver_subject
-    receiver.try(:subject)
+    receiver.subject
   end
 
   # Does this {Contact} have the same sender and receiver?

data/app/models/post.rb

@@ -2,4 +2,11 @@ class Post < ActiveRecord::Base
   include SocialStream::Models::Object
 
   validates_presence_of :text
+  
+    define_index do
+    indexes text
+    
+    has created_at
+  end
+  
 end

data/app/views/devise/registrations/edit.html.erb

@@ -0,0 +1,68 @@
+<% toolbar :profile => current_subject %>
+
+<%= location(image_tag("btn/btn_account.png", :class => "menu_icon")+t('account.one'), 
+  link_to (t('account.edit'), edit_user_registration_path)
+) %>
+
+<div class="space_center"></div>
+
+<div class="block" id="account_form">
+  <div class="form_row">
+    <h2><%= t('account.edit') %></h2>
+  </div>
+  
+  <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+    <%= devise_error_messages! %>
+  
+    <div class="form_row">
+      <div class="form_label">
+        <%= f.label :email %>
+      </div>
+      <div class="form_field">
+        <%= f.email_field :email, :class => "form_tag" %>
+      </div>
+    </div>
+    <div class="form_row">
+      <div class="form_label">
+        <%= f.label :password %>
+      </div>
+      <div class="form_field">
+        <%= f.password_field :password, :class => "form_tag" %><br/>
+        <span class="form_comment">(Leave blank if you don't want to change it)</span>
+      </div>
+    </div>
+    <div class="form_row">
+      <div class="form_label">
+        <%= f.label :password_confirmation %>
+      </div>
+      <div class="form_field">
+        <%= f.password_field :password_confirmation, :class => "form_tag" %>
+      </div>
+    </div>
+    <div class="form_row">
+      <div class="form_label">
+        <%= f.label :current_password %>
+      </div>
+      <div class="form_field">
+        <%= f.password_field :current_password, :class => "form_tag" %><br/>
+        <span class="form_comment">(We need your current password to confirm your changes)</span>
+      </div>
+    </div>
+    <div class="form_row space_center">
+      <%= f.submit t('button.update'), :class => "button" %>
+      <button class="button" onclick="window.location.href='<%= polymorphic_path(current_subject) %>';">
+        <%= t('button.cancel')%>
+      </button>
+    </div>
+  <% end %>
+<div>
+<div class="block">  
+  <div class="content">
+    <h3>Cancel my account</h3>
+  </div>
+  
+  <p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
+  
+  <%= link_to "Back", :back %>
+
+</div>

data/app/views/layouts/_header.erb

@@ -7,8 +7,6 @@
       <% if user_signed_in? %>
         <div class="menu_list menu_white" id="menu_home">
           <ul>
-            <li class="btn_menu_home"><%= link_to t('home'), home_path %></li>
-            <li class="pipe">|</li>
             <li class="btn_menu_profile"><%= link_to(t('profile.one'), current_subject)%></li>
             <li class="pipe">|</li>
             <li class="btn_menu_browse"><%=link_to(t('browse'),users_path) %></li>

data/lib/social_stream-base.rb

@@ -35,6 +35,8 @@ require 'resque/server'
 require 'simple-navigation'
 # Modernizr.js library
 require 'modernizr-rails'
+# Sphinx search engine
+require 'thinking-sphinx'
 
 # Provides your Rails application with social network and activity stream support
 module SocialStream

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.8.0".freeze
+    VERSION = "0.8.1".freeze
   end
 end

data/lib/social_stream/models/subject.rb

@@ -16,7 +16,7 @@ module SocialStream
     # There are several scopes available for subjects 
     #
     # alphabetic:: sort subjects by name
-    # search:: simple search by name
+    # name_search:: simple search by name
     # distinct_initials:: get only the first letter of the name
     # followed:: sort by most following incoming {Tie ties}
     # liked:: sort by most likes
@@ -27,7 +27,8 @@ module SocialStream
       included do
         belongs_to :actor,
                    :validate => true,
-                   :autosave => true
+                   :autosave => true,
+                   :dependent => :destroy
         
         has_one :profile, :through => :actor
         
@@ -41,8 +42,8 @@ module SocialStream
           joins(:actor).merge(Actor.letter(param))
         }
 
-        scope :search, lambda{ |param|
-          joins(:actor).merge(Actor.search(param))
+        scope :name_search, lambda{ |param|
+          joins(:actor).merge(Actor.name_search(param))
         }
         
         scope :tagged_with, lambda { |param|

data/social_stream-base.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   # OAuth provider
   s.add_runtime_dependency('oauth-plugin','~> 0.4.0.pre1')	
   # Messages
-  s.add_runtime_dependency('mailboxer','~> 0.5.0')
+  s.add_runtime_dependency('mailboxer','~> 0.5.3')
   # Tagging
   s.add_runtime_dependency('acts-as-taggable-on','~> 2.0.6')
   # HTML Forms
@@ -48,6 +48,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('resque','~> 1.17.1')
   # Modernizr.js javascript library
   s.add_runtime_dependency('modernizr-rails', '~> 2.0.6')
+  # Sphinx search engine
+  s.add_runtime_dependency('thinking-sphinx', '~> 2.0.7')
 
   # Development gem dependencies
   #

data/spec/models/actor_spec.rb

@@ -25,4 +25,27 @@ describe Actor do
       a.pending_contacts.should_not include(c)
     end
   end
+
+  it 'should generate suggestion' do
+    10.times do
+      Factory(:user)
+    end
+
+    sgs = Factory(:user).suggestions(5)
+
+    sgs.size.should be(5)
+
+    sgs_names = sgs.map{ |s| s.receiver_subject.name }.compact
+
+    sgs.size.should be(5)
+  end
+
+  it "should be destroyed" do
+    u = Factory(:user)
+    a = u.actor
+
+    u.destroy
+
+    Actor.find_by_id(a.id).should be_nil
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: social_stream-base
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - GING - DIT - UPM
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-06 00:00:00 +02:00
+date: 2011-09-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -221,12 +221,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 13
         segments: 
         - 0
         - 5
-        - 0
-        version: 0.5.0
+        - 3
+        version: 0.5.3
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -308,9 +308,25 @@ dependencies:
   type: :runtime
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: capybara
+  name: thinking-sphinx
   prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 2
+        - 0
+        - 7
+        version: 2.0.7
+  type: :runtime
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -322,11 +338,11 @@ dependencies:
         - 9
         version: 0.3.9
   type: :development
-  version_requirements: *id019
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -336,11 +352,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id020
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -350,11 +366,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id021
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -366,11 +382,11 @@ dependencies:
         - 1
         version: 2.6.1
   type: :development
-  version_requirements: *id022
+  version_requirements: *id023
 - !ruby/object:Gem::Dependency 
   name: factory_girl
   prerelease: false
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -382,11 +398,11 @@ dependencies:
         - 2
         version: 1.3.2
   type: :development
-  version_requirements: *id023
+  version_requirements: *id024
 - !ruby/object:Gem::Dependency 
   name: forgery
   prerelease: false
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -398,11 +414,11 @@ dependencies:
         - 2
         version: 0.4.2
   type: :development
-  version_requirements: *id024
+  version_requirements: *id025
 - !ruby/object:Gem::Dependency 
   name: ci_reporter
   prerelease: false
-  requirement: &id025 !ruby/object:Gem::Requirement 
+  requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -414,11 +430,11 @@ dependencies:
         - 4
         version: 1.6.4
   type: :development
-  version_requirements: *id025
+  version_requirements: *id026
 - !ruby/object:Gem::Dependency 
   name: nifty-generators
   prerelease: false
-  requirement: &id026 !ruby/object:Gem::Requirement 
+  requirement: &id027 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -430,7 +446,7 @@ dependencies:
         - 5
         version: 0.4.5
   type: :development
-  version_requirements: *id026
+  version_requirements: *id027
 description: |-
   Social Stream is a Ruby on Rails engine providing your application with social networking features and activity streams.
   
@@ -598,6 +614,7 @@ files:
 - app/assets/javascripts/posts.js
 - app/assets/javascripts/profiles.js
 - app/assets/javascripts/relation_customs.js
+- app/assets/javascripts/search.js
 - app/assets/javascripts/settings.js
 - app/assets/javascripts/social_stream-base.js
 - app/assets/javascripts/ties.js
@@ -738,6 +755,7 @@ files:
 - app/views/conversations/show.js.erb
 - app/views/devise/passwords/edit.html.erb
 - app/views/devise/passwords/new.html.erb
+- app/views/devise/registrations/edit.html.erb
 - app/views/devise/registrations/new.html.erb
 - app/views/devise/sessions/new.html.erb
 - app/views/frontpage/_header.html.erb