rbitter 0.2.0-java → 0.2.1-java

data/lib/rbitter/override/gems/twitter/connection.rb

@@ -1,46 +1,46 @@
-# encoding: utf-8
-
-require 'http/parser'
-require 'openssl'
-require 'resolv'
-
-module Twitter
-  module Streaming
-    class Connection
-      MODIFIED = true
-      attr_reader :tcp_socket_class, :ssl_socket_class
-
-      def initialize(options = {})
-        @tcp_socket_class = options.fetch(:tcp_socket_class) { TCPSocket }
-        @ssl_socket_class = options.fetch(:ssl_socket_class) { OpenSSL::SSL::SSLSocket }
-      end
-
-      def stream(request, response)
-        client_context = OpenSSL::SSL::SSLContext.new
-        client = @tcp_socket_class.new(Resolv.getaddress(request.uri.host), request.uri.port)
-        ssl_client = @ssl_socket_class.new(client, client_context)
-        ssl_client.connect
-        request.stream(ssl_client)
-
-        loop {
-          begin
-            body = ssl_client.read_nonblock(1024) # rubocop:disable AssignmentInCondition, WhileUntilModifier
-            response << body
-          rescue IO::WaitReadable
-            # The reason for setting 90 seconds as a timeout is documented on:
-            # https://dev.twitter.com/streaming/overview/connecting
-            r, w, e = IO.select([ssl_client], [], [], 90)
-            if r.nil?
-              # If timeout occurs
-              ssl_client.close
-              raise Twitter::Error::ServerError.new("Connection stalled")
-            else
-              # If socket is readable
-              retry
-            end
-          end
-        }
-      end
-    end
-  end
+# encoding: utf-8
+
+require 'http/parser'
+require 'openssl'
+require 'resolv'
+
+module Twitter
+  module Streaming
+    class Connection
+      MODIFIED = true
+      attr_reader :tcp_socket_class, :ssl_socket_class
+
+      def initialize(options = {})
+        @tcp_socket_class = options.fetch(:tcp_socket_class) { TCPSocket }
+        @ssl_socket_class = options.fetch(:ssl_socket_class) { OpenSSL::SSL::SSLSocket }
+      end
+
+      def stream(request, response)
+        client_context = OpenSSL::SSL::SSLContext.new
+        client = @tcp_socket_class.new(Resolv.getaddress(request.uri.host), request.uri.port)
+        ssl_client = @ssl_socket_class.new(client, client_context)
+        ssl_client.connect
+        request.stream(ssl_client)
+
+        loop {
+          begin
+            body = ssl_client.read_nonblock(1024) # rubocop:disable AssignmentInCondition, WhileUntilModifier
+            response << body
+          rescue IO::WaitReadable
+            # The reason for setting 90 seconds as a timeout is documented on:
+            # https://dev.twitter.com/streaming/overview/connecting
+            r, w, e = IO.select([ssl_client], [], [], 90)
+            if r.nil?
+              # If timeout occurs
+              ssl_client.close
+              raise Twitter::Error::ServerError.new("Connection stalled")
+            else
+              # If socket is readable
+              retry
+            end
+          end
+        }
+      end
+    end
+  end
 end

data/lib/rbitter/override.rb

