openamplify 0.2.1 → 0.2.2

data/README.rdoc

@@ -92,3 +92,6 @@ In case you are wondering what the request URL looks like:
 If someday, OpenAmplify decides to change their API URL:
 
   client.base_url = 'http://newurl'
+
+== Testing
+  rake test OPEN_AMPLIFY_KEY=YOUR_KEY

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 0
 :build: 
 :minor: 2

data/lib/openamplify.rb

@@ -12,9 +12,8 @@ module OpenAmplify
     end
 
     def analyze_text(text)
-      validate
-      Response.new(:api_url => @options[:api_url], :query => query.merge(:inputText => text), 
-                   :method => @options[:method])
+      OpenAmplify.validate_client!(self)
+      Response.new(self, :query => query.merge(:inputText => text), :method => @options[:method])
     end
     
     %w(api_key analysis api_url method).each do |attr|
@@ -28,27 +27,54 @@ module OpenAmplify
         end
       EOS
     end
+    
+    def fetch(params, method)
+      raise OpenAmplify::NotSupported unless [:get, :post].include?(method.to_sym)
+      Client::send(method, self.api_url, params)
+    end
+
+    def self.compose_url(path, params)
+      path + '?' + URI.escape(params.collect{ |k,v| "#{k}=#{v}" }.join('&'))
+    end
+
 
     private
 
+
     def query
       q = { :apiKey => @options[:api_key] }
       q.merge!(:analysis => @options[:analysis]) if @options[:analysis]
       q
     end
 
+    def self.get(path, params)
+      uri      = URI.parse(compose_url(path, params))
+      response = Net::HTTP.get_response(uri)
+      OpenAmplify.validate_response!(response) 
+      response.body
+    end
+
+    def self.post(path, params)
+      uri      = URI::parse(path)
+      response = Net::HTTP.post_form(uri, params)
+      OpenAmplify.validate_response!(response)
+      response.body
+    end
+
   end # OpenAmplify::Client 
 
+
   # Contains the response from OpenAmplify
   class Response
     include Enumerable
 
-    def initialize(options)
+    def initialize(client, options)
+      @client  = client
       @options = options
     end
 
     def request_url
-      @request_url ||= compose_url(@options[:api_url], @options[:query]) 
+      @request_url ||= Client.compose_url(@client.api_url, @options[:query]) 
     end
 
     def reload
@@ -100,12 +126,12 @@ module OpenAmplify
       response && response['Topics']['Domains']
     end
 
-    private
-
-    def compose_url(path, params)
-      path + '?' + URI.escape(params.collect{ |k, v| "#{k}=#{v}" }.join('&'))
+    def styles
+      response && response['Styles']
     end
 
+    private
+
     def response
       @response ||= fetch_response
     end
@@ -123,26 +149,7 @@ module OpenAmplify
     end
 
     def fetch_as_format(format)
-      fetch(@options[:api_url], @options[:query].merge(:outputFormat => format), @options[:method])
-    end
-
-    def fetch(path, params, method)
-      raise OpenAmplify::NotSupported unless [:get, :post].include?(method.to_sym)
-      self.send(method, path, params)
-    end
-
-    def get(path, params)
-      uri      = URI.parse(compose_url(path, params))
-      response = Net::HTTP.get_response(uri)
-      self.class.validate(response) 
-      response.body
-    end
-
-    def post(path, params)
-      uri      = URI::parse(path)
-      response = Net::HTTP.post_form(uri, params)
-      self.class.validate(response)
-      response.body
+      @client.fetch(@options[:query].merge(:outputFormat => format), @options[:method])
     end
 
   end # OpenAmplify::Response

data/lib/openamplify/validations.rb

@@ -1,34 +1,27 @@
 module OpenAmplify
 
-  class Client
-
-    private
-
-    def validate
-      raise ArgumentError, "missing api key" if self.api_key.blank?
-      raise ArgumentError, "missing api url" if self.api_url.blank?
-    end
-  end
-
-
   class NotAcceptable < StandardError; end
   class NotSupported  < StandardError; end
   class Forbidden     < StandardError; end
 
 
-  class Response
-    def self.validate(response)
-      case response.code.to_i
-        when 403
-          raise Forbidden, "(#{response.code}: #{response.message}) #{response.body}"
-        when 405
-          raise NotSupported, "(#{response.code}: #{response.message}) #{response.body}"
-        when 406
-          raise NotAcceptable, "(#{response.code}: #{response.message}) #{response.body}" 
-      end
+  def self.validate_client!(client)
+    raise ArgumentError, "missing api key" if client.api_key.blank?
+    raise ArgumentError, "missing api url" if client.api_url.blank?
+  end
+
+  def self.validate_response!(response)
+    case response.code.to_i
+      when 403
+        raise Forbidden, "(#{response.code}: #{response.message}) #{response.body}"
+      when 405
+        raise NotSupported, "(#{response.code}: #{response.message}) #{response.body}"
+      when 406
+        raise NotAcceptable, "(#{response.code}: #{response.message}) #{response.body}" 
     end
   end
 
+
 end
 
 class String

data/openamplify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openamplify}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Greg Moreno"]
-  s.date = %q{2010-06-13}
+  s.date = %q{2010-06-14}
   s.description = %q{The OpenAmplify API reads text you supply and returns linguistic data explaining and classifying the content.}
   s.email = %q{rubyoncloud@gmail.com}
   s.extra_rdoc_files = [

data/test/test_openamplify.rb

@@ -62,9 +62,12 @@ class OpenAmplifyTest < Test::Unit::TestCase
       end
     end
 
+    #pending "show the request url"
+
   end  # Response
 
   context "Request methods" do
+
     
     should "raise an error if not supported" do
       assert_raises OpenAmplify::NotSupported do
@@ -85,7 +88,11 @@ class OpenAmplifyTest < Test::Unit::TestCase
   end # Request methods
 
   def client
-    @client ||= OpenAmplify::Client.new(:api_key => ENV['OPEN_AMPLIFY_KEY'])
+    @client ||= OpenAmplify::Client.new(:api_key => api_key)
+  end
+
+  def api_key
+    ENV['OPEN_AMPLIFY_KEY']
   end
 
 end # OpenAmplifyTest

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: openamplify
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Greg Moreno
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 -07:00
+date: 2010-06-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency