howdy 0.1.6 → 0.2.0

data/README.rdoc

@@ -4,7 +4,6 @@ Dead easy command line dictionary.
 
 = Installation
 
-    gem sources -a http://gemcutter.org
     gem install howdy
 
 = Description
@@ -18,17 +17,29 @@ Howdy enables "how" binary in your system. If for example you want to know what
     2.showing or characterized by awe.
     3.Slang. very impressive: That new white convertible is totally awesome. 
 
-    $ how -c 
+    $ how -c awesome 
     
     1. dictionary.com - English dictionary
     2. urbandictionary.com - Slang dictionary
     3. dict.pl - Polish-English dictionary
     4. ling.pl - Polish-English dictionary
     Choose [1..4]: 3
-    Seach in dict.pl: awesome
     
     fantastyczny; zachwycający; niesamowity
 
+= Configuration
+
+Configuration file is created on first howdy run.
+It's available in $HOME/.howdy
+
+Currently it handles only 1 option: default_dictionary
+Examples:
+    default_dictionary = dictionary.com
+Or
+    default_dictionary = urbandictionary.com
+
+Just pass one of available dictionaries listed below.
+
 = Available Dictionaries
 
 * http://urbandictionary.com

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.2.0

data/howdy.gemspec

@@ -1,22 +1,23 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{howdy}
-  s.version = "0.1.6"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mlomnicki"]
-  s.date = %q{2010-02-17}
+  s.date = %q{2010-03-12}
   s.default_executable = %q{how}
   s.description = %q{Howdy is a tool that allows querying web dictionaries from a command line.}
   s.email = %q{michal.lomnicki@gmail.com}
   s.executables = ["how"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.rdoc",
+     "TODO"
   ]
   s.files = [
     ".document",
@@ -30,12 +31,14 @@ Gem::Specification.new do |s|
      "howdy.gemspec",
      "lib/howdy.rb",
      "lib/howdy/base.rb",
+     "lib/howdy/config.rb",
      "lib/howdy/core_ext/ruby/string/integer.rb",
      "lib/howdy/core_ext/ruby/string/underscore.rb",
      "lib/howdy/dictionaries/dict_pl.rb",
      "lib/howdy/dictionaries/dictionary_com.rb",
      "lib/howdy/dictionaries/ling_pl.rb",
      "lib/howdy/dictionaries/urban_dictionary_com.rb",
+     "lib/howdy/templates/howdy",
      "lib/howdy/ui.rb",
      "spec/howdy_spec.rb",
      "spec/spec_helper.rb"
@@ -66,3 +69,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
+

data/lib/howdy/base.rb

@@ -10,6 +10,10 @@ module Howdy # :nodoc
   # Howdy::Dictionary exposes accessors of dictionaries collection.
   module Dictionary
 
+    def self.config
+      @@config ||= Config.new.parse
+    end
+
     # Returns current dictionary class
     def self.current
       @@dictionary ||= default
@@ -23,7 +27,7 @@ module Howdy # :nodoc
 
     # Returns default dictionary
     def self.default
-      DictionaryCom
+      @@default ||= (find_by_label(config[:default_dictionary]) || DictionaryCom)
     end
 
     # Returns array of available dictionaries

data/lib/howdy/config.rb

@@ -0,0 +1,69 @@
+require 'fileutils'
+
+module Howdy
+
+  # Howdy configuration. 
+  # Configuration file points to $HOME/.howdy by default
+	class Config < Hash
+
+		attr_reader :file
+
+    # Path of default configuration file
+    # It's copied to user directory if config file doesn't exist.
+		TEMPLATE_PATH = File.join(File.dirname(__FILE__), 'templates', 'howdy')
+
+		def	initialize(file = self.class.config_path)
+			@file = file
+		end
+
+    # Parse file and associate options to self
+    #   example:
+    #     howdy.conf:
+    #       default_dictionary = dictionary.com
+    #       verbose = true
+    #
+    #     c = Config.new('howdy.conf')
+    #     c.parse
+    #     c.inspect
+    #       { :default_dictionary => 'dictionary.com', :verbose => 'true' }
+		def	parse
+			readlines.each do |line|
+				next if line =~ /\s*#/
+				key, value = line.split('=', 2).map! { |arg| arg.strip }
+        self[key.to_sym] = value
+			end
+      self
+		end
+
+    # path of configuration file
+    #   example: /home/stella/.howdy
+    def	self.config_path
+      @config_path ||= File.join(root_config_path, config_filename) 
+    end
+
+    # root directory of config file
+    #   example: /home/stella
+    def	self.root_config_path
+      @root_config_path ||= (ENV['HOME'] || '') 
+    end
+
+    # filename of configuration file
+    #   example: .howdy
+    def	self.config_filename
+      @config_filename ||= ".howdy".freeze
+    end
+
+    protected
+		def	readlines
+			config = File.readable?(@file) ? @file : self.class.create_config!
+			return File.readlines(config)
+		end
+
+		def self.create_config!
+			FileUtils.cp(TEMPLATE_PATH, config_path)
+			return config_path
+		end
+
+	end
+
+end

data/lib/howdy/dictionaries/dictionary_com.rb

@@ -9,8 +9,10 @@ module Howdy
       description 'English dictionary'
 
       def parse
-        document.css('div.KonaBody div.results_content table.luna-Ent tr').each do |row|
-          result << row.search('td').children.collect { |e| e.content }.join
+        document.css('div.KonaBody div.results_content div.luna-Ent div.body div.luna-Ent').each do |row|
+          index = row.search('span.dnindex').children.collect { |e| e.content }.join
+          data  = row.search('div.dndata').children.collect { |e| e.content }.join
+          result << index + data
         end
       end
 

data/lib/howdy/templates/howdy

@@ -0,0 +1 @@
+default_dictionary = dictionary.com

data/lib/howdy/ui.rb

@@ -16,6 +16,7 @@ module Howdy
       
       # prints list of available dictionaries 
       def list_dictionaries
+        display "Available dictionaries:"
         Dictionary.available.each_with_index do |dict, idx|
           display " #{idx+1}. #{dict.dict_label} - #{dict.dict_description}"
         end
@@ -25,7 +26,7 @@ module Howdy
       # Returns captured data
       def prompt(message)
         print "#{message}: "
-        gets
+        $stdin.gets
       end
 
       def choose_dictionary

data/lib/howdy.rb

@@ -2,6 +2,7 @@ $: << File.join(File.dirname(__FILE__), 'howdy')
 
 require 'core_ext/ruby/string/underscore'
 require 'core_ext/ruby/string/integer'
+require 'config'
 require 'base'
 require 'ui'
 Dir[File.join(File.dirname(__FILE__), 'howdy', 'dictionaries', '*.rb')].each { |dict| require dict }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: howdy
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors: 
 - mlomnicki
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 +01:00
+date: 2010-03-12 00:00:00 +01:00
 default_executable: how
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,7 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.rdoc
+- TODO
 files: 
 - .document
 - .gitignore
@@ -53,12 +54,14 @@ files:
 - howdy.gemspec
 - lib/howdy.rb
 - lib/howdy/base.rb
+- lib/howdy/config.rb
 - lib/howdy/core_ext/ruby/string/integer.rb
 - lib/howdy/core_ext/ruby/string/underscore.rb
 - lib/howdy/dictionaries/dict_pl.rb
 - lib/howdy/dictionaries/dictionary_com.rb
 - lib/howdy/dictionaries/ling_pl.rb
 - lib/howdy/dictionaries/urban_dictionary_com.rb
+- lib/howdy/templates/howdy
 - lib/howdy/ui.rb
 - spec/howdy_spec.rb
 - spec/spec_helper.rb