Permalink
Browse files

Holla 2 - complete rewrite

  • Loading branch information...
maccman committed Mar 27, 2011
1 parent 077108a commit faab542465ee64f1588613fa9f61bd564a4d9615
Showing with 8,553 additions and 14,641 deletions.
  1. +1 −3 .gitignore
  2. +10 −15 Gemfile
  3. +120 −91 Gemfile.lock
  4. +0 −20 MIT-LICENSE
  5. +256 −0 README
  6. +0 −33 README.markdown
  7. +1 −1 Rakefile
  8. +5 −0 TODO
  9. +9 −0 app/controllers/app_controller.rb
  10. +6 −28 app/controllers/application_controller.rb
  11. +0 −39 app/controllers/assets_controller.rb
  12. +10 −0 app/controllers/authorize_controller.rb
  13. +22 −0 app/controllers/channels_controller.rb
  14. +10 −0 app/controllers/messages_controller.rb
  15. +0 −9 app/controllers/pages_controller.rb
  16. +0 −26 app/controllers/ria_controller.rb
  17. +0 −26 app/controllers/settings_controller.rb
  18. +0 −26 app/controllers/user_sessions_controller.rb
  19. +0 −70 app/controllers/users_controller.rb
  20. +14 −0 app/helpers/app_helper.rb
  21. +2 −0 app/helpers/application_helper.rb
  22. +2 −0 app/helpers/authorize_helper.rb
  23. +2 −0 app/helpers/channels_helper.rb
  24. +0 −5 app/helpers/pages_helper.rb
  25. +0 −29 app/helpers/ria_helper.rb
  26. +45 −65 app/javascripts/application.js
  27. +0 −66 app/javascripts/application.juggernaut.js
  28. +0 −35 app/javascripts/application.utils.js
  29. +105 −0 app/javascripts/controllers/messages.js
  30. +36 −0 app/javascripts/controllers/searches.js
  31. +12 −0 app/javascripts/controllers/settings.js
  32. +43 −0 app/javascripts/controllers/sidebar.js
  33. +69 −0 app/javascripts/juggernaut.js
  34. +21 −0 app/javascripts/lib/array.ext.js
  35. +0 −139 app/javascripts/lib/jquery.animation.js
  36. +0 −38 app/javascripts/lib/jquery.drop.js
  37. +0 −61 app/javascripts/lib/jquery.editable.js
  38. +0 −66 app/javascripts/lib/jquery.ios.js
  39. +3,667 −1,591 app/javascripts/lib/jquery.js
  40. +0 −231 app/javascripts/lib/jquery.md5.js
  41. +0 −135 app/javascripts/lib/jquery.timeago.js
  42. +503 −0 app/javascripts/lib/jquery.tmpl.js
  43. +0 −38 app/javascripts/lib/jquery.tooltip.js
  44. +0 −33 app/javascripts/lib/jquery.upload.js
  45. +481 −0 app/javascripts/lib/json2.js
  46. +0 −9 app/javascripts/lib/rails.application.js
  47. +0 −132 app/javascripts/lib/rails.js
  48. +1,884 −0 app/javascripts/lib/require.js
  49. +49 −0 app/javascripts/lib/spine.controller.manager.js
  50. +461 −0 app/javascripts/lib/spine.js
  51. +69 −0 app/javascripts/lib/spine.model.ajax.js
  52. +18 −0 app/javascripts/lib/spine.model.local.js
  53. +0 −72 app/javascripts/lib/superapp.js
  54. +0 −101 app/javascripts/lib/superapp.view.js
  55. +0 −57 app/javascripts/lib/superclass.js
  56. +0 −303 app/javascripts/lib/superconnect.js
  57. +0 −40 app/javascripts/lib/superevent.js
  58. +0 −290 app/javascripts/lib/supermodel.js
  59. +0 −75 app/javascripts/lib/supermodel.relation.js
  60. +0 −71 app/javascripts/lib/superroute.js
  61. +0 −105 app/javascripts/lib/superrpc.js
  62. +0 −19 app/javascripts/loader.js
  63. +0 −5 app/javascripts/models/activity.js
  64. +0 −31 app/javascripts/models/asset.js
  65. +10 −12 app/javascripts/models/channel.js
  66. +0 −19 app/javascripts/models/channel_activity.js
  67. +24 −0 app/javascripts/models/message.js
  68. +0 −21 app/javascripts/models/roster.js
  69. +49 −26 app/javascripts/models/search.js
  70. +0 −4 app/javascripts/models/user.js
  71. +0 −196 app/javascripts/shared.js
  72. +0 −6 app/javascripts/states/activity.js
  73. +0 −154 app/javascripts/states/channel.activity.js
  74. +0 −118 app/javascripts/states/channel.asset.js
  75. +0 −55 app/javascripts/states/channel.js
  76. +0 −32 app/javascripts/states/channel.roster.js
  77. +0 −28 app/javascripts/states/intro.js
  78. +0 −6 app/javascripts/states/loading.js
  79. +0 −36 app/javascripts/states/menu.js
  80. +0 −36 app/javascripts/states/search.js
  81. +0 −58 app/javascripts/states/settings.js
  82. +8 −0 app/javascripts/utils.js
  83. +0 −30 app/models/activity.rb
  84. +0 −27 app/models/asset.rb
  85. +3 −32 app/models/channel.rb
  86. +0 −39 app/models/channel_activity.rb
  87. +0 −17 app/models/comment.rb
  88. +9 −0 app/models/message.rb
  89. +0 −68 app/models/roster.rb
  90. +0 −49 app/models/user.rb
  91. +0 −9 app/models/user_channel.rb
  92. +0 −9 app/models/user_session.rb
  93. +3 −16 app/observers/juggernaut_observer.rb
  94. +167 −190 app/stylesheets/application.less
  95. +0 −137 app/stylesheets/states/activity.less
  96. +0 −79 app/stylesheets/states/channel.less
  97. +0 −91 app/stylesheets/states/intro.less
  98. +0 −6 app/stylesheets/states/loading.less
  99. +0 −10 app/stylesheets/states/search.less
  100. +0 −58 app/stylesheets/states/settings.less
  101. +94 −37 app/stylesheets/theme.less
  102. +12 −0 app/stylesheets/utils.less
  103. +3 −0 app/views/app/_channels.html
  104. +4 −0 app/views/app/_message.html.erb
  105. +4 −0 app/views/app/_search.html.erb
  106. +64 −0 app/views/app/index.html.erb
  107. +3 −5 app/views/layouts/application.html.erb
  108. +0 −28 app/views/layouts/backend.html.erb
  109. +0 −1 app/views/pages/more.html.erb
  110. +0 −187 app/views/ria/index.html.erb
  111. +0 −19 app/views/settings/connect.html.erb
  112. +0 −36 app/views/user_sessions/new.html.erb
  113. +0 −42 app/views/users/edit.html.erb
  114. +0 −42 app/views/users/new.html.erb
  115. +1 −1 config.ru
  116. +11 −16 config/application.rb
  117. +0 −28 config/application.yml
  118. +3 −10 config/boot.rb
  119. +3 −3 config/database.yml
  120. +1 −1 config/environment.rb
  121. +9 −6 config/environments/development.rb
  122. +6 −8 config/environments/production.rb
  123. +5 −2 config/environments/test.rb
  124. +1 −1 config/initializers/backtrace_silencers.rb
  125. +1 −0 config/initializers/ext.rb
  126. +1 −1 config/initializers/inflections.rb
  127. +1 −0 config/initializers/juggernaut.rb
  128. +3 −0 config/initializers/omniauth.rb
  129. +0 −13 config/initializers/preload.rb
  130. +2 −2 config/initializers/secret_token.rb
  131. +3 −3 config/initializers/session_store.rb
  132. +24 −35 config/routes.rb
  133. +0 −117 db/development_structure.sql
  134. +12 −0 db/migrate/20110324001706_create_channels.rb
  135. +12 −0 db/migrate/20110324051348_create_messages.rb
  136. +11 −0 db/migrate/20110325083934_add_guids.rb
  137. +9 −0 db/migrate/20110325211741_add_channel_id_to_messages.rb
  138. +9 −0 db/migrate/20110326065302_add_name_to_messages.rb
  139. +9 −65 db/schema.rb
  140. +7 −0 db/seeds.rb
  141. +0 −64 lib/active_model/serialize_options.rb
  142. +0 −18 lib/active_record/creator.rb
  143. +1 −1 lib/active_record/{random_id.rb → guid.rb}
  144. +0 −16 lib/app_config.rb
  145. +0 −169 lib/blather/app.rb
  146. +0 −19 lib/status_error.rb
  147. +0 −21 lib/supermodel/creator.rb
  148. +0 −113 lib/superrpc.rb
  149. 0 log/.gitkeep
  150. BIN public/.DS_Store
  151. BIN public/audio/new.m4a
  152. BIN public/images/account.png
  153. BIN public/images/area-overlay.png
  154. BIN public/images/arrow2.png
  155. BIN public/images/avatar.jpg
  156. BIN public/images/broadcast.png
  157. BIN public/images/email.png
  158. BIN public/images/intro.png
  159. BIN public/images/logout.png
  160. BIN public/images/mime/audio.png
  161. BIN public/images/mime/document.png
  162. BIN public/images/mime/image.png
  163. BIN public/images/mime/spreadsheet.png
  164. BIN public/images/mime/unknown.png
  165. BIN public/images/mime/zip.png
  166. BIN public/images/missing.png
  167. BIN public/images/progress-bar.png
  168. BIN public/images/site.png
  169. BIN public/images/twitter.png
  170. +0 −6,240 public/javascripts/jquery.js
  171. +0 −127 public/javascripts/rails.js
  172. +0 −205 public/stylesheets/backend.css
  173. +0 −73 public/stylesheets/layout.css
  174. +0 −3 public/stylesheets/user_sessions.css
  175. +0 −3 public/stylesheets/users.css
  176. +0 −5 script/roster
  177. 0 test/fixtures/{assets.yml → channels.yml}
  178. 0 test/fixtures/{comments.yml → chats.yml}
  179. +0 −11 test/fixtures/emails.yml
  180. +0 −11 test/fixtures/groups.yml
  181. +0 −11 test/fixtures/user_groups.yml
  182. +0 −8 test/functional/activity_controller_test.rb
  183. +0 −8 test/functional/api_controller_test.rb
  184. +1 −1 test/functional/{ria_controller_test.rb → app_controller_test.rb}
  185. +1 −1 test/functional/{assets_controller_test.rb → authorize_controller_test.rb}
  186. +0 −8 test/functional/channel_activity_controller_test.rb
  187. +1 −1 test/{unit/activity_observer_test.rb → functional/chat_controller_test.rb}
  188. +0 −8 test/functional/emails_controller_test.rb
  189. +0 −8 test/functional/inbox_test.rb
  190. +0 −8 test/functional/settings_controller_test.rb
  191. +0 −8 test/functional/user_mailer_test.rb
  192. +0 −8 test/functional/user_sessions_controller_test.rb
  193. +0 −8 test/functional/users_controller_test.rb
  194. +0 −8 test/unit/asset_test.rb
  195. +1 −1 test/unit/{comment_test.rb → channel_test.rb}
  196. +1 −1 test/unit/{email_test.rb → chat_test.rb}
  197. +0 −8 test/unit/group_test.rb
  198. +0 −4 test/unit/helpers/activity_helper_test.rb
  199. +0 −4 test/unit/helpers/api_helper_test.rb
  200. +4 −0 test/unit/helpers/app_helper_test.rb
  201. +0 −4 test/unit/helpers/assets_helper_test.rb
  202. +4 −0 test/unit/helpers/authorize_helper_test.rb
  203. +0 −4 test/unit/helpers/channel_activity_helper_test.rb
  204. +4 −0 test/unit/helpers/chat_helper_test.rb
  205. +0 −4 test/unit/helpers/emails_helper_test.rb
  206. +0 −4 test/unit/helpers/pages_helper_test.rb
  207. +0 −4 test/unit/helpers/ria_helper_test.rb
  208. +0 −4 test/unit/helpers/settings_helper_test.rb
  209. +0 −4 test/unit/helpers/user_sessions_helper_test.rb
  210. +0 −4 test/unit/helpers/users_helper_test.rb
  211. +1 −1 test/{functional/pages_controller_test.rb → unit/juggernaut_observer_test.rb}
  212. +0 −8 test/unit/user_group_test.rb
  213. +0 −20 vendor/plugins/dynamic_form/MIT-LICENSE
  214. +0 −13 vendor/plugins/dynamic_form/README
  215. +0 −10 vendor/plugins/dynamic_form/Rakefile
  216. +0 −5 vendor/plugins/dynamic_form/init.rb
  217. +0 −300 vendor/plugins/dynamic_form/lib/action_view/helpers/dynamic_form.rb
  218. +0 −8 vendor/plugins/dynamic_form/lib/action_view/locale/en.yml
  219. +0 −42 vendor/plugins/dynamic_form/test/dynamic_form_i18n_test.rb
  220. +0 −370 vendor/plugins/dynamic_form/test/dynamic_form_test.rb
  221. +0 −9 vendor/plugins/dynamic_form/test/test_helper.rb
View
@@ -1,6 +1,4 @@
.bundle
db/*.sqlite3
log/*.log
-tmp/**/*
-vendor/bundle
-vendor/gems
+tmp/
View
25 Gemfile
@@ -1,24 +1,19 @@
-# Edit this Gemfile to bundle your application's dependencies.
-source 'http://rubygems.org'
+source "http://rubygems.org"
-gem "rails", "= 3.0.0"
-
-gem "authlogic", :git => "git://github.com/maccman/authlogic.git"
-gem "redis", ">= 2.0.0.rc2"
-gem "supermodel", :git => "git://github.com/maccman/supermodel.git"
-gem "juggernaut", ">= 2.0.0.beta3"
-
-gem "paperclip", :git => "git://github.com/thoughtbot/paperclip.git"
-gem "aws-s3", :require => "aws/s3"
+gem "rails", "3.0.5"
gem "less", :git => "git://github.com/maccman/less.git"
gem "rack-less"
gem "rack-sprockets"
gem "yui-compressor"
+gem "supermodel"
+
+gem "mysql2"
+gem "juggernaut"
+gem "thin"
+
+gem "omniauth"
group :development do
gem "ruby-debug19", :require => "ruby-debug"
-end
-
-gem "mysql2"
-gem "thin"
+end
View
@@ -1,10 +1,3 @@
-GIT
- remote: git://github.com/maccman/authlogic.git
- revision: acddb9d8b91f6da23268ed67248f430af3513a3a
- specs:
- authlogic (2.1.5)
- activesupport
-
GIT
remote: git://github.com/maccman/less.git
revision: b25c0c7ed7cabffdbb0146044c36b5deb597399a
@@ -13,103 +6,137 @@ GIT
mutter (>= 0.4.2)
treetop (>= 1.4.2)
-GIT
- remote: git://github.com/maccman/supermodel.git
- revision: 3599867fe915a209612cf24eb326d04b1355b752
- specs:
- supermodel (0.1.4)
- activemodel (~> 3.0.0)
-
-GIT
- remote: git://github.com/thoughtbot/paperclip.git
- revision: ef7233d25700a7e69cebd2334b656fa9ca0ae927
- specs:
- paperclip (2.3.4)
- activerecord
- activesupport
-
GEM
remote: http://rubygems.org/
specs:
abstract (1.0.0)
- actionmailer (3.0.0)
- actionpack (= 3.0.0)
- mail (~> 2.2.5)
- actionpack (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
+ actionmailer (3.0.5)
+ actionpack (= 3.0.5)
+ mail (~> 2.2.15)
+ actionpack (3.0.5)
+ activemodel (= 3.0.5)
+ activesupport (= 3.0.5)
builder (~> 2.1.2)
erubis (~> 2.6.6)
- i18n (~> 0.4.1)
+ i18n (~> 0.4)
rack (~> 1.2.1)
- rack-mount (~> 0.6.12)
- rack-test (~> 0.5.4)
+ rack-mount (~> 0.6.13)
+ rack-test (~> 0.5.7)
tzinfo (~> 0.3.23)
- activemodel (3.0.0)
- activesupport (= 3.0.0)
+ activemodel (3.0.5)
+ activesupport (= 3.0.5)
builder (~> 2.1.2)
- i18n (~> 0.4.1)
- activerecord (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
- arel (~> 1.0.0)
+ i18n (~> 0.4)
+ activerecord (3.0.5)
+ activemodel (= 3.0.5)
+ activesupport (= 3.0.5)
+ arel (~> 2.0.2)
tzinfo (~> 0.3.23)
- activeresource (3.0.0)
- activemodel (= 3.0.0)
- activesupport (= 3.0.0)
- activesupport (3.0.0)
+ activeresource (3.0.5)
+ activemodel (= 3.0.5)
+ activesupport (= 3.0.5)
+ activesupport (3.0.5)
+ addressable (2.2.4)
archive-tar-minitar (0.5.2)
- arel (1.0.1)
- activesupport (~> 3.0.0)
- aws-s3 (0.6.2)
- builder
- mime-types
- xml-simple
+ arel (2.0.9)
builder (2.1.2)
- columnize (0.3.1)
+ columnize (0.3.2)
daemons (1.1.0)
erubis (2.6.6)
abstract (>= 1.0.0)
eventmachine (0.12.10)
- i18n (0.4.1)
- juggernaut (2.0.0.beta3)
+ faraday (0.5.7)
+ addressable (~> 2.2.4)
+ multipart-post (~> 1.1.0)
+ rack (< 2, >= 1.1.0)
+ i18n (0.5.0)
+ juggernaut (2.0.1)
redis
linecache19 (0.5.11)
ruby_core_source (>= 0.1.4)
- mail (2.2.7)
+ mail (2.2.15)
activesupport (>= 2.3.6)
- mime-types
- treetop (>= 1.4.5)
+ i18n (>= 0.4.0)
+ mime-types (~> 1.16)
+ treetop (~> 1.4.8)
mime-types (1.16)
+ multi_json (0.0.5)
+ multipart-post (1.1.0)
mutter (0.5.3)
- mysql2 (0.2.4)
+ mysql2 (0.2.6)
+ net-ldap (0.1.1)
+ nokogiri (1.4.4)
+ oa-basic (0.2.0)
+ multi_json (~> 0.0.2)
+ nokogiri (~> 1.4.2)
+ oa-core (= 0.2.0)
+ rest-client (~> 1.6.0)
+ oa-core (0.2.0)
+ rack (~> 1.1)
+ oa-enterprise (0.2.0)
+ net-ldap (~> 0.1.1)
+ nokogiri (~> 1.4.2)
+ oa-core (= 0.2.0)
+ pyu-ruby-sasl (~> 0.0.3.1)
+ rubyntlm (~> 0.1.1)
+ oa-more (0.2.0)
+ multi_json (~> 0.0.2)
+ oa-core (= 0.2.0)
+ rest-client (~> 1.6.0)
+ oa-oauth (0.2.0)
+ multi_json (~> 0.0.2)
+ nokogiri (~> 1.4.2)
+ oa-core (= 0.2.0)
+ oauth (~> 0.4.0)
+ oauth2 (~> 0.1.1)
+ oa-openid (0.2.0)
+ oa-core (= 0.2.0)
+ rack-openid (~> 1.2.0)
+ ruby-openid-apps-discovery
+ oauth (0.4.4)
+ oauth2 (0.1.1)
+ faraday (~> 0.5.0)
+ multi_json (~> 0.0.4)
+ omniauth (0.2.0)
+ oa-basic (= 0.2.0)
+ oa-core (= 0.2.0)
+ oa-enterprise (= 0.2.0)
+ oa-more (= 0.2.0)
+ oa-oauth (= 0.2.0)
+ oa-openid (= 0.2.0)
polyglot (0.3.1)
- rack (1.2.1)
- rack-less (1.5.0)
- less (>= 1.2.21)
- rack (>= 0.4)
- rack-mount (0.6.13)
+ pyu-ruby-sasl (0.0.3.2)
+ rack (1.2.2)
+ rack-less (2.0.0)
+ less (~> 1.2)
+ rack (~> 1.0)
+ rack-mount (0.6.14)
rack (>= 1.0.0)
- rack-sprockets (1.0.4)
- rack (>= 0.4)
- sprockets (>= 1.0.0)
- rack-test (0.5.6)
+ rack-openid (1.2.0)
+ rack (>= 1.1.0)
+ ruby-openid (>= 2.1.8)
+ rack-sprockets (1.1.0)
+ rack (~> 1.0)
+ sprockets (~> 1.0)
+ rack-test (0.5.7)
rack (>= 1.0)
- rails (3.0.0)
- actionmailer (= 3.0.0)
- actionpack (= 3.0.0)
- activerecord (= 3.0.0)
- activeresource (= 3.0.0)
- activesupport (= 3.0.0)
- bundler (~> 1.0.0)
- railties (= 3.0.0)
- railties (3.0.0)
- actionpack (= 3.0.0)
- activesupport (= 3.0.0)
- rake (>= 0.8.4)
- thor (~> 0.14.0)
+ rails (3.0.5)
+ actionmailer (= 3.0.5)
+ actionpack (= 3.0.5)
+ activerecord (= 3.0.5)
+ activeresource (= 3.0.5)
+ activesupport (= 3.0.5)
+ bundler (~> 1.0)
+ railties (= 3.0.5)
+ railties (3.0.5)
+ actionpack (= 3.0.5)
+ activesupport (= 3.0.5)
+ rake (>= 0.8.7)
+ thor (~> 0.14.4)
rake (0.8.7)
- redis (2.0.11)
+ redis (2.1.1)
+ rest-client (1.6.1)
+ mime-types (>= 1.16)
ruby-debug-base19 (0.11.24)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
@@ -118,35 +145,37 @@ GEM
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby-debug-base19 (>= 0.11.19)
+ ruby-openid (2.1.8)
+ ruby-openid-apps-discovery (1.2.0)
+ ruby-openid (>= 2.1.7)
ruby_core_source (0.1.4)
archive-tar-minitar (>= 0.5.2)
+ rubyntlm (0.1.1)
sprockets (1.0.2)
- thin (1.2.7)
+ supermodel (0.1.4)
+ activemodel (>= 3.0.0.beta)
+ thin (1.2.10)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.14.3)
- treetop (1.4.8)
+ thor (0.14.6)
+ treetop (1.4.9)
polyglot (>= 0.3.1)
- tzinfo (0.3.23)
- xml-simple (1.0.12)
- yui-compressor (0.9.1)
+ tzinfo (0.3.25)
+ yui-compressor (0.9.4)
PLATFORMS
ruby
DEPENDENCIES
- authlogic!
- aws-s3
- juggernaut (>= 2.0.0.beta3)
+ juggernaut
less!
mysql2
- paperclip!
+ omniauth
rack-less
rack-sprockets
- rails (= 3.0.0)
- redis (>= 2.0.0.rc2)
+ rails (= 3.0.5)
ruby-debug19
- supermodel!
+ supermodel
thin
yui-compressor
View
@@ -1,20 +0,0 @@
-Copyright (c) 2010 Alexander MacCaw
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
Oops, something went wrong.

0 comments on commit faab542

Please sign in to comment.