arrest 0.0.7 → 0.0.8

data/lib/arrest.rb

@@ -8,11 +8,11 @@ require "arrest/helper/child_collection"
 require "arrest/exceptions"
 require "arrest/http_source"
 require "arrest/mem_source"
+require "arrest/source"
 require "arrest/nested_resource"
 require "arrest/abstract_resource"
 require "arrest/root_resource"
 require "arrest/rest_child"
 
 module Arrest
-
 end

data/lib/arrest/abstract_resource.rb

@@ -7,10 +7,9 @@ Scope = Struct.new(:name, :block)
 module Arrest
   class AbstractResource
     include HasAttributes
+    attribute :id, String
     class << self
-
       attr_reader :scopes
-      
 
       def source
         Arrest::Source::source
@@ -29,11 +28,7 @@ module Arrest
       end
 
       def build hash
-        underscored_hash = {}
-        hash.each_pair do |k, v|
-          underscored_hash[StringUtils.underscore k] = v
-        end
-        self.new underscored_hash
+        self.new hash, true
       end
 
       def custom_resource_name new_name
@@ -97,42 +92,9 @@ module Arrest
     include BelongsTo
 
     attr_accessor :id
-    attr_reader :stub
-
-    def self.stub id
-      self.new({:id => id}, true)
-    end
-
-    def initialize  hash={},stubbed=false
-      @stub = stubbed
-      init_from_hash(hash) unless stubbed
-      self.id = hash[:id]
-      self.id ||= hash['id']
-    end
-
-    def init_from_hash as_i={}
-      @stub = false
-      super 
-    end
-    
-
-    def to_hash
-      result = {}
-      unless self.class.all_fields == nil
-        self.class.all_fields.find_all{|a| !a.read_only}.each do |field|
-          json_name = StringUtils.classify(field.name.to_s,false)
-           val = self.instance_variable_get("@#{field.name.to_s}")
-           if val != nil && val.is_a?(NestedResource)
-             val = val.to_hash
-           elsif val != nil && field.is_a?(NestedCollection)
-             val = val.map {|v| v.to_hash}
-           end
-           result[json_name] = val
-        end
-      end
-      result[:id] = self.id
-      result
 
+    def initialize  hash={}, from_json = false
+      initialize_has_attributes hash, from_json
     end
 
     def save
@@ -158,7 +120,5 @@ module Arrest
 
       "curl #{hs} -v '#{Arrest::Source.source.url}/#{self.resource_location}'"
     end
-
-
   end
 end

data/lib/arrest/attributes/converter.rb

@@ -5,14 +5,15 @@ end
 module Arrest
 
   class Attribute
-    attr_accessor :name, :read_only, :clazz
+    attr_accessor :name, :read_only, :clazz, :json_name
     def initialize name, read_only, clazz
-      @name = name
+      @name = name.to_sym
       @read_only = read_only
       @clazz = clazz
+      @json_name = Source.json_key_converter.key_to_json(name).to_sym
     end
 
-    def convert value
+    def from_hash value
       return if value == nil
       converter = CONVERTER[@clazz]
       if converter == nil
@@ -21,6 +22,11 @@ module Arrest
       end
       converter.convert value
     end
+
+    def to_hash value
+      return nil unless value != nil
+      value
+    end
   end
 
   class NestedAttribute < Attribute
@@ -28,10 +34,15 @@ module Arrest
       super name, read_only, clazz
     end
 
-    def convert value
-      return unless value
+    def from_hash value
+      return nil unless value != nil
       @clazz.new value
     end
+
+    def to_hash val
+      return nil unless val!= nil
+      val.to_hash
+    end
   end
 
   class NestedCollection < Attribute
@@ -39,14 +50,20 @@ module Arrest
       super name, read_only, clazz
     end
 
-    def convert value
-      return unless value
+    def from_hash value
+      return nil unless value != nil
       raise "Expected an array but got #{value.class.name}" unless value.is_a?(Array)
       value.map do |v|
         @clazz.new v
       end
     end
 
+    def to_hash value
+      return nil unless value != nil
+      raise "Expected an array but got #{value.class.name}" unless value.is_a?(Array)
+      value.map(&:to_hash)
+    end
+
   end
 
   CONVERTER = {}

