rod-rest 0.5.0 → 0.5.1

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    rod-rest (0.0.1.1)
+    rod-rest (0.5.1)
       faraday
       rod
       sinatra

data/changelog.txt

@@ -1,3 +1,7 @@
+0.5.1
+Fix CollectionProxy#each for empty collection
+Fix inspection of proxy
+Fix access to metadata in Proxy
 0.5.0
 #inspect & #to_s for major classes
 ProxyCache

data/lib/rod/rest/collection_proxy.rb

@@ -62,8 +62,10 @@ module Rod
       # Iterates over the elements of the collection.
       def each
         if block_given?
-          self[0..@size-1].each do |object|
-            yield object
+          if @size > 0
+            self[0..@size-1].each do |object|
+              yield object
+            end
           end
         else
           enum_for(:each)

data/lib/rod/rest/constants.rb

@@ -1,5 +1,5 @@
 module Rod
   module Rest
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/rod/rest/property_metadata.rb

@@ -20,7 +20,7 @@ module Rod
       # Rod::Rest::PropertyMetadata<name>
       def inspect
         indexed = indexed? ? ",indexed" : ""
-        "#{self.class}<#{@name}#{indexed}>"
+        "Property<#{@name}#{indexed}>"
       end
 
       # Short description of the poperty.

data/lib/rod/rest/proxy.rb

@@ -38,7 +38,7 @@ module Rod
       private
       def build_class(metadata)
         Class.new do
-          class_variable_set("@@metadata",metadata)
+          instance_variable_set("@metadata",metadata)
 
           attr_reader :type,:rod_id
 
@@ -96,24 +96,36 @@ module Rod
 
           private
           def inspect_fields
-            @@metadata.fields.map do |field|
+            metadata.fields.map do |field|
               "#{field.name}:#{self.send(field.symbolic_name)}"
             end.join(",")
           end
 
           def inspect_singular_associations
-            @@metadata.singular_associations.map do |association|
+            metadata.singular_associations.map do |association|
               description = instance_variable_get("@_#{association.name}_description")
-              "#{association.name}:#{description[:type]}:#{description[:rod_id]}"
+              if description
+                "#{association.name}:#{description[:type]}:#{description[:rod_id]}"
+              else
+                "#{association.name}:nil"
+              end
             end.join(",")
           end
 
           def inspect_plural_associations
-            @@metadata.plural_associations.map do |association|
+            metadata.plural_associations.map do |association|
               count = instance_variable_get("@_#{association.name}_count")
               "#{association.name}[#{count}]"
             end.join(",")
           end
+
+          def metadata
+            self.class.metadata
+          end
+
+          def self.metadata
+            @metadata
+          end
         end
       end
 

data/test/spec/collection_proxy.rb

@@ -150,6 +150,17 @@ module Rod
               drivers = [schumaher,kubica,alonzo]
               collection.each.map{|e| e }.should == drivers
             end
+
+          end
+        end
+
+        context "with 0 drivers" do
+          let(:size)  { 0 }
+
+          describe "#each" do
+            it "doesn't call the block" do
+              lambda { collection.each{|e| raise "Should not be executed" } }.should_not raise_error(Exception)
+            end
           end
         end
       end

data/test/spec/proxy.rb

@@ -35,13 +35,14 @@ module Rod
 
       let(:car_type)            { "Test::Car" }
       let(:mercedes_300_hash)   { { rod_id: mercedes_300_id, name: mercedes_300_name, type: car_type,
-                                    owner: schumaher_hash, drivers: { count: drivers_count } } }
+                                    owner: owner_hash, drivers: { count: drivers_count } } }
       let(:mercedes_300_id)     { 1 }
       let(:mercedes_300_name)   { "Mercedes 300" }
 
       let(:person_type)         { "Test::Person" }
       let(:drivers_count)       { 1 }
       let(:schumaher_hash)      { { rod_id: schumaher_id, type: person_type } }
+      let(:owner_hash)          { schumaher_hash }
       let(:schumaher_id)        { 2 }
       let(:schumaher_object)    { Object.new }
       let(:owner_object)        { schumaher_object }
@@ -118,6 +119,14 @@ module Rod
           it "reports the drivers of the car" do
             mercedes_300.inspect.should match(/drivers\[#{drivers_count}\]/)
           end
+
+          context "with nil owner" do
+            let(:owner_hash) { nil }
+
+            it "reports nil owner" do
+              mercedes_300.inspect.should match(/owner:nil/)
+            end
+          end
         end
 
         describe "#to_s" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rod-rest
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors: