gingerice 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6087ed695413b5137a1bbb35d6c1c83a0bad3f3e
-  data.tar.gz: 41acc2f5e49bc2552b7836abd17effdf5629d647
+  metadata.gz: 61b0c6b84bf3a4b75773816e81164865fae668c1
+  data.tar.gz: b396823b9d4551782b9f0e4bfb2b5343eef351d8
 SHA512:
-  metadata.gz: a5a6e945f6fe1150fe33ea6cff165975c199f198e9560918472f7b5c68a3527b72617f372403266ba79dace2115c5c1e18802e656f494029d52efb58610f8583
-  data.tar.gz: 3e16022c40bd5ccdbe91913e1ac3b8f5e95de6883f2868c46ec4da4d3026ce5c89081d0b4aa9204d43a9cd344da14524c7918ea4a04b9a132304142bbff8f141
+  metadata.gz: 25f1bcbbb7ff8afef7873339bc4ea24531cb6777440b9b2f54e6f6b3288c45fdf7badbec86a5c92b854ff3c2d3e75e46270a9f59ac7ee6ecb60ffa72bd3d0de4
+  data.tar.gz: 81f866843f30574453518fee138aec29737e09c0a3d75bb79d3b4f0370157ff80c683ce288b69df6c2e5265dd5f3ced47392fb0ad87b175a0577ed2629b88049

data/bin/gingerice

@@ -4,6 +4,10 @@ $:.unshift(File::join(File::dirname(File::dirname(__FILE__)), "lib"))
 
 require 'gingerice/command'
 
-command = Gingerice::Command.new(ARGV)
-command.execute
+begin
+  command = Gingerice::Command.new(ARGV)
+  command.execute
+rescue Exception => e
+  puts e.message
+end
 

data/lib/gingerice.rb

@@ -1,2 +1 @@
-require 'gingerice/version'
 require 'gingerice/parser'

data/lib/gingerice/command.rb

@@ -1,7 +1,6 @@
 require 'optparse'
 require 'awesome_print'
-require 'gingerice/parser'
-require 'gingerice/version'
+require 'gingerice'
 
 module Gingerice
   class Command
@@ -13,10 +12,34 @@ module Gingerice
       @args << '-h' if @args.empty?
 
       @options     = Gingerice::Parser.default_options.merge({ :verbose => false })
-      @args_parser = args_parser
+      @args_parser = parse_args
     end
 
-    def args_parser
+    def execute
+      if options.has_key?(:show)
+
+        case options[:show]
+        when :help
+          puts args_parser
+        when :version
+          puts "Gingerice: #{Gingerice::VERSION}"
+        end
+
+      else
+        parser_opts = options.select { |k, _| Parser.default_options.keys.include?(k) }
+        parser      = Parser.new(parser_opts)
+        response    = parser.parse(args.last)
+
+        if options[:verbose]
+          ap response
+        else
+          puts response["result"]
+        end
+      end
+    end
+
+    protected
+    def parse_args
       OptionParser.new do |opt|
         opt.banner = 'Usage: gingerice [options] "some texts"'
 
@@ -51,29 +74,6 @@ module Gingerice
         opt.parse!(args)
       end
     end
-
-    def execute
-      if options.has_key?(:show)
-
-        case options[:show]
-        when :help
-          puts args_parser
-        when :version
-          puts "Gingerice: #{Gingerice::VERSION}"
-        end
-
-      else
-        parser_opts = options.select { |k, _| Parser.default_options.keys.include?(k) }
-        parser      = Parser.new(parser_opts)
-        response    = parser.parse(args.last)
-
-        if options[:verbose]
-          ap response
-        else
-          puts response["result"]
-        end
-      end
-    end
   end
 end
 

data/lib/gingerice/error.rb

@@ -0,0 +1,5 @@
+module Gingerice
+  class Error < StandardError; end
+  class ConnectionError < Error; end
+  class ParseError < Error; end
+end

data/lib/gingerice/parser.rb

@@ -1,6 +1,8 @@
 require 'open-uri'
 require 'addressable/uri'
 require 'json'
+require 'gingerice/version'
+require 'gingerice/error'
 
 module Gingerice
   class Parser
@@ -10,32 +12,29 @@ module Gingerice
     DEFAULT_LANG        = 'US'
 
     attr_accessor :lang, :api_key, :api_version, :api_endpoint
+    attr_reader   :text, :raw_response, :result
 
     def initialize(options = {})
       merge_options(options).each do |key, value|
         send("#{key}=", value)
       end
+
+      @result      = ''
+      @corrections = []
     end
 
     def parse(text)
-      uri = Addressable::URI.parse(api_endpoint)
-      uri.query_values = request_params.merge({ 'text' => text })
-
-      begin
-        open(uri) do |stream|
-          response_processor(text, stream.read)
-        end
-      rescue Exception => e
-        raise StandardError, e.message
-      end
+      @text = text
+      perform_request
+      process_response
     end
 
     def self.default_options
       {
-        :api_endpoint => Gingerice::Parser::GINGER_API_ENDPOINT,
-        :api_version  => Gingerice::Parser::GINGER_API_VERSION,
-        :api_key      => Gingerice::Parser::GINGER_API_KEY,
-        :lang         => Gingerice::Parser::DEFAULT_LANG
+        :api_endpoint => GINGER_API_ENDPOINT,
+        :api_version  => GINGER_API_VERSION,
+        :api_key      => GINGER_API_KEY,
+        :lang         => DEFAULT_LANG
       }
     end
 
@@ -48,37 +47,67 @@ module Gingerice
       Parser.default_options.merge(options)
     end
 
-    def response_processor(text, content)
-      data = JSON.parse(content)
-      i = 0
-      result = ''
-      corrections = []
-
-      data.fetch('LightGingerTheTextResult', []).each do |r|
-        from = r['From']
-        to   = r['To']
-
-        if i <= from
-          result += text[i..from-1] unless from.zero?
-          result += r['Suggestions'][0]['Text']
-
-          corrections << {
-            'text'       => text[from..to],
-            'correct'    => r['Suggestions'][0]['Text'],
-            'definition' => r['Suggestions'][0]['Definition'],
-            'start'      => from,
-            'length'     => to.to_i - from.to_i + 1
-          }
-        end
+    def perform_request
+      uri = Addressable::URI.parse(api_endpoint)
+      uri.query_values = request_params.merge({ 'text' => text })
 
-        i = to+1
+      begin
+        open(uri) do |stream|
+          @raw_response = stream.read
+        end
+      rescue Exception => _
+        raise ConnectionError, "ERROR: Couldn't connect to API endpoint (#{api_endpoint})"
       end
+    end
 
-      if i < text.length
-        result += text[i..-1]
+    def process_response
+      begin
+        json_data = JSON.parse(raw_response)
+
+        i = 0
+
+        json_data.fetch('LightGingerTheTextResult', []).each do |data|
+          process_suggestions(i, data)
+
+          i = data['To']+1
+        end
+
+        if i < text.length
+          @result += text[i..-1]
+        end
+
+        {
+          'text'        => text,
+          'result'      => result,
+          'corrections' => @corrections
+        }
+      rescue Exception => _
+        raise ParseError, "ERROR: We receive invalid JSON format!"
       end
+    end
+
+    def process_suggestions(i, data)
+      from = data['From']
+      to   = data['To']
+
+      if i <= from
+        @result += text[i..from-1] unless from.zero?
+        @result += data['Suggestions'][0]['Text']
+
+        definition = data['Suggestions'][0]['Definition']
 
-      { 'text' => text, 'result' => result, 'corrections' => corrections}
+        if definition.respond_to? :empty?
+          definition = nil if definition.empty?
+        end
+
+        @corrections << {
+          'text'       => text[from..to],
+          'correct'    => data['Suggestions'][0]['Text'],
+          'definition' => definition,
+          'start'      => from,
+          'length'     => to - from + 1
+        }
+      end
     end
 
     def request_params

data/lib/gingerice/version.rb

@@ -1,3 +1,3 @@
 module Gingerice
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/test/test_gingerice.rb

@@ -21,6 +21,7 @@ module Kernel
 end
 
 require 'test/unit'
+require 'gingerice'
 require 'gingerice/command'
 
 class TestGingerice < Test::Unit::TestCase
@@ -60,11 +61,6 @@ class TestGingerice < Test::Unit::TestCase
     assert_equal 5, result['corrections'].first['length']
   end
 
-  def test_exceptions
-    exception = assert_raise(StandardError) { @custom_parser.parse('Hllo') }
-    assert_equal 'getaddrinfo: Name or service not known', exception.message
-  end
-
   def test_command_simple_output
     output = capture_stdout do
       command = Gingerice::Command.new(["Edwards will be sck yesterday"])
@@ -124,5 +120,19 @@ class TestGingerice < Test::Unit::TestCase
 
     assert_equal "ID", options[:lang]
   end
+
+  def test_request_exceptions
+    exception = assert_raise(Gingerice::ConnectionError) { @custom_parser.parse('Hllo') }
+    assert_equal "ERROR: Couldn't connect to API endpoint (http://example.id/)", exception.message
+  end
+
+  def test_parse_error_exceptions
+    invalid_parser = Gingerice::Parser.new({
+      api_endpoint: 'http://subosito.com/',
+    })
+
+    exception = assert_raise(Gingerice::ParseError) { invalid_parser.parse('Hllo') }
+    assert_equal 'ERROR: We receive invalid JSON format!', exception.message
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gingerice
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Alif Rachmawadi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,6 +113,7 @@ files:
 - gingerice.gemspec
 - lib/gingerice.rb
 - lib/gingerice/command.rb
+- lib/gingerice/error.rb
 - lib/gingerice/parser.rb
 - lib/gingerice/version.rb
 - test/test_gingerice.rb