social_stream 2.2.0 → 2.2.1

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

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "2.2.0".freeze
+    VERSION = "2.2.1".freeze
   end
 end

data/base/lib/social_stream/population.rb

@@ -0,0 +1,14 @@
+module SocialStream
+  module Population
+    class << self
+      def task message
+        puts message
+        time = Time.now
+
+        yield
+
+        puts "   -> #{ (Time.now - time).round(4) }s"
+      end
+    end
+  end
+end

data/base/lib/social_stream/search.rb

@@ -117,8 +117,10 @@ module SocialStream
 
         [
           query,
-          :classes => models,
-          :with => with
+          classes: models,
+          with: with,
+          limit: options[:limit],
+          page: options[:page]
         ]
       end
     end

data/base/lib/tasks/db/populate.rake

@@ -45,171 +45,127 @@ namespace :db do
       # USERS
       desc "Create users"
       task :users => :read_environment do
-        puts 'User population (Demo and ' + @USERS.to_s + ' users more)'
-        users_start = Time.now
-
-        # Create demo user if not present
-        if Actor.find_by_slug('demo').blank?
-          u = User.create! :name => '<Demo>',
-                           :email => 'demo@social-stream.dit.upm.es',
-                           :password => 'demonstration',
-                           :password_confirmation => 'demonstration'
-          u.actor!.update_attribute :slug, 'demo'
-        end
+        SocialStream::Population.task "User population (Demo and #{ @USERS } users more)" do
 
-        @USERS.times do
-          User.create! :name => Forgery::Name.full_name,
-                       :email => Forgery::Internet.email_address,
-                       :password => 'demonstration',
-                       :password_confirmation => 'demonstration'
-        end
+          # Create demo user if not present
+          if Actor.find_by_slug('demo').blank?
+            u = User.create! :name => '<Demo>',
+                             :email => 'demo@social-stream.dit.upm.es',
+                             :password => 'demonstration',
+                             :password_confirmation => 'demonstration'
+            u.actor!.update_attribute :slug, 'demo'
+          end
 
-        # Reload actors to include new users
-        @available_actors = Actor.all
+          @USERS.times do
+            User.create! :name => Forgery::Name.full_name,
+                         :email => Forgery::Internet.email_address,
+                         :password => 'demonstration',
+                         :password_confirmation => 'demonstration'
+          end
 
-        users_end = Time.now
-        puts '   -> ' + (users_end - users_start).round(4).to_s + 's'
+          # Reload actors to include new users
+          @available_actors = Actor.all
+        end
       end
 
 
       # GROUPS
       desc "Create groups"
       task :groups => :read_environment do
-        puts 'Groups population (' + @GROUPS.to_s + ' groups)'
-        groups_start = Time.now
+        SocialStream::Population.task "Groups population (#{ @GROUPS } groups)" do
+          @GROUPS.times do
+            founder = @available_actors[rand(@available_actors.size)]
 
-        @GROUPS.times do
-          founder = @available_actors[rand(@available_actors.size)]
+            Group.create! :name  => Forgery::Name.company_name,
+                          :email => Forgery::Internet.email_address,
+                          :author_id => founder.id,
+                          :user_author_id => founder.id
+          end
 
-          Group.create! :name  => Forgery::Name.company_name,
-                        :email => Forgery::Internet.email_address,
-                        :author_id => founder.id,
-                        :user_author_id => founder.id
+          # Reload actors to include groups
+          @available_actors = Actor.all
         end
-
-        # Reload actors to include groups
-        @available_actors = Actor.all
-
-        groups_end = Time.now
-        puts '   -> ' +  (groups_end - groups_start).round(4).to_s + 's'
       end
 
       desc "Populate profiles"
 
       task :profiles => :read_environment do
-        puts "Profiles population"
-        time = Time.now
+        SocialStream::Population.task "Profiles population" do
+          SocialStream::Population::Actor.available.each do |a|
+            p = a.profile
 
-        SocialStream::Population::Actor.available.each do |a|
-          p = a.profile
+            if rand < 0.2
+              a.tag_list = Forgery::LoremIpsum.words(3, random: true).gsub(' ', ',')
+            end
 
-          if rand < 0.2
-            a.tag_list = Forgery::LoremIpsum.words(3, random: true).gsub(' ', ',')
-          end
+            if rand < 0.2
+              p.organization = Forgery::Name.company_name
+            end
 
-          if rand < 0.2
-            p.organization = Forgery::Name.company_name
-          end
+            if rand < 0.2
+              p.birthday = Time.at(Time.now.to_i - (18.years + rand(60.years)))
+            end
 
-          if rand < 0.2
-            p.birthday = Time.at(Time.now.to_i - (18.years + rand(60.years)))
-          end
+            if rand < 0.2
+              p.city = Forgery::Address.city
+            end
 
-          if rand < 0.2
-            p.city = Forgery::Address.city
-          end
+            if rand < 0.2
+              p.country = Forgery::Address.country
+            end
 
