dictuby 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc80c16353302eba29dcfa40f96845266184e259
-  data.tar.gz: 29dde9645958d0422f3417a8a4ed653e5a2825a5
+  metadata.gz: 2aeb4c2f27ea83409959efad3e7f12cbd093a164
+  data.tar.gz: 01c419e1786eee5c74842eab5e0b7d9b1f945c09
 SHA512:
-  metadata.gz: 0599c314505bc3f8c871a0a1a6b0e09913fcfa4d08bac596e4c48e022d55a750bbc811ac77730ca672a2d3ff567d330ab9a4047ff72ba581c4ce610aafe462ee
-  data.tar.gz: 9e208ee3b4713f0b7a79b46b675817f23b5ac11bef6630636f754b3f58acc3d19d6bd3390ad8c3718baa8ce2c2bb9633d54817e682e0f0d71cf9918eb31f8ab9
+  metadata.gz: 855f378fb801af841b83a93a00917e385290b64ba59e4e719648c7211d0758c16b0c79b8e1d27287ff003c1d101ca938eacbec4858af49f83399ccb91c6eae2a
+  data.tar.gz: f4f8eb83d92da3c86baba3ad2eed81c3295a4de5618b24a0ed0b9d7f452853c1fc044d85b1b123b9b7e3991c44fa5059ee0f586f6e45f366a2dc8836fb461909

data/lib/dictuby.rb

@@ -10,5 +10,6 @@ require 'dictuby/runner'
 require 'dictuby/args_parser'
 require 'dictuby/config'
 require 'dictuby/online_dictionary'
-require 'dictuby/sources/slovnik_azet_sk'
+require 'dictuby/sources/slovnik_sk'
 require 'dictuby/sources/slovnik_cz'
+require 'dictuby/sources/dict_cc'

data/lib/dictuby/args_parser.rb

@@ -20,7 +20,7 @@ module Dictuby
                     '--list-dicts',
                     'List available dictionaries'
                 ) do |b|
-                    options[:list] = b
+                    options[:list_dicts] = b
                 end
 
                 o.on(
@@ -38,6 +38,30 @@ module Dictuby
                 ) do |d| 
                     options[:set] = d
                 end
+
+                o.on(
+                    '-a',
+                    '--list-sources',
+                    'List available sources'
+                ) do |b|
+                    options[:list_sources] = b
+                end
+
+                o.on(
+                    '-e SOURCE_NAME',
+                    '--enable-source SOURCE_NAME',
+                    'Enable source with specified name'
+                ) do |s| 
+                    options[:enable] = s
+                end
+
+                o.on(
+                    '-d SOURCE_NAME',
+                    '--disable-source SOURCE_NAME',
+                    'Enable source with specified name'
+                ) do |s| 
+                    options[:disable] = s
+                end
                 o.on('QUERY') {}
                 o.parse!
             end

data/lib/dictuby/config.rb

@@ -15,6 +15,7 @@ module Dictuby
             if !@settings
                 @settings = {}
                 set('dictionary', @default_dict)
+                set('disabled_sources', [])
             end
         end
 

data/lib/dictuby/online_dictionary.rb

@@ -1,6 +1,7 @@
 
 module Dictuby
     class OnlineDictionary
+        @name = ''
         @url = ''
         @dicts = {}
 
@@ -15,6 +16,10 @@ module Dictuby
             self.process(page, query)
         end
 
+        def self.name
+            @name
+        end
+
         def self.dicts
             @dicts
         end

data/lib/dictuby/runner.rb

@@ -10,15 +10,22 @@ module Dictuby
             @config = DictubyConfig.new
             @args = args
 
-            @sources = [SlovnikAzetSK, SlovnikCZ]
+            @sources = [SlovnikSK, SlovnikCZ, DictCC]
+            @source_names = @sources.inject([]) {|r,s| r << s.name}
+            @dsources = @config.get('disabled_sources') || []
 
-            @dicts = @sources.inject([]) {|r, p| r << p.dicts.keys}
+            @dicts = @sources.inject([]) do |r, s|
+                r << s.dicts.keys unless @dsources.include?(s.name)
+                r
+            end
             @dicts.flatten!.sort!
         end
 
         def run
-            if @options[:list]
-                @dicts.each {|d| puts d}
+            if @options[:list_dicts]
+                @dicts.each_slice(6) do |d1, d2, d3, d4, d5, d6|
+                    puts "#{d1}  #{d2}  #{d3}  #{d4}  #{d5} #{d6}"
+                end
             elsif @options[:set]
                 if @dicts.include?(@options[:set])
                     @config.set('dictionary', @options[:set])
@@ -27,6 +34,33 @@ module Dictuby
                 end
             elsif @options[:get]
                 puts @config.get('dictionary')
+            elsif @options[:list_sources]
+                @source_names.each do |name|
+                    puts "%{name} - %{status}" % {
+                        :name => name,
+                        :status => @dsources.include?(name) ? 'Disabled' : 'Enabled'
+                    }
+                end
+            elsif @options[:enable]
+                if !@source_names.include?(@options[:enable])
+                    puts 'Invalid source'
+                elsif @dsources.include?(@options[:enable])
+                    @dsources.delete(@options[:enable])
+                    @config.set('disabled_sources', @dsources)
+                    puts 'Source enabled'
+                else
+                    puts 'Source already enabled'
+                end
+            elsif @options[:disable]
+                if !@source_names.include?(@options[:disable])
+                    puts 'Invalid source'
+                elsif @dsources.include?(@options[:disable])
+                    puts 'Source already disabled'
+                else
+                    @dsources << @options[:disable]
+                    @config.set('disabled_sources', @dsources)
+                    puts "Source disabled"
+                end
             else
                 if @args.size == 1
                     dict, query = @config.get('dictionary'), @args[0]

