pluct 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 632ce7f4bf78bf8c5ae4c5dd973767dbf6c9611d
-  data.tar.gz: 8f26330cfc0b1f0019748397aa41e77eed82ea4e
+  metadata.gz: 67665aa5ada6f45c24166430f601c7fd6c8c5eb4
+  data.tar.gz: 3834088016a2809b1b7f734a1d22d4ae44354544
 SHA512:
-  metadata.gz: a452415d7153ee4e98c32d5f948602269422b5a70fe27f184d2a2acc0e29a2b0dba4e0f4de604b0501df8f63b3c4d2167b61140ab05e3da8ed80bb4d6ad94a30
-  data.tar.gz: dd3a30db0d336890c2d8fb235fd739b55cfefef0b52a57bee4f91ff1c6e42b95d75f64c5897c9c4b62cd2883c18ad31445f07fd24aea69ad1c8934c2e6adf79f
+  metadata.gz: dfb73b9d7f6d5b4be672821a28f7c033944c788e7700bc8713b35ee8e7e4c1392122e4628c03bd734d3f4bbb0f656a1447b535bf24f6e0577bd445c993d17b30
+  data.tar.gz: c1c6cd9e9922befdc62a8808b597de88dc8439ec133da4024f2597a9a3ae0e90e05c7640515fbc329c8ad5866cadf5953b65f14d5b366187032b084d23c8a60d

data/lib/pluct.rb

@@ -8,6 +8,7 @@ module Pluct
   autoload :Errors,   "pluct/errors"
   autoload :Helpers,  "pluct/helpers"
   autoload :JSON,     "pluct/extensions/json"
+  autoload :LinkDescriptionObject, "pluct/link_description_object"
   autoload :Resource, "pluct/resource"
   autoload :Schema,   "pluct/schema"
 

data/lib/pluct/helpers/request.rb

@@ -7,12 +7,13 @@ module Pluct
         'content-type' => 'application/json'
       }
 
-      protected
-      def get(url, *opts)
-        options = Hash[opts] if opts
-        resource = RestClient::Resource.new(url)
-        options = (options ? DEFAULT_HEADERS.merge(options) : DEFAULT_HEADERS)
-        resource.get(options)
+    protected
+
+      def get(url, data = nil, headers = nil)
+        headers = (headers ? DEFAULT_HEADERS.merge(headers) : DEFAULT_HEADERS)
+        options = headers.dup
+        options.merge!(params: data)
+        RestClient.get(url, options)
       rescue RestClient::Exception => e
         raise_exception(url, e)
       end

data/lib/pluct/link_description_object.rb

@@ -0,0 +1,24 @@
+module Pluct
+  class LinkDescriptionObject
+    def initialize(raw_link)
+      @href = raw_link["href"]
+    end
+
+    def expand_href(mapping)
+      template.expand(mapping).to_s
+    end
+
+    def unused_mapping(orig_mapping)
+      mapping = orig_mapping.dup
+      expanded_href = self.expand_href(mapping)
+      used_mapping = template.extract(expanded_href)
+      mapping.delete_if { |key, value| used_mapping.include?(key.to_s) }
+    end
+
+  private
+
+    def template
+      @template ||= Addressable::Template.new(@href)
+    end
+  end
+end

data/lib/pluct/resource.rb

@@ -1,6 +1,5 @@
-#TODO: Returns Pluct::Response if there is no header, otherwise Pluct::Resource.
 module Pluct
-  class Resource 
+  class Resource
     include Pluct::Helpers::Request
 
     attr_reader :data, :response, :schema, :uri
@@ -9,7 +8,7 @@ module Pluct
       @uri = uri
       @response = response || get(@uri)
       @data ||= (JSON.is_json?(@response.body) ? JSON.parse(@response.body, {symbolize_names: true}) : {})
-      
+
       @schema = Schema.from_header(@response.headers)
       Resource.create_methods(@schema.links) if @schema
     end
@@ -18,39 +17,29 @@ module Pluct
       @data[method] || super
     end
 
-    private
+  private
+
     def self.create_methods(links=[])
       links.each do |link|
+        ldo = Pluct::LinkDescriptionObject.new(link)
+
         define_method link["rel"] do |*args|
-          query_string, *options = *args
+          params, *options = *args
+
           method = link["method"] || "GET"
-          href = link["href"]
 
-          payload = query_string.dup
           if ['PATCH', 'PUT'].include? method
-            query_string.merge!(@data) 
+            params.merge!(@data)
           end
 
-          uri = define_request_uri(href, query_string)
-          payload = define_request_payload(href, uri, payload)
+          uri = ldo.expand_href(params)
+          payload = ldo.unused_mapping(params)
           options.unshift(payload)
 
           response = send(method.downcase, uri, *options)
           Resource.new(uri, response)
-        end 
+        end
       end
     end
-
-    def define_request_uri(uri_template, query_string)
-      template = Addressable::Template.new(uri_template)
-      Addressable::URI.parse(template.expand(query_string)).to_s
-    end
-
-    def define_request_payload(uri_template, href, payload)
-      template = Addressable::Template.new(uri_template)
-      uri_template = template.extract(href)
-
-      payload.delete_if{ |key, value| uri_template.include?(key) }
-    end
   end
 end

data/lib/pluct/version.rb

@@ -1,3 +1,3 @@
 module Pluct
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/spec/pluct/helpers/request_spec.rb

@@ -19,7 +19,7 @@ describe Pluct::Helpers::Request do
     end
   end
 
-    it 'returns 200 for valid request' do
+  it 'returns 200 for valid request' do
     body = File.read('spec/assets/user.json')
     stub_request(:get, 'http://www.example.com/success').to_return(body: body, status: 200)
     response = client.send(:get, 'http://www.example.com/success')
@@ -28,4 +28,12 @@ describe Pluct::Helpers::Request do
     expect(response.code).to eq 200
     expect(response.body).to eq body
   end
+
+  describe "#get" do
+    it "should GET resource" do
+      RestClient.should_receive(:get).with(
+        "http://example.org", {params: {key: "value"}, "content-type" => "application/json"})
+      client.send(:get, "http://example.org", {key: "value"})
+    end
+  end
 end

data/spec/pluct/link_description_object_spec.rb

@@ -0,0 +1,24 @@
+require "spec_helper"
+
+describe Pluct::LinkDescriptionObject do
+  describe "#expand_href" do
+    let(:raw_link) { {"href" => "http://example.org/{variable}", "rel" => "my-rel"} }
+    subject(:ldo) { Pluct::LinkDescriptionObject.new(raw_link) }
+    specify { expect(ldo.expand_href({variable: "my-variable"})).to eq("http://example.org/my-variable") }
+  end
+
+  describe "#unused_mapping" do
+    let(:raw_link) { {"href" => "http://example.org/{variable}", "rel" => "my-rel"} }
+    let(:mapping) { {variable: "my-variable", unused_variable: "my-unused-variable"} }
+    subject(:ldo) { Pluct::LinkDescriptionObject.new(raw_link) }
+
+    it "should return unused mapping" do
+      expect(ldo.unused_mapping(mapping)).to eq({unused_variable: "my-unused-variable"})
+    end
+
+    it "should not change original mapping" do
+      ldo.unused_mapping(mapping)
+      expect(mapping).to eq({variable: "my-variable", unused_variable: "my-unused-variable"})
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pluct
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Alberto Leal
@@ -168,6 +168,7 @@ files:
 - lib/pluct/extensions/json.rb
 - lib/pluct/helpers.rb
 - lib/pluct/helpers/request.rb
+- lib/pluct/link_description_object.rb
 - lib/pluct/resource.rb
 - lib/pluct/schema.rb
 - lib/pluct/version.rb
@@ -177,6 +178,7 @@ files:
 - spec/integration/resource_spec.rb
 - spec/pluct/extensions/json_spec.rb
 - spec/pluct/helpers/request_spec.rb
+- spec/pluct/link_description_object_spec.rb
 - spec/pluct/resource_spec.rb
 - spec/pluct/schema_spec.rb
 - spec/spec_helper.rb
@@ -215,6 +217,7 @@ test_files:
 - spec/integration/resource_spec.rb
 - spec/pluct/extensions/json_spec.rb
 - spec/pluct/helpers/request_spec.rb
+- spec/pluct/link_description_object_spec.rb
 - spec/pluct/resource_spec.rb
 - spec/pluct/schema_spec.rb
 - spec/spec_helper.rb