data/lib/arrest/attributes/has_attributes.rb

@@ -1,58 +1,86 @@
+require "arrest/source"
 module Arrest
   module HasAttributes
-
-    def self.included(base) # :nodoc:
-      base.extend HasAttributesMethods
+    attr_accessor :attribute_values
+
+    def initialize_has_attributes hash, from_json = false, &blk
+      if block_given?
+        @stubbed = true
+        @load_blk = blk
+      else
+        @stubbed = false
+      end
+      init_from_hash hash, from_json
     end
 
-    def unstub
+    def initialize hash = {}, from_json = false, &blk
+      if block_given?
+        @stubbed = true
+        @load_blk = blk
+      else
+        init_from_hash hash, from_json
+      end
+    end
 
+    def self.included(base) # :nodoc:
+      base.extend HasAttributesMethods
     end
 
-    def init_from_hash as_i={}
+    def init_from_hash as_i={}, from_json = false
+      @attribute_values = {} unless @attribute_values != nil
       as = {}
       as_i.each_pair do |k,v|
         as[k.to_sym] = v
       end
-      unless self.class.all_fields == nil
-        self.class.all_fields.each do |field|
-          value = as[field.name.to_sym]
-          converted = field.convert(value)
-          self.send("#{field.name.to_s}=", converted) 
+      self.class.all_fields.each do |field|
+        if from_json
+          key = field.json_name
+        else
+          key = field.name
         end
+        value = as[key] 
+        converted = field.from_hash(value)
+        self.send(field.name.to_s + '=', converted) unless converted == nil
       end
     end
 
-    def to_hash
+    def load_from_stub
+      @load_blk.call
+      @stubbed = false
+    end
+
+
+    def to_jhash
+      to_hash(false, true)
+    end
+
+    def to_hash(show_all_fields = true, json_names = false)
       result = {}
-      unless self.class.all_fields == nil
-        self.class.all_fields.find_all{|a| !a.read_only}.each do |field|
-          json_name = StringUtils.classify(field.name.to_s,false)
-           val = self.instance_variable_get("@#{field.name.to_s}")
-           if val != nil && val.is_a?(NestedResource)
-             val = val.to_hash
-           end
-           result[json_name] = val
+      self.class.all_fields.find_all{|a| show_all_fields || !a.read_only}.each do |field|
+        if json_names
+          json_name = field.json_name
+        else
+          json_name = field.name
+        end
+        val = self.send(field.name)
+        converted = field.to_hash val
+        if converted != nil
+          result[json_name] = converted
         end
       end
       result
     end
 
     module HasAttributesMethods
+
       attr_accessor :fields
 
-      
+      def initialize
+        @fields = []
+      end
+
       def attribute name, clazz
-          add_attribute Attribute.new(name, false, clazz)
-
-          send :define_method, "#{name}=" do |v|
-            self.unstub
-            self.instance_variable_set("@#{name}", v)
-          end
-          send :define_method, "#{name}" do
-            self.unstub
-            self.instance_variable_get("@#{name}")
-          end
+        add_attribute Attribute.new(name, false, clazz)
       end
 
       def attributes(args)
@@ -62,52 +90,43 @@ module Arrest
       end
 
       def add_attribute attribute
-          if @fields == nil
-            @fields = []
-          end
-          @fields << attribute
+        if @fields == nil
+          @fields = []
+        end
+        send :define_method, "#{attribute.name}=" do |v|
+          Arrest::debug "setter #{self.class.name} #{attribute.name} = #{v}"
+          self.attribute_values[attribute.name] = v
+        end
+        send :define_method, "#{attribute.name}" do
+          Arrest::debug "getter #{self.class.name} #{attribute.name}" 
+          self.load_from_stub if @stubbed
+          self.attribute_values[attribute.name]
+        end
+        @fields << attribute
       end
 
       def all_fields
         self_fields = self.fields
         self_fields ||= []
-        if self.superclass.respond_to?('fields') && self.superclass.fields != nil
-          self_fields + self.superclass.fields
+        if self.superclass.respond_to?('fields') && self.superclass.all_fields != nil
+          res = self_fields + self.superclass.all_fields
         else
-          self_fields
+          res = self_fields
         end
+        res
       end
 
       def nested name, clazz