data/lib/dictuby/sources/dict_cc.rb

@@ -0,0 +1,35 @@
+
+module Dictuby
+    class DictCC < OnlineDictionary
+        @name = 'dict.cc'
+        @dicts = {
+            'en-es' => 'en-es',
+            'es-en' => 'es-en',
+            'en-de' => 'en-de',
+            'de-en' => 'de-en',
+            'en-fr' => 'en-fr',
+            'fr-en' => 'fr-en',
+            'en-it' => 'en-it',
+            'it-en' => 'it-en',
+            'en-fi' => 'en-fi',
+            'fi-en' => 'fi-en',
+        }
+        @url = 'http://%{dict}.dict.cc/?s=%{query}'
+
+        def self.process(page, query)
+            page.xpath(
+                '//tr[starts-with(@id, "tr")]'
+            ).inject([]) do |result, tr|
+                tds = tr.xpath('td[@dir="ltr"]')
+
+                left = tds[0].xpath('a')[0].text.normalize
+                right = tds[1].xpath('a')[0].text.normalize
+
+                return result if left != query && right != query
+
+                result << left == query ? right : left
+                result
+            end
+        end
+    end
+end

data/lib/dictuby/sources/slovnik_cz.rb

@@ -5,14 +5,14 @@ module Dictuby
         @dicts = {
             'en-cz' => 'encz.en',
             'cz-en' => 'encz.cz',
-            'ge-cz' => 'gecz.ge',
-            'cz-ge' => 'gecz.cz',
+            'de-cz' => 'gecz.ge',
+            'cz-de' => 'gecz.cz',
             'fr-cz' => 'frcz.fr',
             'cz-fr' => 'frcz.cz',
             'it-cz' => 'itcz.it',
             'cz-it' => 'itcz.cz',
-            'sp-cz' => 'spcz.sp',
-            'cz-sp' => 'spcz.cz',
+            'es-cz' => 'spcz.sp',
+            'cz-es' => 'spcz.cz',
         }
         @url = 'http://slovnik.cz/bin/mld.fpl?vcb=%{query}&dictdir=%{dict}&lines=30&js=0'
 

data/lib/dictuby/sources/{slovnik_azet_sk.rb → slovnik_sk.rb}

@@ -1,16 +1,16 @@
 
 module Dictuby
-    class SlovnikAzetSK < OnlineDictionary
-        @name = 'slovnik.azet.sk'
+    class SlovnikSK < OnlineDictionary
+        @name = 'slovnik.sk'
         @dicts = {
             'en-sk' => 'anglicko-slovensky',
             'sk-en' => 'slovensko-anglicky',
-            'ge-sk' => 'nemecko-slovensky',
-            'sk-ge' => 'slovensko-nemecky',
+            'de-sk' => 'nemecko-slovensky',
+            'sk-de' => 'slovensko-nemecky',
             'fr-sk' => 'francuzsko-slovensky',
             'sk-fr' => 'slovensko-francuzsky',
-            'sp-sk' => 'spanielsko-slovensky',
-            'sk-sp' => 'slovensko-spanielsky',
+            'es-sk' => 'spanielsko-slovensky',
+            'sk-es' => 'slovensko-spanielsky',
             'hu-sk' => 'madarsko-slovensky',
             'sk-hu' => 'slovensko-madarsky',
             'it-sk' => 'taliansko-slovensky',
@@ -23,16 +23,14 @@ module Dictuby
         def self.process(page, query)
             query = query.normalize
             left = page.xpath('//table[1]//span')[0].text rescue nil
-            left.normalize!
+            left.normalize! unless left.nil?
             return [] unless left == query
 
-            right = page.xpath(
+            page.xpath(
                 '//table[1]//tr/td[@class="do"]/span'
             ).inject([]) {
                 |r, e| r << e.text
             }
-
-            right
         end
     end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: dictuby
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Rene Klacan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-01 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies: []
-description: Command line online dictionary tool written in ruby
+description: Command line online dictionary tool written in Ruby
 email: rene.klacan@gmail.com
 executables:
 - dictuby
@@ -20,13 +20,14 @@ files:
 - lib/dictuby.rb
 - lib/dictuby/string.rb
 - lib/dictuby/online_dictionary.rb
-- lib/dictuby/sources/slovnik_azet_sk.rb
+- lib/dictuby/sources/slovnik_sk.rb
 - lib/dictuby/sources/slovnik_cz.rb
+- lib/dictuby/sources/dict_cc.rb
 - lib/dictuby/config.rb
 - lib/dictuby/args_parser.rb
 - lib/dictuby/runner.rb
 - bin/dictuby
-homepage: https://rubygems.org/gems/dictuby
+homepage: https://github.com/simpliplant/dictuby
 licenses:
 - MIT
 metadata: {}