active_rest_client 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 287ff0756e1a325c054bb32e601270ebe459b6c9
-  data.tar.gz: 28d6c1a06dde0da5872a96683731ad07741e0159
+  metadata.gz: b673b275ac742495303d8632a70e7a2425df69bf
+  data.tar.gz: 99edc9e4f9ec9faa7703449685c48b898196ee15
 SHA512:
-  metadata.gz: 0081d8815d8bfa568980695683ae889afc68c6f782acfc6759b166f205d0b033c5788ee8973e6ac2e66abd42c9906affbe0913ec71064532009b1626427638f8
-  data.tar.gz: 518e02c69f5239f0528d57dfaba126224dc1e0a4b766d8920a6df50bdfecf3b15d05dd3e4c170c16b23ac70614db98573790a8790cff1c70f1cfd4477e477039
+  metadata.gz: ea15068289c7bedc5faee76611548e342e8ba395f4bb76fb81f99395d5f3fad10e0936a94df5eac5c45236adf137b9ade25c7553a7828c44ad4e83d2d23be3e9
+  data.tar.gz: d201d14a7563791a12885ffb7967f58c938194cd979d06c779b42db11cb0792f336d6f7993ad1e21cd8985cfddc05ff8f4522d098b9b5d733f6ba8c62c41af25

data/active_rest_client.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec", "~> 2"
   spec.add_development_dependency "webmock"
   spec.add_development_dependency "rspec_junit_formatter"
   spec.add_development_dependency "simplecov"
@@ -33,5 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "multi_json"
   spec.add_runtime_dependency "activesupport"
   spec.add_runtime_dependency "faraday", "~> 0.9"
-  spec.add_runtime_dependency "patron", ">= 0.4.9" # 0.4.18 breaks against Curl v0.7.15 but works with webmock
+  spec.add_development_dependency "patron", ">= 0.4.9" # 0.4.18 breaks against Curl v0.7.15 but works with webmock
 end

data/lib/active_rest_client/lazy_association_loader.rb

@@ -6,7 +6,8 @@ module ActiveRestClient
 
     def initialize(name, value, request, options = {})
       @name = name
-      @request = request
+      class_to_map = request.method[:options][:lazy][name] rescue nil
+      @request = class_to_map.nil? ? request : ActiveRestClient::Request.new(class_to_map._mapped_method(:find), class_to_map.new, options)
       @object = nil
       @options = options
       if value.is_a? Array

data/lib/active_rest_client/version.rb

@@ -1,3 +1,3 @@
 module ActiveRestClient
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/lib/lazy_association_loader_spec.rb

@@ -1,5 +1,17 @@
 require 'spec_helper'
 
+class MonthExample < ActiveRestClient::Base
+  base_url "http://www.example.com"
+
+  get :find, "/month/:id", fake:"{\"name\":\"january\"}"
+end
+
+class YearExample < ActiveRestClient::Base
+  base_url "http://www.example.com"
+
+  get :find, "/year/:id", lazy: { months: MonthExample }, fake: "{\"months\": [\"http://www.example.com/months/1\"] }"
+end
+
 describe ActiveRestClient::LazyAssociationLoader do
   let(:url1) { "http://www.example.com/some/url" }
   let(:url2) { "http://www.example.com/some/other" }
@@ -115,4 +127,9 @@ describe ActiveRestClient::LazyAssociationLoader do
     ActiveRestClient::Request.any_instance.should_receive(:call).with(any_args).and_return([1,2,3])
     expect(loader.size).to eq(3)
   end
+
+  it "should use the class specified in the 'lazy' declaration to parse the response rather than the class of the object the lazy loader is attached to" do
+    association = YearExample.find(1)
+    expect(association.months.instance_variable_get('@request').instance_variable_get('@object').class).to eq(MonthExample)
+  end
 end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ elsif ENV["TRAVIS"]
 end
 
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.color = true
   # config.formatter     = 'documentation'
 
   config.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_rest_client
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Which Ltd
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,16 +43,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -200,7 +200,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.9
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: