frenchy 0.5.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d2619d769fe19f6a125107e3473f36a77ce85e5d
-  data.tar.gz: 17f15bcd90080806dd6b944bb1fceeeb9849cac7
+SHA256:
+  metadata.gz: 90c9e971bf0cee2367ca74b3c2f2342da1a5740acf2473d266fa97a574bbcb69
+  data.tar.gz: 8633892fd38e341447124b068f70ca11069ad4e684092694f61d184f87981fc1
 SHA512:
-  metadata.gz: 42cceb0cb279b6b8b5c96a603d8ead6a6c2b1c268d0b2171a86f399648e23c6977c6451054cebf0ebd7b94e5155a4751ea286099879d71c3e932035baa6718bc
-  data.tar.gz: d5decd2797fb0b2f29f6d3e6afe1bbe6d1227f71774bf06dd403bfd615806a47b251f12d27435d737eb3291afb88da811968bfd23117f5952a8a3ef999f68297
+  metadata.gz: 7c5999ea947402f8f148bbea41536a6103826591aafa00e197e227b9dba11bc98118a3fe30cc0c0ee507b9613a2c51c926eba149f250e7748bfe9ae9e101009f
+  data.tar.gz: c68812567016ed5cd9feb96280cd10bcdb27c32ad279a643742557e204dd3f1936a7cf6a98304484a9a7dbc3eac59de1ced4a04361afab11532991ef1acb83ce

data/.travis.yml

@@ -1,3 +1,7 @@
 language: ruby
 rvm:
-  - 2.3.0
+  - 2.3.4
+  - 2.4.1
+  - 2.5.9
+  - 2.7.3
+  - 3.0.1

data/frenchy.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "json"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

data/lib/frenchy.rb

@@ -14,6 +14,8 @@ require "frenchy/version"
 module Frenchy
   class_eval do
     @services = {}
+    @content_types = {}
+    @content_type_accept = ""
   end
 
   def self.register_service(name, options={})
@@ -23,4 +25,19 @@ module Frenchy
   def self.find_service(name)
     @services[name.to_s] || raise(Frenchy::Error, "No service '#{name}' registered")
   end
+
+  def self.register_content_type(name, &block)
+    @content_types[name] = block
+    @content_type_accept = @content_types.keys.join(", ")
+  end
+
+  def self.find_content_type_handler(name)
+    @content_types[name] || raise(Frenchy::Error, "No content type '#{name}' registered")
+  end
+
+  def self.accept_header
+    @content_type_accept
+  end
 end
+
+Frenchy.register_content_type("application/json") {|x| JSON.parse(x) }

data/lib/frenchy/client.rb

@@ -1,5 +1,6 @@
 require "net/http"
 require "json"
+require "uri"
 
 module Frenchy
   class Client
@@ -46,16 +47,13 @@ module Frenchy
     private
 
     def perform(method, path, params)
-      uri = URI(@host)
+      uri = URI(@host + path)
       body = nil
       headers = {
         "User-Agent" => "Frenchy/#{Frenchy::VERSION}",
-        "Accept"     => "application/json",
+        "Accept"     => Frenchy.accept_header,
       }.merge(@headers)
 
-      # Set the URI path
-      uri.path = path
-
       # Set request parameters
       if params.any?
         case method
@@ -102,7 +100,7 @@ module Frenchy
       when 200...399
         # Positive responses are expected to return JSON
         begin
-          JSON.parse(resp.body)
+          decode_response(resp)
         rescue => ex
           raise Frenchy::InvalidResponse.new(ex, reqinfo, resp)
         end
@@ -124,5 +122,9 @@ module Frenchy
     def perform_request(http, req)
       http.request(req)
     end
+
+    def decode_response(resp)
+      Frenchy.find_content_type_handler(resp["Content-Type"]).call(resp.body)
+    end
   end
 end

data/lib/frenchy/model.rb

@@ -145,7 +145,7 @@ module Frenchy
           # Convert value to a Time or DateTime. Numbers are treated as unix timestamps,
           # other values are parsed with DateTime.parse.
           define_method("#{name}=") do |v|
-            if v.is_a?(Fixnum)
+            if v.is_a?(Integer)
               set(name, Time.at(v).to_datetime)
             elsif v.is_a?(DateTime)
               set(name, v)

data/lib/frenchy/request.rb

@@ -19,7 +19,7 @@ module Frenchy
         end
 
         params.delete(k)
-        path.sub!(pat, v)
+        path.sub!(pat, CGI.escape(v))
       end
 
       @service = service

data/lib/frenchy/resource.rb

@@ -7,7 +7,7 @@ module Frenchy
     module ClassMethods
       # Find record(s) using the default endpoint and flexible input
       def find(params={})
-        params = {"id" => params.to_s} if [Fixnum, String].any? {|c| params.is_a? c }
+        params = {"id" => params.to_s} if [Integer, String].any? {|c| params.is_a? c }
         find_with_endpoint("default", params)
       end
 

data/lib/frenchy/version.rb

@@ -1,3 +1,3 @@
 module Frenchy
-  VERSION = "0.5.1"
+  VERSION = "0.6.3"
 end

data/spec/lib/frenchy/model_spec.rb

@@ -250,7 +250,7 @@ describe Frenchy::Model do
         expect(v.other_priority).to eql(Box::Priority::NORMAL)
       end
 
-      it "accepts fixnums" do
+      it "accepts integers" do
         v = Box.new(priority: 2)
         expect(v.priority).to eql(Box::Priority::EXPRESS)
         expect(v.priority.to_i).to eql(2)
@@ -307,4 +307,4 @@ describe Frenchy::Model do
       end
     end
   end
-end
+end

data/spec/lib/frenchy/request_spec.rb

@@ -7,6 +7,12 @@ describe Frenchy::Request do
       expect(request.path).to eql("/v1/users/1234/md5something")
     end
 
+    it "escapes path parameters but not query params" do
+      request = Frenchy::Request.new("service", "get", "/v1/users/:slug/:fullname", {"slug" => "big dog 20", "fullname" => "How Big Is He?", "division" => "How Big Is He, Really?"}, {})
+      expect(request.path).to eql("/v1/users/big+dog+20/How+Big+Is+He%3F")
+      expect(request.params).to eql({"division" => "How Big Is He, Really?"})
+    end
+
     it "retains remaining parameters as query parameters" do
       request = Frenchy::Request.new("service", "get", "/v1/users/:id", {"id" => 1234, "token" => "md5something"}, {})
       expect(request.path).to eql("/v1/users/1234")

data/spec/lib/frenchy_spec.rb

@@ -15,4 +15,16 @@ describe Frenchy do
       expect{Frenchy.find_service("nonexistent")}.to raise_error(Frenchy::Error)
     end
   end
-end
+
+  describe ".register_content_type" do
+    it "adds the content type to the accept header" do
+      expect(Frenchy.accept_header).to eql("application/json")
+      Frenchy.register_content_type("application/other") do |x|
+        5
+      end
+      expect(Frenchy.accept_header).to eql("application/json, application/other")
+      expect(Frenchy.find_content_type_handler("application/other").call(nil)).to eql(5)
+      expect{Frenchy.find_content_type_handler("nonexistent")}.to raise_error(Frenchy::Error)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frenchy
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.3
 platform: ruby
 authors:
 - Jason Coene
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-02-28 00:00:00.000000000 Z
+date: 2021-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ homepage: https://github.com/jcoene/frenchy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -180,9 +180,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Opinionated JSON API modeling framework for Ruby.
 test_files: