distant 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b013860fb76db4c918bb3dc7a2de9821d9ec8f47
-  data.tar.gz: b8d368d98798f9e79f19af8202d56ed9ab2d6205
+  metadata.gz: 28f6eb35f0ed682487b4386e1f95b2367c9956c3
+  data.tar.gz: 222daaed9d2614c6cfeec30275d5327e0c57c844
 SHA512:
-  metadata.gz: 73df7dd9644e1521668a611708a163f0163f330b9ad488488ab521eebaa4e7c951f6b10af1aff7066c6efeccc38c71b52804e84d64a31788842f54a1b51550cc
-  data.tar.gz: 9c3254be7bff13ff9d0acc4fc6a5104de935c3730a1a8035d7f1f26e50032774544d7659c924b7a4aceb45e2ffc403517a676f37ea0ad5fa7733343806352a7e
+  metadata.gz: 518d5f087ee08af705f7ba9cdb0bd54dc3b482eb3e51614fa4902b069a9257190bb87a6c5219d1319c7bb51a997fa4a38dd389a37bff6aa7ca95e9c2455e34a8
+  data.tar.gz: 2be94392e8ab8d23acb09a578156af76d18cc034806cb83047a1638be0cc6f51f7af9435d098da94db35290821b361c4d99c5947a6602b51fdd306ccb7cf52e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    distant (0.1.6)
+    distant (0.1.7)
       activesupport
       httparty
 

data/distant.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = 'distant'
-  spec.version     = '0.1.6'
+  spec.version     = '0.1.7'
   spec.authors     = ['John Drago']
   spec.email       = 'jdrago.999@gmail.com'
   spec.homepage    = 'https://github.com/distant/distant'

data/lib/distant/base.rb

@@ -30,6 +30,7 @@ module Distant
       def init_class_vars
         @has_many = [ ]
         @belongs_to = [ ]
+        @translator = Distant::Translator.new
       end
 
       def connection
@@ -50,7 +51,8 @@ module Distant
 
       def get(name, route)
         define_singleton_method(name) do |*args|
-          path = path_closure_generator(route).call(*args)
+          path_generator, captures = self.path_closure_generator(route)
+          path = path_generator.call(*args)
           headers = Distant.config.default_headers('')
                       .merge(Distant.config.auth_headers(''))
           response_data = preprocess_response connection.get(path, headers: headers)
@@ -65,7 +67,9 @@ module Distant
       def has_many(plural, route)
         @has_many << plural.to_sym
         define_method(plural) do
-          path = self.class.path_closure_generator(route).call(id: self.id)
+          path_generator, captures = self.class.path_closure_generator(route)
+          path_args = captures.map{|x| {x.to_sym => send(x)}}.reduce({}, :merge)
+          path = path_generator.call(path_args)
           headers = Distant.config.default_headers('')
                       .merge(Distant.config.auth_headers(''))
           class_ref = Kernel.const_get self.class.to_s.deconstantize + '::' + plural.to_s.singularize.classify
@@ -79,7 +83,9 @@ module Distant
         define_method(singular) do
           foreign_key_attr = singular.to_s + '_id'
           foreign_key_value = self.send(foreign_key_attr)
-          path = self.class.path_closure_generator(route).call(id: foreign_key_value)
+          path_generator, captures = self.class.path_closure_generator(route)
+          path_args = captures.map{|x| {x.to_sym => send(x)}}.reduce({}, :merge)
+          path = path_generator.call(id: foreign_key_value)
           headers = Distant.config.default_headers('')
                       .merge(Distant.config.auth_headers(''))
           class_ref = Kernel.const_get self.class.to_s.deconstantize + '::' + singular.to_s.classify
@@ -96,13 +102,15 @@ module Distant
         template = route.gsub(%r{:([^/\{\}\:\-]+)}, "%{#{$1}}")
 
         # Convert '/foo/%{bar}/%{bux}' to /foo/123/456 with {bar: 123, bux: 456}
-        class_eval <<-EOF
+        proc = class_eval <<-EOF
           Proc.new do |#{captures.map{|cap| "#{cap}:"}.join(', ')}|
             template % {
               #{captures.map{ |cap| cap + ": " + cap }.join(', ')}
             }
           end
         EOF
+
+        return proc, captures
       end
 
       def preprocess_response(response)

data/spec/client/base_spec.rb

@@ -36,7 +36,7 @@ describe Distant::Base do
         end
         context 'the closure returned' do
           before do
-            @closure = Distant::BaseTest.path_closure_generator(@route)
+            @closure, @captures = Distant::BaseTest.path_closure_generator(@route)
           end
           it 'accepts no arguments' do
             expect{@closure.call()}.not_to raise_error
@@ -49,7 +49,7 @@ describe Distant::Base do
         end
         context 'the closure returned' do
           before do
-            @closure = Distant::BaseTest.path_closure_generator(@route)
+            @closure, @captures = Distant::BaseTest.path_closure_generator(@route)
           end
           it 'accepts one corresponding argument' do
             expect{@closure.call(id: 123)}.not_to raise_error
@@ -63,7 +63,7 @@ describe Distant::Base do
         end
         context 'the closure returned' do
           before do
-            @closure = Distant::BaseTest.path_closure_generator(@route)
+            @closure, @captures = Distant::BaseTest.path_closure_generator(@route)
           end
           it 'accepts all corresponding arguments' do
             expect{@closure.call(id: 123, bar_id: 456)}.not_to raise_error
@@ -147,11 +147,13 @@ describe Distant::Base do
       expect(Distant::BaseTest.new).to respond_to :sub_tests
     end
     context 'when the plural instance method is called' do
-      before do
-        expect(Distant::BaseTest).to receive(:preprocess_response){ [{base_test_id: 123, id: 456}]}
-      end
       it 'makes a GET request with the correct route' do
-        expect(Distant::Connection).to receive(:get).with('/base/123/tests', headers: {})
+        expect(Distant::Connection).to receive(:get).with('/base/123/tests', headers: {}) do
+          response = double('response')
+          expect(response).to receive(:code){ 200 }
+          expect(response).to receive(:body){ [{base_test_id: 123, id: 456}].to_json }
+          response
+        end
         result = Distant::BaseTest.new(id: 123).sub_tests
         expect(result.first).to be_a Distant::SubTest
       end
@@ -167,11 +169,13 @@ describe Distant::Base do
       expect(Distant::SubTest.new).to respond_to :base_test
     end
     context 'when the  instance method is called' do
-      before do
-        expect(Distant::SubTest).to receive(:preprocess_response){ {id: 123, name: 'foo'}}
-      end
       it 'makes a GET request with the correct route' do
-        expect(Distant::Connection).to receive(:get).with('/base/123', headers: {})
+        expect(Distant::Connection).to receive(:get).with('/base/123', headers: {}) do
+          response = double('response')
+          expect(response).to receive(:code){ 200 }
+          expect(response).to receive(:body){ {id: 123, name: 'test'}.to_json }
+          response
+        end
         result = Distant::SubTest.new(id: 456, base_test_id: 123).base_test
         expect(result).to be_a Distant::BaseTest
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: distant
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - John Drago