-          add_attribute NestedAttribute.new(name, false, clazz)
-
-          send :define_method, "#{name}=" do |v|
-            self.unstub
-            self.instance_variable_set("@#{name}", v)
-          end
-          send :define_method, "#{name}" do
-            self.unstub
-            self.instance_variable_get("@#{name}")
-          end
-        
+        add_attribute NestedAttribute.new(name, false, clazz)
       end
 
       def nested_array name, clazz
-          add_attribute NestedCollection.new(name, false, clazz)
-
-          send :define_method, "#{name}=" do |v|
-            self.unstub
-            self.instance_variable_set("@#{name}", v)
-          end
-          send :define_method, "#{name}" do
-            self.unstub
-            self.instance_variable_get("@#{name}")
-          end
-        
+        add_attribute NestedCollection.new(name, false, clazz)
       end
-
     end
 
-
+    def stubbed?
+      @stubbed
+    end
   end
 end

data/lib/arrest/helper/child_collection.rb

@@ -1,21 +1,20 @@
 module Arrest
-  class ChildCollection  < BasicObject
-    def initialize parentX, clazz_name
-      @parent_clazz = parentX
+  class ChildCollection < BasicObject
+    def initialize parent, clazz_name
+      @parent = parent
       @clazz_name = clazz_name
       @children = nil
     end
 
     def build attributes = {}
-      resolved_class.new @parent_clazz, attributes
+      resolved_class.new @parent, attributes
     end
 
     def method_missing(*args, &block)
      if resolved_class.respond_to?(args[0])
-       resolved_class.send(args[0], @parent_clazz)
+       resolved_class.send(args[0], @parent)
      else
        children.send(*args, &block)
-
      end
     end
 
@@ -24,7 +23,7 @@ module Arrest
 
     def children
       if @children == nil
-        @children = resolved_class.all_for @parent_clazz
+        @children = resolved_class.all_for @parent
       end
       @children
     end

data/lib/arrest/http_source.rb

@@ -58,7 +58,7 @@ module Arrest
     def post rest_resource
       raise "new object must have setter for id" unless rest_resource.respond_to?(:id=)
       raise "new object must not have id" if rest_resource.respond_to?(:id) && rest_resource.id != nil
-      hash = rest_resource.to_hash
+      hash = rest_resource.to_jhash
       hash.delete(:id)
       hash.delete('id')
 

data/lib/arrest/mem_source.rb

@@ -25,24 +25,19 @@ module Arrest
     end
 
     def initialize
-    @@all_objects = {} # holds all objects of all types,
+      @@all_objects = {} # holds all objects of all types,
 
-    @@collections = {} # maps urls to collections of ids of objects
-    @@random = Random.new(42)
+      @@collections = {} # maps urls to collections of ids of objects
+      @@random = Random.new(42)
 
     end
 
-    def debug s
-      if Arrest::Source.debug
-        puts s
-      end
-    end
 
     # only to stub collection for development
     #
     def set_collection clazz, scope, objects
       url = clazz.scoped_path scope
-      self.class.debug "url:#{url}"
+      Arrest::debug "url:#{url}"
       @@data[url] = objects
     end
 
@@ -67,7 +62,7 @@ module Arrest
     end
 
     def get_many sub, filters = {}
-      debug sub + (hash_to_query filters)
+      Arrest::debug sub + (hash_to_query filters)
       # filters are ignored by mem impl so far
 
       id_list = @@collections[sub] || []
@@ -80,7 +75,7 @@ module Arrest
     end
 
     def get_one sub, filters = {}
-      debug sub + (hash_to_query filters)
+      Arrest::debug sub + (hash_to_query filters)
       # filters are ignored by mem impl so far
       idx = sub.rindex '/'
       if idx
@@ -90,12 +85,12 @@ module Arrest
       if val == nil
         raise Errors::DocumentNotFoundError
       end
-      wrap val.to_hash.to_json, 1
+      wrap val.to_jhash.to_json, 1
     end
     
     def collection_json values
       single_jsons = values.map do |v|
-        v.to_hash.to_json
+        v.to_jhash.to_json
       end
       "[#{single_jsons.join(',')}]"
     end
@@ -133,6 +128,7 @@ module Arrest
     end
 
     def post rest_resource
