social_stream 0.3.6 → 0.4.0

data/app/views/users/show.html.erb

@@ -1,9 +1,9 @@
-<% content_for :middle do %>
-  <%= render :partial => 'middle_show' %>
+<% content_for :sidebar do %>
+  <%= render :partial => 'sidebar_show' %>
 <% end %>
 
-<% content_for :right do %>
-  <%= render :partial => 'right_show' %>
+<% content_for :toolbar do %>
+  <%= render :partial => 'toolbar_show' %>
 <% end %>
 
 <%= render :partial => 'location' %>

data/app/views/users/show.xml.builder

@@ -0,0 +1,28 @@
+xml.instruct!
+	xml.user do
+		xml.uid @user.id
+		xml.name @user.name
+		xml.slug @user.slug
+		xml.email @user.email
+		xml.userSince @user.created_at
+		xml.birthday @user.profile.birthday
+		xml.organization @user.profile.organization
+		xml.city @user.profile.city
+		xml.country @user.profile.country
+		xml.website @user.profile.website
+		xml.ties do
+			@user.actors(:subject_type => 'user', :direction => :senders).each do |u|
+				xml.contact do
+					xml.uid u.id
+					xml.slug u.slug
+				end
+			end
+			
+			@user.actors(:subject_type => 'group', :direction => :senders).each do |g|
+				xml.group do
+					xml.gid g.id
+					xml.slug g.slug
+				end
+			end
+		end
+end

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

@@ -1,4 +1,6 @@
 
+
+
   if ($("#notice").length == 0){
 
     $("#content").prepend('<div id="notice"></div>');
@@ -10,7 +12,7 @@
   $("#notice").html("<h2>Form Submitted!</h2><br/>");
 	$("#notice").removeClass('error_explanation');
   $("#notice").addClass('confirmed');
-  $("#middleContent").replaceWith("<%= escape_javascript(render(:partial => 'middle_show'))%>");
+  $("#sidebarContent").replaceWith("<%= escape_javascript(render(:partial => 'sidebar_show'))%>");
 	
   $("#contact_info").addClass('section_normal');
   $("#experience_info").addClass('section_normal');

data/config/locales/en.yml

@@ -1,4 +1,7 @@
 en:
+  action:
+    send: "Send"
+    accept: "Accept"
   account:
     one: "Account"
   activity:
@@ -8,9 +11,9 @@ en:
     confirm_delete: "Delete activity?"
     delete: "Delete"
     to_comment: "Comment"
-    like: I like
-    unlike: Already I do not like
-    last: Last Activities
+    like: "I like"
+    unlike: "Already I do not like"
+    last: "Last Activities"
   browse: "Browse"
   comment:
     input: "Write a comment..."
@@ -26,9 +29,59 @@ en:
   days: Days
   delete:
     confirm: Delete %{element}}?
-  forgot_password?: "Forgot you password?"
+  devise:
+    confirmations:
+      send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
+      confirmed: 'Your account was successfully confirmed. You are now signed in.'
+    failure:
+      unauthenticated: 'You need to sign in or sign up before continuing.'
+      unconfirmed: 'You have to confirm your account before continuing.'
+      locked: 'Your account is locked.'
+      invalid: 'Invalid email or password.'
+      invalid_token: 'Invalid authentication token.'
+      timeout: 'Your session expired, please sign in again to continue.'
+      inactive: 'Your account was not activated yet.'
+    mailer:
+      confirmation_instructions:
+        subject: 'Confirmation instructions'
+      reset_password_instructions:
+        subject: 'Reset password instructions'
+      unlock_instructions:
+        subject: 'Unlock Instructions'
+    registrations:
+      signed_up: 'You have signed up successfully. If enabled, a confirmation was sent to your e-mail.'
+      updated: 'You updated your account successfully'
+      destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
+    passwords:
+      send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
+      updated: 'Your password was changed successfully. You are now signed in.'
+      field: 'Please, enter same email when you create account'
+    sessions:
+      signed_in: 'Signed in successfully'
+      signed_out: 'Signed out successfully'
+    unlocks:
+      send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
+      unlocked: 'Your account was successfully unlocked. You are now signed in.'
+  edit:
+    aboutme: "About me"
+    actualcity: "Actual City"
+    address: "Address"
+    birthday: "BirthDay"
+    contact: "Contact information"
+    email: "E-mail"
+    experience: "Experience"
+    fax: "Fax"
+    group_info: "Group information"
+    mobile: "Mobile"
+    organization: "Organization"
+    personal_info: "Personal information"
+    phone: "Phone"
+    profile: "Edit profile"
+    website: "Website"
+  forgot_password: "Forgot you password?"
   frontpage:
     collaborate:
+      default: "Collaborate"
       sentence1: "Organize your projects and activities"
       sentence2: "Create your own groups"
     elements:
@@ -40,11 +93,14 @@ en:
       tags: "Tags"
     main_title: "SocialStream is a core for building social network websites."
     meet:
+      default: "Meet"
       sentence1: "Meet interesting people and groups"
     share:
+      default: "Share"
       sentence1: "Your contacts and relations"
       sentence2: "Posts, comments and activities"
     stats: "%{users} users and %{groups} groups registered"
+  find: "Find"
   group:
     one: "Group"
     other: "Groups"
@@ -62,15 +118,25 @@ en:
       most: "Most popular"
     voted:
       most: "Most voted"
+  help: "Help"
   home: "Home"
   inbox:
     one: "Inbox"
   location:
     message: "You are here > %{location}"
+  mailbox:
+    mailbox: "Message"
+    inbox: "Inbox"
+    sentbox: "Sentbox"
+    trash: "Trash"
   message:
     one: "Message"
   menu:
     options: "Menu Options"
+    information: "Information"
+    wall: "Wall"
+  password:
+    forgot: "Do you forgot your password?"
   post:
     confirm_delete: "Delete post?"
   profile:
@@ -80,18 +146,31 @@ en:
   representation:
     action: "representing"
     change: "Change"
+  service:
+    one: "Service"
+    other: "Services"
+  products:
+    one: "Product"
+    other: "Products"
+  share: "Share"
   sign_in: "Sign in"
-  sign_up: "Sign up"
   sign_out: "Sign out"
+  sign_up: "Sign up"
   socialstream: "SocialStream"
   tie:
+    add:
+      bookmark: "Bookmark"
+      contact: "Add Contact"
+      follow: "Follow"
+      partner: "Add Partner"
     pending:
-      other: Pending requests
+      other: "Pending requests"
       all: "All"
     suggestion:
-      one: Suggestion
-      other: Suggestions
-      all: All
+      one: "Suggestion"
+      other: "Suggestions"
+      all: "All"
+    options: "Tie options"
   time:
     ago: "%{time} ago"
   user:

data/config/routes.rb

@@ -1,29 +1,45 @@
 Rails.application.routes.draw do
   get "contacts/index"
   root :to => "frontpage#index"
-
+  
   match 'home' => 'home#index', :as => :home
   match 'home' => 'home#index', :as => :user_root # devise after_sign_in_path_for
-
-  devise_for :users, :controllers => {:omniauth_callbacks => 'omniauth_callbacks'}
-  resources :users
-
+  
+  ##API###
+  match 'api/keygen' => 'api#create_key', :as => :api_keygen
+  match 'api/user/:id' => 'api#users'
+  match 'api/me' => 'api#users'
+  match 'api/me/home/' => 'api#activity_atom_feed', :format => 'atom', :as => :api_my_home
+  match 'api/user/:id/home' => 'api#activity_atom_feed', :format => 'atom'
+  ##/API##
+  
+  SocialStream.subjects.each do |actor|
+    resources actor.to_s.pluralize do
+      resource :profile
+    end
+  end
+  
   resource :representation
-
-  resources :groups
-
+  
+  resources :logos
+    
+  namespace :mailbox do 
+    resources :conversation, :controller => :conversation 
+  end
+  resources :mailbox, :controller => :mailbox 
+  
   resources :ties do
     collection do
       get 'suggestion'
     end
   end
-
+  
   resources :activities do
     resource :like
   end
-
-
-  resources :posts
-  resources :comments
-  resources :messages
+  
+  
+  (SocialStream.objects - [ :actor ]).each do |object|
+    resources object.to_s.pluralize
+  end
 end

data/lib/generators/social_stream/install_generator.rb

@@ -6,14 +6,20 @@ class SocialStream::InstallGenerator < Rails::Generators::Base #:nodoc:
 
   source_root File.expand_path('../templates', __FILE__)
 
-  def outh_for_devise_config
+  def devise_initializer_config
     inject_into_file "config/initializers/devise.rb",
                      "\n  config.omniauth :linked_in, \"ekxfXU8nueVSMQ9fc5KJAryBkyztUlCBYMW3DoQPzbE79WhivvzhQloRNHCHgPeB\", \"WYiHFT-KKFgjd45W3-pEAficmXRHmN6_6DGwj1C_ZILJlSO1gBvv6VNYXU9tybGY\"
                       \n  config.omniauth :facebook, \"129571360447856\",\"eef39dce5e20e76f77495c59623bdb38\"
-                      \n  #config.omniauth :twitter, \"wgTxO0fTpjTeSnjKC9ZHA\",\"JepulVWwLcuAnGfWjwCu47yEP0TcJJfKtvISPBsilI\"",
+                      \n  #config.omniauth :twitter, \"wgTxO0fTpjTeSnjKC9ZHA\",\"JepulVWwLcuAnGfWjwCu47yEP0TcJJfKtvISPBsilI\"
+                      \n  config.token_authentication_key = :auth_token
+                      \n  config.stateless_token = true",
                       :after => "  # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'"
   end
 
+  def create_devise_route
+    route "devise_for :users, :controllers => {:omniauth_callbacks => 'omniauth_callbacks'}"
+  end
+
   def create_initializer_file
     copy_file 'initializer.rb', 'config/initializers/social_stream.rb'
   end

data/lib/generators/social_stream/templates/migration.rb

@@ -6,37 +6,37 @@ class CreateSocialStream < ActiveRecord::Migration
       t.datetime "updated_at"
       t.string   "ancestry"
     end
-
+    
     add_index "activities", "activity_verb_id"
-
+    
     create_table "activity_object_activities", :force => true do |t|
       t.integer  "activity_id"
       t.integer  "activity_object_id"
       t.datetime "created_at"
       t.datetime "updated_at"
-      t.string   "type",               :limit => 45
+      t.string   "object_type"
     end
-
+    
     add_index "activity_object_activities", "activity_id"
     add_index "activity_object_activities", "activity_object_id"
-
+    
     create_table "activity_objects", :force => true do |t|
       t.datetime "created_at"
       t.datetime "updated_at"
       t.string   "object_type", :limit => 45
     end
-
+    
     create_table "activity_verbs", :force => true do |t|
       t.string   "name",       :limit => 45
       t.datetime "created_at"
       t.datetime "updated_at"
     end
-
+    
     create_table "actors", :force => true do |t|
-      t.string   "name",      :limit => 45
+      t.string   "name"
       t.string   "email",     :default => "", :null => false
-      t.string   "permalink", :limit => 45
-      t.string   "subject_type", :limit => 45
+      t.string   "slug"
+      t.string   "subject_type"
       t.datetime "created_at"
       t.datetime "updated_at"
       t.integer  "activity_object_id"
@@ -45,11 +45,11 @@ class CreateSocialStream < ActiveRecord::Migration
       t.integer  "logo_file_size"
       t.datetime "logo_updated_at"
     end
-
+    
     add_index "actors", "activity_object_id"
     add_index "actors", "email"
-    add_index "actors", "permalink", :unique => true
-
+    add_index "actors", "slug", :unique => true
+    
     create_table :authentications, :force => true do |t|
       t.integer :user_id
       t.string :provider
@@ -58,34 +58,24 @@ class CreateSocialStream < ActiveRecord::Migration
     end
     
     add_index "authentications", "user_id"
-
+    
     create_table "comments", :force => true do |t|
       t.integer  "activity_object_id"
       t.text     "text"
       t.datetime "updated_at"
       t.datetime "created_at"
     end
-
+    
     add_index "comments", "activity_object_id"
-
+    
     create_table "groups", :force => true do |t|
       t.integer  "actor_id"
       t.datetime "created_at"
       t.datetime "updated_at"
-      t.string    "description"
     end
-
+    
     add_index "groups", "actor_id"
-
-    create_table "messages", :force => true do |t|
-      t.integer  "activity_object_id"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.text     "text"
-    end
-
-    add_index "messages", "activity_object_id"
-
+    
     create_table "permissions", :force => true do |t|
       t.string   "action"
       t.string   "object"
@@ -93,16 +83,23 @@ class CreateSocialStream < ActiveRecord::Migration
       t.datetime "created_at"
       t.datetime "updated_at"
     end
-
+    
+    create_table "logos", :force => true do |t|
+        t.string   "logo_file_name"
+        t.string   "logo_content_type"
+        t.integer  "logo_file_size"
+        t.datetime "logo_updated_at"
+    end
+    
     create_table "posts", :force => true do |t|
       t.integer  "activity_object_id"
       t.datetime "created_at"
       t.datetime "updated_at"
       t.text     "text"
     end
-
+    
     add_index "posts", "activity_object_id"
-
+    
     create_table "profiles", :force => true do |t|
       t.integer  "actor_id"
       t.date     "birthday"
@@ -124,9 +121,9 @@ class CreateSocialStream < ActiveRecord::Migration
       t.string   "skype",        :limit => 45
       t.string   "im",           :limit => 45
     end
-
+    
     add_index "profiles", "actor_id"
-
+    
     create_table "relation_permissions", :force => true do |t|
       t.integer  "relation_id"
       t.integer  "permission_id"
@@ -134,10 +131,10 @@ class CreateSocialStream < ActiveRecord::Migration
       t.datetime "updated_at"
       t.integer  "relation_id"
     end
-
+    
     add_index "relation_permissions", "relation_id"
     add_index "relation_permissions", "permission_id"
-
+    
     create_table "relations", :force => true do |t|
       t.string   "name",       :limit => 45
       t.datetime "created_at"
@@ -148,137 +145,134 @@ class CreateSocialStream < ActiveRecord::Migration
       t.integer  "lft"
       t.integer  "rgt"
     end
-
+    
     add_index "relations", "parent_id"
-
+    
     create_table "tags", :force => true do |t|
       t.string   "name",       :limit => 45
       t.datetime "created_at"
       t.datetime "updated_at"
     end
-
+    
     create_table "tags_activity_objects", :force => true do |t|
       t.integer "tag_id"
       t.integer "activity_object_id"
     end
-
+    
     add_index "tags_activity_objects", "activity_object_id"
     add_index "tags_activity_objects", "tag_id"
-
+    
     create_table "tie_activities", :force => true do |t|
       t.integer "tie_id"
       t.integer "activity_id"
       t.boolean "read"
       t.boolean "original", :default => true
     end
-
+    
     add_index "tie_activities", "tie_id"
     add_index "tie_activities", "activity_id"
-
+    
     create_table "ties", :force => true do |t|
       t.integer  "sender_id"
       t.integer  "receiver_id"
       t.integer  "relation_id"
       t.datetime "created_at"
       t.datetime "updated_at"
+      t.boolean  "original", :default => true
     end
-
+    
     add_index "ties", "receiver_id"
     add_index "ties", "relation_id"
     add_index "ties", "sender_id"
-
+    
     create_table "users", :force => true do |t|
       t.string :encrypted_password, :null => false, :default => "", :limit => 128
       t.string :password_salt
-
+      
       t.recoverable
       t.rememberable
       t.trackable
-
+      
       # t.confirmable
       # t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
-      # t.token_authenticatable
-
+      t.token_authenticatable
+      
       t.timestamps
       t.integer  "actor_id"
     end
-
+    
     add_index "users", "actor_id"
     add_index "users", :reset_password_token, :unique => true
     # add_index :users, :confirmation_token, :unique => true
     # add_index :users, :unlock_token,       :unique => true
-
+    
     add_foreign_key "activities", "activity_verbs", :name => "index_activities_on_activity_verb_id"
-
+    
     add_foreign_key "activity_object_activities", "activities", :name => "index_activity_object_activities_on_activity_id"
     add_foreign_key "activity_object_activities", "activity_objects", :name => "activity_object_activities_on_activity_object_id"
