arrest 0.0.4 → 0.0.5

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 *.swp
+coverage

data/.rspec

@@ -0,0 +1,2 @@
+--colour
+--format nested

data/arrest.gemspec

@@ -22,4 +22,12 @@ Gem::Specification.new do |s|
   # s.add_development_dependency "rspec"
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "faraday", '0.7.5'
+
+  s.add_development_dependency 'bundler', '>= 1.0.0'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rdoc'
+  s.add_development_dependency 'rspec', '~> 2'
+  s.add_development_dependency 'rr'
+  s.add_development_dependency 'simplecov'
+  s.add_development_dependency 'rack'
 end

data/lib/arrest.rb

@@ -1,6 +1,8 @@
 require "arrest/version"
 
 require "arrest/source"
+require "arrest/helper/child_collection"
+require "arrest/exceptions"
 require "arrest/http_source"
 require "arrest/mem_source"
 require "arrest/abstract_resource"

data/lib/arrest/abstract_resource.rb

@@ -1,9 +1,12 @@
 require 'json'
 require 'arrest/string_utils'
 require 'time'
-  class Boolean
 
-  end
+Scope = Struct.new(:name, :block)
+
+class Boolean
+  # to have a boolean type for attributes
+end
 
 module Arrest
 
@@ -61,6 +64,8 @@ module Arrest
     class << self
 
       attr_accessor :fields
+      attr_reader :scopes
+      
 
       def source
         Arrest::Source::source
@@ -68,10 +73,14 @@ module Arrest
 
       def body_root response
         if response == nil
-          return nil
+          raise Errors::DocumentNotFoundError
         end
         all = JSON.parse response
-        all["result"]
+        body = all["result"]
+        if body == nil
+          raise Errors::DocumentNotFoundError
+        end
+        body
       end
 
       def build hash
@@ -82,8 +91,16 @@ module Arrest
         self.new underscored_hash
       end
 
+      def custom_resource_name new_name
+        @custom_resource_name = new_name
+      end
+
       def resource_name
-       StringUtils.plural self.name.sub(/.*:/,'').downcase
+       if @custom_resource_name
+         @custom_resource_name
+       else
+         StringUtils.plural self.name.sub(/.*:/,'').downcase
+       end
       end
 
       def has_many(*args)
@@ -98,15 +115,20 @@ module Arrest
           end
         end
         send :define_method, method_name do
-         Arrest::Source.mod.const_get(StringUtils.classify clazz_name).all_for self
+          if @child_collections == nil
+            @child_collections = {}
+          end
+          if @child_collections[method_name] == nil
+            @child_collections[method_name]  = ChildCollection.new(self, (StringUtils.classify clazz_name))
+          end
+
+          @child_collections[method_name]
         end
       end
 
       def parent(*args)
         method_name = args[0].to_s.to_sym
-        send :define_method, method_name do
-          self.parent
-        end
+        class_eval "def #{method_name}; self.parent; end"
       end
 
       def add_attribute attribute
@@ -116,11 +138,20 @@ module Arrest
           @fields << attribute
       end
 
+      def scope name, &block 
+        if @scopes == nil
+          @scopes = []
+        end
+        @scopes << Scope.new(name, &block)
+      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
+          self_fields + self.superclass.fields
         else
-          self.fields
+          self_fields
         end
 
       end
@@ -132,10 +163,22 @@ module Arrest
         end
       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
+      end
+
       def attributes(args)
         args.each_pair do |name, clazz|
-          self.send :attr_accessor,name
-          add_attribute Attribute.new(name, false, clazz)
+          self.attribute name, clazz
         end
       end
 
@@ -148,11 +191,26 @@ module Arrest
           Arrest::Source.mod.const_get(StringUtils.classify name).find(val)
         end
       end
+
     end
+    self.fields = []
 
     attr_accessor :id
+    attr_reader :stub
+
+    def self.stub id
+      self.new({:id => id}, true)
+    end
 
-    def initialize  as_i
+    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
       as = {}
       as_i.each_pair do |k,v|
         as[k.to_sym] = v
@@ -172,8 +230,8 @@ module Arrest
           self.send("#{field.name.to_s}=", converter.convert(value)) 
         end
       end
-      self.id = as[:id]
     end
+    
 
     def to_hash
       result = {}
@@ -189,16 +247,29 @@ module Arrest
     end
 
     def save
-      if self.respond_to?(:id) && self.id != nil
-        AbstractResource::source().put self
-      else
-        AbstractResource::source().post self
-      end
+      verb = new_record? ? :post : :put
+      !!AbstractResource::source.send(verb, self)
+    end
+
+    def new_record?
+      [nil, ''].include?(id)
     end
 
     def delete
       AbstractResource::source().delete self
+      true
     end
+    #
+    # convenicence method printing curl command
+    def curl
+      hs = ""
+      Arrest::Source.header_decorator.headers.each_pair do |k,v| 
+        hs << "-H '#{k}:#{v}'"
+      end
+
+      "curl #{hs} -v '#{Arrest::Source.source.url}/#{self.resource_location}'"
+    end
+
 
   end
 end

data/lib/arrest/exceptions.rb

@@ -0,0 +1,7 @@
+module Arrest
+  module Errors
+    class DocumentNotFoundError < StandardError
+
+    end
+  end
+end

data/lib/arrest/helper/child_collection.rb

@@ -0,0 +1,40 @@
+module Arrest
+  class ChildCollection  < BasicObject
+    def initialize parentX, clazz_name
+      @parent_clazz = parentX
+      @clazz_name = clazz_name
+      @children = nil
+    end
+
+    def build attributes = {}
+      resolved_class.new @parent_clazz, attributes
+    end
+
+    def method_missing(*args, &block)
+     if resolved_class.respond_to?(args[0])
+       resolved_class.send(args[0], @parent_clazz)
+     else
+       children.send(*args, &block)
+
+     end
+    end
+
+    private
+
+
+    def children
+      if @children == nil
+        @children = resolved_class.all_for @parent_clazz
+      end
+      @children
+    end
+
+    def resolved_class
+      if @clazz == nil
+        @clazz = Source.mod.const_get(@clazz_name)
+      end
+      @clazz
+    end
+
+  end
+end

data/lib/arrest/http_source.rb

@@ -7,24 +7,35 @@ module Arrest
       @base = base
     end
 
+    def url
+      @base
+    end
+
     def add_headers headers
       Arrest::Source.header_decorator.headers.each_pair do |k,v|
         headers[k.to_s] = v.to_s
       end
     end
 
-    def get sub
+    def get_one sub, filter={}
       response = self.connection().get do |req|
-        req.url sub
+        req.url sub, filter
         add_headers req.headers
       end
+      if response.env[:status] != 200
+        raise Errors::DocumentNotFoundError 
+      end
       response.body
     end
 
+    def get_many sub, filter={}
+      get_one sub, filter
+    end
+
     def delete rest_resource
       raise "To delete an object it must have an id" unless rest_resource.respond_to?(:id) && rest_resource.id != nil
       response = self.connection().delete do |req|
-        req.url rest_resource.location
+        req.url rest_resource.resource_location
         add_headers req.headers
       end
       response.env[:status] == 200
@@ -37,7 +48,7 @@ module Arrest
       hash.delete("id")
 
       response = self.connection().put do |req|
-        req.url rest_resource.location
+        req.url rest_resource.resource_location
         add_headers req.headers
         req.body = hash.to_json
       end
@@ -53,11 +64,9 @@ module Arrest
 
       hash.delete_if{|k,v| v == nil}
       
-      puts "URL:#{rest_resource.class.resource_path}"
       body = hash.to_json
-      puts "Body:#{body}"
       response = self.connection().post do |req|
-        req.url rest_resource.class.resource_path
+        req.url rest_resource.resource_path
         add_headers req.headers
         req.body = body
       end
@@ -65,6 +74,7 @@ module Arrest
         location = response.env[:response_headers][:location]
         id = location.gsub(/^.*\//, '')
         rest_resource.id= id
+        true
       else
         puts "unable to create: #{response.env[:response_headers]} body: #{response.body} "
         false

data/lib/arrest/mem_source.rb

@@ -2,14 +2,48 @@ module Arrest
   class MemSource
 
     attr_accessor :data
+    
+
+    @@all_objects = {} # holds all objects of all types,
+                       # each having a unique id
+
+    @@collections = {} # maps urls to collections of ids of objects
 
+    
     @@data = {}
 
+    def objects
+      @@all_objects
+    end
+
+    def collections
+      @@collections
+    end
+
     def data
       @@data
     end
 
     def initialize
+    @@all_objects = {} # holds all objects of all types,
+
+    @@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}"
+      @@data[url] = objects
     end
 
     def wrap content,count
@@ -20,22 +54,44 @@ module Arrest
 
     end
 
