social_stream 0.2.1 → 0.2.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (50) hide show
  1. data/.gitignore +2 -0
  2. data/Gemfile.lock +1 -1
  3. data/README.rdoc +4 -4
  4. data/app/controllers/private_messages_controller.rb +3 -0
  5. data/app/controllers/users_controller.rb +26 -0
  6. data/app/models/permission.rb +19 -0
  7. data/app/models/private_message.rb +6 -0
  8. data/app/models/profile.rb +3 -0
  9. data/app/models/tie.rb +28 -2
  10. data/app/models/user.rb +29 -13
  11. data/app/views/home/_options.html.erb +4 -1
  12. data/app/views/home/_right.html.erb +1 -1
  13. data/app/views/layouts/application.html.erb +7 -4
  14. data/app/views/private_messages/_form.html.erb +24 -0
  15. data/app/views/private_messages/_index.html.erb +24 -0
  16. data/app/views/private_messages/_location.html.erb +3 -0
  17. data/app/views/private_messages/_messages.html.erb +2 -0
  18. data/app/views/private_messages/_private_message.html.erb +17 -0
  19. data/app/views/private_messages/edit.html.erb +6 -0
  20. data/app/views/private_messages/index.html.erb +1 -0
  21. data/app/views/private_messages/index.js.erb +1 -0
  22. data/app/views/private_messages/new.html.erb +14 -0
  23. data/app/views/private_messages/show.html.erb +21 -0
  24. data/app/views/users/_contacts.html.erb +2 -0
  25. data/app/views/users/_profile.html.erb +44 -57
  26. data/app/views/users/edit.html.erb +164 -0
  27. data/config/locales/en.yml +5 -4
  28. data/config/routes.rb +1 -0
  29. data/lib/generators/social_stream/install_generator.rb +4 -0
  30. data/lib/generators/social_stream/templates/migration.rb +21 -3
  31. data/lib/generators/social_stream/templates/public/javascripts/jquery-ui.min.js +401 -0
  32. data/lib/generators/social_stream/templates/public/stylesheets/edit_user.css +80 -0
  33. data/lib/generators/social_stream/templates/public/stylesheets/message.css +46 -0
  34. data/lib/social_stream/populate.rb +26 -0
  35. data/lib/social_stream/version.rb +1 -1
  36. data/lib/tasks/db/populate.rake +2 -2
  37. data/spec/controllers/.groups_controller_spec.rb.swp +0 -0
  38. data/spec/controllers/.users_controller_spec.rb.swp +0 -0
  39. data/spec/controllers/frontpage_controller_spec.rb +11 -0
  40. data/spec/controllers/groups_controller_spec.rb +51 -0
  41. data/spec/controllers/home_controller_spec.rb +24 -0
  42. data/spec/controllers/users_controller_spec.rb +48 -0
  43. data/spec/factories/post.rb +1 -0
  44. data/spec/factories/user.rb +2 -0
  45. data/spec/spec_helper.rb +1 -1
  46. data/spec/support/devise.rb +4 -0
  47. metadata +29 -7
  48. data/spec/dummy/app/models/post.rb +0 -2
  49. data/spec/dummy/app/models/user.rb +0 -2
  50. data/spec/dummy/app/views/layouts/application.html.erb +0 -14
@@ -1,2 +0,0 @@
1
- class Post < ActiveRecord::Base
2
- end
@@ -1,2 +0,0 @@
1
- class User < ActiveRecord::Base
2
- end
@@ -1,14 +0,0 @@
1
- <!DOCTYPE html>
2
- <html>
3
- <head>
4
- <title>Dummy</title>
5
- <%= stylesheet_link_tag :all %>
6
- <%= javascript_include_tag :defaults %>
7
- <%= csrf_meta_tag %>
8
- </head>
9
- <body>
10
-
11
- <%= yield %>
12
-
13
- </body>
14
- </html>