etvnet_seek 0.3.0 → 0.4.0

data/lib/runglish.rb

@@ -1,133 +1,131 @@
-# Converts file names in directory recursively from Russian to Runglish.
+# Converts file names in directory recursively from Russian to Runglish and vice versa.
 #
 # Runglish stands for Russian text in Latin letters.
 
 # -*- encoding: utf-8 -*-
 
-if RUBY_VERSION < "1.9"
-  $KCODE = 'u'
-end
+$KCODE = 'u' if RUBY_VERSION < "1.9"
 
-class Runglish
-
-  LOWER_SINGLE = {
-    "і"=>"i", "ґ"=>"g", "ё"=>"yo", "№"=>"#", "є"=>"e", "ї"=>"yi",
-    "а"=>"a", "б"=>"b", "в"=>"v", "г"=>"g", "д"=>"d", "е"=>"e", "ж"=>"zh",
-    "з"=>"z", "и"=>"i", "й"=>"y", "к"=>"k", "л"=>"l", "м"=>"m", "н"=>"n", "о"=>"o", "п"=>"p", "р"=>"r",
-    "с"=>"s", "т"=>"t", "у"=>"u", "ф"=>"f", "х"=>"h", "ц"=>"ts", "ч"=>"ch", "ш"=>"sh", "щ"=>"sch",
-    "ъ"=>"'", "ы"=>"y", "ь"=>"", "э"=>"e", "ю"=>"yu", "я"=>"ya",
-  }
-
-  LOWER_MULTI = {
-    "ье"=>"ie",
-    "ьё"=>"ie",
-  }
-
-  UPPER_SINGLE = {
-    "Ґ"=>"G", "Ё"=>"YO", "Є"=>"E", "Ї"=>"YI", "І"=>"I",
-    "А"=>"A", "Б"=>"B", "В"=>"V", "Г"=>"G", "Д"=>"D", "Е"=>"E", "Ж"=>"ZH",
-    "З"=>"Z", "И"=>"I", "Й"=>"Y", "К"=>"K", "Л"=>"L", "М"=>"M", "Н"=>"N", "О"=>"O", "П"=>"P", "Р"=>"R",
-    "С"=>"S", "Т"=>"T", "У"=>"U", "Ф"=>"F", "Х"=>"H", "Ц"=>"TS", "Ч"=>"CH", "Ш"=>"SH", "Щ"=>"SCH",
-    "Ъ"=>"'", "Ы"=>"Y", "Ь"=>"", "Э"=>"E", "Ю"=>"YU", "Я"=>"YA",
-  }
-
-  UPPER_MULTI = {
-    "ЬЕ"=>"IE",
-    "ЬЁ"=>"IE",
-  }
-
-  LOWER = (LOWER_SINGLE.merge(LOWER_MULTI)).freeze
-  UPPER = (UPPER_SINGLE.merge(UPPER_MULTI)).freeze
-  MULTI_KEYS = (LOWER_MULTI.merge(UPPER_MULTI)).keys.sort_by {|s| s.length}.reverse.freeze
-
-
-  LOWER_SINGLE_2 = {
-    "i"=>"і", "g"=>"ґ", "#"=>"№", "e"=>"є",
-    "a"=>"а", "b"=>"б", "v"=>"в", "g"=>"г", "d"=>"д", "e"=>"е", "z"=>"з", "i"=>"и", "y"=>"й",
-    "k"=>"к", "l"=>"л", "m"=>"м", "n"=>"н", "o"=>"о", "p"=>"п", "r"=>"р", "s"=>"с", "t"=>"т",
-    "u"=>"у", "f"=>"ф", "h"=>"х", "'"=>"ъ", "y"=>"ы", "e"=>"э"
-  }
-  LOWER_MULTI_2 = {
-    "yo"=>"ё",
-    "yi"=>"ї",
-    "zh"=>"ж",
-    "ts"=>"ц",
-    "ch"=>"ч",
-    "sh"=>"ш",
-    "sch"=>"щ",
-    "yu"=>"ю",
-    "ya"=>"я",
-    "ie"=>"ье"
-  }
-
-  UPPER_SINGLE_2 = {
-    "G"=>"Ґ", "Є"=>"E", "I"=>"І",
-    "A"=>"А", "B"=>"Б", "V"=>"В", "G"=>"Г", "D"=>"Д", "E"=>"Е", "Z"=>"З", "I"=>"И",
-    "Y"=>"Й", "K"=>"К", "L"=>"Л", "M"=>"М", "N"=>"Н", "O"=>"О", "P"=>"П", "R"=>"Р",
-    "S"=>"С", "T"=>"Т", "U"=>"У", "F"=>"Ф", "H"=>"Х", "'"=>"Ъ", "Y"=>"Ы", "E"=>"Э"
-  }
-
-  UPPER_MULTI_2 = {
-    "YO"=>"Ё",
-    "YI"=>"Ї",
-    "ZH"=>"Ж",
-    "TS"=>"Ц",
-    "CH"=>"Ч",
-    "SH"=>"Ш",
-    "SCH"=>"Щ",
-    "YU"=>"Ю",
-    "YA"=>"Я",
-    "IE"=>"ЬЕ"
-  }
-
-  LOWER_2 = (LOWER_SINGLE_2.merge(LOWER_MULTI_2)).freeze
-  UPPER_2 = (UPPER_SINGLE_2.merge(UPPER_MULTI_2)).freeze
-  MULTI_KEYS_2 = (LOWER_MULTI_2.merge(UPPER_MULTI_2)).keys.sort_by {|s| s.length}.reverse.freeze
-
-  # Transliterate a string with russian characters
-  #
-  # Возвращает строку, в которой все буквы русского алфавита заменены на похожую по звучанию латиницу
-  def ru_to_lat(str)
-    chars = str.scan(%r{#{MULTI_KEYS.join '|'}|\w|.})
-
-    result = ""
-
-    chars.each_with_index do |char, index|
-      if UPPER.has_key?(char) && LOWER.has_key?(chars[index+1])
-        # combined case
-        result << UPPER[char].downcase.capitalize
-      elsif UPPER.has_key?(char)
-        result << UPPER[char]
-      elsif LOWER.has_key?(char)
-        result << LOWER[char]
-      else
-        result << char
-      end
+module Runglish
+
+  class Converter
+    def initialize(lower_single, lower_multi, upper_single, upper_multi)
+      @lower_single = lower_single
+      @lower_multi = lower_multi
+      @upper_single = upper_single
+      @upper_multi = upper_multi
+
+      @lower = (@lower_single.merge(@lower_multi)).freeze
+      @upper = (@upper_single.merge(@upper_multi)).freeze
+      @multi_keys = (@lower_multi.merge(@upper_multi)).keys.sort_by {|s| s.length}.reverse.freeze
     end
 
-    result
+    # Transliterate a string
+    def transliterate(str)
+      chars = str.scan(%r{#{@multi_keys.join '|'}|\w|.})
+
+      result = ""
+
+      chars.each_with_index do |char, index|
+        if @upper.has_key?(char) && @lower.has_key?(chars[index+1]) # combined case
+          result << @upper[char].downcase.capitalize
+        elsif @upper.has_key?(char)
+          result << @upper[char]
+        elsif @lower.has_key?(char)
+          result << @lower[char]
+        else
+          result << char
+        end
+      end
+
+      result
+    end
   end
 
-  def lat_to_ru(str)
-    chars = str.scan(%r{#{MULTI_KEYS_2.join '|'}|\w|.})
-
-    result = ""
-
-    chars.each_with_index do |char, index|
-      if UPPER_2.has_key?(char) && LOWER_2.has_key?(chars[index+1])
-        # combined case
-        result << UPPER_2[char].downcase.capitalize
-      elsif UPPER_2.has_key?(char)
-        result << UPPER_2[char]
-      elsif LOWER_2.has_key?(char)
-        result << LOWER_2[char]
-      else
-        result << char
-      end
+  class RusToLatConverter < Converter
+    def initialize
+      lower_single = {
+        "і"=>"i", "ґ"=>"g", "ё"=>"yo", "№"=>"#", "є"=>"e", "ї"=>"yi",
+        "а"=>"a", "б"=>"b", "в"=>"v", "г"=>"g", "д"=>"d", "е"=>"e", "ж"=>"zh",
+        "з"=>"z", "и"=>"i", "й"=>"y", "к"=>"k", "л"=>"l", "м"=>"m", "н"=>"n", "о"=>"o", "п"=>"p", "р"=>"r",
+        "с"=>"s", "т"=>"t", "у"=>"u", "ф"=>"f", "х"=>"h", "ц"=>"ts", "ч"=>"ch", "ш"=>"sh", "щ"=>"sch",
+        "ъ"=>"'", "ы"=>"y", "ь"=>"", "э"=>"e", "ю"=>"yu", "я"=>"ya"
+      }
+
+      lower_multi = {
+        "ье"=>"ie",
+        "ьё"=>"ie"
+      }
+
+      upper_single = {
+        "Ґ"=>"G", "Ё"=>"YO", "Є"=>"E", "Ї"=>"YI", "І"=>"I",
+        "А"=>"A", "Б"=>"B", "В"=>"V", "Г"=>"G", "Д"=>"D", "Е"=>"E", "Ж"=>"ZH",
+        "З"=>"Z", "И"=>"I", "Й"=>"Y", "К"=>"K", "Л"=>"L", "М"=>"M", "Н"=>"N", "О"=>"O", "П"=>"P", "Р"=>"R",
+        "С"=>"S", "Т"=>"T", "У"=>"U", "Ф"=>"F", "Х"=>"H", "Ц"=>"TS", "Ч"=>"CH", "Ш"=>"SH", "Щ"=>"SCH",
+        "Ъ"=>"'", "Ы"=>"Y", "Ь"=>"", "Э"=>"E", "Ю"=>"YU", "Я"=>"YA"
+      }
+
+      upper_multi = {
+        "ЬЕ"=>"IE",
+        "ЬЁ"=>"IE"
+      }
+
+      super(lower_single, lower_multi, upper_single, upper_multi)
     end
+  end
 
-    result
+  class LatToRusConverter < Converter
+    def initialize
+      lower_single = {
+        "i"=>"і", "g"=>"ґ", "#"=>"№", "e"=>"є",
+        "a"=>"а", "b"=>"б",  "v"=>"в", "g"=>"г", "d"=>"д", "e"=>"е", "z"=>"з", "i"=>"и",
+        "k"=>"к", "l"=>"л", "m"=>"м", "n"=>"н", "o"=>"о", "p"=>"п", "r"=>"р", "s"=>"с", "t"=>"т",
+        "u"=>"у", "f"=>"ф", "h"=>"х", "y"=>"ъ", "y"=>"ы",
+        "c"=>"к", "w"=> "в"
+      }
+
+      lower_multi = {
+        "yo"=>"ё",
+        "yi"=>"ї",
+        "ii"=>"й",
+        "zh"=>"ж",
+        "ts"=>"ц",
+        "ch"=>"ч",
+        "sh"=>"ш",
+        "sch"=>"щ",
+        "ye"=>"э",
+        "yu"=>"ю",
+        "ya"=>"я",
+        "ie"=>"ье"
+      }
+
+      upper_single = {
+        "G"=>"Ґ", "Є"=>"E", "I"=>"І",
+        "A"=>"А", "B"=>"Б", "V"=>"В", "G"=>"Г", "D"=>"Д", "E"=>"Е", "Z"=>"З", "I"=>"И",
+        "K"=>"К", "L"=>"Л", "M"=>"М", "N"=>"Н", "O"=>"О", "P"=>"П", "R"=>"Р",
+        "S"=>"С", "T"=>"Т", "U"=>"У", "F"=>"Ф", "H"=>"Х", "'"=>"Ъ", "Y"=>"Ы",
+        "C"=>"К", "W"=> "В"
+      }
+
+      upper_multi = {
+        "YO"=>"Ё",
+        "YI"=>"Ї",
+        "II"=>"Й",
+        "ZH"=>"Ж",
+        "TS"=>"Ц",
+        "CH"=>"Ч",
+        "SH"=>"Ш",
+        "SCH"=>"Щ",
+        "YE"=>"Э",
+        "YU"=>"Ю",
+        "YA"=>"Я",
+        "IE"=>"ЬЕ"
+      }
+
+      super(lower_single, lower_multi, upper_single, upper_multi)
+    end
   end
+  
 end
 
 

data/spec/etvnet_seek_spec.rb

@@ -1,34 +1,28 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/lib'
 
 require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
 
-#require 'spec'
-
-require 'main'
-require 'url_seeker'
+require 'etvnet/url_seeker'
 require 'runglish'
 
 describe UrlSeeker do
 
   before :each do
-    @client = UrlSeeker.new
+    @client = Main.new
   end
 
   it "should return search menu items" do
     keywords = "красная шапочка"
 
-    #@client.search(keywords).size.should > 0
-
-    items = @client.search(Main.search_url(keywords))
-    @client.display_results items
+    items = @client.seek(keywords)
+    @client.display_items items
   end
 
 end
 
 describe Runglish do
   it "should return translation" do
-    #Runglish.new.translate("kak dela?").size.should > 0
-    p Runglish.new.ru_to_lat("как дела?")
-    p Runglish.new.lat_to_ru("krasnaya shapochka")
+    Runglish::RusToLatConverter.new.transliterate("как дела?").should == "kak dela?"
+    Runglish::LatToRusConverter.new.transliterate("krasnaya shapochka").should == "красная шапочка"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: etvnet_seek
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Alexander Shvets
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: libxml-ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.3
+    version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
   type: :runtime
@@ -40,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.3
+        version: 1.4.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -50,7 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.8
+        version: 1.2.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: mocha
@@ -62,6 +72,46 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.9.7
     version: 
+- !ruby/object:Gem::Dependency 
+  name: metric_fu
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: reek
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: roodi
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: googlecharts
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Command line tool for getting mms urls from etvnet service.
 email: alexander.shvets@gmail.com
 executables: 
@@ -73,10 +123,30 @@ extra_rdoc_files: []
 files: 
 - bin/etvnet_seek
 - bin/etvnet_seek.bat
-- lib/cookie_helper.rb
-- lib/main.rb
+- lib/etvnet_seek/commander.rb
+- lib/etvnet_seek/cookie_helper.rb
+- lib/etvnet_seek/core/access_page.rb
+- lib/etvnet_seek/core/announces_page.rb
+- lib/etvnet_seek/core/base_page.rb
+- lib/etvnet_seek/core/browse_media_item.rb
+- lib/etvnet_seek/core/channel_media_item.rb
+- lib/etvnet_seek/core/channels_page.rb
+- lib/etvnet_seek/core/freetv_page.rb
+- lib/etvnet_seek/core/group_media_item.rb
+- lib/etvnet_seek/core/group_page.rb
+- lib/etvnet_seek/core/login_page.rb
+- lib/etvnet_seek/core/main_page.rb
+- lib/etvnet_seek/core/media_info.rb
+- lib/etvnet_seek/core/media_item.rb
+- lib/etvnet_seek/core/media_page.rb
+- lib/etvnet_seek/core/page.rb
+- lib/etvnet_seek/core/page_factory.rb
+- lib/etvnet_seek/core/search_page.rb
+- lib/etvnet_seek/core/service_call.rb
+- lib/etvnet_seek/link_info.rb
+- lib/etvnet_seek/main.rb
+- lib/etvnet_seek/user_selection.rb
 - lib/runglish.rb
-- lib/url_seeker.rb
 - spec/etvnet_seek_spec.rb
 - spec/spec.opts
 - CHANGES

data/lib/main.rb

@@ -1,95 +0,0 @@
-require 'rubygems' unless RUBY_VERSION =~ /1.9.*/
-
-#require "readline"
-require "highline/import"
-
-require 'cookie_helper'
-require 'url_seeker'
-require 'runglish'
-
-class Main
-  include CookieHelper
-
-  BASE_URL = "http://www.etvnet.ca"
-  SEARCH_URL = BASE_URL + "/cgi-bin/video/eitv_browse.fcgi?action=search"
-  ACCESS_URL = BASE_URL + "/cgi-bin/video/access.fcgi"
-  LOGIN_URL =  BASE_URL + "/cgi-bin/video/login.fcgi"
-
-  attr_reader :cookie
-
-  def initialize
-    @cookie = get_cookie
-  end
-
-  def self.search_url keywords, order_direction='-'
-    SEARCH_URL + "&keywords=#{CGI.escape(keywords)}&order_direction=#{order_direction}"
-  end
-
-  def search_and_grab_link keywords
-    if(keywords.strip.size == 0)
-      while keywords.strip.size == 0
-        keywords = ask("Keywords: ")
-      end
-    end
-
-    url_seeker = UrlSeeker.new
-
-    items = url_seeker.search Main.search_url(keywords)
-
-    if items.size == 0
-      say "Empty search result."
-      link = nil
-    else
-      url_seeker.display_results items
-
-      title_number = ask("Select title number: ")
-      while not title_number =~ /(\d+)(\.?)(\d*)/
-        title_number = ask("Select title number: ")
-      end
-
-      dot_index = title_number.index('.')
-
-      if not dot_index.nil?
-        pos1 = title_number[0..dot_index-1].to_i
-        pos2 = title_number[dot_index+1..-1].to_i
-
-        link = url_seeker.grab_movie_link items[pos1-1][:container][pos2-1][:link], cookie, ACCESS_URL
-      else
-        link = url_seeker.grab_movie_link items[title_number.to_i-1][:link], cookie, ACCESS_URL
-      end
-    end
-
-    link
-  end
-
-  private
-
-  def get_cookie
-    file_name = ENV['HOME'] + "/.etvnet-seek"
-
-    if File.exist? file_name
-      cookie = read_user_file file_name
-    else
-      username = ask("Enter username :  " )
-      password = ask("Enter password : " ) { |q| q.echo = '*' }
-
-      cookie = retrieve_cookie LOGIN_URL, username, password
-
-      write_user_file file_name, cookie
-   end
-
-    cookie
-  end
-
-  def read_user_file file_name
-    File.open(file_name, 'r') do |file|
-      return file.gets
-    end
-  end
-
-  def write_user_file file_name, cookie
-    File.open(file_name, 'w') do |file|
-      file.puts cookie
-    end
-  end
-end

data/lib/url_seeker.rb

@@ -1,97 +0,0 @@
-require 'nokogiri'
-require 'open-uri'
-require 'cgi'
-require 'json'
-
-class UrlSeeker
-
-  def search url
-    doc = Nokogiri::HTML(open(url))
-
-    list = []
-
-    doc.css("table tr[2] td table").each do |item|
-      links = item.css(".media_file")
-
-      links.each_with_index do |link, index|
-        if index % 2 != 0
-          href = link.attributes['href'].value
-
-          new_link = list.select {|l| l[:link] == href}.empty?
-
-          if new_link
-            record = {:link => href,
-                      :name => link.content.strip,
-  #                    :first_time => link.parent.parent.previous.previous.previous.previous.content.strip,
-  #                    :year => link.parent.parent.next.next.content.strip,
-  #                    :how_long => link.parent.parent.next.next.next.next.content.strip
-            }
-
-            if href =~ /action=browse_container/
-              record[:container] = search(href)
-            else
-              result = href.match(/(\w*)\/(\w*)\/(\w*)\/([\w|-]*)/)
-
-              record[:media_file] = (result.size > 2) ? result[3] : ""
-              record[:english_name] = (result.size > 3) ? result[4] : ""
-            end
-
-            list << record
-          end
-        end
-      end
-    end
-
-    list
-  end
-
-  def display_results items
-    items.each_with_index do |item1, index1|
-
-      if item1[:container].nil?
-        puts "#{index1+1}. #{item1[:english_name]} --- #{item1[:media_file]} --- #{item1[:name]}"
-      else
-        puts "#{index1+1}. #{item1[:name]}"
-
-        item1[:container].each_with_index do |item2, index2|
-          puts "    #{index1+1}.#{index2+1}. #{item2[:english_name]} --- #{item2[:media_file]} --- #{item2[:name]}"
-        end
-      end
-    end
-  end
-
-  def grab_movie_link link, cookie, url
-    result = link.match(/(\w*)\/(\w*)\/(\w*)\/([\w|-]*)/)
-
-    media_file = (not result.nil? and result.size > 2) ? result[3] : ""
-
-    media_info = request_media_info media_file, cookie, url
-
-    mms_link(media_info)
-  end
-  
-  private
-
-  def request_media_info media_file, cookie, url
-    url = URI.parse(url)
-    conn = Net::HTTP.new(url.host, url.port)
-    
-    headers = { 'Cookie' => cookie }
-  
-    request = Net::HTTP::Post.new(url.request_uri, headers)
-  
-    request.set_form_data(
-      { 'action' => 'start_video', 'bitrate' => '600',
-        'media_file'=> media_file, 'replay' => '1', 'skin' => 'JSON'
-      }
-    )
-  
-    response = conn.request(request)
-  
-    response.body
-  end
-
-  def mms_link media_info
-    JSON.parse(media_info)["PARAMETERS"]["REDIRECT_URL"]
-  end
-end