-    def get sub
-      idx = sub.rindex(/\/[0-9]*$/)
-      if idx
-        ps = [sub[0..(idx-1)], sub[(idx+1)..sub.length]]
-      else
-        ps = [sub]
+    def hash_to_query filters
+      ps = []
+      filters.each_pair do |k,v|
+        ps << "#{k}=v"
       end
-      val = traverse @@data,ps
-      if val.is_a?(Hash)
-        wrap collection_json(val.values), val.length
-      elsif val == nil
-        wrap "{}", 0
+      if ps.empty?
+        ''
       else
-        wrap val.to_hash.to_json, 1
+        '?' + ps.join('&')
       end
     end
+
+    def get_many sub, filters = {}
+      debug sub + (hash_to_query filters)
+      # filters are ignored by mem impl so far
+
+      id_list = @@collections[sub] || []
+      objects = id_list.map do |id|
+        @@all_objects[id]
+      end
+
+      wrap collection_json(objects), id_list.length
+
+    end
+
+    def get_one sub, filters = {}
+      debug sub + (hash_to_query filters)
+      # filters are ignored by mem impl so far
+      idx = sub.rindex '/'
+      if idx
+       id = sub[(idx+1)..sub.length]
+      end
+      val = @@all_objects[id]
+      if val == nil
+        raise Errors::DocumentNotFoundError
+      end
+      wrap val.to_hash.to_json, 1
+    end
     
     def collection_json values
       single_jsons = values.map do |v|
@@ -59,35 +115,42 @@ module Arrest
 
     def delete rest_resource
       raise "To change an object it must have an id" unless rest_resource.respond_to?(:id) && rest_resource.id != nil
-      @@data[rest_resource.resource_path()].delete(rest_resource.id.to_s) 
+      @@all_objects.delete(rest_resource.id)
+      @@collections.each_pair do |k,v|
+        v.reject!{ |id| id == rest_resource.id }
+      end
       rest_resource
     end
 
     def put rest_resource
       raise "To change an object it must have an id" unless rest_resource.respond_to?(:id) && rest_resource.id != nil
-      @@data[rest_resource.resource_path()][rest_resource.id.to_s] = rest_resource
-      rest_resource
+      old = @@all_objects[rest_resource.id]
+
+      rest_resource.class.all_fields.each do |f|
+        old.send("#{f.name}=", rest_resource.send(f.name))
+      end
+      true
     end
 
     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
-      if @@data[rest_resource.resource_path()] != nil
-        last_id = @@data[rest_resource.resource_path()].values.map(&:id).sort.last
-      else
-        last_id = 42
-      end
-      if last_id.is_a?(Integer)
-        next_id = last_id + 1
-      else
-        next_id = "#{last_id}x"
-      end
       rest_resource.id = next_id
+      @@all_objects[rest_resource.id] = rest_resource
       unless @@data[rest_resource.resource_path()] != nil
         @@data[rest_resource.resource_path()] = {}
       end
-      @@data[rest_resource.resource_path()][next_id.to_s] = rest_resource
-      next_id
+      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] = []
+      end
+      @@collections[rest_resource.resource_path] << rest_resource.id
+      true
+    end
+
+    def next_id
+      (0...32).map{ ('a'..'z').to_a[@@random.rand(26)] }.join
     end
   end
 end

data/lib/arrest/rest_child.rb

@@ -9,7 +9,11 @@ module Arrest
     class << self
       # class method to generate path to a child resource of aonther resource
       def resource_path_for parent
-        "#{parent.location}/#{self.resource_name}"
+        "#{parent.resource_location}/#{self.resource_name}"
+      end
+
+      def scoped_path_for parent, scope_name
+        (resource_path_for parent) + '/' + scope_name.to_s
       end
 
       def build parent, hash
@@ -19,17 +23,33 @@ module Arrest
 
       def all_for parent
         raise "Parent has no id yet" unless parent.id
-        body_root(source().get self.resource_path_for(parent)).map do |h|
+        body_root(source().get_many self.resource_path_for(parent)).map do |h|
           self.build(parent, h)
         end
       end
 
       def find_for parent,id
-        r = source().get "#{self.resource_path_for(parent)}/#{id}"
+        r = source().get_one "#{self.resource_path_for(parent)}/#{id}"
         body = body_root(r)
         self.build body
       end
 