+      Arrest::debug "post -> #{rest_resource.class.name} #{rest_resource.to_hash} #{rest_resource.class.all_fields.map(&:name)}"
       raise "new object must have setter for id" unless rest_resource.respond_to?(:id=)
       raise "new object must not have id" if rest_resource.respond_to?(:id) && rest_resource.id != nil
       rest_resource.id = next_id
@@ -140,7 +136,7 @@ module Arrest
       unless @@data[rest_resource.resource_path()] != nil
         @@data[rest_resource.resource_path()] = {}
       end
-      debug "child path #{rest_resource.resource_path()}"
+      Arrest::debug "child path #{rest_resource.resource_path()}"
       @@data[rest_resource.resource_path()][next_id.to_s] = rest_resource.id
       if @@collections[rest_resource.resource_path] == nil
         @@collections[rest_resource.resource_path] = []

data/lib/arrest/nested_resource.rb

@@ -9,21 +9,5 @@ module Arrest
     def initialize h
       init_from_hash h
     end
-
-    class << self
-      def to_hash
-        result = {}
-        unless self.class.all_fields == nil
-          self.class.all_fields.find_all{|a| !a.read_only}.each do |field|
-            json_name = StringUtils.classify(field.name.to_s,false)
-            result[json_name] = self.instance_variable_get("@#{field.name.to_s}")
-          end
-        end
-        result[:id] = self.id
-        result
-
-      end
-
-    end
   end
 end

data/lib/arrest/root_resource.rb

@@ -21,7 +21,7 @@ module Arrest
         if body == nil || body.empty?
           raise Errors::DocumentNotFoundError.new
         end
-        self.build body
+        self.build body.merge({:id => id})
       end
 
       def scope name, &block
@@ -43,6 +43,16 @@ module Arrest
       def scoped_path scope_name
         resource_path + '/' + scope_name.to_s
       end
+
+      def stub stub_id
+        n = self.new
+        n.initialize_has_attributes({:id => stub_id}) do
+          r = n.class.source().get_one "#{self.resource_path}/#{stub_id}"
+          body = n.class.body_root(r)
+          n.init_from_hash(body, true)
+        end
+        n
+      end
     end
 
     def resource_path
@@ -53,18 +63,6 @@ module Arrest
       self.class.resource_path + '/' + self.id.to_s 
     end
 
-
-    def unstub
-      return unless @stub
-      r = self.class.source().get_one "#{self.resource_path}/#{id}"
-      body = self.class.body_root(r)
-      underscored_hash = {}
-      body.each_pair do |k, v|
-        underscored_hash[StringUtils.underscore k] = v
-      end
-      init_from_hash underscored_hash
-    end
-
   end
 end
 

data/lib/arrest/source.rb

@@ -1,4 +1,9 @@
 module Arrest
+  def self.debug s
+    if Arrest::Source.debug
+      puts s
+    end
+  end
 
   class Source 
     class << self
@@ -6,6 +11,7 @@ module Arrest
       attr_reader :source
       attr_reader :mod
       attr_reader :header_decorator
+      attr_accessor :json_key_converter
 
       def source=(host=nil)
         if host == nil || host.blank?
@@ -27,7 +33,7 @@ module Arrest
       end
 
       def header_decorator=(hd=nil)
-        puts "Setting headerd to #{hd}"
+        Arrest::debug "Setting headerd to #{hd}"
         if hd == nil
           @header_decorator = self
         elsif hd.respond_to?(:headers)
@@ -41,9 +47,19 @@ module Arrest
         {}
       end
 
+      def key_from_json name
+        StringUtils.underscore(name.to_s)
+      end
+
+      def key_to_json name
+        StringUtils.classify(name.to_s,false)
+      end
+
     end
   end
   Source.mod = nil
   Source.header_decorator = Source
   Source.debug = false
+  Source.json_key_converter = Source
+
 end

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/test/has_attributed.rb

@@ -0,0 +1,68 @@
+require 'arrest'
+require 'test/unit'
+class HasAttributesTest < Test::Unit::TestCase
+
+  class ItHas
+    include Arrest::HasAttributes
+
+    attribute :name, String
+    attribute :my_name, String
+  end
+
+
+  def test_empty_new
+    ih = ItHas.new
+    ih.name = "NAME"
+    ih.my_name = "MYNAME"
+    assert_equal "NAME", ih.name
+    assert_equal "MYNAME", ih.my_name
+  end
+
+  def test_new
+    ih = ItHas.new({:name => "NAME", :my_name => "MYNAME"})
+    assert_equal "NAME", ih.name
+    assert_equal "MYNAME", ih.my_name
+  end
+
+  class ItHasMore < ItHas
+
+    attribute :my_other_name, String
+  end
+
+  def test_new_inherit
+    ih = ItHasMore.new({:name => "NAME", :my_name => "MYNAME", :my_other_name => "OTHER"})
+    assert_equal "NAME", ih.name
+    assert_equal "MYNAME", ih.my_name
+    assert_equal "OTHER", ih.my_other_name
+    assert_equal 3, ih.class.all_fields.length
+  end
+
+  def test_to_json
+    ih = ItHasMore.new({:name => "NAME", :my_name => "MYNAME", :my_other_name => "OTHER"})
+    h = ih.to_hash
+    assert_equal "NAME", h[:name]
+    assert_equal "MYNAME", h[:my_name]
+    assert_equal "OTHER", h[:my_other_name]
+
+  end
+
+  class ItHasMoreAndId < ItHasMore
+    attribute :id, String
+  end
+
+  def test_to_json_with_id
+    assert_equal [:name, :my_name].sort, ItHas.all_fields.map(&:name).sort
+    assert_equal [:name, :my_name, :my_other_name].sort, ItHasMore.all_fields.map(&:name).sort
+    assert_equal [:name, :my_name, :my_other_name, :id].sort, ItHasMoreAndId.all_fields.map(&:name).sort
+
+    ih = ItHasMoreAndId.new({:id => 'vr23', :name => "NAME", :my_name => "MYNAME", :my_other_name => "OTHER"})
+    ih.id = 'foo42'
+    h = ih.to_hash
+    assert_equal "NAME", h[:name]
+    assert_equal "MYNAME", h[:my_name]
+    assert_equal "OTHER", h[:my_other_name]
+    assert_equal 'foo42', h[:id]
+  end
+
+end
+

data/test/models.rb

@@ -32,6 +32,7 @@ end
 
 class ANestedClass < Arrest::NestedResource
   attribute :name, String
+  attribute :underscore_name, String
   attribute :bool, Boolean
 end
 

data/test/nested_resource.rb

@@ -9,8 +9,9 @@ class NestedResourcesTest < Test::Unit::TestCase
   end
 
   def test_instance_test
-    n = ANestedClass.new({:name => "foo"})
+    n = ANestedClass.new({:name => "foo", :underscore_name => "Bar"})
     assert_equal "foo", n.name
+    assert_equal "Bar", n.underscore_name
   end
 
   def test_from_hash
@@ -19,6 +20,7 @@ class NestedResourcesTest < Test::Unit::TestCase
       :bool => false,
       :nested_object => { 
         :name => 'iamnested',
+        :underscore_name => 'foo',
         :bool => true
       }
     }
@@ -37,23 +39,14 @@ class NestedResourcesTest < Test::Unit::TestCase
       :bool => false,
       :nested_object => { 
         :name => 'iamnested',
+        :underscore_name => 'foo',
         :bool => true
       }
     }
 
     actual = WithNested.new(input)
 
-    # we expect camel cased keys
-    expected = {
-      'parentName' => 'parent',
-      'bool' => false,
-      'nestedObject' => { 
-        'name' => 'iamnested',
-        'bool' => true
-      }
-    }
-
-    assert_equal_hashes expected, actual.to_hash
+    assert_equal_hashes input, actual.to_hash
 
   end
 
@@ -74,22 +67,7 @@ class NestedResourcesTest < Test::Unit::TestCase
 
     actual = WithManyNested.new(input)
 
-    # we expect camel cased keys
-    expected = {
-      'parentName' => 'parent',
-      'bool' => false,
-      'nestedObjects' => [
-        { 
-        'name' => 'iamnested_one',
-        'bool' => true
-        },{ 
-        'name' => 'iamnested_two',
-        'bool' => false
-        }
-      ]
-    }
-
-    assert_equal_hashes expected, actual.to_hash
+    assert_equal_hashes input, actual.to_hash
 
   end
 
@@ -109,19 +87,7 @@ class NestedResourcesTest < Test::Unit::TestCase
 
     actual = WithNestedBelongingTo.new(input)
 
-    # we expect camel cased keys
-    expected = {
-      'parentName' => 'parent',
-      'bool' => false,
-      'nestedObject' => { 
-        'name' => 'iamnested',
-        'bool' => true,
-        'zooId' => new_zoo.id
-
-      }
-    }
-
-    assert_equal_hashes expected, actual.to_hash
+    assert_equal_hashes input, actual.to_hash
 
     zoo = actual.nested_object.zoo
     assert_equal "Foo", zoo.name

data/test/unit.rb

@@ -5,7 +5,7 @@ class FirstTest < Test::Unit::TestCase
 
   def setup
      Arrest::Source.source = nil
-     #Arrest::Source.debug = true
+     Arrest::Source.debug = true
   end
 
   def test_mem_src
@@ -15,9 +15,14 @@ class FirstTest < Test::Unit::TestCase
   end
 
   def test_init
+    puts "test_init NOWWWWWW #{Arrest::Source::source.objects.length}"
     zooname =  "Hagenbecks"
     z = Zoo.new({:name => zooname})
+    puts "aaa #{z.attribute_values.inspect}"
     assert_equal zooname, z.name
+    #assert_not_empty Arrest::AbstractResource.all_fields.select {|f| f.name == :id}, "AbstractResource defines the id field itself"
+    #assert_not_empty Arrest::RootResource.all_fields.select {|f| f.name == :id}, "RootResource should inherit id from AbstractResource"
+    #assert_not_empty Zoo.all_fields.select {|f| f.name == :id}, "Zoo should inherit id field from RootResource"
   end
   
   def test_create
@@ -25,15 +30,18 @@ class FirstTest < Test::Unit::TestCase
     new_zoo = Zoo.new({:name => "Foo"})
     new_zoo.save
     zoo_count_after = Zoo.all.length
+    assert_not_nil new_zoo.id
 
     assert_equal (zoo_count_before + 1), zoo_count_after
     assert new_zoo.id != nil
 
     zoo_the_last = Zoo.all.last
     assert_equal new_zoo.name, zoo_the_last.name
+    assert_equal new_zoo.id, zoo_the_last.id
 
     zoo_reloaded = Zoo.find(new_zoo.id)
     assert_equal new_zoo.name, zoo_reloaded.name
+    assert_equal new_zoo.id, zoo_reloaded.id
   end
 
   def test_delete
@@ -75,6 +83,8 @@ class FirstTest < Test::Unit::TestCase
     assert new_zoo.id != nil
 
     zoo_reloaded = Zoo.find(new_zoo.id)
+    assert_not_nil zoo_reloaded
+    assert_equal new_zoo.id, zoo_reloaded.id
 
     assert_equal new_zoo_name, zoo_reloaded.name
   end
@@ -82,6 +92,8 @@ class FirstTest < Test::Unit::TestCase
   def test_child
     new_zoo = Zoo.new({:name => "Foo"})
     new_zoo.save
+    assert_not_nil new_zoo.id
+    #assert_not_nil new_zoo.class.all_fields.select {|f| f.name = :id}
 
     animal_kind = "mouse"
     new_animal = Animal.new new_zoo, {:kind => animal_kind, :age => 42}
@@ -94,7 +106,9 @@ class FirstTest < Test::Unit::TestCase
     assert new_animal.id != nil
 
     zoo_reloaded = Zoo.find(new_zoo.id)
-
+    puts "--1 #{zoo_reloaded.to_hash}"
+    assert_equal new_zoo.id, zoo_reloaded.id
+    assert_equal new_animal.parent.id, zoo_reloaded.id
 
     assert_equal 1, zoo_reloaded.animals.length
     assert_equal Animal, zoo_reloaded.animals.first.class
@@ -126,11 +140,15 @@ class FirstTest < Test::Unit::TestCase
   end
 
   def test_inheritance
+    puts "NOWWWWWW #{Arrest::Source::source.objects.length}"
     new_zoo = SpecialZoo.new({:name => "Foo", :is_magic => true})
