api-resource 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6afbb3ebeef30833689dd643fe2d4adb207fea3a
-  data.tar.gz: 858ed311b43747cfb3b27013d97a34643aebbb4f
+  metadata.gz: 23cbaeb15eab2892df46438827daafa4fab93168
+  data.tar.gz: 2a6bc12c082d02bd7938d7b57091a08afc97e05b
 SHA512:
-  metadata.gz: 8baeb9905f08887b6aa068ed08775a587a5ca04c9b899ad8d9623e2701dc7b61f7298f4e4e1daf4d605300cd5cae94eea4c6d3d74930b1bc62e3ab9524323e38
-  data.tar.gz: 14ccce8abbe4c02c5b7fe0f5a225e0386498aa201a680b7dac1038a2b29e06bc96df5813aad1d5ab5c829b8deb3b653fd9abc0af685073582c6459fa1a700ec0
+  metadata.gz: 005bb30e8ab91f0aaead583e085e4468e29a7b481705ca99de2de49a19b78402ecf722cf005b91169fe0c5b665cae9ae60447a7d8b22ae111b02b668620d9c51
+  data.tar.gz: 3a8d3545b5d6ac2c4bc70ac1741d8359446686fafb762074880a27538dc7ee7ea34a30cd44ea7f14a9cf9d178bfd7247dde939a5d7e2dbd2f8605d0b22d736e0

data/lib/api-resource/resource.rb

@@ -1,3 +1,4 @@
+require 'uri'
 require 'simple-hmac'
 require 'rest_client'
 require 'active_model'
@@ -43,7 +44,7 @@ module ApiResource
     end
 
     def self.resource_path=(path)
-      @resource_path = path
+      @resource_path = path.gsub(%r{\A/+|/+\Z}, '')
     end
 
     def resource_path
@@ -57,8 +58,7 @@ module ApiResource
     end
 
     def self.all
-      result = client(:get, {}, resource_path)
-      create_resource_collection(result)
+      self.where({}, :get)
     end
 
     def self.all_pages(options={})
@@ -115,8 +115,8 @@ module ApiResource
       raise ResourceError unless valid?
       verb = respond_to?(:id) && id ? :put : :post
       begin
-        attrs = attributes
-        attrs = submitted_attributes_filter[attrs] if submitted_attributes_filter
+        attrs  = attributes
+        attrs  = submitted_attributes_filter[attrs] if submitted_attributes_filter
         result = self.class.client(verb, attrs, path)
       rescue RestClient::ExceptionWithResponse => e
         result = e.http_body
@@ -167,18 +167,20 @@ module ApiResource
     end
 
     def self.method_missing(m, *args, &_)
-      unless args.empty?
-        by_method_match = /^by_(.+)/.match(m)
-        if by_method_match
-          parent_resource_name = by_method_match[1]
-          with_parent_resource(args[0], parent_resource_name)
-        end
+      case (m)
+        when /^by_(.+)/
+          with_parent_resource(args[0], $1) unless args.empty?
+        else
+          # do nothing
       end
     end
 
     def self.with_parent_resource(parent_resource_id, parent_resource_name)
-      result = client(:get, {}, parent_resource_name.pluralize, parent_resource_id, resource_path)
-      create_resource_collection(result)
+      parent_resource_name = parent_resource_name.pluralize
+      child_resource_path =  resource_path
+      Class.new(self) do
+        self.resource_path = build_url(parent_resource_name, parent_resource_id, child_resource_path)
+      end
     end
 
     def self.create_resource_collection(result)
@@ -192,10 +194,7 @@ module ApiResource
     end
 
     def self.client(verb, params, *paths)
-      raise RuntimeError, 'Empty base_url' if base_url.blank?
-      url        = base_url
-      url        += '/' unless url.end_with?('/')
-      url        += paths.join('/')
+      url        = build_url(*paths)
       headers    = { accept: :json }
       req_params = { url: url, method: verb, headers: headers }
       if verb == :get
@@ -211,6 +210,11 @@ module ApiResource
       req.execute
     end
 
+    def self.build_url(*paths)
+      raise RuntimeError, 'Empty base_url' if base_url.blank?
+      URI::parse(base_url).merge(paths.map { |p| "#{URI.encode p.to_s}" }.join('/')).to_s
+    end
+
     class ResourceCollection
       include Enumerable
 

data/lib/api-resource/version.rb

@@ -1,3 +1,3 @@
 module ApiResource
-  VERSION = '0.4.4'
+  VERSION = '0.5.0'
 end

data/spec/resource_spec.rb

@@ -114,7 +114,7 @@ RSpec.describe ApiResource::Resource do
     it 'fetches resource nested with parent resource' do
       resource_id = 3
       req(:get, "/tags/#{resource_id}/blogs", @expected_resources)
-      result = Blog.by_tag(resource_id)
+      result = Blog.by_tag(resource_id).all
       check_returned_array(Blog, @expected_resources, result)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api-resource
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Chaker Nakhli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple-hmac