social_stream 0.26.0 → 0.26.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (114) hide show
  1. data/Gemfile +1 -1
  2. data/base/README.rdoc +2 -2
  3. data/base/app/assets/stylesheets/base.css.scss +1 -1
  4. data/base/app/controllers/activities_controller.rb +1 -2
  5. data/base/app/controllers/profiles_controller.rb +40 -8
  6. data/base/app/controllers/search_controller.rb +6 -49
  7. data/base/app/helpers/search_helper.rb +4 -34
  8. data/base/app/models/activity_object.rb +37 -4
  9. data/base/app/models/actor.rb +6 -0
  10. data/base/app/models/relation.rb +15 -0
  11. data/base/app/models/tie.rb +6 -0
  12. data/base/app/views/comments/create.js.erb +12 -7
  13. data/base/app/views/messages/_form.html.erb +1 -1
  14. data/base/app/views/posts/create.js.erb +8 -3
  15. data/base/app/views/search/_extended_search.html.erb +1 -1
  16. data/base/app/views/search/_extended_tab.html.erb +5 -0
  17. data/base/app/views/search/_form.html.erb +3 -3
  18. data/base/app/views/search/index.js.erb +3 -3
  19. data/base/config/routes.rb +6 -2
  20. data/base/lib/logos/groups/1.jpg +0 -0
  21. data/base/lib/logos/groups/10.jpg +0 -0
  22. data/base/lib/logos/groups/11.jpg +0 -0
  23. data/base/lib/logos/groups/12.jpg +0 -0
  24. data/base/lib/logos/groups/2.jpg +0 -0
  25. data/base/lib/logos/groups/3.jpg +0 -0
  26. data/base/lib/logos/groups/4.jpg +0 -0
  27. data/base/lib/logos/groups/5.jpg +0 -0
  28. data/base/lib/logos/groups/6.jpg +0 -0
  29. data/base/lib/logos/groups/7.jpg +0 -0
  30. data/base/lib/logos/groups/8.jpg +0 -0
  31. data/base/lib/logos/groups/9.jpg +0 -0
  32. data/base/lib/logos/partners/1.jpg +0 -0
  33. data/base/lib/logos/partners/1.png +0 -0
  34. data/base/lib/logos/partners/2.jpg +0 -0
  35. data/base/lib/logos/partners/2.png +0 -0
  36. data/base/lib/logos/users/1.jpg +0 -0
  37. data/base/lib/logos/users/10.jpg +0 -0
  38. data/base/lib/logos/users/11.jpg +0 -0
  39. data/base/lib/logos/users/12.jpg +0 -0
  40. data/base/lib/logos/users/2.jpg +0 -0
  41. data/base/lib/logos/users/3.jpg +0 -0
  42. data/base/lib/logos/users/4.jpg +0 -0
  43. data/base/lib/logos/users/5.jpg +0 -0
  44. data/base/lib/logos/users/6.jpg +0 -0
  45. data/base/lib/logos/users/7.jpg +0 -0
  46. data/base/lib/logos/users/8.jpg +0 -0
  47. data/base/lib/logos/users/9.jpg +0 -0
  48. data/base/lib/social_stream-base.rb +8 -0
  49. data/base/lib/social_stream/base/dependencies.rb +3 -1
  50. data/base/lib/social_stream/base/thinking-sphinx.rb +3 -1
  51. data/base/lib/social_stream/base/version.rb +1 -1
  52. data/base/lib/social_stream/controllers/helpers.rb +36 -30
  53. data/base/lib/social_stream/controllers/objects.rb +89 -1
  54. data/base/lib/social_stream/controllers/subjects.rb +3 -1
  55. data/base/lib/social_stream/models/object.rb +18 -0
  56. data/base/lib/social_stream/models/subject.rb +2 -0
  57. data/base/lib/social_stream/population/activity_object.rb +55 -0
  58. data/base/lib/social_stream/{populate.rb → population/power_law.rb} +3 -4
  59. data/base/lib/social_stream/population/timestamps.rb +12 -0
  60. data/base/lib/social_stream/search.rb +107 -0
  61. data/base/lib/tasks/db/populate.rake +13 -26
  62. data/base/social_stream-base.gemspec +3 -1
  63. data/base/spec/models/post_spec.rb +14 -0
  64. data/documents/app/controllers/documents_controller.rb +10 -34
  65. data/documents/app/controllers/pictures_controller.rb +6 -0
  66. data/documents/app/models/document.rb +2 -2
  67. data/documents/app/views/audios/index.html.erb +1 -1
  68. data/documents/app/views/common_documents/_headers.html.erb +20 -15
  69. data/documents/app/views/common_documents/_index.html.erb +5 -6
  70. data/documents/app/views/documents/index.html.erb +1 -1
  71. data/documents/app/views/documents/search.html.erb +3 -0
  72. data/documents/app/views/pictures/index.html.erb +1 -1
  73. data/documents/app/views/videos/index.html.erb +1 -1
  74. data/documents/config/routes.rb +2 -0
  75. data/documents/lib/samples/car.jpg +0 -0
  76. data/documents/lib/samples/house.jpg +0 -0
  77. data/documents/lib/samples/loremipsum.odt +0 -0
  78. data/documents/lib/samples/loremipsum.pdf +0 -0
  79. data/documents/lib/samples/siren.mp3 +0 -0
  80. data/documents/lib/samples/water.mp3 +0 -0
  81. data/documents/lib/social_stream/documents/version.rb +1 -1
  82. data/documents/lib/tasks/db/populate_documents.rake +6 -23
  83. data/documents/social_stream-documents.gemspec +1 -1
  84. data/events/app/assets/javascripts/social_stream-events.js +3 -0
  85. data/events/app/assets/javascripts/social_stream.event.js +5 -0
  86. data/events/app/controllers/events_controller.rb +1 -3
  87. data/events/app/models/event.rb +1 -1
  88. data/events/app/views/events/create.js.erb +1 -1
  89. data/events/app/views/events/index.html.erb +1 -1
  90. data/events/lib/social_stream/events/version.rb +1 -1
  91. data/events/social_stream-events.gemspec +1 -2
  92. data/lib/social_stream.rb +6 -6
  93. data/lib/social_stream/release/component.rb +29 -0
  94. data/lib/social_stream/release/component/version_file.rb +1 -1
  95. data/lib/social_stream/release/global.rb +65 -0
  96. data/lib/social_stream/release/global/version_file.rb +1 -1
  97. data/lib/social_stream/version.rb +1 -1
  98. data/linkser/lib/social_stream/linkser/version.rb +1 -1
  99. data/linkser/lib/tasks/db/populate_links.rake +4 -23
  100. data/linkser/social_stream-linkser.gemspec +2 -2
  101. data/presence/lib/social_stream/presence/version.rb +1 -1
  102. data/presence/social_stream-presence.gemspec +2 -2
  103. data/release.thor +69 -0
  104. data/social_stream.gemspec +6 -6
  105. data/spec/dummy/.gitignore +4 -1
  106. data/spec/dummy/app/assets/javascripts/application.js +5 -2
  107. data/spec/dummy/app/assets/stylesheets/application.css +6 -1
  108. data/spec/dummy/db/schema.rb +4 -2
  109. metadata +76 -40
  110. data/events/app/assets/javascripts/social_stream.events.tools.js.coffee +0 -50
  111. data/lib/social_stream/release.rb +0 -63
  112. data/lib/social_stream/release/component/release.rb +0 -29
  113. data/lib/social_stream/release/global/release.rb +0 -70
  114. data/social_stream.thor +0 -21
