social_stream 0.23.4 → 0.24.0

data/base/config/locales/rails.pt.yml

@@ -0,0 +1,192 @@
+pt:
+  date:
+    abbr_day_names:
+    - dom
+    - seg
+    - ter
+    - qua
+    - qui
+    - sex
+    - sáb
+    abbr_month_names:
+    - 
+    - jan
+    - fev
+    - mar
+    - abr
+    - mai
+    - jun
+    - jul
+    - ago
+    - set
+    - out
+    - nov
+    - dez
+    day_names:
+    - domingo
+    - segunda
+    - terça
+    - quarta
+    - quinta
+    - sexta
+    - sábado
+    formats:
+      default: ! '%d/%m/%Y'
+      long: ! '%d de %B de %Y'
+      short: ! '%d de %b'
+    month_names:
+    - 
+    - janeiro
+    - fevereiro
+    - março
+    - abril
+    - maio
+    - junho
+    - julho
+    - agosto
+    - setembro
+    - outubro
+    - novembro
+    - dezembro
+    order:
+    - :dia
+    - :mês
+    - :ano
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: aproximadamente 1 hora
+        other: aproximadamente %{count} horas
+      about_x_months:
+        one: aproximadamente 1 mês
+        other: aproximadamente %{count} meses
+      about_x_years:
+        one: aproximadamente 1 ano
+        other: aproximadamente %{count} anos
+      almost_x_years:
+        one: quase 1 ano
+        other: quase %{count} anos
+      half_a_minute: meio minuto
+      less_than_x_minutes:
+        one: menos de 1 minuto
+        other: menos de %{count} minutos
+      less_than_x_seconds:
+        one: menos de 1 segundo
+        other: menos de %{count} segundos
+      over_x_years:
+        one: mais de 1 ano
+        other: mais de %{count} anos
+      x_days:
+        one: 1 dia
+        other: ! '%{count} dias'
+      x_minutes:
+        one: 1 minuto
+        other: ! '%{count} minutos'
+      x_months:
+        one: 1 mês
+        other: ! '%{count} meses'
+      x_seconds:
+        one: 1 segundo
+        other: ! '%{count} segundos'
+    prompts:
+      day: Dia
+      hour: Hora
+      minute: Minuto
+      month: Mês
+      second: Segundo
+      year: Ano
+  errors:
+    format: ! '%{attribute} %{message}'
+    messages:
+      accepted: deve ser aceito
+      blank: não pode ficar em branco
+      confirmation: não está de acordo com a confirmação
+      empty: não pode ficar vazio
+      equal_to: deve ser igual a %{count}
+      even: deve ser par
+      exclusion: não está disponível
+      greater_than: deve ser maior que %{count}
+      greater_than_or_equal_to: deve ser maior ou igual a %{count}
+      inclusion: não está incluído na lista
+      invalid: não é válido
+      less_than: deve ser menor que %{count}
+      less_than_or_equal_to: deve ser menor ou igual a %{count}
+      not_a_number: não é um número
+      not_an_integer: não é um número inteiro
+      odd: deve ser ímpar
+      record_invalid: ! 'A validação falhou: %{errors}'
+      taken: já está em uso
+      too_long: ! 'é muito longo (máximo: %{count} caracteres)'
+      too_short: ! 'é muito curto (mínimo: %{count} caracteres)'
+      wrong_length: não possui o tamanho esperado (%{count} caracteres)
+    template:
+      body: ! 'Por favor, verifique o(s) seguinte(s) campo(s):'
+      header:
+        one: ! 'Não foi possível gravar %{model}: 1 erro'
+        other: ! 'Não foi possível gravar %{model}: %{count} erros.'
+  helpers:
+    select:
+      prompt: Por favor selecione
+    submit:      
+      create: Criar %{model}
+      submit: Salvar %{model}
+      update: Atualizar %{model}
+  number:
+    currency:
+      format:
+        delimiter: .
+        format: ! '%u %n'
+        precision: 2
+        separator: ! ','
+        significant: false
+        strip_insignificant_zeros: false
+        unit: R$
+    format:
+      delimiter: .
+      precision: 3
+      separator: ! ','
+      significant: false
+      strip_insignificant_zeros: false
+    human:
+      decimal_units:
+        format: ! '%n %u'
+        units:
+          billion: bilhão
+          million: milhão
+          quadrillion: quatrilhão
+          thousand: mil
+          trillion: trilhão
+          unit: ''
+      format:
+        delimiter: ''
+        precision: 2
+        significant: true
+        strip_insignificant_zeros: true
+      storage_units:
+        format: ! '%n %u'
+        units:
+          byte:
+            one: Byte
+            other: Bytes
+          gb: GB
+          kb: KB
+          mb: MB
+          tb: TB
+    percentage:
+      format:
+        delimiter: ''
+    precision:
+      format:
+        delimiter: ''
+  support:
+    array:
+      last_word_connector: ! ', e '
+      two_words_connector: ! ' e'
+      words_connector: ! ', '
+  time:
+    am: ''
+    formats:
+      default:  ! '%A, %d de %B de %Y, %H:%M h'
+      long: ! '%A, %d de %B de %Y, %H:%M h'
+      short: ! '%d/%m, %H:%M h'
+    pm: ''

data/base/config/routes.rb

@@ -40,16 +40,29 @@ Rails.application.routes.draw do
     resources object.to_s.pluralize
   end
 
-  resources :contacts do
-    collection do
-      get 'pending'
+  case SocialStream.relation_model
+  when :follow
+    resources :followers
+    resources :contacts do
+      collection do
+        get 'pending'
+      end
+    end
+  when :custom
+    resources :contacts do
+      collection do
+        get 'pending'
+      end
+    end
+
+    namespace "relation" do
+      resources :customs
     end
-  end
 
-  namespace "relation" do
-    resources :customs
+    resources :permissions
   end
-  resources :permissions
+
+  resources :activity_actions
 
   match 'tags'     => 'tags#index', :as => 'tags'
   

data/base/db/migrate/20120316093946_create_activity_actions.rb

@@ -0,0 +1,15 @@
+class CreateActivityActions < ActiveRecord::Migration
+  def change
+    create_table :activity_actions do |t|
+      t.references :actor
+      t.references :activity_object
+
+      t.timestamps
+    end
+    add_index :activity_actions, :actor_id
+    add_index :activity_actions, :activity_object_id
+
+    add_foreign_key "activity_actions", "actors", :name => "index_activity_actions_on_actor_id"
+    add_foreign_key "activity_actions", "activity_objects", :name => "index_activity_actions_on_activity_object_id"
+  end
+end

data/base/db/migrate/20120316113728_activity_action_follow.rb

@@ -0,0 +1,23 @@
+class ActivityActionFollow < ActiveRecord::Migration
+  def up
+    add_column :activity_actions, :follow, :boolean, :default => false
+    add_column :activity_objects, :follower_count, :integer, :default => 0
+    remove_column :actors, :follower_count
+
+    ActivityObject.reset_column_information
+    Actor.reset_column_information
+
+    Tie.
+      joins(:relation).
+      with_permissions('follow', nil).
+      each do |t|
+        t.set_follow_action
+      end
+  end
+
+  def down
+    remove_column :activity_actions, :follow
+    remove_column :activity_objects, :follower_count
+    add_column :actors, :follower_count, :integer, :default => 0
+  end
+end

data/base/lib/generators/social_stream/base/install_generator.rb

@@ -41,10 +41,6 @@ class SocialStream::Base::InstallGenerator < Rails::Generators::Base #:nodoc:
     remove_file 'app/views/layouts/application.html.erb'
   end
 
-  def create_navigation_config
-    copy_file 'navigation.rb', 'config/navigation.rb'
-  end
-
   def require_javascripts
     inject_into_file 'app/assets/javascripts/application.js',
                      "//= require social_stream-base\n",

data/base/lib/generators/social_stream/base/templates/initializer.rb

@@ -20,6 +20,13 @@ SocialStream.setup do |config|
   # You can write your own activity objects
   #
   # config.activity_forms = [ :post, :document, :foo, :bar ]
+
+  # Config the relation model of your network
+  #
+  # :custom - users define their own relation types, and post with privacy, like Google+
+  # :follow - user just follow other users, like Twitter
+  #
+  # config.relation_model = :custom
   
   # Quick search (header) and Extended search models and its order. Remember to create
   # the indexes with thinking-sphinx if you are using customized models.

data/base/lib/inherited_resources/social_stream.rb

