served 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fc33f665810efb0338be77783f46f28a79604a3
-  data.tar.gz: 9141fc737d07f6d9d8fdf235cbb3ac6dfd335a89
+  metadata.gz: 466e2def975e298806ecdef050c3c735823a3a95
+  data.tar.gz: 5ee4e6779cd2ec8f28c6121bb8e7b4a0a3e11f4d
 SHA512:
-  metadata.gz: f38dae786e45652389e082659118258eb77d6bbccf34fe9f358321bfca0b2e416a7f7080c4523a6ccfa927fed2503e9aceb0d80b61755475c015eb71ed215658
-  data.tar.gz: 15ac1e21e7e1557b53de03862cb3a622e3b0fa33618c010d64c0fa3545e3e9b3a7fdf809db0369bca22a1302c8755352691ff375145c16dd5e8296c0aafde22e
+  metadata.gz: 1ee891ea98ac7805ed1b5b39bb689131fd7c2fd46c693725f9eb8b2a43803d0df72e62b379be8293bf4a0291198fff1b1f7a8a4e3a48ba077a4074b18f345771
+  data.tar.gz: 78c97fc01bceaf808b868afee6a26bfc2206481c84e4d52457f97a8bfd2352a2bd8577e749c76a1bc87bf6079c48abcd5d9627caa73d90b441f76735280c7cab

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## 0.1.8
+
+* fix buggy GET request template expansion defaults

data/lib/served/http_client.rb

@@ -3,7 +3,7 @@ module Served
   # Provides an interface between HTTParty and the models. Most of the crap in here is self explanatory
   class HTTPClient
     HEADERS = { 'Content-type' => 'application/json', 'Accept' => 'application/json' }
-    DEFAULT_TEMPLATE = '{resource}.json{?query*}'
+    DEFAULT_TEMPLATE = '{resource}{/id}.json{?query*}'
 
     def initialize(host)
       unless host =~ /{.+}/
@@ -12,15 +12,15 @@ module Served
       @template = Addressable::Template.new(host)
     end
 
-    def get(endpoint, params={})
-      HTTParty.get(@template.expand(query: params, resource: endpoint).to_s,
+    def get(endpoint, id, params={})
+      HTTParty.get(@template.expand(id: id, query: params, resource: endpoint).to_s,
                    headers: HEADERS,
                    timeout: Served.config.timeout
       )
     end
 
-    def put(endpoint, body, params={})
-      HTTParty.put(@template.expand(query: params, resource: endpoint).to_s,
+    def put(endpoint, id, body, params={})
+      HTTParty.put(@template.expand(id: id, query: params, resource: endpoint).to_s,
         body:    body,
         headers: HEADERS,
         timeout: Served.config.timeout

data/lib/served/resource/base.rb

@@ -94,9 +94,6 @@ module Served
 
       alias_method :save!, :save # TODO: differentiate save! and safe much the same AR does.
 
-      # Returns a hash of attributes. If `with_values` is true, it will return only attributes whose values are not nil
-      #
-      # @param [Boolean] with_values whether or not to return all attributes or only those whose values are not nil
       def attributes
         Hash[self.class.attributes.keys.collect { |name| [name, send(name)] }]
       end
@@ -104,6 +101,7 @@ module Served
       # Reloads the resource using attributes from the service
       def reload
         reload_with_attributes(get)
+        self
       end
 
       # renders the model as json
@@ -121,17 +119,17 @@ module Served
       private
 
       def get(params={})
-        handle_response(client.get("#{resource_name}/#{id}", params))
+        handle_response(client.get(resource_name, id, params))
       end
 
       def put(params={})
         body = to_json
-        handle_response(client.put("#{resource_name}/#{id}", body, params))
+        handle_response(client.put(resource_name, id, body, params))
       end
 
       def post(params={})
         body = to_json
-        handle_response(client.post("#{resource_name}", body, params))
+        handle_response(client.post(resource_name, body, params))
       end
 
       def handle_response(response)

data/lib/served/version.rb

@@ -1,3 +1,3 @@
 module Served
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: served
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Jarod Reid
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -105,6 +105,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt