pluct 0.0.6 → 0.0.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmZiMjRiNWU4Y2YyMzQwYWZmZDE5ZjI0NjJmMzg3ZmI0NzY4OTBiMQ==
+    OTgzNTBjZDdhYmQ0YjcyMTZhMWMzYjM3NDE0YzRjY2E2MWJhMzczZQ==
   data.tar.gz: !binary |-
-    OWY0Mzc4NTUxYTk3YmJhZmJlMmY2ZWI5NTM3YzhmODdlYzk1OTBmYg==
+    ZjA1NjdlOWQwOTc3ZDVkNTBlNjA5NDA2NjYxODFhMGRiZTk4ZmMxZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTdjYzQ3M2IxNGU4NWYzMWU3YmY0MjZhM2U0OGEzNDBjYTFjMzc5NDg5MGE0
-    NDlkMzFmNmIxZDU4MjYzOTc5YzdiMTMzMmRjNTE0MjVkNzg1YWFmY2JmZmU4
-    NTRjZDM1MzUyODc1N2MyZTYwZWIwODQxMWY5ZGJmMTcwMThjMzk=
+    OTcyZjMzZjVjYTdlZTkwMjNiYzczYmRlNjdmMTcwMzNiM2FhODdkNjhmYzEy
+    NzIwMDY2Mzc3MjMxMjA0ZGYzNTY0NzFlZTUyNzU1NDE4NTI5YzZjZjEyODk1
+    ZDFjZDRlMjJiZGZhNTU2M2YwYmM0NWI0NjIxZmZiMDY0MjU0YWE=
   data.tar.gz: !binary |-
-    MWZhOWQzZDVkMWY5OWI2ZWRkNDE3ZmEyM2Q0MTcxYzlkZGU5MGVjMmI5MmE4
-    MmE0NmZiMDU5NTNmZTRlNmIyYjhiNjYxNjdhOWYyNWE4OWZiNTkwOWQxMTU4
-    MWM4ZGFiMzcxZDE1NmY1MDcyZTBhYWI5YzFjYzg5YmE0YWZhMmI=
+    YmRlOGJiZGZkMjg3Y2ZmNWI2NTc3YjA0OTE2Y2I3ODEyMDhhODlhNDU2OWU2
+    MTA5ODYzODE4ZmFhYzg3YjU2OGMxZDM4ODE5MTk5ZWYxZTI1ZGI1OWI1MTE3
+    MTZkYTI4MzMzMjNkYWVjZjA4YWY3YWNmZTYzMTNhNTc1YjI3ODE=

data/lib/pluct/extensions/json.rb

@@ -0,0 +1,9 @@
+module JSON
+  def self.is_json?(string)
+    begin
+      parse(string)
+    rescue ParserError
+      false
+    end
+  end
+end

data/lib/pluct/helpers/request.rb

@@ -9,7 +9,7 @@ module Pluct
 
       protected
       def get(url, *opts)
-        options = Hash[*opts]
+        options = Hash[opts] if opts
         resource = RestClient::Resource.new(url)
         options = (options ? DEFAULT_HEADERS.merge(options) : DEFAULT_HEADERS)
         resource.get(options)
@@ -18,7 +18,7 @@ module Pluct
       end
 
       def head(url, *opts)
-        options = Hash[*opts]
+        options = Hash[opts] if opts
         resource = RestClient::Resource.new(url)
         options = (options ? DEFAULT_HEADERS.merge(options) : DEFAULT_HEADERS)
         resource.head(options)
@@ -27,7 +27,7 @@ module Pluct
       end
 
       def delete(url, *opts)
-        options = Hash[*opts]
+        options = Hash[opts] if opts
         resource = RestClient::Resource.new(url)
         options = (options ? DEFAULT_HEADERS.merge(options) : DEFAULT_HEADERS)
         resource.delete(options)
@@ -37,7 +37,7 @@ module Pluct
 
       def post(url, *opts)
         data, options = *opts
-        options = Hash[*opts] if options
+        options = Hash[opts] if options
         resource = RestClient::Resource.new(url)
         options = (options ? DEFAULT_HEADERS.merge(options) : DEFAULT_HEADERS)
         resource.post(data.to_json, options)
@@ -57,7 +57,7 @@ module Pluct
 
       def patch(url, *opts)
         data, options = *opts
-        options = Hash[*opts] if options
+        options = Hash[options] if options
         resource = RestClient::Resource.new(url)
         options = (options ? DEFAULT_HEADERS.merge(options) : DEFAULT_HEADERS)
         resource.patch(data.to_json, options)

data/lib/pluct/resource.rb

@@ -1,19 +1,21 @@
+#TODO: Returns Pluct::Response if there is no header, otherwise Pluct::Resource.
 module Pluct
   class Resource 
     include Pluct::Helpers::Request
 
-    attr_reader :url, :data, :schema
+    attr_reader :data, :response, :schema, :uri
 
-    def initialize(url, schema)
-      @url = url
-      @data = get_data
-      @schema = schema
+    def initialize(uri, response = nil)
+      @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
 
-    #TODO: Authenticate the request if necessary.
-    def get_data
-      get @url
+    def method_missing(method, *args)
+      @data[method] || super
     end
 
     private
@@ -23,16 +25,32 @@ module Pluct
           query_string, *options = *args
           method = link["method"] || "GET"
           href = link["href"]
-          
-          if query_string
-            href = Addressable::Template.new(href)
-            href = href.expand(query_string).to_s          
+
+          payload = query_string.dup
+          if ['PATCH', 'PUT'].include? method
+            query_string.merge!(@data) 
           end
 
-          #query_string (uri_template), payload, headers
-          send(method.downcase, href, *options)
+          uri = define_request_uri(href, query_string)
+          payload = define_request_payload(href, uri, payload)
+          options.unshift(payload)
+
+          response = send(method.downcase, uri, *options)
+          Resource.new(uri, response)
         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/schema.rb

@@ -2,21 +2,31 @@ module Pluct
   class Schema
     include Pluct::Helpers::Request
 
-    attr_reader :path, :data, :links
+    attr_reader :path, :data
     
     def initialize(path)
       @path = path
-      @data = get_content
-      @links = @data["links"]
+    end
+    
+    def data
+      @data ||= ::MultiJson.decode(get(@path))
+    end
+    
+    def links
+      self.data["links"]
     end
     
     def to_s
       @path  
     end
-
-    private
-    def get_content
-      ::MultiJson.decode(get(@path))
+    
+    def self.from_header(headers)
+      return nil unless headers[:content_type]
+                  
+      schema = headers[:content_type].match('.*profile=([^;]+);?')
+      return nil unless schema      
+      
+      Schema.new(schema[1])
     end
   end
 end

data/lib/pluct/version.rb

@@ -1,3 +1,3 @@
 module Pluct
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/pluct.rb

@@ -1,6 +1,7 @@
 require 'addressable/template'
-require 'pluct/version'
 require 'multi_json'
+require 'json'
+require 'pluct/version'
 
 module Pluct
   autoload :Errors,   "pluct/errors"
@@ -9,24 +10,8 @@ module Pluct
   autoload :Schema,   "pluct/schema"
 
   extend Pluct::Helpers::Request
-  
-  def self.get_resource(path)
-    request = get(path)
-    schema = schema_from_header(request.headers)
-    resource = Resource.new(path, schema)
-  end
-  
+
   def self.root
     File.expand_path '../..', __FILE__
   end
-  
-  private
-  def self.schema_from_header(headers)
-    return nil unless headers[:content_type] 
-    
-    schema = headers[:content_type].match('.*profile=([^;]+);?')
-    return nil unless schema
-
-    Schema.new(schema[1])    
-  end  
 end

data/spec/integration/resource_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Pluct::Resource, :integration do
+
+  let(:resource){ Pluct::Resource.new('http://localhost:8888') }
+
+  it 'creates a new instance' do
+    app = resource.collection({context_name: 'baas', collection_name: 'apps'}).create({name: 'my_app', description: 'app_desc'})
+
+    expect(app.response.code).to eq 201
+    expect(app.response.headers[:location]).to_not be_nil
+    expect(app.data).to be_empty
+  end
+
+  it 'expands uri template' do
+    collection = resource.collection({context_name: 'baas', collection_name: 'apps'})
+    expect(collection.uri).to eq 'http://localhost:8888/baas/apps'
+  end
+
+  it 'raises 404 for url not found' do
+    expect {resource.resource({context_name: 'baas', collection_name: 'apps', resource_id: 'invalid'}) }.to raise_error(Pluct::Errors::UrlNotFound)
+  end
+end

data/spec/pluct/extensions/json_spec.rb

@@ -0,0 +1,13 @@
+require File.join [Pluct.root, 'lib/pluct/extensions/json']
+
+describe JSON do
+  it 'returns false for invalid data' do
+    ['', ' ', 'string'].each do |s|
+      expect(JSON.is_json?(s)).to be_false
+    end
+  end
+
+  it 'returns true for valid data' do  
+    expect(JSON.is_json?('{"name" : "foo"}')).to be_true
+  end
+end

data/spec/pluct/resource_spec.rb

@@ -1,11 +1,7 @@
 require 'spec_helper'
 
 describe Pluct::Resource do
-  let(:schema) { mock(Pluct::Schema) }
-  let(:user) { Pluct::Resource.new 'www.example.com/users/1', schema }
-  let(:user_without_content_type) { Pluct::Resource.new 'www.example.com/users/2' }
-  let(:user_without_schema) { Pluct::Resource.new 'www.example.com/users/3' }
-  let(:user_schema) { MultiJson.decode(File.read('spec/assets/user_schema.json')) }
+  let(:schema) { mock(Pluct::Schema) }  
 
   before(:each) do
     stub_request(:get, 'www.example.com/users/1').to_return(body: File.read('spec/assets/user.json'), 
@@ -19,22 +15,49 @@ describe Pluct::Resource do
     stub_request(:get, 'www.example.com/users/3').to_return(body: File.read('spec/assets/user.json'), 
                                                            status: 200,
                                                            headers: {'content-type' => 'application/json; charset=utf-8;'})
-    
+
     stub_request(:get, 'www.example.com/schemas/user').to_return(body: File.read('spec/assets/user_schema.json'),
                                                                  status: 200)
-    
-    schema.stub(:links).and_return(user_schema["links"])
   end
 
-  it 'has resource data' do
-    resource_data = File.read('spec/assets/user.json')
-    expect(user.data).to eq resource_data
+  context 'schema on header' do
+    it 'has resource data' do
+      resource = Pluct::Resource.new('www.example.com/users/1')
+      resource_data = JSON.parse(File.read('spec/assets/user.json'), {symbolize_names: true})
+
+      expect(resource.data).to eq resource_data
+    end
+
+    it 'retrieves the schema' do
+      resource = Pluct::Resource.new('www.example.com/users/1')
+
+      expect(resource.schema).to_not be_nil
+      expect(resource.schema.to_s).to eq 'http://www.example.com/schemas/user'
+    end
+
+    it 'adds methods dynamically' do
+      resource = Pluct::Resource.new('www.example.com/users/1')
+
+      methods = [:edit, :replace, :self, :delete, :create]
+      methods.each do |method|
+        expect(resource.class.instance_methods(false)).to include(method)
+      end
+    end
   end
 
-  it 'adds methods' do
-    methods = [:edit, :replace, :self, :delete, :create]
-    methods.each do |method|
-      expect(user.class.instance_methods(false)).to include(method)
+  context 'invalid header' do
+    it 'does not have content type' do
+      resource = Pluct::Resource.new('www.example.com/users/2')
+
+      expect(resource.data).to_not be_nil
+      expect(resource.schema).to be_nil
     end
+
+    it 'does not have profile on content type' do
+      resource = Pluct::Resource.new('www.example.com/users/3')
+
+      expect(resource.data).to_not be_nil
+      expect(resource.schema).to be_nil
+    end    
   end
-end 
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pluct
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Alberto Leal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-22 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -165,15 +165,17 @@ files:
 - Rakefile
 - lib/pluct.rb
 - lib/pluct/errors.rb
+- lib/pluct/extensions/json.rb
 - lib/pluct/helpers.rb
 - lib/pluct/helpers/request.rb
 - lib/pluct/resource.rb
 - lib/pluct/schema.rb
 - lib/pluct/version.rb
 - pluct.gemspec
-- spec/acceptance/pluct_spec.rb
 - spec/assets/user.json
 - spec/assets/user_schema.json
+- spec/integration/resource_spec.rb
+- spec/pluct/extensions/json_spec.rb
 - spec/pluct/helpers/request_spec.rb
 - spec/pluct/resource_spec.rb
 - spec/pluct/schema_spec.rb
@@ -206,9 +208,10 @@ signing_key:
 specification_version: 4
 summary: json-schema hypermedia client
 test_files:
-- spec/acceptance/pluct_spec.rb
 - spec/assets/user.json
 - spec/assets/user_schema.json
+- spec/integration/resource_spec.rb
+- spec/pluct/extensions/json_spec.rb
 - spec/pluct/helpers/request_spec.rb
 - spec/pluct/resource_spec.rb
 - spec/pluct/schema_spec.rb

data/spec/acceptance/pluct_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe Pluct, :acceptance do
-  
-    it '', :vcr, cassette_name: 'acceptance/pluct_resource' do
-    resource = Pluct.get_resource 'http://repos.example.com/interatividade/famosos'
-    resource_self = MultiJson.decode(resource.self)
-
-    expect(resource_self).to have_key("items")
-    expect(resource_self["item_count"]).to eq 2
-  end
-
-  it 'creates a new app', :vcr, cassette_name: 'acceptance/creates_new_app' do
-    resource = Pluct.get_resource 'http://localhost:8888/baas/apps'   
-    response = resource.create(nil, {name: 'New App', description: 'My Awesome App'})
-
-    expect(response.code).to eq 201
-    expect(response.headers[:location]).to_not be_nil
-  end
-end