@@ -1,47 +1,47 @@
-=begin
-This module gives special workarounds for some issues.
-
-Problems are bypassed by monkey-patching.
-
-As soon as a problem is resolved, patch should be removed.
-
-**** Known issues ****
-
-1. gem/twitter
-Location : override/gem/twitter/connection.rb
-Maintain : until below issue is fixed
-Reference: https://github.com/sferik/twitter/pull/669
-
-Gem 'twitter' does not handle streaming timeout. By applying this,
-reading timeout works and Rbitter can handle timeouts.
-
-2. gem/rubysl-socket
-Location : override/gem/rubysl-socket/socket.rb
-Maintain : until ip_address_list is implemented
-Reference: https://github.com/rubysl/rubysl-socket/pull/9
-
-With ipv6 environment, Resolv#use_ipv6? (in rubysl-resolv gem) checks 
-Socket.ip_address_list. This is not implemented at all with rubysl-socket-2.0.1.
-NoMethodError exception is raised instead of NotImplementedError.
-
-By applying this, Socket.ip_address_list is implemented and the method throws
-NotImplementedError exception.
-
-=end
-
-def gem_twitter_patcher
-  require 'rbitter/override/gems/twitter/connection'
-end
-
-if Twitter::Version.const_defined?(:MAJOR)
-  b5_version = Twitter::Version::MAJOR * 10000
-  + Twitter::Version::MINOR * 100 + Twitter::Version::PATCH
-  gem_twitter_patcher if b5_version <= 51400
-else
-  b6_version = Twitter::Version.to_a
-  if b6_version[0] <= 6 and b6_version[1] <= 0 and b6_version[2] <= 0
-    gem_twitter_patcher
-  end
-end
-
-require 'rbitter/override/gems/rubysl-socket/socket' if RUBY_ENGINE == 'rbx'
+=begin
+This module gives special workarounds for some issues.
+
+Problems are bypassed by monkey-patching.
+
+As soon as a problem is resolved, patch should be removed.
+
+**** Known issues ****
+
+1. gem/twitter
+Location : override/gem/twitter/connection.rb
+Maintain : until below issue is fixed
+Reference: https://github.com/sferik/twitter/pull/669
+
+Gem 'twitter' does not handle streaming timeout. By applying this,
+reading timeout works and Rbitter can handle timeouts.
+
+2. gem/rubysl-socket
+Location : override/gem/rubysl-socket/socket.rb
+Maintain : until ip_address_list is implemented
+Reference: https://github.com/rubysl/rubysl-socket/pull/9
+
+With ipv6 environment, Resolv#use_ipv6? (in rubysl-resolv gem) checks 
+Socket.ip_address_list. This is not implemented at all with rubysl-socket-2.0.1.
+NoMethodError exception is raised instead of NotImplementedError.
+
+By applying this, Socket.ip_address_list is implemented and the method throws
+NotImplementedError exception.
+
+=end
+
+def gem_twitter_patcher
+  require 'rbitter/override/gems/twitter/connection'
+end
+
+if Twitter::Version.const_defined?(:MAJOR)
+  b5_version = Twitter::Version::MAJOR * 10000
+  + Twitter::Version::MINOR * 100 + Twitter::Version::PATCH
+  gem_twitter_patcher if b5_version <= 51400
+else
+  b6_version = Twitter::Version.to_a
+  if b6_version[0] <= 6 and b6_version[1] <= 0 and b6_version[2] <= 0
+    gem_twitter_patcher
+  end
+end
+
+require 'rbitter/override/gems/rubysl-socket/socket' if RUBY_ENGINE == 'rbx'

data/lib/rbitter/progress.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+
+module Rbitter
+  module Progress
+    @@last_draw = 0
+    def putback
+      $> << "\r"
+    end
+
+    def draw sentence
+      $> << sentence
+      if sentence.length < @@last_draw
+        $> << " "*(@@last_draw - sentence.length)
+      end
+      @@last_draw = sentence.length
+      putback
+    end
+
+    def newline
+      puts ""
+    end
+  end
+end

data/lib/rbitter/records.rb