@@ -0,0 +1,18 @@
+# Monkey path inherited_resources
+#
+#
+# Fix https://github.com/josevalim/inherited_resources/issues/216
+module InheritedResources::BaseHelpers
+  private
+
+  def resource_params
+    @resource_params ||=
+      build_resource_params
+  end
+
+  def build_resource_params
+    rparams = [params[resource_request_name] || params[resource_instance_name] || {}]
+    rparams << as_role if role_given?
+    rparams
+  end
+end

data/base/lib/rails/social_stream.rb

@@ -0,0 +1,23 @@
+# Monkey patches to Ruby on Rails
+#
+# Use unix file util to prove the content type sent by the browser
+class ActionDispatch::Http::UploadedFile
+  def initialize_with_magic(*args, &block)
+    initialize_without_magic(*args, &block)
+
+    if (unix_file = `which file`.chomp).present? && File.exists?(unix_file)
+      `#{ unix_file } -v 2>&1` =~ /^file-(.*)$/
+      version = $1
+
+      @content_type =
+        if version >= "4.24"
+          `#{ unix_file } -b --mime-type #{ @tempfile.path }`.chomp
+        else
+          `#{ unix_file } -bi #{ @tempfile.path }`.chomp =~ /(\w*\/[\w+-\.]*)/
+          $1
+        end
+    end
+  end
+
+  alias_method_chain :initialize, :magic
+end

data/base/lib/social_stream-base.rb

@@ -36,15 +36,16 @@ module SocialStream
     module Sidebar
       autoload :Base, 'social_stream/views/sidebar/base'
     end
+
+    module Toolbar
+      autoload :Base, 'social_stream/views/toolbar/base'
+    end
   end
 
   module TestHelpers
     autoload :Controllers, 'social_stream/test_helpers/controllers'
   end
 
-  module ToolbarConfig
-    autoload :Base, 'social_stream/toolbar_config/base'
-  end
 
   mattr_accessor :subjects
   @@subjects = [ :user, :group ]
@@ -58,6 +59,9 @@ module SocialStream
 
   mattr_accessor :activity_forms
   @@activity_forms = [ :post ]
+
+  mattr_accessor :relation_model
+  @@relation_model = :custom
   
   mattr_accessor :quick_search_models
   @@quick_search_models = [ :user, :group, :post ]

data/base/lib/social_stream/base/dependencies.rb

@@ -1,3 +1,5 @@
+# Monkey path Ruby on Rails
+require 'rails/social_stream'
 # Database foreign keys
 require 'foreigner'
 # jQuery
@@ -14,6 +16,7 @@ require 'devise'
 require 'cancan'
 # REST controllers
 require 'inherited_resources'
+require 'inherited_resources/social_stream'
 # Scopes in controllers
 require 'has_scope'
 # Logo attachments
@@ -33,8 +36,6 @@ require 'acts_as_taggable_on/social_stream'
 require 'formtastic'
 #Background tasks
 require 'resque/server'
-#Simple Navigation for menu
-require 'simple-navigation'
 # Modernizr.js library
 require 'modernizr-rails'
 # Sphinx search engine

data/base/lib/social_stream/base/engine.rb

@@ -35,12 +35,6 @@ module SocialStream
         end
       end
 
-      initializer "social_stream-base.toolbar_config" do
-        SocialStream::ToolbarConfig.module_eval do
-          include SocialStream::ToolbarConfig::Base
-        end
-      end
-
       initializer "social_stream-base.views.settings" do
         SocialStream::Views::Settings.module_eval do
           include SocialStream::Views::Settings::Base
@@ -53,6 +47,12 @@ module SocialStream
         end
       end
 
+      initializer "social_stream-base.views.toolbar" do
+        SocialStream::Views::Toolbar.module_eval do
+          include SocialStream::Views::Toolbar::Base
+        end
+      end
+
       initializer "social_stream-base.avatars_for_rails" do
         AvatarsForRails.setup do |config|
           config.avatarable_model = :actor

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.17.3".freeze
+    VERSION = "0.18.0".freeze
   end
 end

data/base/lib/social_stream/models/channeled.rb

@@ -23,6 +23,8 @@ module SocialStream
         subtype_of :channel,
                    :belongs => { :dependent => nil }
 
+        # before_validation :set_owner_id, :on => :create
+
         before_validation :check_existing_channel
       end
 
@@ -43,6 +45,12 @@ module SocialStream
 
         self.channel = existing_channel
       end
+
+      private
+
+      def set_owner_id
+        self.owner_id ||= author_id
+      end
     end
   end
 end