Permalink
Browse files

Merge pull request #2 from ruby-no-kai/2012

Pull up to 2012
  • Loading branch information...
2 parents b0adb3f + a2320e3 commit 0997a8772f312cb0b23cac30374704f49499d01c @darashi darashi committed Dec 24, 2012
View
18 Gemfile
@@ -1,30 +1,30 @@
source "http://rubygems.org"
-gem "rake"
+gem "rails", "3.2.8"
-gem "rails", "3.1.0.rc4"
+group :assets do
+ gem "sass-rails"
+ gem "coffee-script"
+ gem "uglifier"
+end
-gem "sass-rails", "~> 3.1.0.rc"
-gem "haml"
gem "haml-rails"
-gem "coffee-script"
-gem "uglifier"
-
gem "jquery-rails"
gem "configatron"
-
gem "pusher"
+gem "rails_emoji"
group :development do
gem "sqlite3"
+ gem "eventmachine"
+ gem "twitter-stream"
gem "yajl-ruby"
gem "net-irc"
gem "eventmachine"
end
group :production do
gem "pg"
- gem "therubyracer-heroku"
end
View
@@ -1,125 +1,124 @@
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0.rc4)
- actionpack (= 3.1.0.rc4)
- mail (~> 2.3.0)
- actionpack (3.1.0.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
+ actionmailer (3.2.8)
+ actionpack (= 3.2.8)
+ mail (~> 2.4.4)
+ actionpack (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.0)
- rack-cache (~> 1.0.1)
- rack-mount (~> 0.8.1)
- rack-test (~> 0.6.0)
- sprockets (~> 2.0.0.beta.10)
- tzinfo (~> 0.3.27)
- activemodel (3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- bcrypt-ruby (~> 2.1.4)
+ journey (~> 1.0.4)
+ rack (~> 1.4.0)
+ rack-cache (~> 1.2)
+ rack-test (~> 0.6.1)
+ sprockets (~> 2.1.3)
+ activemodel (3.2.8)
+ activesupport (= 3.2.8)
builder (~> 3.0.0)
+ activerecord (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
+ arel (~> 3.0.2)
+ tzinfo (~> 0.3.29)
+ activeresource (3.2.8)
+ activemodel (= 3.2.8)
+ activesupport (= 3.2.8)
+ activesupport (3.2.8)
i18n (~> 0.6)
- activerecord (3.1.0.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- arel (~> 2.1.1)
- tzinfo (~> 0.3.27)
- activeresource (3.1.0.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- activesupport (3.1.0.rc4)
multi_json (~> 1.0)
- arel (2.1.3)
- bcrypt-ruby (2.1.4)
- builder (3.0.0)
+ arel (3.0.2)
+ builder (3.0.2)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.1.1)
- configatron (2.8.0)
+ coffee-script-source (1.3.3)
+ configatron (2.9.1)
yamler (>= 0.1.0)
- crack (0.1.8)
erubis (2.7.0)
eventmachine (0.12.10)
- execjs (1.2.0)
+ execjs (1.4.0)
multi_json (~> 1.0)
- haml (3.1.2)
- haml-rails (0.3.4)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- haml (~> 3.0)
- railties (~> 3.0)
- hike (1.1.0)
- i18n (0.6.0)
- jquery-rails (1.0.12)
- railties (~> 3.0)
+ haml (3.1.7)
+ haml-rails (0.3.5)
+ actionpack (>= 3.1, < 4.1)
+ activesupport (>= 3.1, < 4.1)
+ haml (~> 3.1)
+ railties (>= 3.1, < 4.1)
+ hike (1.2.1)
+ http_parser.rb (0.5.1)
+ i18n (0.6.1)
+ journey (1.0.4)
+ jquery-rails (2.1.2)
+ railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
- mail (2.3.0)
+ json (1.7.5)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
- mime-types (1.16)
- multi_json (1.0.3)
+ mime-types (1.19)
+ multi_json (1.3.6)
net-irc (0.0.9)
- pg (0.11.0)
- polyglot (0.3.1)
- pusher (0.8.1)
- crack (~> 0.1.0)
+ pg (0.14.1)
+ polyglot (0.3.3)
+ pusher (0.9.4)
multi_json (~> 1.0)
- ruby-hmac (~> 0.4.0)
signature (~> 0.1.2)
- rack (1.3.0)
- rack-cache (1.0.2)
+ rack (1.4.1)
+ rack-cache (1.2)
rack (>= 0.4)
- rack-mount (0.8.1)
- rack (>= 1.0.0)
rack-ssl (1.3.2)
rack
- rack-test (0.6.0)
+ rack-test (0.6.1)
rack (>= 1.0)
- rails (3.1.0.rc4)
- actionmailer (= 3.1.0.rc4)
- actionpack (= 3.1.0.rc4)
- activerecord (= 3.1.0.rc4)
- activeresource (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
+ rails (3.2.8)
+ actionmailer (= 3.2.8)
+ actionpack (= 3.2.8)
+ activerecord (= 3.2.8)
+ activeresource (= 3.2.8)
+ activesupport (= 3.2.8)
bundler (~> 1.0)
- railties (= 3.1.0.rc4)
- railties (3.1.0.rc4)
- actionpack (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
+ railties (= 3.2.8)
+ rails_emoji (1.6.1)
+ rails (>= 3.1.0)
+ railties (3.2.8)
+ actionpack (= 3.2.8)
+ activesupport (= 3.2.8)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
- rake (0.9.2)
- rdoc (3.8)
- ruby-hmac (0.4.0)
- sass (3.1.3)
- sass-rails (3.1.0.rc.3)
- actionpack (~> 3.1.0.rc1)
- railties (~> 3.1.0.rc1)
- sass (>= 3.1.3)
- sprockets (>= 2.0.0.beta.9)
- signature (0.1.2)
- ruby-hmac
- sprockets (2.0.0.beta.10)
- hike (~> 1.0)
+ thor (>= 0.14.6, < 2.0)
+ rake (0.9.2.2)
+ rdoc (3.12)
+ json (~> 1.4)
+ sass (3.2.1)
+ sass-rails (3.2.5)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
+ signature (0.1.4)
+ simple_oauth (0.1.9)
+ sprockets (2.1.3)
+ hike (~> 1.2)
rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
- sqlite3 (1.3.3)
- therubyracer-heroku (0.8.1.pre3)
- thor (0.14.6)
- tilt (1.3.2)
- treetop (1.4.9)
+ tilt (~> 1.1, != 1.3.0)
+ sqlite3 (1.3.6)
+ thor (0.16.0)
+ tilt (1.3.3)
+ treetop (1.4.10)
+ polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.29)
- uglifier (1.0.0)
+ twitter-stream (0.1.14)
+ eventmachine (>= 0.12.8)
+ http_parser.rb (~> 0.5.1)
+ simple_oauth (~> 0.1.4)
+ tzinfo (0.3.33)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (>= 1.0.2)
- yajl-ruby (0.8.2)
+ multi_json (~> 1.0, >= 1.0.2)
+ yajl-ruby (1.1.0)
yamler (0.1.0)
PLATFORMS
@@ -129,16 +128,15 @@ DEPENDENCIES
coffee-script
configatron
eventmachine
- haml
haml-rails
jquery-rails
net-irc
pg
pusher
- rails (= 3.1.0.rc4)
- rake
- sass-rails (~> 3.1.0.rc)
+ rails (= 3.2.8)
+ rails_emoji
+ sass-rails
sqlite3
- therubyracer-heroku
+ twitter-stream
uglifier
yajl-ruby
@@ -1,9 +1,5 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
//= require jquery
//= require jquery_ujs
-//= require_tree .
+//= require pusher.min
+//= require notices
+//= require screens

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -42,16 +42,12 @@ var handlers = {
var channel = data.channel;
var message = data.message;
var usec = data.usec;
- if (prev_usec = usec) {
- return;
- }
- prev.usec = usec;
var div = $("<div/>").addClass("irc")
.append($("<p/>")
.append($("<span/>").addClass("screen_name")
.text(nick))
- .append($('<span/>').text(message)));
+ .append($('<span/>').html(message)));
prepend(div);
}
@@ -93,6 +93,12 @@
padding: 0 5px;
}
+.irc .emoji {
+ vertical-align: middle;
+ width: 40px;
+ height: 40px;
+}
+
th {
font-weight: normal;
}
View
@@ -4,4 +4,6 @@ class Assignment < ActiveRecord::Base
belongs_to :screen
belongs_to :channel
+
+ attr_accessible :screen, :channel # NOTE is it OK?
end
View
@@ -4,4 +4,6 @@ class Channel < ActiveRecord::Base
has_many :assignments
has_many :screens, :through => :assignments
+
+ attr_accessible :group, :name # NOTE is it OK?
end
View
@@ -3,5 +3,7 @@ class Notice < ActiveRecord::Base
validates :status, :presence => true
validates :requested_by, :presence => true
+ attr_accessible :message, :requested_by # NOTE is it OK?
+
scope :published, where("status = 'published'")
end
View
@@ -4,6 +4,8 @@ class Screen < ActiveRecord::Base
validates :name, :presence => true
validates :description, :presence => true
+ attr_accessible :name, :description # NOTE is it OK?
+
has_many :assignments
has_many :channels, :through => :assignments
@@ -2,9 +2,9 @@
%html
%head
%title
- = ["KaigiSubscreen", @title].compact.join(" - ")
+ = [@title, "KaigiSubscreen"].compact.join(" - ")
= stylesheet_link_tag "application"
- = javascript_include_tag "pusher.min", "application"
+ = javascript_include_tag "application"
:javascript
var channels = [];
= csrf_meta_tags
Oops, something went wrong.

0 comments on commit 0997a87

Please sign in to comment.