@@ -1,127 +1,127 @@
-# encoding: utf-8
-
-require "active_record"
-require "date"
-
-module Rbitter
-  class Record < ActiveRecord::Base
-  end
-end
-
-module ARSupport
-  SCHEME_VERSION = 20150504
-  SCHEME = {
-    :marker => :integer, # 0 normal, 1 begin 2 halt
-    :marker_msg => :string,
-    :userid => :integer,
-    :username => :string,
-    :tweetid => :integer,
-    :replyto => :integer,
-    :tweet => :text, # with url unpacked
-    :date => :datetime,
-    :rt_count => :integer,
-    :fav_count => :integer
-  }
-
-  module_function
-  def prepared?
-    ActiveRecord::Base.connection.table_exists?(:records)
-  end
-
-  def connect_database
-    if Rbitter['activerecord'] == 'sqlite3'
-      warn "Warning: If you enable XMLRPC access, using sqlite is not recommended."
-      warn "Warning: Random crash can happen because of concurrency."
-      
-      if RUBY_PLATFORM == 'java'
-        require "jdbc/sqlite3"
-        Jdbc::SQLite3.load_driver
-        ActiveRecord::Base.establish_connection(
-          adapter: 'jdbcsqlite3',
-          database: Rbitter['sqlite3']['dbfile'],
-          timeout: 10000) # Long timeout for slow computer
-      else
-        ActiveRecord::Base.establish_connection(
-          adapter: 'sqlite3',
-          database: Rbitter['sqlite3']['dbfile'],
-          timeout: 10000) # Long timeout for slow computer
-      end
-    elsif Rbitter['activerecord'] == 'mysql2'
-      Jdbc::MySQL.load_driver if RUBY_PLATFORM == 'java'
-      
-      ActiveRecord::Base.establish_connection(
-        adapter: (RUBY_PLATFORM == 'java' ? 'jdbcmysql' : 'mysql2'),
-        host: Rbitter['mysql2']['host'],
-        port: Rbitter['mysql2']['port'],
-        database: Rbitter['mysql2']['dbname'],
-        username: Rbitter['mysql2']['username'],
-        password: Rbitter['mysql2']['password'],
-        encoding: "utf8mb4",
-        collation: "utf8mb4_unicode_ci")
-    else
-      raise RuntimeException.new("Unknown configuration value. 'activerecord' value should be sqlite3 or mysql2.")
-    end
-  end
-
-  def disconnect_database
-    if ActiveRecord::Base.connected?
-      ActiveRecord::Base.connection.close
-    end
-  end
-
-  def update_database_scheme
-    current_version = ActiveRecord::Migrator.current_version
-    if current_version < SCHEME_VERSION
-      warn "[records] Your ActiveRecord scheme is outdated."
-      warn "[records] Migrate... #{current_version} => #{SCHEME_VERSION}"
-      ActiveRecord::Migrator.migrate(File.expand_path("../records_migrate", __FILE__), SCHEME_VERSION)
-    end
-  end
-
-  def prepare option_string=""
-    ActiveRecord::Schema.define(version: SCHEME_VERSION) {
-      # MySQL specific option_string:
-      # utf8mb4 -> supporting UTF-8 4-byte characters (i.e. Emoji)
-      create_table(:records, { :options => option_string }) do |t|
-        SCHEME.each_key { |column|
-          case SCHEME[column]
-          when :string
-            t.string column
-          when :integer
-            t.integer column, :limit => 8
-          when :datetime
-            t.datetime column
-          when :text
-            t.text column
-          else
-            puts "Unexpected column type '#{SCHEME[column]}' of #{column}"
-          end
-        }
-      end
-
-      add_index :records, :tweetid
-    }
-  end
-
-  def any_to_datestring(obj)
-    if obj.is_a?(String)
-      # try to parse it
-      DateTime.parse(obj).strftime("%Y-%m-%d %H:%M:%S")
-    elsif obj.is_a?(DateTime) or obj.is_a?(Time)
-      obj.strftime("%Y-%m-%d %H:%M:%S")
-    else
-      raise ArgumentError.new("Can\'t automatically extract DateTime info")
-    end
-  end
-
-  def export_to_csv(csvfile)
-    open(csvfile, 'w') { |f|
-      f.write("marker,marker_msg,userid,username,tweetid,replyto,tweet,date,rt_count,fav_count")
-      f.write("\n")
-      Rbitter::Record.find_each { |t|
-        f.write("#{t.marker},#{t.marker_msg},#{t.userid},#{t.username},#{t.tweetid},")
-        f.write("#{t.replyto},#{t.tweet},#{t.date},#{t.rt_count},#{t.fav_count}\n")
-      }
-    }
-  end
-end
+# encoding: utf-8
+
+require "active_record"
+require "date"
+
+module Rbitter
+  class Record < ActiveRecord::Base
+  end
+end
+
+module ARSupport
+  SCHEME_VERSION = 20150504
+  SCHEME = {
+    :marker => :integer, # 0 normal, 1 begin 2 halt
+    :marker_msg => :string,
+    :userid => :integer,
+    :username => :string,
+    :tweetid => :integer,
+    :replyto => :integer,
+    :tweet => :text, # with url unpacked
+    :date => :datetime,
+    :rt_count => :integer,
+    :fav_count => :integer
+  }
+
+  module_function
+  def prepared?
+    ActiveRecord::Base.connection.table_exists?(:records)
+  end
+
+  def connect_database
+    if Rbitter['activerecord'] == 'sqlite3'
+      warn "Warning: If you enable XMLRPC access, using sqlite is not recommended."
+      warn "Warning: Random crash can happen because of concurrency."
+      
+      if RUBY_PLATFORM == 'java'
+        require "jdbc/sqlite3"
+        Jdbc::SQLite3.load_driver
+        ActiveRecord::Base.establish_connection(
+          adapter: 'jdbcsqlite3',
+          database: Rbitter['sqlite3']['dbfile'],
+          timeout: 10000) # Long timeout for slow computer
+      else
+        ActiveRecord::Base.establish_connection(
+          adapter: 'sqlite3',
+          database: Rbitter['sqlite3']['dbfile'],
+          timeout: 10000) # Long timeout for slow computer
+      end
+    elsif Rbitter['activerecord'] == 'mysql2'
+      Jdbc::MySQL.load_driver if RUBY_PLATFORM == 'java'
+      
+      ActiveRecord::Base.establish_connection(
+        adapter: (RUBY_PLATFORM == 'java' ? 'jdbcmysql' : 'mysql2'),
+        host: Rbitter['mysql2']['host'],
+        port: Rbitter['mysql2']['port'],
+        database: Rbitter['mysql2']['dbname'],
+        username: Rbitter['mysql2']['username'],
+        password: Rbitter['mysql2']['password'],
+        encoding: "utf8mb4",
+        collation: "utf8mb4_unicode_ci")
+    else
+      raise RuntimeException.new("Unknown configuration value. 'activerecord' value should be sqlite3 or mysql2.")
+    end
+  end
+
+  def disconnect_database
+    if ActiveRecord::Base.connected?
+      ActiveRecord::Base.connection.close
+    end
+  end
+
+  def update_database_scheme
+    current_version = ActiveRecord::Migrator.current_version
+    if current_version < SCHEME_VERSION
+      warn "[records] Your ActiveRecord scheme is outdated."
+      warn "[records] Migrate... #{current_version} => #{SCHEME_VERSION}"
+      ActiveRecord::Migrator.migrate(File.expand_path("../records_migrate", __FILE__), SCHEME_VERSION)
+    end
+  end
+
+  def prepare option_string=""
+    ActiveRecord::Schema.define(version: SCHEME_VERSION) {
+      # MySQL specific option_string:
+      # utf8mb4 -> supporting UTF-8 4-byte characters (i.e. Emoji)
+      create_table(:records, { :options => option_string }) do |t|
+        SCHEME.each_key { |column|
+          case SCHEME[column]
+          when :string
+            t.string column
+          when :integer
+            t.integer column, :limit => 8
+          when :datetime
+            t.datetime column
+          when :text
+            t.text column
+          else
+            puts "Unexpected column type '#{SCHEME[column]}' of #{column}"
+          end
+        }
+      end
+
+      add_index :records, :tweetid
+    }
+  end
+
+  def any_to_datestring(obj)
+    if obj.is_a?(String)
+      # try to parse it
+      DateTime.parse(obj).strftime("%Y-%m-%d %H:%M:%S")
+    elsif obj.is_a?(DateTime) or obj.is_a?(Time)
+      obj.strftime("%Y-%m-%d %H:%M:%S")
+    else
+      raise ArgumentError.new("Can\'t automatically extract DateTime info")
+    end
+  end
+
+  def export_to_csv(csvfile)
+    open(csvfile, 'w') { |f|
+      f.write("marker,marker_msg,userid,username,tweetid,replyto,tweet,date,rt_count,fav_count")
+      f.write("\n")
+      Rbitter::Record.find_each { |t|
+        f.write("#{t.marker},#{t.marker_msg},#{t.userid},#{t.username},#{t.tweetid},")
+        f.write("#{t.replyto},#{t.tweet},#{t.date},#{t.rt_count},#{t.fav_count}\n")
+      }
+    }
+  end
+end

data/lib/rbitter/records_migrate/20150327_add_index.rb

@@ -1,12 +1,12 @@
-# encoding: utf-8
-
-
-class AddIndex < ActiveRecord::Migration
-  def up
-    add_index :records, :tweetid
-  end
-
-  def change
-    up
-  end
+# encoding: utf-8
+
+
+class AddIndex < ActiveRecord::Migration
+  def up
+    add_index :records, :tweetid
+  end
+
+  def change
+    up
+  end
 end

data/lib/rbitter/records_migrate/20150504_add_replyto_column.rb

@@ -1,12 +1,12 @@
-# encoding: utf-8
-
-
-class AddReplytoColumn < ActiveRecord::Migration
-  def up
-    add_column :records, :replyto, :integer, :limit => 8
-  end
-
-  def change
-    up
-  end
+# encoding: utf-8
+
+
+class AddReplytoColumn < ActiveRecord::Migration
+  def up
+    add_column :records, :replyto, :integer, :limit => 8
+  end
+
+  def change
+    up
+  end
 end