proxima 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd5615b370a04a9c8c474fc142242e78fb9b5d81
-  data.tar.gz: ad9ffa8bd99d82ad192971607dfea44ceb6e43d2
+  metadata.gz: 8d40a3e470e452d37b6d587e7925763a1ccf6424
+  data.tar.gz: 2c7a02576f7b706b24f5bfc1e7925259eff5cde6
 SHA512:
-  metadata.gz: 7cd3f7973557921d3fdfbcc62607ac19f7eb29b6fffcc0171330ae068c045f29e87320b9941d2327988ab852831e2ff8eb3b9207882509b0849031c57e9ea00d
-  data.tar.gz: 0e8f6b84a313e58bf8756a8c9f5ab2f31f2ff447baf90396a810182bf4b3d85882750d491e598155dade32b51d54a9f3faa4b1c08542357f1e8d280f261f4c75
+  metadata.gz: 0f6f84e8d906a2db653c068db1bbe46a35ae61d2c873b6f1dc10070ca7fa8e31f60924b179802d708b5ce0b37af04a1afb9ed1908a5b250187ff37567896379d
+  data.tar.gz: f0bb3bd5cb94e2193bb8d706e87b87659719fd648d97b81756823ced4f2f34f26820afeaf283f1b4d3200d3be70c20e8c555924a919bb2c801e705feffedb022

data/lib/proxima/api.rb

@@ -1,50 +1,22 @@
-require 'rest-client'
-
 
 module Proxima
-
   class Api
 
-    attr_accessor :url, :headers
+    attr_reader :base_uri, :headers
 
     def initialize(base_url, opts = {})
-      @base_url = base_url
+      @base_uri = URI.parse base_url
       @headers  = opts[:headers] || {}
     end
 
-    def post(path, opts = {}, &block)
-      self.request(:post, path, opts, &block)
-    end
-
-    def get(path, opts = {}, &block)
-      self.request(:get, path, opts, &block)
-    end
-
-    def put(path, opts = {}, &block)
-      self.request(:put, path, opts, &block)
-    end
-
-    def delete(path, opts = {}, &block)
-      self.request(:delete, path, opts, &block)
+    HTTP_METHODS.each do |http_method|
+      define_method http_method do |path, opts = {}, &block|
+        self.request http_method, path, opts, &block
+      end
     end
 
     def request(method, path, opts = {}, &block)
-      headers = @headers.clone
-      headers.merge!(opts[:headers])  if opts[:headers]
-      headers[:params] = opts[:query] if opts[:query]
-      headers[:content_type] = :json  if opts[:json]
-      payload = opts[:json].to_json   if opts[:json]
-
-      begin
-        RestClient::Request.execute({
-          method:  method,
-          url:     @base_url + path,
-          headers: headers,
-          payload: payload
-        }, &block)
-      rescue RestClient::Exception => e
-        e.response
-      end
+      Proxima::Request.new(self, method, path, opts, &block).response
     end
   end
 end

data/lib/proxima/{rest.rb → http_methods.rb}

@@ -2,9 +2,11 @@
 
 module Proxima
 
-  module Rest
+  HTTP_METHODS = [:head, :post, :get, :put, :delete]
 
-    [:post, :get, :put, :delete].each do |http_method|
+  module HTTPMethods
+
+    HTTP_METHODS.each do |http_method|
       define_method :"#{http_method}" do |path, opts = {}, &block|
         @response = self.class.api.public_send(:"#{http_method}", path, opts, &block)
         @response
@@ -13,7 +15,7 @@ module Proxima
 
     module ClassMethods
 
-      [:post, :get, :put, :delete].each do |http_method|
+      HTTP_METHODS.each do |http_method|
         define_method :"#{http_method}" do |path, opts = {}, &block|
           @response = self.api.public_send(:"#{http_method}", path, opts, &block)
           @response

data/lib/proxima/model.rb

@@ -1,11 +1,3 @@
-require 'active_model'
-require 'proxima/watch'
-require 'proxima/rest'
-require 'proxima/attributes'
-require 'proxima/paths'
-require 'proxima/serialization'
-require 'proxima/validation'
-
 
 module Proxima
 
@@ -19,7 +11,7 @@ module Proxima
     include ActiveModel::Serializers::JSON
     include ActiveModel::Validations
 
-    include Proxima::Rest
+    include Proxima::HTTPMethods
     include Proxima::Attributes
     include Proxima::Paths
     include Proxima::Serialization

data/lib/proxima/request.rb

@@ -0,0 +1,45 @@
+
+module Proxima
+  class Request
+
+    attr_reader :response
+    attr_reader :method
+    attr_reader :uri
+    attr_reader :headers
+    attr_reader :body
+
+    def initialize(api, method, path, opts = {})
+      @api    = api
+      @method = method.to_s.upcase
+
+      headers = opts[:headers] || {}
+
+      @body = if opts[:json]
+        headers[:content_type] = 'application/json'
+        opts[:json].to_json
+      elsif opts[:body]
+        opts[:body]
+      else
+        ''
+      end
+
+      headers.merge! @api.headers
+
+      @headers  = headers.map{ |name, val| [to_header(name), val.to_s] }.to_h
+      query_str = opts[:query] ? "?#{opts[:query].to_query}" : ''
+      @uri      = URI.join @api.base_uri, path, query_str
+      @http     = Net::HTTP.new(@uri.host, @uri.port)
+    end
+
+    def response
+      raw_response = @http.send_request @method, @uri, @body, @headers
+      Response.new self, raw_response
+    end
+
+    private
+
+    def to_header symbol_or_string
+      symbol_or_string.to_s.split(/[_ -]/).map!{ |w| w.downcase.capitalize }.join '-'
+    end
+  end
+end

data/lib/proxima/response.rb

@@ -0,0 +1,36 @@
+
+module Proxima
+  class Response
+
+    attr_reader :request
+
+    def initialize(request, raw_response)
+      @request      = request
+      @raw_response = raw_response
+    end
+
+    def json
+      begin
+        JSON.parse @raw_response.body if @raw_response.body
+      rescue => e
+        raise "Failed to parse response body as JSON string: #{e.message}"
+      end
+    end
+
+    def body
+      @raw_response.body
+    end
+
+    def code
+      @raw_response.code.to_i
+    end
+
+    def message
+      @raw_response.message
+    end
+
+    def http_version
+      @raw_response.http_version
+    end
+  end
+end

data/lib/proxima/types.rb

@@ -0,0 +1,76 @@
+
+module Proxima
+  TYPES = [
+    {
+      klass:     String,
+      from_json: -> v { v.to_s },
+      to_json:   -> v { v.to_s }
+    }, {
+      klass:     Integer,
+      from_json: -> v { v.to_i },
+      to_json:   -> v { v.to_i }
+    }, {
+      klass:     Float,
+      from_json: -> v { v.to_f },
+      to_json:   -> v { v.to_f }
+    }, {
+      klass:     Rational,
+      from_json: -> v { v.to_r },
+      to_json:   -> v { v.to_r }
+    }, {
+      klass:     Complex,
+      from_json: -> v { v.to_c },
+      to_json:   -> v { v.to_c }
+    }, {
+      klass:     TrueClass,
+      from_json: -> v { v.to_s == 'true' },
+      to_json:   -> v { v.to_s == 'true' }
+    }, {
+      klass:     Array,
+      from_json: -> v { v.to_a },
+      to_json:   -> v { v.to_a }
+    }, {
+      klass:     Hash,
+      from_json: -> v { v.to_h },
+      to_json:   -> v { v.to_h }
+    }, {
+      klass:     DateTime,
+      from_json: -> v { DateTime.iso8601 v },
+      to_json:   -> v { v.iso8601 3 }
+    }
+  ]
+
+  def self.add_type(klass, from = nil, to = nil)
+    TYPES.push({
+      klass: klass,
+      from:  from,
+      to:    to
+    })
+  end
+
+  def self.remove_type(klass)
+    TYPES.delete_if({
+      klass: klass,
+      from:  from,
+      to:    to
+    })
+  end
+
+  def self.type_from_json(klass, value)
+    type = TYPES.find { |t| t[:klass] == klass }
+    if type
+      type[:from_json].call(value)
+    else
+      value
+    end
+  end
+
+  def self.type_to_json(klass, value)
+    type = TYPES.find { |t| t[:klass] == klass }
+    if type
+      type[:to_json].call(value)
+    else
+      value
+    end
+  end
+end

data/lib/proxima/version.rb

@@ -1,5 +1,5 @@
 
 
 module Proxima
-  VERSION = "1.1.1"
+  VERSION = "2.0.0"
 end

data/lib/proxima.rb

@@ -1,81 +1,17 @@
-require "proxima/version"
-require "proxima/api"
-require "proxima/model"
-
+require 'net/http'
+require 'active_model'
+require 'proxima/version'
+require 'proxima/types'
+require 'proxima/request'
+require 'proxima/response'
+require 'proxima/http_methods'
+require 'proxima/api'
+require 'proxima/attributes'
+require 'proxima/serialization'
+require 'proxima/paths'
+require 'proxima/validation'
+require 'proxima/watch'
+require 'proxima/model'
 
 module Proxima
-
-  @types = [
-    {
-      klass:     String,
-      from_json: -> v { v.to_s },
-      to_json:   -> v { v.to_s }
-    }, {
-      klass:     Integer,
-      from_json: -> v { v.to_i },
-      to_json:   -> v { v.to_i }
-    }, {
-      klass:     Float,
-      from_json: -> v { v.to_f },
-      to_json:   -> v { v.to_f }
-    }, {
-      klass:     Rational,
-      from_json: -> v { v.to_r },
-      to_json:   -> v { v.to_r }
-    }, {
-      klass:     Complex,
-      from_json: -> v { v.to_c },
-      to_json:   -> v { v.to_c }
-    }, {
-      klass:     TrueClass,
-      from_json: -> v { v.to_s == 'true' },
-      to_json:   -> v { v.to_s == 'true' }
-    }, {
-      klass:     Array,
-      from_json: -> v { v.to_a },
-      to_json:   -> v { v.to_a }
-    }, {
-      klass:     Hash,
-      from_json: -> v { v.to_h },
-      to_json:   -> v { v.to_h }
-    }, {
-      klass:     DateTime,
-      from_json: -> v { DateTime.iso8601 v },
-      to_json:   -> v { v.iso8601 3 }
-    }
-  ]
-
-  def self.add_type(klass, from = nil, to = nil)
-    @types.push({
-      klass: klass,
-      from:  from,
-      to:    to
-    })
-  end
-
-  def self.remove_type(klass)
-    @types.delete_if({
-      klass: klass,
-      from:  from,
-      to:    to
-    })
-  end
-
-  def self.type_from_json(klass, value)
-    type = @types.find { |t| t[:klass] == klass }
-    if type
-      type[:from_json].call(value)
-    else
-      value
-    end
-  end
-
-  def self.type_to_json(klass, value)
-    type = @types.find { |t| t[:klass] == klass }
-    if type
-      type[:to_json].call(value)
-    else
-      value
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: proxima
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Robert Hurst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-05 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,26 +72,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 description: Proxima is a gem the provides models for use with REST endpoints. These
   models are based upon the Active Model interface
 email:
@@ -103,10 +83,13 @@ files:
 - lib/proxima.rb
 - lib/proxima/api.rb
 - lib/proxima/attributes.rb
+- lib/proxima/http_methods.rb
 - lib/proxima/model.rb
 - lib/proxima/paths.rb
-- lib/proxima/rest.rb
+- lib/proxima/request.rb
+- lib/proxima/response.rb
 - lib/proxima/serialization.rb
+- lib/proxima/types.rb
 - lib/proxima/validation.rb
 - lib/proxima/version.rb
 - lib/proxima/watch.rb