social_stream 0.4.4 → 0.4.5

data/app/controllers/avatars_controller.rb

@@ -1,51 +0,0 @@
-class AvatarsController < InheritedResources::Base
-
-  before_filter :authenticate_user!
-  def update
-
-    if !current_subject.avatars.blank?
-
-      new_logo = Avatar.find(params[:id])
-
-      if (new_logo.actor == current_subject.actor)
-
-        actual_logo = current_subject.avatars.active.first
-        if !actual_logo.blank?
-        actual_logo.active = false
-        actual_logo.save
-        end
-
-      new_logo.active = true
-      new_logo.save
-      end
-    end
-    redirect_to avatars_path
-  end
-
-  def create
-    @avatar = Avatar.create(params[:avatar])
-
-    if @avatar.new_record?
-      render :new
-    else
-      @avatar.updating_logo = true
-      @avatar.actor_id = current_subject.actor.id
-      if !current_subject.avatars.blank?
-        actual_logo = current_subject.avatars.active.first
-      actual_logo.active = false
-      actual_logo.save
-      end
-      @avatar.active = true
-      @avatar.save
-      redirect_to avatars_path
-    #redirect_to [current_subject, :profile]
-    end
-  end
-
-  protected
-
-  def begin_of_association_chain
-    current_subject
-  end
-
-end

data/app/controllers/representations_controller.rb

@@ -1,19 +0,0 @@
-# Changes context for users to represent other subjects
-class RepresentationsController < ApplicationController
-  before_filter :load_representation
-
-  authorize_resource
-
-  def create
-    self.current_subject = @representation.subject
-
-    redirect_to(request.referer || home_path)
-  end
-
-  private
-
-  # Build representation from params
-  def load_representation
-    @representation = Representation.new(params[:representation])
-  end
-end

data/app/controllers/ties_controller.rb

@@ -1,22 +0,0 @@
-class TiesController < InheritedResources::Base
-  respond_to :html, :xml, :js
-
-  before_filter :authenticate_user!
-
-  def create
-    create! do |format|
-      format.html { redirect_to resource.receiver_subject }
-    end
-  end
-
-  def update
-    update do |format|
-      format.html { redirect_to resource.receiver_subject }
-    end
-  end
-
-  def suggestion
-    @tie = current_subject.suggestion
-    render :layout  => false
-  end
-end

data/app/helpers/ties_helper.rb

@@ -1,37 +0,0 @@
-module TiesHelper
-  def tie_brief(tie)
-    "N contacts in common"
-  end
-
-  # Show current ties from current user to actor, if they exist, or provide a link
-  # to create a new tie to actor
-  def ties_to(a)
-    if user_signed_in?
-      if current_subject.ties_to(a).present?
-        current_subject.ties_to(a).first.relation_name
-      else
-        new_tie_link(current_subject.sent_ties.build :receiver_id => Actor.normalize_id(a))
-      end
-    else
-      link_to t("contact.new.link"), new_user_session_path
-    end
-  end
-
-  def new_tie_link(tie)
-    link_to t("contact.new.link"),
-            new_tie_path("tie[sender_id]" => tie.sender.id,
-                         "tie[receiver_id]" => tie.receiver.id),
-            :title => t("contact.new.title",
-                        :name => tie.receiver_subject.name)
-  end
-
-  def link_follow_state
-      link_to("Unfollow", home_path)
-  end
-  
-  
-  def get_permission_id(action,object,function)
-    return Permission.find_by_action_and_function_and_object(action,object,function).id
-  end
-  
-end

data/app/models/avatar.rb

@@ -1,91 +0,0 @@
-require 'RMagick'
-
-class Avatar < ActiveRecord::Base
- 	has_attached_file :logo,
-                      :styles => { :representation => "20x20>",
-                                   :tie => "30x30>",
-                                   :actor => '35x35>',
-                                   :profile => '94x94' },
-                      :default_url => "/images/logos/:style/:subtype_class.png"
-	
-	before_post_process :process_precrop
-	attr_accessor :crop_x, :crop_y, :crop_w, :crop_h, :name,:updating_logo
-	validates_attachment_presence :logo, :if => :uploading_file?, :message => I18n.t('avatar.error.no_file')
-		
-	after_validation :precrop_done
-	
-	belongs_to :actor
-	
-	scope :active, where(:active => true)
-	
-  	def uploading_file?
-    	return @name.blank?
-  	end
-	
-	def precrop_done
-		return if @name.blank? || !@updating_logo.blank?
-
-    	precrop_path = File.join(Avatar.images_tmp_path,@name)
-    	
-    	make_precrop(precrop_path,@crop_x.to_i,@crop_y.to_i,@crop_w.to_i,@crop_h.to_i)
-	   	@avatar = Avatar.new :logo => File.open(precrop_path), :name => @name
-		
-				
-		self.logo = @avatar.logo
-		
-		FileUtils.remove_file(precrop_path)
-	end
-	
-	def self.images_tmp_path
-		images_path = File.join(RAILS_ROOT, "public", "images")
-		tmp_path = FileUtils.mkdir_p(File.join(images_path, "tmp"))		
-	end
-	
-	def self.copy_to_temp_file(path)
-		FileUtils.cp(path,Avatar.images_tmp_path)
-	end	
-	
-	
-	def self.get_image_dimensions(name)
-   		img_orig = Magick::Image.read(name).first
-   		dimensions = {}
-   		dimensions[:width] =  img_orig.columns
-   		dimensions[:height] = img_orig.rows
-   		dimensions
-   end
-	
-   def process_precrop
-   	
-  	if @name.blank? && (  logo.content_type.present? && !logo.content_type.start_with?("image/"))
-		logo.errors['invalidType'] = I18n.t('avatar.error.no_image_file')
-		return false
-	end
-   	  	
-	return if !@name.blank?
-      logo.errors['precrop'] = "You have to make precrop"
-      resize_image(logo.queued_for_write[:original].path,500,500)
-      Avatar.copy_to_temp_file(logo.queued_for_write[:original].path)   
-   end
-      
-   def resize_image(path,width,height)
-	  img_orig = Magick::Image.read(path).first
-   	img_orig = img_orig.resize_to_fit(width, height)
-   	img_orig.write(path)
-   end
-   
-   def make_precrop(path,x,y,width,height)
-     img_orig = Magick::Image.read(path).first
-     dimensions = Avatar.get_image_dimensions(path)
-     
-	   unless (width == 0) || (height == 0)
-		  crop_args = [x,y,width,height]
-      img_orig = img_orig.crop(*crop_args)
-	   end     
- 
-     img_orig = img_orig.resize_to_fill(500,500)
-     
-     
-     img_orig.write(path)
-  end   
-end
-

data/app/models/representation.rb

@@ -1,35 +0,0 @@
-# Users can represent other subjects in the application, acting as them
-# through the browser, posting new activities, establishing new ties, etc.
-class Representation
-  extend ActiveModel::Naming
-  include ActionController::RecordIdentifier
-
-  attr_reader :subject
-
-  # Sets up new representation
-  #
-  # params[:subject] must contain the dom_id of the represented subject
-  def initialize arg
-    @subject =
-      case arg
-      when Hash
-        arg[:subject_dom_id] =~ /(.*)_(\d*)$/
-
-        subject_type = $1.classify.constantize
-        subject_id   = $2.to_i
-
-        subject_type.find subject_id
-      else
-        arg
-      end
-  end
-
-  def subject_dom_id
-    dom_id(subject)
-  end
-
-  # ActiveRecord compatibility
-  def to_key #:nodoc:
-    nil
-  end
-end

data/app/views/avatars/_form.html.erb

@@ -1,12 +0,0 @@
-<div class= "block">
-  <div class = "content">
-  <%= form_for Avatar.new,:html => { :multipart => true} do |f| %>
-  <div class="form_row">
-  	<%= f.file_field :logo %>
-
-	  <%= f.submit t('avatar.upload'), :class => "button" %>
-  </div>
-  <div id= "prueba">
-  </div>
-  <% end %>
-</div></div>

data/app/views/avatars/_precrop.html.erb

@@ -1,66 +0,0 @@
-<% my_file_name = File.basename(@avatar.logo.queued_for_write[:original].path) %>
-
-<div class = "block">
-  <div id="precropPrev" >
-    <div class="form_row">
-      <%= t('avatar.preview') %>
-    </div>
-    <div id="precropPrevImg" class="logo">
-      <%= image_tag "tmp/#{my_file_name}",:id=>"preview" %>
-    </div>  
-  </div>
-  
-  <div class="form_row">
-    <%= t('avatar.original') %>
-  </div>
-  
-  <div id="precropDiv" class = "block title content">
-  	<%= image_tag "tmp/#{my_file_name}",:id=>"cropImage" %>
-  </div>
-</div>
-<% content_for :javascript do %>
-jQuery('#cropImage').Jcrop({
-            bgColor:     'clear',
-            bgOpacity:   .6,
-            setSelect:   [ 0, 0, 200, 200 ],
-            aspectRatio: 1 ,
-            onChange: update_crop,
-            onSelect: update_crop
-        });
-
-function update_crop(coords) {
-  var rx = 100/coords.w;
-  var ry = 100/coords.h;
-  
-  if((coords.w == 0) || (coords.h == 0)){
-  	rx = 100/$("#cropImage").width();
-  	ry = 100/$("#cropImage").height();
-  	coords.x = 0;
-  	coords.y = 0;
-  }  
-  
-  $('#preview').css({
-    width: Math.round(rx * $("#cropImage").width()) + 'px',
-    height: Math.round(ry * $("#cropImage").height()) + 'px',
-    marginLeft: '-' + Math.round(rx * coords.x) + 'px',
-    marginTop: '-' + Math.round(ry * coords.y) + 'px'
-  });
-  var ratio = 1;
-  $("#crop_x").val(Math.round(coords.x * ratio));
-  $("#crop_y").val(Math.round(coords.y * ratio));
-  $("#crop_w").val(Math.round(coords.w * ratio));
-  $("#crop_h").val(Math.round(coords.h * ratio));
-}
-<% end %>
-
-<%= form_for @avatar, :html => { :multipart => true } do |f| %>
-<div class= "block">
-  <% for attribute in [:crop_x, :crop_y, :crop_w, :crop_h] %>
-    <%= f.hidden_field attribute, :id => attribute %>
-  <% end %>
-	<%= f.hidden_field :name, :value => my_file_name %>
-	  <div class="form_row center">
-  <%= f.submit t('avatar.crop_submit'), :class => "button" %>
-  </div>
-  </div>
-<% end %>

data/app/views/avatars/edit.html.erb

@@ -1,6 +0,0 @@
-<h1>Editing logo</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @avatar %> |
-<%= link_to 'Back', avatars_path %>

data/app/views/avatars/new.html.erb

@@ -1,32 +0,0 @@
-<% content_for :headers do %>
-	<%= javascript_include_tag 'jquery.Jcrop.min' %>
-	<%= stylesheet_link_tag "jquery.Jcrop", :media => "screen, projection" %>
-  <%= stylesheet_link_tag "avatars", :media => "screen, projection" %>
-<%end%>
-
-<% toolbar :profile => current_subject %>
-
-<% content_for :sidebar do %>
-  <%= render :partial => 'home/sidebar' %>
-<% end %>
-
-<%= location(
-	link_to(image_tag("btn/btn_edit.png", :class => "menu_icon")+t('profile.one'), [current_subject,:profile]),	
-	link_to(image_tag("btn/edit.png", :class => "menu_icon")+t('avatar.other'), avatars_path)
-) %>
-
-<br class="clearfloat" />
-<div class="space_center"></div>
-<div class="space_center"></div>
-<div id="content_logo">
-<% if !@avatar.logo.errors['precrop'].blank? %>
-	<h2><%= t('avatar.crop_image') %></h2>
-	<br class="clearfloat" />
-  <div class="space_center"></div>
-	<%= render :partial => 'precrop' %>
-<% else %>
-	<h2><%= t('avatar.new') %></h2>
-	<%= render :partial => 'form' %>
-<% end %>
-</div>
-<% link_to 'Back', avatars_path %>

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

@@ -1,5 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-
-<%= link_to 'Edit', edit_avatar_path(@avatar) %> |
-<%= link_to 'Back', avatars_path %>

data/app/views/groups/_location.html.erb

@@ -1,3 +0,0 @@
-<div id="map_location" class="content_size">
-  <%= t('location.message', :location => "#{ image_tag('btn/btn_group.png' , :class => 'btn_config') } #{ t('group.one') }: <span class=\"name_group\">#{ sanitize @group.name }</span>").html_safe %>
-</div>

data/app/views/groups/_logo.html.erb

@@ -1,5 +0,0 @@
-<div id="logo_index">
-  <div class="center"><span class="title_bold" ><%= @group.name %></span> (<%= ties_to(@group) %>)</div>
-  <%= link_to image_tag(@group.logo.url, :alt => @group.name , :size => "119x108"), @group %>
-</div>
-

data/app/views/home/_location.html.erb

@@ -1,3 +0,0 @@
-<div id="map_location" class="content_size">
-  <%= t('location.message', :location => "#{ image_tag('btn/btn_home.png' , :class => 'btn_config') } #{ t('home') }: <span class=\"name_group\">#{ sanitize current_subject.name }</span>").html_safe %>
-</div>

data/app/views/subjects/_toolbar_home.html.erb

@@ -1,9 +0,0 @@
-<%= render :partial => 'subjects/toolbar_logo', :locals => { :subject => current_subject, } %>
-
-<div class="block space_center">
-</div>
-
-<%= render :partial => 'subjects/toolbar_home_menu' %>
-
-<div class="block space_center">
-</div>

data/app/views/subjects/_toolbar_profile_menu.html.erb

@@ -1,12 +0,0 @@
-<% content_for :headers do %>
-  <%= stylesheet_link_tag "menu", :media => "screen, projection" %>
-  <%= javascript_include_tag 'menu' %>
-<% end %>
-
-<div id="menu_lateral">
-  <ul class="menu">
-    <%= render :partial => "subjects/toolbar_profile_menu_tie_options", :locals => { :subject => subject } %>
-    <%= render :partial => "subjects/toolbar_profile_menu_basic_options", :locals => { :subject => subject } %>
-  </ul>
-</div>
-<div class="space_center"></div>

data/app/views/subjects/_toolbar_profile_menu_basic_options.html.erb

@@ -1,13 +0,0 @@
-<%= menu_options[:messages] || capture do %>
-  <% if user_signed_in? %>
-    <li >
-    <%= link_to(image_tag("btn/btn_send.png", :class => "menu_icon")+t('message.send'), new_message_path(:receiver => subject.slug)) %>
-    </li>
-  <% end %>
-<% end %>
-
-<%= menu_options[:profile] || capture do %>
-  <li>
-    <%= link_to( image_tag("btn/btn_edit.png", :class => "menu_icon")+t('menu.information'), [subject, :profile]) %>
-  </li>
-<% end %>