-          if rand < 0.2
-            p.country = Forgery::Address.country
-          end
+            if rand < 0.2
+              p.description = Forgery::LoremIpsum.sentences(2, random: true)
+            end
 
-          if rand < 0.2
-            p.description = Forgery::LoremIpsum.sentences(2, random: true)
-          end
+            if rand < 0.2
+              p.phone = Forgery::Address.phone
+            end
 
-          if rand < 0.2
-            p.phone = Forgery::Address.phone
-          end
+            if rand < 0.2
+              p.address = Forgery::Address.street_address
+            end
 
-          if rand < 0.2
-            p.address = Forgery::Address.street_address
-          end
+            if rand < 0.2
+              p.website = "http://#{ Forgery::Internet.domain_name }"
+            end
 
-          if rand < 0.2
-            p.website = "http://#{ Forgery::Internet.domain_name }"
-          end
+            if rand < 0.2
+              p.experience = Forgery::LoremIpsum.sentences(3, random: true)
+            end
 
-          if rand < 0.2
-            p.experience = Forgery::LoremIpsum.sentences(3, random: true)
+            p.save!
           end
-
-          p.save!
         end
-
-        puts '   -> ' + (Time.now - time).round(4).to_s + 's'
       end
 
       # TIES
       desc "Create ties"
       task :ties => :read_environment do
-        puts 'Ties population'
-        ties_start = Time.now
-
-        SocialStream::Population::Actor.available.each do |a|
-          actors = SocialStream::Population::Actor.available
-          actors.delete(a)
-
-          relations = a.relation_customs + [ Relation::Reject.instance ]
-
-          Forgery::Basic.number(:at_most => actors.size).times do
-            actor = actors.delete_at((rand * actors.size).to_i)
-            contact = a.contact_to!(actor)
-            contact.user_author = a.user_author if a.subject_type != "User"
-            contact.relation_ids = [ Forgery::Extensions::Array.new(relations).random.id ]
+        SocialStream::Population.task 'Ties population' do
+          SocialStream::Population::Actor.available.each do |a|
+            actors = SocialStream::Population::Actor.available
+            actors.delete(a)
+
+            relations = a.relation_customs + [ Relation::Reject.instance ]
+
+            Forgery::Basic.number(:at_most => actors.size).times do
+              actor = actors.delete_at((rand * actors.size).to_i)
+              contact = a.contact_to!(actor)
+              contact.user_author = a.user_author if a.subject_type != "User"
+              contact.relation_ids = [ Forgery::Extensions::Array.new(relations).random.id ]
+            end
           end
-        end
-
-        Activity.includes(:activity_verb).merge(ActivityVerb.verb_name(["follow", "make-friend"])).each do |a|
-          t = SocialStream::Population::Timestamps.new
-
-          a.update_attributes :created_at => t.created,
-                              :updated_at => t.updated
-        end
-
-        ties_end = Time.now
-        puts '   -> ' +  (ties_end - ties_start).round(4).to_s + 's'
-      end
 
+          Activity.includes(:activity_verb).merge(ActivityVerb.verb_name(["follow", "make-friend"])).each do |a|
+            t = SocialStream::Population::Timestamps.new
 
-      # TIES, special version for cheesecake testing
-      desc "Create cheesecake ties"
-      task :cheesecake_ties => :read_environment do
-        puts 'Ties population (Cheesecake version)'
-        ties_start = Time.now
-
-        SocialStream::Population::Actor.available.each do |a|
-          actors = SocialStream::Population::Actor.available - Array(a)
-          relations = a.relation_customs + Array.wrap(Relation::Reject.instance)
-          break if actors.size==0
-          actor = Actor.first
-          unless a==actor
-            puts a.name + " connecting with " + actor.name
-            # DRY! :-S
-            contact = a.contact_to!(actor)
-            contact.user_author = a.user_author if a.subject_type != "User"
-            contact.relation_ids = Array(Forgery::Extensions::Array.new(a.relation_customs).random.id)
-
-            contact = actor.contact_to!(a)
-            contact.user_author = actor.user_author if actor.subject_type != "User"
-            contact.relation_ids = Array(Forgery::Extensions::Array.new(actor.relation_customs).random.id)
+            a.update_attributes :created_at => t.created,
+                                :updated_at => t.updated
           end
         end
-
-        ties_end = Time.now
-        puts '   -> ' +  (ties_end - ties_start).round(4).to_s + 's'
       end
 
-
       # POSTS
       desc "Create posts"
       task :posts => :read_environment do
@@ -223,58 +179,52 @@ namespace :db do
       # MESSAGES
       desc "Create messages using mailboxer"
       task :messages => :read_environment do
-        puts 'Mailboxer population'
-        mailboxer_start = Time.now
+        SocialStream::Population.task 'Mailboxer population' do
+          demo = SocialStream::Population::Actor.demo
+          @available_actors = Actor.all.sample(Actor.count / 3)
+          @available_actors |= [ demo ]
 
-        demo = SocialStream::Population::Actor.demo
-        @available_actors = Actor.all.sample(Actor.count / 3)
-        @available_actors |= [ demo ]
 
+          5.times do
+            actors = @available_actors.dup
 
-        5.times do
-          actors = @available_actors.dup
+            mult_recp = actors.uniq
 
-          mult_recp = actors.uniq
+            actor = mult_recp.sample
 
-          actor = mult_recp.sample
+            mult_recp.delete(actor)
 
-          mult_recp.delete(actor)
+            mail = actor.send_message(mult_recp, "Hello all, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))
 
-          mail = actor.send_message(mult_recp, "Hello all, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))
+            [ 'Well', 'Ok', 'Pretty well', 'Finally' ].inject(mail) do |st|
+              break if rand < 0.2
 
-          [ 'Well', 'Ok', 'Pretty well', 'Finally' ].inject(mail) do |st|
-            break if rand < 0.2
+              actor = mult_recp.sample
 
-            actor = mult_recp.sample
+              mail = actor.reply_to_all(mail, "#{ st }, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
 
-            mail = actor.reply_to_all(mail, "#{ st }, I am #{actor.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
-
-            mail
-          end
+              mail
+            end
 
-          if rand > 0.75
-            mail.conversation.move_to_trash(demo)
-          end
+            if rand > 0.75
+              mail.conversation.move_to_trash(demo)
+            end
 
-          @available_actors = (Actor.all.sample(Actor.count / 3) - [ demo ])
+            @available_actors = (Actor.all.sample(Actor.count / 3) - [ demo ])
 
-          @available_actors.each do |a|
-            mail = a.send_message(demo, "Hello, #{demo.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))
-            if rand > 0.5
-              mail = demo.reply_to_sender(mail, "Pretty well #{a.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+            @available_actors.each do |a|
+              mail = a.send_message(demo, "Hello, #{demo.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}", Forgery::LoremIpsum.words(10,:random => true))
               if rand > 0.5
-                a.reply_to_sender(mail, "Ok #{demo.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+                mail = demo.reply_to_sender(mail, "Pretty well #{a.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+                if rand > 0.5
+                  a.reply_to_sender(mail, "Ok #{demo.name}. #{Forgery::LoremIpsum.sentences(2,:random => true)}")
+                end
               end
             end
           end
         end
-
-        mailboxer_end = Time.now
-        puts '   -> ' +  (mailboxer_end - mailboxer_start).round(4).to_s + 's'
-
       end
 
-
       # AVATARS
       desc "Create avatars"
       task :avatars => :read_environment do
@@ -295,11 +245,9 @@ namespace :db do
           end
         end
 
-        puts 'Avatar population'
-        avatar_start = Time.now
-        SocialStream.subjects.each {|a| set_logos(Kernel.const_get(a.to_s.classify)) }
-        avatar_end = Time.now
-        puts '   -> ' +  (avatar_end - avatar_start).round(4).to_s + 's'
+        SocialStream::Population.task 'Avatar population' do
+          SocialStream.subjects.each {|a| set_logos(Kernel.const_get(a.to_s.classify)) }
+        end
       end
     end
   end

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "2.2.0".freeze
+  VERSION = "2.2.1".freeze
 end

data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/layout/_applications-oauth2server.css.sass

@@ -48,3 +48,6 @@
       input
         &[type="file"]
           line-height: 0px
+
+.next-step
+  @include next-btn

data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/mixins/_mixin.css.sass

@@ -1,5 +1,45 @@
 // menu horizontal
 // ----------------------------------
+@mixin btn-secundary
+  @include ie7-inline-block()
+  padding: 4px 12px
+  margin-bottom: 0
+  font-size: $baseFontSize
+  line-height: $baseLineHeight
+  vertical-align: middle
+  cursor: pointer
+  background-color: $secundary-btnColorbackground
+  border: 1px solid $secundary-btnColorborder 
+  *border: 0
+  color: $auxiliarColor
+  background-image: none
+  @include ie7-restore-left-whitespace()
+  @include box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05))
+  @include transition(background 1s, color, 1s)
+  @include border-radius(7px)
+  a
+    color: $gray
+  
+  &:hover
+    border: 1px solid $secundary-btnColorbackground
+    background-color: $secundary-btnColorborder !important
+    color: $principalColor
+  
+  &:focus 
+    @include tab-focus()
+  
+  &.active
+    border: 1px solid $secundary-btnColorborder
+    background-color: $secundary-btnColorbackground !important
+    color: $principalColor
+
+  &.disabled,
+  &[disabled] 
+    cursor: default
+    @include opacity(85)
+    background-color: $secundary-btnColorbackground
+    color: $gray
+
 
 @mixin principal-box
   @include border-radius(5px)
@@ -7,4 +47,9 @@
   border: 1px solid 
   border-color: rgba(0,0,0, 0.1)
   background-color: $auxiliarColor
-  border-color: rgba(0,0,0, 0.1)
+  border-color: rgba(0,0,0, 0.1)
+
+
+@mixin next-btn
+  @include btn-secundary
+