+      def scope name, &block
+        super name
+        if block_given?
+          send :define_singleton_method, name do |parent|
+            self.all_for(parent).select &block 
+          end
+        else
+          send :define_singleton_method, name do |parent|
+            raise "Parent has no id yet" unless parent.id
+            body_root(source().get_many self.scoped_path_for(parent, name)).map do |h|
+              self.build(parent, h)
+            end
+          end
+        end
+
+      end
     end
 
     # instance method to generate path to a child resource of another resource
@@ -38,10 +58,15 @@ module Arrest
     end
 
     # unique url for one instance of this class
-    def location
+    def resource_location
       "#{self.class.resource_path}/#{self.id.to_s}"
     end
 
+    def unstub
+      return unless @stub
+      raise "stubbing for child resource isnt supported yet"
+    end
+
 
   end
 end

data/lib/arrest/root_resource.rb

@@ -7,8 +7,8 @@ module Arrest
         "#{self.resource_name}"
       end
 
-      def all
-        body = body_root(source().get self.resource_path)
+      def all filter={}
+        body = body_root(source().get_many self.resource_path, filter)
         body ||= []
         body.map do |h|
           self.build h
@@ -16,21 +16,55 @@ module Arrest
       end
 
       def find id
-        r = source().get "#{self.resource_path}/#{id}"
+        r = source().get_one "#{self.resource_path}/#{id}"
         body = body_root(r)
+        if body == nil || body.empty?
+          raise Errors::DocumentNotFoundError.new
+        end
         self.build body
       end
 
+      def scope name, &block
+        super(name)
+        if block_given?
+          send :define_singleton_method, name do
+            self.all.select &block 
+          end
+        else
+          send :define_singleton_method, name do
+            body_root(source().get_many self.scoped_path(name)).map do |h|
+              self.build(h)
+            end
+          end
+        end
+
+      end
+
+      def scoped_path scope_name
+        resource_path + '/' + scope_name.to_s
+      end
     end
 
     def resource_path
       "#{self.class.resource_name}"
     end
 
-    def location
+    def resource_location
       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

@@ -2,6 +2,7 @@ module Arrest
 
   class Source 
     class << self
+      attr_accessor :debug
       attr_reader :source
       attr_reader :mod
       attr_reader :header_decorator
@@ -44,4 +45,5 @@ module Arrest
   end
   Source.mod = nil
   Source.header_decorator = Source
+  Source.debug = false
 end

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/arrest_spec.rb