+    assert_equal "Foo", new_zoo.name
+    assert_equal true, new_zoo.is_magic
     new_zoo.save
 
     assert new_zoo.id != nil, "Zoo must have id after save"
     zoo_reloaded = SpecialZoo.find(new_zoo.id)
+    assert_equal new_zoo.id, zoo_reloaded.id
     assert_equal true, zoo_reloaded.is_magic
     assert_equal "Foo", zoo_reloaded.name
   end
@@ -172,7 +190,7 @@ class FirstTest < Test::Unit::TestCase
     assert_equal "two", zoo.ro2
     assert_equal true, zoo.is_magic
      
-    hash = zoo.to_hash
+    hash = zoo.to_jhash
 
     assert_nil hash[:ro1]
     assert_nil hash[:ro2]
@@ -188,9 +206,9 @@ class FirstTest < Test::Unit::TestCase
     assert_not_nil new_zoo.id
 
     stubbed = Zoo.stub(new_zoo.id)
-    assert stubbed.stub, "Zoo should be a stub, so not loaded yet"
+    assert stubbed.stubbed?, "Zoo should be a stub, so not loaded yet"
     new_name = stubbed.name
-    assert !stubbed.stub, "Zoo should not be a stub, so loaded now"
+    assert !stubbed.stubbed?, "Zoo should not be a stub, so loaded now"
 
     assert_equal "Foo", new_name
   end
@@ -202,24 +220,21 @@ class FirstTest < Test::Unit::TestCase
     assert_not_nil new_zoo.id
     # this is where the magic hapens
     stubbed = Zoo.stub(new_zoo.id)
-    return
 
     new_animal = Animal.new new_zoo, {:kind => "foo", :age => 42}
     new_animal.save
     
-    assert stubbed.stub, "Zoo should be a stub, so not loaded yet"
+    assert stubbed.stubbed?, "Zoo should be a stub, so not loaded yet"
 
     animals = stubbed.animals
 
-    assert stubbed.stub, "Zoo should still be a stub, so not loaded yet"
+    assert stubbed.stubbed?, "Zoo should still be a stub, so not loaded yet"
     assert_equal 1, animals.length
 
     new_name = stubbed.name
-    assert !stubbed.stub, "Zoo should not be a stub, so loaded now"
+    assert !stubbed.stubbed?, "Zoo should not be a stub, so loaded now"
 
     assert_equal "Foo", new_name
-    
-
   end
 
   def test_root_scope

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000Z
+date: 2011-12-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2154189380 !ruby/object:Gem::Requirement
+  requirement: &2154088800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154189380
+  version_requirements: *2154088800
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2154188840 !ruby/object:Gem::Requirement
+  requirement: &2154087020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *2154188840
+  version_requirements: *2154087020
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154188080 !ruby/object:Gem::Requirement
+  requirement: &2154085760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2154188080
+  version_requirements: *2154085760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154187220 !ruby/object:Gem::Requirement
+  requirement: &2154084940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154187220
+  version_requirements: *2154084940
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2154186100 !ruby/object:Gem::Requirement
+  requirement: &2154083900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154186100
+  version_requirements: *2154083900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154185300 !ruby/object:Gem::Requirement
+  requirement: &2154082700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2154185300
+  version_requirements: *2154082700
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2154184880 !ruby/object:Gem::Requirement
+  requirement: &2154082100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154184880
+  version_requirements: *2154082100
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2154184380 !ruby/object:Gem::Requirement
+  requirement: &2154081620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154184380
+  version_requirements: *2154081620
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2154183740 !ruby/object:Gem::Requirement
+  requirement: &2154081180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154183740
+  version_requirements: *2154081180
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -141,6 +141,7 @@ files:
 - spec/arrest_spec.rb
 - spec/spec_helper.rb
 - spec/support/models/user.rb
+- test/has_attributed.rb
 - test/models.rb
 - test/nested_resource.rb
 - test/unit.rb
@@ -172,6 +173,7 @@ test_files:
 - spec/arrest_spec.rb
 - spec/spec_helper.rb
 - spec/support/models/user.rb
+- test/has_attributed.rb
 - test/models.rb
 - test/nested_resource.rb
 - test/unit.rb