legato 0.0.6 → 0.0.7

data/lib/legato/model.rb

@@ -26,13 +26,13 @@ module Legato
       end
     end
 
-    # def set_instance_klass(klass)
-    #   @instance_klass = klass
-    # end
+    def set_instance_klass(klass)
+      @instance_klass = klass
+    end
 
-    # def instance_klass
-    #   @instance_klass || OpenStruct
-    # end
+    def instance_klass
+      @instance_klass || OpenStruct
+    end
 
     def results(profile, options = {})
       Query.new(self).results(profile, options)

data/lib/legato/query.rb

@@ -43,6 +43,10 @@ module Legato
       # end
     end
 
+    def instance_klass
+      @parent_klass.instance_klass
+    end
+
     def apply_filter(*args, &block)
       @profile = extract_profile(args)
 

data/lib/legato/user.rb

@@ -20,7 +20,7 @@ module Legato
         access_token.get(URL, :params => query.to_params)
       end
 
-      Response.new(raw_response)
+      Response.new(raw_response, query.instance_klass)
     end
 
     # Management

data/lib/legato/version.rb

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

data/spec/lib/legato/model_spec.rb

@@ -32,6 +32,16 @@ describe "Legato::Model" do
       @model.dimensions.should == Legato::ListParameter.new(:dimensions, [:browser, :city])
     end
 
+    it 'knows the instance class it should use' do
+      klass = Class.new
+      @model.set_instance_klass(klass)
+      @model.instance_klass.should == klass
+    end
+
+    it "defaults to OpenStruct for its instance class" do
+      @model.instance_klass.should == OpenStruct
+    end
+
     context "with filters" do
       before :each do
         @block = lambda {}

data/spec/lib/legato/query_spec.rb

@@ -46,6 +46,12 @@ describe Legato::Query do
       @query.loaded?.should == false
     end
 
+    it 'delegates the instance klass from the parent klass' do
+      klass = Class.new
+      @query.parent_klass.stubs(:instance_klass).returns(klass)
+      @query.instance_klass.should == klass
+    end
+
     it "loads a collection of results" do
       response = stub(:collection => [], :total_results => 0, :totals_for_all_results => {})
       user = stub(:request => response)

data/spec/lib/legato/user_spec.rb

@@ -8,12 +8,13 @@ describe Legato::User do
     end
 
     it 'returns a response for a given query' do
+      klass = Class.new
       @access_token.stubs(:get).returns('a response')
       Legato::Response.stubs(:new)
 
-      @user.request(stub(:to_params => "params"))
+      @user.request(stub(:to_params => "params", :instance_klass => klass))
 
-      Legato::Response.should have_received(:new).with('a response')
+      Legato::Response.should have_received(:new).with('a response', klass)
       @access_token.should have_received(:get).with(Legato::User::URL, :params => "params")
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: legato
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Tony Pitale
@@ -80,7 +80,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 3111266077
+        hash: -2540839718
         segments: 
         - 2
         - 0