@@ -0,0 +1,159 @@
+require 'spec_helper'
+
+describe Arrest do
+  let(:user) {User.new(:email => 'hans@wurst.de', :password => 'tester')}
+
+  describe 'validation' do
+    it 'should be implemented'
+    it 'should work'
+  end
+
+  describe '#new_record?' do
+    it 'should return true if id is nil' do
+      user.id = nil
+      user.new_record?.should be_true
+    end
+
+    it 'should return true if id is empty' do
+      user.id = ''
+      user.new_record?.should be_true
+    end
+
+    it 'should return false if id has been set' do
+      user.id = 'whatever'
+      user.new_record?.should be_false
+    end
+  end
+
+  describe '#save' do
+    it 'should return true on success' do
+      user.save.should eql(true)
+    end
+
+    it 'should return false on failure' do
+      mock(Arrest::Source.source).post(user) {false}
+      user.save.should eql(false)
+    end
+
+    it 'should persist the object' do
+      mock(Arrest::Source.source).post(user)
+      user.save
+    end
+  end
+
+  describe '#update' do
+    it 'should raise an ArgumentError when called without options'
+    it 'should update a persisted object'
+    it 'should not call #save to persist the object'
+  end
+
+  describe '#destroy' do
+    it 'should destroy a persisted object'
+    it 'should raise an Arrest::Errors::DocumentNotPersistedError if the object was not persisted'
+  end
+
+  describe '.new' do
+    context 'without options' do
+      let(:user) {User.new}
+
+      it 'should return a new object' do
+        user.should be_kind_of(User)
+      end
+
+      it 'should not set undefined attributes' do
+        user.email.should be_nil
+      end
+    end
+
+    context 'with options' do
+      let(:user) {User.new(:email => 'hans@wurst.de')}
+
+      it 'should return a new object' do
+        user.should be_kind_of(User)
+      end
+
+      it 'should set defined attributes' do
+        user.email.should eq('hans@wurst.de')
+      end
+
+      it 'should not set undefined attributes' do
+        user.password.should be_nil
+      end
+    end
+  end
+
+  describe '.create' do
+    it 'should initialize and persist an object'
+    it 'should return the persisted object'
+  end
+
+  describe '.destroy' do
+    it 'should raise an ArgumentError when called without options'
+    it 'should destroy a persisted object with given id'
+    it 'should call .find to get the destroyable object'
+  end
+
+  describe '.find' do
+    let(:user) do
+      User.new(:email => 'hans@wurst.de', :password => 'tester').tap do |u|
+        u.save
+      end
+    end
+
+    it 'should return a persisted object' do
+      User.find(user.id).id.should eq(user.id)
+    end
+
+    it 'should raise an Arrest::Errors::DocumentNotFoundError if an object cannot be found' do
+      expect {User.find('whatever')}.to raise_error(Arrest::Errors::DocumentNotFoundError)
+    end
+
+    it 'should raise an ArgumentError when called without options' do
+      expect {User.find}.to raise_error(ArgumentError)
+    end
+  end
+
+  describe '.all' do
+    let(:user) do
+      User.new(:email => 'hans@wurst.de', :password => 'tester').tap {|u| u.save}
+    end
+
+    let(:another_user) do
+      User.new(:email => 'fritz@cola.de', :password => 'blub').tap {|u| u.save}
+    end
+
+    context 'without options' do
+      context 'and without objects being persisted' do
+        before do
+          Arrest::Source.source = nil
+        end
+
+        it 'should return an empty array' do
+          User.all.should eq([])
+        end
+      end
+
+      context 'and with objects being persisted' do
+        before do
+          Arrest::Source.source = nil
+          user
+          another_user
+        end
+
+        it 'should return all persisted objects' do
+          User.all.size.should eql(2)
+        end
+
+        it 'should return objects of same type' do
+          User.all.each do |user|
+            user.should be_kind_of(User)
+          end
+        end
+
+        it 'should return objects in order they have been persisted' do
+          User.all.map {|user| user.email}.should eq(['hans@wurst.de', 'fritz@cola.de'])
+        end
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,19 @@
+require 'simplecov'
+SimpleCov.start
+
+require 'rspec'
+require 'rr'
+require 'rack'
+
+require 'arrest'
+
+Dir["#{File.dirname(__FILE__)}/../spec/support/**/*.rb"].each {|f| require f}
+
+Arrest::Source.source = nil
+
+RSpec.configure do |config|
+  config.mock_with :rr
+  config.before(:each) do
+    Arrest::MemSource.class_variable_set('@@data', {})
+  end
+end

data/spec/support/models/user.rb

@@ -0,0 +1,4 @@
+class User < Arrest::RootResource
+  attribute :email, String
+  attribute :password, String
+end

data/test/models.rb

@@ -0,0 +1,32 @@
+require 'arrest'
+
+class Zoo < Arrest::RootResource
+  attributes({ :name => String , :open => Boolean})
+  read_only_attributes({ :ro1 => String})
+  has_many :animals
+
+  scope :server_scope
+  scope(:open) { |z| z.open }
+end
+
+class Animal < Arrest::RestChild
+  attribute :kind, String
+  attribute :age, Integer
+  attribute :male, Boolean
+  
+  parent :zoo
+
+  scope :server_males_only
+  scope(:males_only){|a| a.male}
+end
+
+class SpecialZoo < Zoo
+  custom_resource_name :zoo3000
+  read_only_attributes({ :ro2 => String})
+  attributes({ 
+    :is_magic => Boolean,
+    :opened_at => Time
+  })
+
+end
+

data/test/unit.rb

@@ -1,33 +1,11 @@
-require 'arrest'
 require 'test/unit'
-
-class Zoo < Arrest::RootResource
-  attributes({ :name => String })
-  read_only_attributes({ :ro1 => String})
-  has_many :animals
-end
-
-class Animal < Arrest::RestChild
-  attributes({
-    :kind => String,
-    :age => Integer
-  })
-  parent :zoo
-end
-
-class SpecialZoo < Zoo
-  read_only_attributes({ :ro2 => String})
-  attributes({ 
-    :is_magic => Boolean,
-    :opened_at => Time
-  })
-
-end
+load 'test/models.rb'
 
 class FirstTest < Test::Unit::TestCase
 
   def setup
      Arrest::Source.source = nil
+     #Arrest::Source.debug = true
   end
 
   def test_mem_src
@@ -119,6 +97,7 @@ class FirstTest < Test::Unit::TestCase
 
 
     assert_equal 1, zoo_reloaded.animals.length
+    assert_equal Animal, zoo_reloaded.animals.first.class
     assert_equal 42, zoo_reloaded.animals.first.age
     
     animal_reloaded = zoo_reloaded.animals.first