-
+    
     add_foreign_key "actors", "activity_objects", :name => "actors_on_activity_object_id"
-
+    
     add_foreign_key "authentications", "users", :name => "authentications_on_user_id"
-
+    
     add_foreign_key "comments", "activity_objects", :name => "comments_on_activity_object_id"
-
+    
     add_foreign_key "groups", "actors", :name => "groups_on_actor_id"
-
-    add_foreign_key "messages", "activity_objects", :name => "messages_on_activity_object_id"
-
+    
     add_foreign_key "posts", "activity_objects", :name => "posts_on_activity_object_id"
-
+    
     add_foreign_key "profiles", "actors", :name => "profiles_on_actor_id"
-
+    
     add_foreign_key "relation_permissions", "relations", :name => "relation_permissions_on_relation_id"
     add_foreign_key "relation_permissions", "permissions", :name => "relation_permissions_on_permission_id"
-
+    
     add_foreign_key "tags_activity_objects", "activity_objects", :name => "tags_activity_objects_on_activity_object_id"
     add_foreign_key "tags_activity_objects", "tags", :name => "tags_activity_objects_on_tag_id"
-
+    
     add_foreign_key "tie_activities", "ties",       :name => "tie_activities_on_tie_id"
     add_foreign_key "tie_activities", "activities", :name => "tie_activities_on_activity_id"
-
+    
     add_foreign_key "ties", "actors", :name => "ties_on_receiver_id", :column => "receiver_id"
     add_foreign_key "ties", "actors", :name => "ties_on_relation_id", :column => "sender_id"
     add_foreign_key "ties", "relations", :name => "ties_on_sender_id"
-
+    
     add_foreign_key "users", "actors", :name => "users_on_actor_id"
   end
   
-
+  
   def self.down
     remove_foreign_key "activities", :name => "index_activities_on_activity_verb_id"
-
+    
     remove_foreign_key "activity_object_activities", :name => "index_activity_object_activities_on_activity_id"
     remove_foreign_key "activity_object_activities", :name => "activity_object_activities_on_activity_object_id"
-
+    
     remove_foreign_key "actors", :name => "actors_on_activity_object_id"
-
+    
     remove_foreign_key "authentications", :name => "authentications_on_user_id"
-
+    
     remove_foreign_key "comments", :name => "comments_on_activity_object_id"
-
+    
     remove_foreign_key "groups", :name => "groups_on_actor_id"
-
-    remove_foreign_key "messages", :name => "messages_on_activity_object_id"
-
+       
     remove_foreign_key "posts", :name => "posts_on_activity_object_id"
-
+    
     remove_foreign_key "profiles", :name => "profiles_on_actor_id"
-
+    
     remove_foreign_key "relation_permissions", :name => "relation_permissions_on_relation_id"
     remove_foreign_key "relation_permissions", :name => "relation_permissions_on_permission_id"
-
+    
     remove_foreign_key "tags_activity_objects", :name => "tags_activity_objects_on_activity_object_id"
     remove_foreign_key "tags_activity_objects", :name => "tags_activity_objects_on_tag_id"
-
+    
     remove_foreign_key "tie_activities", :name => "tie_activities_on_tie_id"
     remove_foreign_key "tie_activities", :name => "tie_activities_on_activity_id"
-
+    
     remove_foreign_key "ties", :name => "ties_on_receiver_id", :column => "receiver_id"
     remove_foreign_key "ties", :name => "ties_on_relation_id", :column => "sender_id"
     remove_foreign_key "ties", :name => "ties_on_sender_id"
-
+    
     remove_foreign_key "users", :name => "users_on_actor_id"
-
+    
     drop_table :activities
     drop_table :activity_object_activities
     drop_table :activity_objects
@@ -287,7 +281,6 @@ class CreateSocialStream < ActiveRecord::Migration
     drop_table :authentications
     drop_table :comments
     drop_table :groups
-    drop_table :messages
     drop_table :permissions
     drop_table :posts
     drop_table :profiles
@@ -297,5 +290,6 @@ class CreateSocialStream < ActiveRecord::Migration
     drop_table :tags_activity_objects
     drop_table :ties
     drop_table :users
+
   end
 end