data/lib/social_stream/release/component/release.rb DELETED
@@ -1,29 +0,0 @@
1
- module SocialStream
2
- module Release
3
- module Component
4
- class Release < ::SocialStream::Release::Global::Release
5
- attr_reader :name
6
-
7
- def initialize(name, version = nil)
8
- @name, @target = name, version
9
- end
10
-
11
- def version_file
12
- @version_file ||= Component::VersionFile.new(@name, @target)
13
- end
14
-
15
- def gemspec
16
- "#{ name }/social_stream-#{ name }.gemspec"
17
- end
18
-
19
- def commit_command
20
- "git commit #{ commit_files } -m #{ @name }#{ @version }"
21
- end
22
-
23
- def rake_release_command
24
- "cd #{ @name } && rake release"
25
- end
26
- end
27
- end
28
- end
29
- end
data/lib/social_stream/release/global/release.rb DELETED
@@ -1,70 +0,0 @@
1
- module SocialStream
2
- module Release
3
- module Global
4
- class Release
5
- include Thor::Actions
6
-
7
- DEPENDENCY_REGEXP = /dependency.*social_stream-(\w*)/
8
-
9
- attr_reader :name, :version
10
-
11
- def initialize(target = nil)
12
- @target = target
13
- end
14
-
15
- def release!
16
- bump_version
17
-
18
- update_dependencies
19
-
20
- commit
21
-
22
- rake_release
23
- end
24
-
25
- def bump_version
26
- @version = version_file.bump!
27
- end
28
-
29
- def version_file
30
- @version_file ||= VersionFile.new(@target)
31
- end
32
-
33
- def dependencies
34
- @dependencies ||=
35
- File.read(gemspec).scan(DEPENDENCY_REGEXP).flatten
36
- end
37
-
38
- def update_dependencies
39
- dependencies.each do |d|
40
- DependencyUpdate.new.invoke(:update, [ gemspec, d, Component::VersionFile.new(d).old_number ])
41
- end
42
- end
43
-
44
- def gemspec
45
- "social_stream.gemspec"
46
- end
47
-
48
- def commit
49
- system(commit_command) || raise(RuntimeError.new)
50
- end
51
-
52
- def commit_command
53
- "git commit #{ commit_files } -m #{ @version }"
54
- end
55
-
56
- def commit_files
57
- "#{ @version_file.filename } #{ gemspec }"
58
- end
59
-
60
- def rake_release
61
- system(rake_release_command) || raise(RuntimeError.new)
62
- end
63
-
64
- def rake_release_command
65
- "rake release"
66
- end
67
- end
68
- end
69
- end
70
- end
data/social_stream.thor DELETED
@@ -1,21 +0,0 @@
1
- require File.expand_path('../lib/social_stream/release', __FILE__)
2
-
3
- # SocialStream release tasks
4
- class SocialStream < Thor
5
-
6
- desc "create", "update dependencies and release SocialStream's gems"
7
- def create(*args)
8
- ::SocialStream::Release.create *args
9
- end
10
-
11
- desc "release", "release SocialStream's gems"
12
- def release(*args)
13
- ::SocialStream::Release.release
14
- end
15
-
16
- desc "update", "set SocialStream's dependencies"
17
- def update(*args)
18
- ::SocialStream::Release.update *args
19
- end
20
-
21
- end