@@ -157,6 +136,8 @@ class FirstTest < Test::Unit::TestCase
   end
 
   def test_inheritance_update
+    assert_equal :zoo3000, SpecialZoo.resource_name
+
     new_zoo = SpecialZoo.new({:name => "Foo", :is_magic => true})
     new_zoo.save
 
@@ -167,12 +148,13 @@ class FirstTest < Test::Unit::TestCase
 
     new_name = "Bar"
     zoo_reloaded.name = new_name
+    old_is_magic = zoo_reloaded.is_magic
     zoo_reloaded.is_magic = !zoo_reloaded.is_magic
     zoo_reloaded.save
 
     updated_zoo = SpecialZoo.find(zoo_reloaded.id)
     assert_equal new_name, updated_zoo.name
-    assert_equal !new_zoo.is_magic, updated_zoo.is_magic
+    assert_equal !old_is_magic, updated_zoo.is_magic
   end
 
   def test_read_only_attributes
@@ -198,5 +180,84 @@ class FirstTest < Test::Unit::TestCase
     assert_equal now, zoo.opened_at
 
   end
+
+  def test_stub_delayed_load
+    new_zoo = Zoo.new({:name => "Foo"})
+    new_zoo.save
+    
+    assert_not_nil new_zoo.id
+
+    stubbed = Zoo.stub(new_zoo.id)
+    assert stubbed.stub, "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_equal "Foo", new_name
+  end
+
+  def test_stub_not_load_for_child_access
+    new_zoo = Zoo.new({:name => "Foo"})
+    new_zoo.save
+    
+    assert_not_nil new_zoo.id
+
+    # this is where the magic hapens
+    stubbed = Zoo.stub(new_zoo.id)
+
+    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"
+
+    animals = stubbed.animals
+
+    assert stubbed.stub, "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_equal "Foo", new_name
+    
+
+  end
+
+  def test_root_scope
+    assert_not_nil Zoo.server_scope
+  end
+  
+  def test_child_scope
+    new_zoo = Zoo.new({:name => "Foo"})
+    new_zoo.save
+    
+    assert_not_nil new_zoo.id
+
+    assert_not_nil new_zoo.animals.server_males_only
+  end
+
+  def test_local_scope
+
+    zoo_false = Zoo.new({:name => "Foo", :open => false})
+    zoo_false.save
+    zoo_true = Zoo.new({:name => "Foo", :open => true})
+    zoo_true.save
+
+    assert_equal 1, Zoo.open.length
+    assert_equal true, Zoo.open.first.open
+  end
+
+  def test_local_child_scope
+    new_zoo = Zoo.new({:name => "Foo"})
+    new_zoo.save
+
+    animal_kind = "mouse"
+    Animal.new(new_zoo, {:kind => animal_kind, :age => 42, :male => true}).save
+    Animal.new(new_zoo, {:kind => animal_kind, :age => 42, :male => false}).save
+
+    assert_equal 2, Zoo.all.first.animals.length
+    assert_equal 1, Zoo.all.first.animals.males_only.length
+    assert_equal true, Zoo.all.first.animals.males_only.first.male
+
+  end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000Z
+date: 2011-11-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2154642500 !ruby/object:Gem::Requirement
+  requirement: &10579480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154642500
+  version_requirements: *10579480
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2154641400 !ruby/object:Gem::Requirement
+  requirement: &10578980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,7 +32,84 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *2154641400
+  version_requirements: *10578980
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &10578480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *10578480
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &10578100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *10578100
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &10577640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *10577640
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &10577140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: *10577140
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &10576720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *10576720
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &10576260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *10576260
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &10575840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *10575840
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -41,12 +118,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - README.md
 - Rakefile
 - arrest.gemspec
 - lib/arrest.rb
 - lib/arrest/abstract_resource.rb
+- lib/arrest/exceptions.rb
+- lib/arrest/helper/child_collection.rb
 - lib/arrest/http_source.rb
 - lib/arrest/mem_source.rb
 - lib/arrest/rest_child.rb
@@ -54,6 +134,10 @@ files:
 - lib/arrest/source.rb
 - lib/arrest/string_utils.rb
 - lib/arrest/version.rb
+- spec/arrest_spec.rb
+- spec/spec_helper.rb
+- spec/support/models/user.rb
+- test/models.rb
 - test/unit.rb
 homepage: ''
 licenses: []
@@ -79,5 +163,4 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Another ruby rest client
-test_files:
-- test/unit.rb
+test_files: []