wduck 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c7073a84f233c73cf2b99d9665f951b6461e181
-  data.tar.gz: 6cbc80688ada7c246acc4fa9d5b34cee716f0d7d
+  metadata.gz: a748a3abea56ff5c89d3809a5cead09d1c56ef79
+  data.tar.gz: a577e6afd96eb4a5dd1a14935fb572646332f022
 SHA512:
-  metadata.gz: dc6d721d28011293a99e3713e118609f8cd446470384a82cb38b68e7d75e285d1457b4987c2cad1412de40e2529714620eb6a7fcb19fcfb598f6a0786c990e34
-  data.tar.gz: 70a777a34f896d818bfb908ce957f62546ddc764c2392d0a70d8a0dec334634ae0c1ce6168df66b7d02cef9cae402d690faf431a31101d2dac6269ab39b9ea67
+  metadata.gz: 5d1daea712b6d485697941a8ec45698a55104718b1c6a25e2925e9dd544a7ba20aa55c9611fd3daa8c65ced24475ae1cd4885eed7d0aa85b8faf28b7f4d336b9
+  data.tar.gz: 434dd0d45f2ce43f4753d3082dde24e2dd2c96c98f0d6a241c1ba30d4f6ac657b95a78ab482e66e0f14f2b3d46379df3d2355f817f003bd74cb5e820bac2a8e1

data/lib/wduck/duck.rb

@@ -7,25 +7,17 @@ module Wduck
       include Wduck::DuckHelper
 
       def initialize(query)
-        @parsed_data = get_json_data(query)
+        @search_data = DuckHelper::SearchData.new(query)
       end
 
       def result
-        heading(@parsed_data)
-        source(@parsed_data)
+        @search_data.heading # eg: Linus Torvalds
+        @search_data.source # eg: Wikipedia
 
-        if @parsed_data["Answer"].empty?
-          abstract_text(@parsed_data)
-
-          if @parsed_data["AbstractText"].empty?
-            @parsed_data["RelatedTopics"].each_with_index do |result, index|
-              result_text(index, result)
-            end
-          end
-
-        else
-          answer(@parsed_data)
-        end
+        @search_data.answer # Helsiniki Kernel Hacker
+        # when results has too options like Ruby: a lang, a gem etc
+        @search_data.abstract
+        @search_data.topics_result #the all related results/topics
       end
 
     end

data/lib/wduck/duck_helper.rb

@@ -7,45 +7,74 @@ module Wduck
   module DuckHelper
 
     API_URL = "https://api.duckduckgo.com/"
-    FORMAT = "json"
+    FORMAT  = "json"
 
-    def get_json_data(query)
-      http = HTTPClient.new(agent_name: "ddg.rb")
-      args = { q: query, format: FORMAT }
-      data = http.get_content(API_URL, args )
-      JSON.parse data
-    end
+    class SearchData
 
-    def make_sane(value)
-      # remove html tags, convert to proper utf codes
+      attr_reader :answer_data
+      def initialize(query)
+        @parsed_data     = get_json_data(query)
+        @answer_data = check_data("Answer")
+        @abstract_text   = check_data("AbstractText")
+        @related_topics  = check_data("RelatedTopics")
+        @heading         = check_data("Heading")
+        @abstract_source = check_data("AbstractSource")
+      end
 
-      coder = HTMLEntities.new
-      re = /<("[^"]*"|'[^']*'|[^'">])*>/
-      coder.decode(value.gsub(re, '')) #remove html tags, then make proper unicode conversion
-    end
+      def heading
+        puts "Heading".color(:cyan).underline
+        display(@heading, :red )
+        puts ""
+      end
 
-    def heading(parsed_data)
-      unless parsed_data["Heading"].empty?
-        puts make_sane(parsed_data["Heading"]).foreground(:red).background(:white)
+      def source
+        display(@abstract_source, :yellow)
+        puts " "
       end
-    end
 
-    def source(parsed_data)
-      unless parsed_data["AbstractSource"].empty?
-        puts "Source: #{make_sane(parsed_data["AbstractSource"])}".color(:yellow)
+      def abstract
+        display(@abstract_text, :green)
       end
-    end
 
-    def abstract_text(parsed_data)
-      puts make_sane(parsed_data["AbstractText"]).color(:green)
-    end
+      def topics_result
+        if @related_topics
+          puts ""
+          puts "Related Topics".color(:white).underline
+          puts ""
+          @related_topics.each do |result|
+            puts "#{display(result["Text"], :green)}" if result["Text"]
+          end
+        end
+      end
 
-    def result_text(index, result)
-      puts "#{(index + 1)},  #{make_sane(result["Text"]).color(:green)}" if result["Text"]
-    end
+      def answer
+        display(@answer_text, :yellow)
+      end
+
+      private
+
+      def get_json_data(query)
+        http = HTTPClient.new(agent_name: "ddg.rb")
+        args = { q: query, format: FORMAT }
+        data = http.get_content(API_URL, args )
+        JSON.parse data
+      end
+
+      def check_data(data)
+        @parsed_data[data].empty? ? nil : @parsed_data[data]
+      end
+
+      def display(type, color)
+        puts make_sane(type).color(color) if type
+      end
+
+      def make_sane(value)
+        # remove html tags, convert to proper utf codes
+        coder = HTMLEntities.new
+        re = /<("[^"]*"|'[^']*'|[^'">])*>/
+        coder.decode(value.gsub(re, '')) #remove html tags, then make proper unicode conversion
+      end
 
-    def answer(parsed_data)
-      puts make_sane(parsed_data["Answer"]).color(:green)
     end
   end
 

data/lib/wduck/version.rb

@@ -1,3 +1,3 @@
 module Wduck
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wduck
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Vysakh Sreeenivasan
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: aruba
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,27 +67,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: htmlentities
+  name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.7.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: gli
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: '0'
 description: A command line tool to get instant zero click result from ddg
 email: diplomatv@gmail.com
 executables: