kentaroi-okayu 0.0.1 → 0.0.2

data/README.rdoc

@@ -1,6 +1,26 @@
 = okayu
 
-Description goes here.
+okayu = おかゆ　は、ニコニコ生放送用のシンプルなコメントビューアです。
+
+== Download
+Github: http://github.com/kentaroi/okayu/tree/master
+
+== Installing
+Linux:
+  # Install packagies for sqlite3
+  # if you use Debian:
+  sudo aptitude install sqlite3 libsqlite3-dev libsqlite3-ruby1.8
+
+  # Install the gem
+  sudo gem install kentaroi-okayu --source http://gems.github.com
+
+Windows:
+http://www.sqlite.org/download.html
+上記サイトから、SQLiteのDLLをダウンロード
+
+  # Install the gem
+  gem install kentaroi-okayu --source http://gems.github.com
+
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/okayu

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
 require 'okayu.rb'
 
 okayu = Okayu::App.new

data/lib/app.rb

@@ -18,8 +18,8 @@ module Okayu
       unless @teardowned
         UserInfo.save
         @teardowned = true
-        puts "teardown!!"
       end
+      super
     end
   end
 end

data/lib/app_dir.rb

@@ -2,6 +2,9 @@ require 'rubygems'
 require 'facter'
 
 module Okayu
+  # for some windows environment
+  ENV['HOME'] = ENV['HOMEPATH'].gsub(/\\/, '/') unless ENV['HOME']
+
   class AppDir
     if Facter.value(:kernel) == 'Linux'
       if File.exist?(@@app_dir = ENV['HOME'] + '/.okayu')

data/lib/client.rb

@@ -4,7 +4,6 @@ require 'mechanize'
 require 'thread'
 require 'player_status.rb'
 require 'thread_info.rb'
-require 'ruby-debug'
 
 class WWW::Mechanize::CookieJar
   def load_cookie cookie
@@ -28,6 +27,7 @@ module Okayu
     PLAYER_STATUS_URL = 'http://live.nicovideo.jp/api/getplayerstatus?v='
     @@channels = []
     @@connected = false
+    @@agent = WWW::Mechanize.new
 
     class << self
       def channels
@@ -42,7 +42,6 @@ module Okayu
       end
 
       def connect auth={}
-        @@agent = WWW::Mechanize.new
         begin
           if auth[:mail] && auth[:password]
             @@login_page = @@agent.post(LOGIN_URL, 'mail' => auth[:mail], 'password' => auth[:password])
@@ -176,15 +175,15 @@ module Okayu
         hash[:number]       = reader.attribute('no')
         hash[:user_id]      = reader.attribute('user_id')
         case reader.attribute('premium')
-        when 1
+        when '1'
           hash[:premium]    = true
           hash[:owner]      = false
           hash[:command]    = false
-        when 2
+        when '2'
           hash[:premium]    = true
           hash[:owner]      = true
           hash[:command]    = true
-        when 3
+        when '3'
           hash[:premium]    = true
           hash[:owner]      = true
           hash[:command]    = false

data/lib/controllers.rb

@@ -1,3 +1 @@
 require 'controllers/live_controller.rb'
-require 'controllers/listeners_controller.rb'
-require 'controllers/visitors_controller.rb'

data/lib/controllers/live_controller.rb

@@ -4,24 +4,24 @@ module Okayu
       @live_id = live_id
       if @client = Client.open(live_id)
         @live_now = true
-        if @live = Live.find(:first, :conditions => {:live_id => @live_id})
-          @community = @live.community
+        if @program = Program.find(:first, :conditions => {:live_id => @live_id})
+          @community = @program.community
         else
-          @live = Live.new
-          @live.live_id = @live_id
-          @live.base_time = @client.base_time
+          @program = Program.new
+          @program.live_id = @live_id
+          @program.base_time = @client.base_time
           unless @community = Community.find(:first, :conditions => {:community_id => @client.community})
             @community = Community.new
             @community.community_id = @client.community
             @community.save
           end
-          @live.community = @community
-          @live.save
+          @program.community = @community
+          @program.save
         end
       else
         @live_now = false
-        if @live = Live.find(:first, :conditions => {:live_id => @live_id})
-          @community = @live.community
+        if @program = Program.find(:first, :conditions => {:live_id => @live_id})
+          @community = @program.community
         else
           @community = nil
         end
@@ -29,7 +29,7 @@ module Okayu
     end
  
     def valid?
-      !!@live
+      !!@program
     end
 
     def live_now?
@@ -38,22 +38,30 @@ module Okayu
 
 
     def base_time
-      @live.base_time
+      @program.base_time
     end
 
     def comments
-      @live.comments
+      @program.comments
+    end
+    
+    def reload_comments
+      @program.comments.reload
+    end
+
+    def comment number
+      @program.comments.reload.find :first, :conditions => {:number => number}
     end
 
     def new_comments
       if @live_now
         @client.comments.map{|comment_hash|
-          if Comment.find :first, :conditions => {:live_id => @live_id, :number => comment_hash[:number]}
+          if Comment.find :first, :conditions => {:program_id => @program.id, :number => comment_hash[:number]}
             nil
           else
             comment = Comment.new(comment_hash)
             comment.community = @community
-            comment.live = @live
+            comment.program = @program
             if comment_hash[:user_id]
               if visitor = Visitor.find(:first, :conditions => {:user_id => comment_hash[:user_id]})
                 comment.visitor = visitor

data/lib/cookie_thief.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 require 'rubygems'
 require 'sqlite3'
 
@@ -9,12 +10,17 @@ module Okayu
       end
       
       def send_query sql
-        db = SQLite3::Database.new(cookies_filename)
-        cookie_array = db.execute(sql).first
-        db.close
+        cookie_array = []
+
+        do_on_tmpfile(cookies_filename) do |tmpfile|
+          db = SQLite3::Database.new(tmpfile)
+          cookie_array = db.execute(sql).first
+          db.close
+        end
+
         cookie_array
       end
-      
+
       def cookiestxt_from_array cookie_array
         if cookie_array
           cookie_array[1] = 'TRUE'
@@ -22,6 +28,13 @@ module Okayu
           cookie_array.join("\t") + "\n"
         end
       end
+      
+      def do_on_tmpfile filename
+        tmpfile = "#{AppDir}/tmpfile"
+        FileUtils.cp(cookies_filename, tmpfile)
+        yield tmpfile 
+        File.unlink "#{AppDir}/tmpfile"
+      end
     end
   end
 
@@ -71,10 +84,18 @@ module Okayu
         cookie_filename = []
         case Facter.value(:kernel)
         when 'windows'
-          cookie_filenames =  Dir.glob("#{ENV['HOME']}/AppData/Roaming/Microsoft/Windows/Cookies/Low/*").select{|path| path =~ /#{host_main_str(host)}/}
+          if Facter.value(:operatingsystemrelease).to_i < 6 # before Vista
+            unless cookie_filenames =  Dir.glob("#{ENV['HOME']}/Application Data/Microsoft/Windows/Cookies/Low/*").select{|path| path =~ /#{host_main_str(host)}/}
+              cookie_filenames =  Dir.glob("#{ENV['HOME']}/../Administrator/Application Data/Microsoft/Windows/Cookies/Low/*").select{|path| path =~ /#{host_main_str(host)}/}
+
+            end
+          else # from Vista
+            cookie_filenames =  Dir.glob("#{ENV['HOME']}/AppData/Roaming/Microsoft/Windows/Cookies/Low/*").select{|path| path =~ /#{host_main_str(host)}/}
+          end
         end
         cookie_filenames
       end
+
       def host_main_str host
         host_main_str = host.sub(/^\./, '').sub(/\..*$/, '')
       end

data/lib/db/migrate/{000_create_lives.rb → 000_create_programs.rb}

@@ -1,6 +1,6 @@
-class CreateLives < ActiveRecord::Migration
+class CreatePrograms < ActiveRecord::Migration
   def self.up
-    create_table :lives do |t|
+    create_table :programs do |t|
       t.string :live_id, :default => '', :null => false
       t.datetime :base_time, :default => 0, :null => false
       t.text :title
@@ -9,6 +9,6 @@ class CreateLives < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :lives
+    drop_table :programs
   end
 end

data/lib/db/migrate/001_create_comments.rb

@@ -10,8 +10,7 @@ class CreateComments < ActiveRecord::Migration
       t.boolean :command, :default => false, :null => false
       t.boolean :ng, :default => false, :null => false
       t.string :ngword, :default => nil
-      t.references :live, :visitor, :default => 0, :null => false
-      t.references :listener
+      t.references :program, :visitor, :default => 0, :null => false
     end
   end
 

data/lib/db/migrate/005_create_listeners_programs.rb

@@ -0,0 +1,12 @@
+class CreateListenersPrograms < ActiveRecord::Migration
+  def self.up
+    create_table :listeners_programs, :id => false do |t|
+      t.references :listener, :program, :default => 0, :null => false
+    end
+  end
+
+  def self.down
+    drop_table :listeners_programs
+  end
+end
+

data/lib/db/migrate/006_create_programs_visitors.rb

@@ -0,0 +1,13 @@
+class CreateProgramsVisitors < ActiveRecord::Migration
+  def self.up
+    create_table :programs_visitors, :id => false do |t|
+      t.references :program, :visitor, :default => 0, :null => false
+    end
+  end
+
+  def self.down
+    drop_table :programs_visitors
+  end
+end
+
+

data/lib/models.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'active_record'
 
 require 'models/community.rb'
-require 'models/live.rb'
+require 'models/program.rb'
 require 'models/listener.rb'
 require 'models/visitor.rb'
 require 'models/comment.rb'

data/lib/models/comment.rb

@@ -1,22 +1,7 @@
-require 'nokogiri'
-
 class Comment < ActiveRecord::Base
   belongs_to :community
-  belongs_to :live
-  belongs_to :listener
+  belongs_to :program
   belongs_to :visitor
 
   attr_accessor :user_id
-  def load_from_xml chat_xml
-    reader = Nokogiri::XML::Reader(chat_xml)
-    reader.read
-    if reader.name == 'chat'
-      self.commented_at = reader.attribute('date').to_i
-      self.command = reader.attribute('mail') || ''
-      self.number = reader.attribute('no')
-      @user_id = reader.attribute('user_id')
-      reader.read
-      self.message = reader.value
-    end
-  end
 end

data/lib/models/community.rb

@@ -1,3 +1,3 @@
 class Community < ActiveRecord::Base
-  has_many :lives
+  has_many :programs
 end

data/lib/models/listener.rb

@@ -1,5 +1,4 @@
 class Listener < ActiveRecord::Base
   has_many :visitors
-  has_and_belongs_to_many :lives
-  has_many :comments
+  has_and_belongs_to_many :programs
 end

data/lib/models/{live.rb → program.rb}

@@ -1,4 +1,4 @@
-class Live < ActiveRecord::Base
+class Program < ActiveRecord::Base
   belongs_to :community
   has_and_belongs_to_many :listners
   has_and_belongs_to_many :visitors

data/lib/models/visitor.rb

@@ -1,5 +1,5 @@
 class Visitor < ActiveRecord::Base
   belongs_to :listener
-  has_and_belongs_to_many :lives
+  has_and_belongs_to_many :programs
   has_many :comments
 end

data/lib/user_info.rb

@@ -1,6 +1,5 @@
 require 'yaml'
 require 'rubygems'
-require 'ruby-debug'
 
 
 module Okayu

data/lib/views/app_frame.rb

@@ -36,6 +36,9 @@ module Okayu
 
       set_menu_bar(menu_bar)
 
+      @status_bar = Wx::StatusBar.new(self, Wx::ID_ANY)
+      set_status_bar(@status_bar)
+
       rect = get_client_rect
       @panel = MainPanel.new(self, rect.x, rect.y, rect.width, rect.height)
 
@@ -64,6 +67,9 @@ module Okayu
     def on_connect
       login_dialog = LoginDialog.new(self)
       login_dialog.show_modal
+      if Client.connected?
+        @status_bar.set_status_text '接続してるかも'
+      end
     end
 
     def on_move event

data/lib/views/live_panel.rb

@@ -1,6 +1,17 @@
+module Wx
+  class ListItem
+    def color color_data
+      set_background_colour(color_data[:color])
+      if color_data[:white_text]
+        set_text_colour(Wx::WHITE)
+      end
+    end
+  end
+end
+
 module Okayu
-  COLORIZE = 300
-  NAME     = 301
+  DYE  = 300
+  NAME = 301
 
   class LiveListCtrl < Wx::ListCtrl
     COLUMNS = { :no => 0,
@@ -29,9 +40,10 @@ module Okayu
 
       evt_list_item_right_click(get_id) {|event| on_list_item_right_click(event)}
       evt_list_item_activated(Wx::ID_ANY) {|event| on_activated(event)}
+      evt_list_item_selected(Wx::ID_ANY) {|event| on_selected(event)}
       evt_key_down(){|event| get_parent.on_key_down(event)}
 
-      evt_menu(COLORIZE){show_color_dialog}
+      evt_menu(DYE){show_color_dialog}
       evt_menu(NAME){show_name_dialog}
     end
     
@@ -50,12 +62,23 @@ module Okayu
     def insert_comment comment
       item = Wx::ListItem.new
       item.set_data({:id => comment.id,
+                     :message => comment.message,
                      :visitor_id => comment.visitor_id,
-                     :listener_id => comment.listener_id})
+                     :listener_id => comment.visitor.listener_id})
       item.set_id 0
       item.set_column COLUMNS[:no]
       item.set_text comment.number.to_s
-      # item.set_text_colour Wx::GREEN
+    
+      if comment.visitor.listener
+        if color_index = comment.visitor.listener.color_index
+          item.color COLORS[color_index]
+        end
+      elsif comment.visitor
+        if color_index = comment.visitor.color_index
+          item.color COLORS[color_index]
+        end
+      end
+
       insert_item(item)
     
       item.set_column COLUMNS[:message]
@@ -70,9 +93,9 @@ module Okayu
       item.set_text Time.at(comment.commented_at - @base_time).strftime("%M:%S")
       set_item(item)
 
-      if comment.listener
+      if comment.visitor.listener
         item.set_column COLUMNS[:name]
-        item.set_text comment.listener.name
+        item.set_text comment.visitor.listener.name
         set_item(item)
       end
 
@@ -92,16 +115,50 @@ module Okayu
       end
       set_item(item)
 
-      if comment.listener
-        if color_index = comment.listener.color_index
-          set_color_to_an_item(0, COLORS[color_index])
-        end
-      elsif comment.visitor
-        if color_index = comment.visitor.color_index
-          set_color_to_an_item(0, COLORS[color_index])
-        end
+    end
+
+    def rewrite_item item_index
+      item = get_item(item_index)
+      comment = Comment.find item.get_data[:id]
+
+      item.set_id 0
+      item.set_column COLUMNS[:no]
+      item.set_text comment.number.to_s
+      set_item(item)
+    
+      item.set_column COLUMNS[:message]
+      item.set_text comment.message
+      set_item(item)
+
+      item.set_column COLUMNS[:mail]
+      item.set_text comment.mail
+      set_item(item)
+
+      item.set_column COLUMNS[:time]
+      item.set_text Time.at(comment.commented_at - @base_time).strftime("%M:%S")
+      set_item(item)
+
+      if comment.visitor.listener
+        item.set_column COLUMNS[:name]
+        item.set_text comment.visitor.listener.name
+        set_item(item)
       end
 
+      item.set_column COLUMNS[:id]
+      item.set_text comment.user_id || comment.visitor.user_id
+      set_item(item)
+
+      item.set_column COLUMNS[:premium]
+      if comment.owner
+        item.set_text '主'
+      elsif comment.premium
+        item.set_text 'P'
+      elsif comment.command
+        item.set_text 'System'
+      else
+        item.set_text ''
+      end
+      set_item(item)
     end
 
     def on_column_resized event
@@ -123,8 +180,9 @@ module Okayu
     end
 
     def on_list_item_right_click event
+      @selected_item_text = get_item_text(event.get_index) # code for windows
       menu = Wx::Menu.new
-      menu.append(COLORIZE, "色をつける(&C)", "")
+      menu.append(DYE, "色をつける(&C)", "")
       menu.append(NAME, "名前をつける(&M)", "")
       popup_menu(menu, event.get_point)
     end
@@ -132,22 +190,30 @@ module Okayu
     def show_color_dialog
       dialog = ColorDialog.new(self)
       color_index = dialog.show_modal
-      item_index = get_selections.first
+      item_index = get_selections.first # get_selections won't work in windows
+      item_index = find_item(-1, @selected_item_text) unless item_index # code for windows
       if color_index >= 0 && color_index < COLORS.length
         on_color_set item_index, color_index
       end
     end
 
     def show_name_dialog
-      dialog = Wx::TextEntryDialog.new(self, "名前を入力してください")
+      message =  get_message(@selected_index)
+      message =~ /(@|＠)(.*)/
+      default_name = $2 || ''
+      dialog = Wx::TextEntryDialog.new(self, "名前を入力してください", "名前の設定", default_name)
       dialog.show_modal
-      item_index = get_selections.first
+      item_index = get_selections.first # get_selections won't work in windows
+      item_index = find_item(-1, @selected_item_text) unless item_index # code for windows
+      if (name = dialog.get_value) != ''
+        on_name_set(item_index, name)
+      else
+        on_name_unset(item_index, name)
+      end
+    end
 
-      item = get_item(item_index)
-      item.set_text_colour(COLORS[WHITE][:color])
-      item.set_column COLUMNS[:name]
-      item.set_text(dialog.get_value)
-      set_item(item)
+    def get_message index
+      get_item_data(index)[:message]
     end
 
     def is_colored? index
@@ -156,30 +222,46 @@ module Okayu
     end
     
     def on_activated event
-      item_index = event.get_index
-      if is_colored?(item_index)
-        on_color_unset item_index
+      @selected_index = event.get_index
+      if is_colored?(@selected_index)
+        on_color_unset @selected_index
       else
-        on_color_set item_index
+        on_color_set @selected_index
       end
     end
 
+    def on_selected event
+      @selected_index = event.get_index
+    end
+
+    def same_text_color? a, b
+      COLORS[a||WHITE][:white_text] == COLORS[b||WHITE][:white_text]
+    end
+
     def on_color_set index, color_index=nil
       color_index = rand(COLORS.length) unless color_index
       data = get_item_data(index)
       return unless data
 
       if data[:listener_id]
-        set_color({:listener_id => data[:listener_id]}, COLORS[color_index])
-        unless ListenersController.set_color_index :id => data[:listener_id],
-                                                   :color_index => color_index
-          Wx::message_box('色設定の保存に失敗しました')
-        end 
+        listener = Listener.find(data[:listener_id])
+        same_text_color = same_text_color?(listener.color_index, color_index)
+        listener.color_index = color_index
+        listener.save
+        if same_text_color
+          set_color({:listener_id => data[:listener_id]}, COLORS[color_index])
+        else
+          redraw
+        end
       else
-        set_color({:visitor_id => data[:visitor_id]}, COLORS[color_index])
-        unless VisitorsController.set_color_index :id => data[:visitor_id],
-                                                  :color_index => color_index
-          Wx::message_box('色設定の保存に失敗しました')
+        visitor = Visitor.find(data[:visitor_id])
+        same_text_color = same_text_color?(visitor.color_index, color_index)
+        visitor.color_index = color_index
+        visitor.save
+        if same_text_color
+          set_color({:visitor_id => data[:visitor_id]}, COLORS[color_index])
+        else
+          redraw
         end
       end
     end
@@ -189,14 +271,24 @@ module Okayu
       return unless data
 
       if data[:listener_id]
-        set_color({:listener_id => data[:listener_id]}, COLORS[WHITE])
-        unless ListenersController.unset_color_index :id => data[:listener_id]
-          Wx::message_box('色設定の消去に失敗しました')
-        end 
+        listener = Listener.find(data[:listener_id])
+        old_color_index = listener.color_index
+        listener.color_index = nil
+        listener.save
+        if COLORS[old_color_index||WHITE][:white_text]
+          redraw
+        else
+          set_color({:listener_id => data[:listener_id]}, COLORS[WHITE])
+        end
       else
-        set_color({:visitor_id => data[:visitor_id]}, COLORS[WHITE])
-        unless VisitorsController.unset_color_index :id => data[:visitor_id]
-          Wx::message_box('色設定の消去に失敗しました')
+        visitor = Visitor.find(data[:visitor_id])
+        old_color_index = visitor.color_index
+        visitor.color_index = nil
+        visitor.save
+        if COLORS[old_color_index||WHITE][:white_text]
+          redraw
+        else
+          set_color({:visitor_id => data[:visitor_id]}, COLORS[WHITE])
         end
       end
     end
@@ -217,6 +309,12 @@ module Okayu
       end
     end
 
+    def redraw
+      get_parent.pause
+      get_parent.redraw_list @selected_index
+      get_parent.resume
+    end
+
     def set_color_to_an_item index, color
       set_item_background_colour(index, color[:color])
       if color[:white_text]
@@ -225,13 +323,65 @@ module Okayu
     end
 
     def on_name_set index, name
+      data = get_item_data(index)
+      return unless data
+
+      if data[:listener_id]
+        listener = Listener.find(data[:listener_id])
+        listener.name = name
+        listener.save
+        set_name_to_listener(data[:listener_id], name)
+      else
+        visitor = Visitor.find(data[:visitor_id])
+        visitor.create_listener(:name => name)
+        visitor.save
+        set_name_to_visitor(data[:visitor_id], visitor.listener_id, name)
+      end
     end
+    
     def on_name_unset index, name
+      data = get_item_data(index)
+      return unless data
+
+      visitor = Visitor.find(data[:visitor_id])
+      visitor.listener_id = nil
+      visitor.save
+      if data[:listener_id]
+        listener = Listener.find data[:listener_id]
+        if listener.visitors.size == 0
+          listener.destroy
+        end
+      end
+      set_name_to_visitor data[:visitor_id], nil, ''
     end
-    def set_name target, name
+
+
+    def set_name_to_listener listener_id, name
+      self.each do |index|
+        if get_item_data(index)[:listener_id] == listener_id
+          set_name_to_an_item(index, name)
+        end
+      end
     end
+
+    def set_name_to_visitor visitor_id, listener_id, name
+      self.each do |index|
+        data = get_item_data(index)
+        if data[:visitor_id] == visitor_id
+          data[:listener_id] = listener_id
+          set_item_data(index, data)
+          set_name_to_an_item(index, name)
+        end
+      end
+    end
+
     def set_name_to_an_item index, name
+      item = get_item(index)
+      item.set_column COLUMNS[:name]
+      item.set_text(name)
+      set_item(item)
     end
+
   end
 
   class LivePanel < Wx::Panel
@@ -254,7 +404,6 @@ module Okayu
 
       @live_url.set_focus
 
-      #@live_url.evt_key_down(){|event| on_key_down(event)}
       evt_key_down(){|event| on_key_down(event)}
 
 
@@ -284,12 +433,21 @@ module Okayu
           @live_controller.comments.each do |comment|
             @list.insert_comment(comment)
           end
-          
+         
+          @list.set_focus 
           @ready = true
         end
       end
     end
-    
+
+    def redraw_list selected_item_index
+      @list.delete_all_items
+      @live_controller.reload_comments.each do |comment|
+        @list.insert_comment(comment)
+      end
+      @list.get_item(selected_item_index).set_state(Wx::LIST_STATE_SELECTED)
+    end
+
     def live_id_from_url url
       if /^\d+$/ =~ url
         "lv#{url}"
@@ -319,6 +477,13 @@ module Okayu
       end
     end
 
+    def pause
+      @ready = false
+    end
+
+    def resume
+      @ready = true
+    end
 
     def on_update
       if @ready && @live_controller.live_now?

data/lib/views/main_panel.rb

@@ -12,7 +12,7 @@ module Okayu
       create_tab
 
       @timer = Wx::Timer.new(self, Wx::ID_ANY)
-      @timer.start
+      @timer.start 100
       evt_timer(@timer.get_id) {|event| on_update}
 
       evt_size{|event| on_size(event)}

data/okayu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{okayu}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kentaro Imai"]
-  s.date = %q{2009-09-18}
+  s.date = %q{2009-09-19}
   s.default_executable = %q{okayu}
   s.description = %q{A comment viewer for http://live.nicovideo.jp/}
   s.email = %q{kentaroi@gmail.com}
@@ -30,23 +30,20 @@ Gem::Specification.new do |s|
      "lib/app_dir.rb",
      "lib/client.rb",
      "lib/controllers.rb",
-     "lib/controllers/listeners_controller.rb",
      "lib/controllers/live_controller.rb",
-     "lib/controllers/visitors_controller.rb",
      "lib/cookie_thief.rb",
-     "lib/db/migrate/000_create_lives.rb",
+     "lib/db/migrate/000_create_programs.rb",
      "lib/db/migrate/001_create_comments.rb",
      "lib/db/migrate/002_create_visitors.rb",
      "lib/db/migrate/003_create_listeners.rb",
      "lib/db/migrate/004_create_communities.rb",
-     "lib/db/migrate/005_create_listeners_lives.rb",
-     "lib/db/migrate/006_create_lives_visitors.rb",
-     "lib/factory.rb",
+     "lib/db/migrate/005_create_listeners_programs.rb",
+     "lib/db/migrate/006_create_programs_visitors.rb",
      "lib/models.rb",
      "lib/models/comment.rb",
      "lib/models/community.rb",
      "lib/models/listener.rb",
-     "lib/models/live.rb",
+     "lib/models/program.rb",
      "lib/models/visitor.rb",
      "lib/okayu.rb",
      "lib/player_status.rb",
@@ -60,13 +57,12 @@ Gem::Specification.new do |s|
      "lib/views/live_panel.rb",
      "lib/views/login_dialog.rb",
      "lib/views/main_panel.rb",
-     "logged_in_page",
-     "login_error_page",
      "okayu.gemspec",
-     "tcp_log",
      "test/client_test.rb",
      "test/cookie_thief_test.rb",
      "test/ie_cookie.txt",
+     "test/logged_in_page",
+     "test/login_error_page",
      "test/okayu_test.rb",
      "test/player_status_test.rb",
      "test/raw_player_status",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: kentaroi-okayu
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Kentaro Imai
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-18 00:00:00 -07:00
+date: 2009-09-19 00:00:00 -07:00
 default_executable: okayu
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,23 +113,20 @@ files:
 - lib/app_dir.rb
 - lib/client.rb
 - lib/controllers.rb
-- lib/controllers/listeners_controller.rb
 - lib/controllers/live_controller.rb
-- lib/controllers/visitors_controller.rb
 - lib/cookie_thief.rb
-- lib/db/migrate/000_create_lives.rb
+- lib/db/migrate/000_create_programs.rb
 - lib/db/migrate/001_create_comments.rb
 - lib/db/migrate/002_create_visitors.rb
 - lib/db/migrate/003_create_listeners.rb
 - lib/db/migrate/004_create_communities.rb
-- lib/db/migrate/005_create_listeners_lives.rb
-- lib/db/migrate/006_create_lives_visitors.rb
-- lib/factory.rb
+- lib/db/migrate/005_create_listeners_programs.rb
+- lib/db/migrate/006_create_programs_visitors.rb
 - lib/models.rb
 - lib/models/comment.rb
 - lib/models/community.rb
 - lib/models/listener.rb
-- lib/models/live.rb
+- lib/models/program.rb
 - lib/models/visitor.rb
 - lib/okayu.rb
 - lib/player_status.rb
@@ -143,13 +140,12 @@ files:
 - lib/views/live_panel.rb
 - lib/views/login_dialog.rb
 - lib/views/main_panel.rb
-- logged_in_page
-- login_error_page
 - okayu.gemspec
-- tcp_log
 - test/client_test.rb
 - test/cookie_thief_test.rb
 - test/ie_cookie.txt
+- test/logged_in_page
+- test/login_error_page
 - test/okayu_test.rb
 - test/player_status_test.rb
 - test/raw_player_status

data/lib/controllers/listeners_controller.rb

@@ -1,18 +0,0 @@
-module Okayu
-  class ListenersController
-    def self.set_color_index params
-      begin
-        listener = Listener.find params[:id]
-        listener.color_index = params[:color_index]
-        listener.save!
-      rescue
-        return false
-      end
-      true
-    end
-    
-    def self.unset_color_index params
-      self.set_color_index params
-    end
-  end
-end

data/lib/controllers/visitors_controller.rb

@@ -1,19 +0,0 @@
-module Okayu
-  class VisitorsController
-    def self.set_color_index params
-      begin
-        visitor = Visitor.find params[:id]
-        visitor.color_index = params[:color_index]
-        visitor.save!
-      rescue
-        return false
-      end
-      true
-    end
-
-    def self.unset_color_index params
-      self.set_color_index params
-    end
-  end
-end
-

data/lib/db/migrate/005_create_listeners_lives.rb

@@ -1,12 +0,0 @@
-class CreateListenersLives < ActiveRecord::Migration
-  def self.up
-    create_table :listeners_lives, :id => false do |t|
-      t.references :listener, :live, :default => 0, :null => false
-    end
-  end
-
-  def self.down
-    drop_table :listeners_lives
-  end
-end
-

data/lib/db/migrate/006_create_lives_visitors.rb

@@ -1,13 +0,0 @@
-class CreateLivesVisitors < ActiveRecord::Migration
-  def self.up
-    create_table :lives_visitors, :id => false do |t|
-      t.references :live, :visitor, :default => 0, :null => false
-    end
-  end
-
-  def self.down
-    drop_table :lives_visitors
-  end
-end
-
-

data/lib/factory.rb

@@ -1,16 +0,0 @@
-module Okayu
-  class Factory
-    def initialize
-      UserInfo.load
-      @client = Client.instance
-      @app = Okayu::App.new
-      @app.main_loop
-    end
-
-    def close
-      @client.kill_all
-      UserInfo.save
-    end
-  end
-end
-