tika-client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a520c2018bc2474f7006b3dc2defca7ba0dd051
-  data.tar.gz: 33a1f20b73f45f6f4c3f46a58136569041dac139
+  metadata.gz: 3bb963d542e83e8d690b3e243bf05a155ec22391
+  data.tar.gz: 7776e59b7a1210326b8006f3891dfb78f14cf9c8
 SHA512:
-  metadata.gz: a2adeecc540ee13117e32848226d8616f833a82103caa7ebb6d09185948c22dc753801499e9f3c355bc43cf7fef8d7cf6372737462a7cfcd60692a04cb42ce1b
-  data.tar.gz: 6461f28df9c2975bb0e707dff6fac55ec1141b5fdd157bafa57c00d298491759c2392d7a571ab814b863e463c0188686053e3267e43428cce3a093d32a915897
+  metadata.gz: 09198bec1ef7e2f79d0bee0b2b7762dc438ef3e5f821f52c000f297526a82d6e145d46a8e5b6ad17c9244f1dda5a978e96c9cb0bdc0aacf90269438165f16a5a
+  data.tar.gz: e058fd18fb370a579d21a58a1c227313d81000bc5a6e27344fb42a0c6a14c6a89644070fc435a5f6a68d1432f42db2ae77ee84848565c981fadaf98f16a08e2e

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/tika/client.rb

@@ -1,11 +1,10 @@
 require_relative "configuration"
-require_relative "api"
-require_relative "request"
-require "forwardable"
+require_relative "requests"
 
 module Tika
   class Client
-    extend Forwardable
+
+    include Requests
 
     class << self
       def config
@@ -17,31 +16,29 @@ module Tika
       end
     end
 
-    attr_accessor :host, :port, :api
-    def_delegators :api, :endpoint, :has_endpoint?
+    attr_reader :host, :port
 
     def initialize(opts={})
       @host = opts.fetch(:host, config.host)
       @port = opts.fetch(:port, config.port)
-      @api = Api.new
     end
 
-    def config
-      self.class.config
+    def get_text(opts={})
+      GetTextRequest.execute(connection, opts)
     end
 
-    def connection
-      @connection ||= Net::HTTP.new(host, port)
+    def get_metadata(opts={})
+      GetMetadataRequest.execute(connection, opts)
     end
 
-    def execute(name, opts={})
-      request = Request.new(connection, endpoint(name))
-      request.execute(opts)
+    private
+
+    def config
+      self.class.config
     end
 
-    def method_missing(name, *args)
-      return execute(name, *args) if has_endpoint?(name)
-      super
+    def connection
+      @connection ||= Net::HTTP.new(host, port)
     end
 
   end

data/lib/tika/endpoints.rb

@@ -0,0 +1,18 @@
+require "net/http"
+
+module Tika
+  module Endpoints
+
+    PUT = Net::HTTP::Put
+    GET = Net::HTTP::Get
+
+    JSON = "application/json"
+    TEXT = "text/plain"
+    
+    Endpoint = Struct.new(:request_method, :path, :response_format)
+
+    GetTextEndpoint     = Endpoint.new(PUT, "/tika", TEXT)
+    GetMetadataEndpoint = Endpoint.new(PUT, "/meta", JSON)
+
+  end
+end

data/lib/tika/request.rb

@@ -1,26 +1,27 @@
 require "uri"
 require "net/http"
 require "delegate"
-# require "mime-types"
 
 module Tika
-  # Executes an API method
   class Request < SimpleDelegator
 
-    attr_reader :connection # , :endpoint, :http_request
+    class << self
+      attr_accessor :endpoint
+    end
+
+    attr_reader :connection
     
-    # def self.execute(*args)
-    #   request = new(*args)
-    #   yield request if block_given?
-    #   request.execute
-    # end
+    def self.execute(connection, opts={})
+      request = new(connection)
+      yield request if block_given?
+      request.execute(opts)
+    end
 
-    def initialize(connection, endpoint)
+    def initialize(connection)
       @connection = connection
-      @endpoint = endpoint
-      uri = URI::HTTP.build(host: connection.address, port: connection.port, path: endpoint.path)
-      super endpoint.request_method.new(uri)
-      self["Accept"] = endpoint.response_format
+      super build_request
+      set_defaults
+      post_initialize
     end
 
     def execute(opts={})
@@ -30,9 +31,30 @@ module Tika
           self.content_length = file.size
         end
         self.content_type = opts[:content_type] if opts[:content_type]
+        yield self if block_given?
         conn.request(__getobj__)
       end
     end
 
+    def endpoint
+      self.class.endpoint
+    end
+
+    def uri
+      @uri ||= URI::HTTP.build(host: connection.address, port: connection.port, path: endpoint.path)
+    end
+
+    private
+
+    def post_initialize; end
+
+    def build_request
+      endpoint.request_method.new(uri)
+    end
+
+    def set_defaults
+      self["Accept"] = endpoint.response_format
+    end
+
   end
 end

data/lib/tika/requests.rb

@@ -0,0 +1,19 @@
+require_relative "request"
+require_relative "endpoints"
+
+module Tika
+  module Requests
+
+    include Endpoints
+
+    def self.request_class(endpoint)
+      klass = Class.new(Request)
+      klass.endpoint = endpoint
+      klass
+    end
+
+    GetTextRequest     = request_class GetTextEndpoint
+    GetMetadataRequest = request_class GetMetadataEndpoint
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tika-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - dchandekstark
@@ -67,10 +67,11 @@ files:
 - Rakefile
 - VERSION
 - lib/tika-client.rb
-- lib/tika/api.rb
 - lib/tika/client.rb
 - lib/tika/configuration.rb
+- lib/tika/endpoints.rb
 - lib/tika/request.rb
+- lib/tika/requests.rb
 - spec/spec_helper.rb
 - tika-client.gemspec
 homepage: https://github.com/duke-libraries/tika-client

data/lib/tika/api.rb

@@ -1,26 +0,0 @@
-module Tika
-  class Api
-
-    PUT = Net::HTTP::Put
-    GET = Net::HTTP::Get
-
-    JSON = "application/json"
-    TEXT = "text/plain"
-    
-    Endpoint = Struct.new(:request_method, :path, :response_format)
-
-    ENDPOINTS = {
-      get_metadata: Endpoint.new(PUT, "/meta", JSON),
-      get_text:     Endpoint.new(PUT, "/tika", TEXT)
-    }
-
-    def endpoint(name)
-      ENDPOINTS.fetch(name)
-    end
-
-    def has_endpoint?(name)
-      ENDPOINTS.include?(name)
-    end
-
-  end
-end