arrest 0.0.75 → 0.0.76

data/lib/arrest.rb

@@ -3,6 +3,16 @@ require 'logger'
 require "arrest/version"
 require 'arrest/helper/logger'
 
+require "arrest/utils/class_utils.rb"
+require "arrest/utils/string_utils.rb"
+
+require "arrest/transport/source"
+require "arrest/transport/http_source"
+require "arrest/transport/mem_source"
+require "arrest/transport/request_context"
+require "arrest/transport/scoped_root"
+require "arrest/transport/resource_proxy"
+
 require "arrest/attributes/belongs_to"
 require "arrest/attributes/has_attributes"
 require "arrest/attributes/attribute"
@@ -11,10 +21,7 @@ require "arrest/attributes/nested_collection"
 require "arrest/attributes/belongs_to_attribute"
 require "arrest/attributes/polymorphic_attribute"
 require "arrest/attributes/converter"
-require "arrest/class_utils.rb"
-require "arrest/string_utils.rb"
 require "arrest/handler"
-require "arrest/source"
 require "arrest/helper/filter"
 require "arrest/helper/child_collection"
 require "arrest/helper/ordered_collection"
@@ -23,9 +30,6 @@ require "arrest/helper/ids_collection"
 require "arrest/helper/has_many"
 require "arrest/helper/has_view"
 require "arrest/exceptions"
-require "arrest/http_source"
-require "arrest/mem_source"
-require "arrest/source"
 require "arrest/abstract_resource"
 require "arrest/nested_resource"
 require "arrest/root_resource"

data/lib/arrest/abstract_resource.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'arrest/string_utils'
 require 'time'
 require 'active_model'
 
@@ -7,65 +6,6 @@ Scope = Struct.new(:name, :options, :block)
 
 module Arrest
 
-  class RequestContext
-    attr_accessor :header_decorator
-  end
-
-  class ScopedRoot
-    attr_accessor :context
-
-    def initialize(context = Arrest::RequestContext.new())
-      @context = context
-    end
-
-    def self.register_resource(clazz)
-      @classes ||= []
-      @classes << clazz
-      send :define_method, ClassUtils.simple_name(clazz) do ||
-        proxy = clazz.mk_proxy(self)
-      proxy
-      end
-    end
-
-    def self.registered_classes
-      @classes ||= []
-      @classes
-    end
-
-    def delete_all
-      self.class.registered_classes.each do |clazz|
-        begin
-          clazz.delete_all(@context)
-        rescue
-          puts "couldnt delete #{clazz.name}s"
-        end
-      end
-    end
-
-    def get_context
-      @context
-    end
-  end
-
-  class ResourceProxy
-    def initialize(resource, context_provider)
-      @resource = resource
-      @context_provider = context_provider
-    end
-
-    def method_missing(*args, &block)
-      params = [@context_provider.get_context]
-      params += args.drop(1)
-      @resource.send(args.first, *params)
-    end
-
-    def load(*args)
-      ext = [@context_provider.get_context] + args
-      @resource.load(*ext)
-    end
-
-  end
-
   class AbstractResource
     extend ActiveModel::Naming
     include ActiveModel::Validations
@@ -223,7 +163,9 @@ module Arrest
     def save
       if Source.skip_validations || self.valid?
         req_type = new_record? ? :post : :put
-        !!AbstractResource::source.send(req_type, @context, self)
+        success = !!AbstractResource::source.send(req_type, @context, self)
+        context.cache.update(self.id, self) if success
+        success
       else
         false
       end
@@ -233,12 +175,14 @@ module Arrest
       raise self.errors.inspect unless self.save
     end
 
+    def clone
+      self.class.new(self.context, self.to_hash)
+    end
+
     def reload
       @child_collections = {}
       @views = {}
       @belongs_tos = {}
-      @ids_collections = {}
-      @has_many_collections = {}
       hash = internal_reload
       self.attributes= hash
     end

data/lib/arrest/attributes/belongs_to_attribute.rb

@@ -7,7 +7,7 @@ module Arrest
       @target_class_name = target_class_name
     end
     def target_class
-      Arrest::Source.mod.const_get(@target_class_name)
+      @target_class ||= Arrest::Source.mod.const_get(@target_class_name)
     end
   end
-end
+end

data/lib/arrest/attributes/has_attributes.rb

@@ -1,4 +1,3 @@
-require "arrest/source"
 require 'active_model'
 
 module Arrest
@@ -191,4 +190,4 @@ module Arrest
       end
 
   end
-end
+end

data/lib/arrest/handler.rb

@@ -1,4 +1,3 @@
-require 'arrest/string_utils'
 
 module Arrest
 

data/lib/arrest/root_resource.rb

@@ -42,21 +42,22 @@ module Arrest
       end
 
       def find(context, id)
-        if id == nil || "" == id
-          Arrest::logger.info "DocumentNotFoundError: no id given"
-          raise Errors::DocumentNotFoundError.new
-        end
+        context.cache.lookup(id) do
+          if id == nil || "" == id
+            Arrest::logger.info "DocumentNotFoundError: no id given"
+            raise Errors::DocumentNotFoundError.new
+          end
+          full_resource_path = "#{self.resource_path}/#{id}"
+          r = source().get(context, full_resource_path)
+          body = body_root(r)
+          if body == nil || body.empty?
+            Arrest::logger.info "DocumentNotFoundError for #{full_resource_path}"
+            raise Errors::DocumentNotFoundError.new
+          end
 
-        full_resource_path = "#{self.resource_path}/#{id}"
-        r = source().get(context, full_resource_path)
-        body = body_root(r)
-        if body == nil || body.empty?
-          Arrest::logger.info "DocumentNotFoundError for #{full_resource_path}"
-          raise Errors::DocumentNotFoundError.new
+          resource = self.build(context, body.merge({:id => id}))
+          resource
         end
-
-        resource = self.build(context, body.merge({:id => id}))
-        resource
       end
 
       def filter name, &aproc

data/lib/arrest/transport/request_context.rb

@@ -0,0 +1,38 @@
+module Arrest
+
+  class RequestContext
+    attr_accessor :header_decorator
+
+    ##
+    # override with actual cache if desired
+    def cache
+      @cache ||= DummyCache.new
+    end
+
+  end
+
+  class IdentityCache
+    def initialize()
+      @map = {}
+    end
+
+    def lookup(id, &blk)
+      hit = @map[id]
+      unless hit
+        hit = @map[id] = yield
+      end
+      hit.clone
+    end
+
+    def update(id, object)
+      @map[id] = object
+    end
+  end
+
+  class DummyCache
+    def lookup(id, &blk)
+       yield
+    end
+  end
+end
+

data/lib/arrest/transport/resource_proxy.rb

@@ -0,0 +1,24 @@
+module Arrest
+  ##
+  # Forwards context as first parameter to every method call
+  # of the proxied class
+  class ResourceProxy
+    def initialize(resource, context_provider)
+      @resource = resource
+      @context_provider = context_provider
+    end
+
+    def method_missing(*args, &block)
+      params = [@context_provider.get_context]
+      params += args.drop(1)
+      @resource.send(args.first, *params)
+    end
+
+    def load(*args)
+      ext = [@context_provider.get_context] + args
+      @resource.load(*ext)
+    end
+
+  end
+
+end

data/lib/arrest/transport/scoped_root.rb

@@ -0,0 +1,38 @@
+module Arrest
+  class ScopedRoot
+    attr_accessor :context
+
+    def initialize(context = Arrest::RequestContext.new())
+      @context = context
+    end
+
+    def self.register_resource(clazz)
+      @classes ||= {}
+      @classes[clazz] = true
+      class_name = ClassUtils.simple_name(clazz)
+      send :define_method, class_name do ||
+        clazz.mk_proxy(self)
+      end
+    end
+
+    def self.registered_classes
+      @classes ||= {}
+      @classes.keys
+    end
+
+    def delete_all
+      self.class.registered_classes.each do |clazz|
+        begin
+          clazz.delete_all(@context)
+        rescue
+          puts "couldnt delete #{clazz.name}s"
+        end
+      end
+    end
+
+    def get_context
+      @context
+    end
+  end
+
+end

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.75"
+  VERSION = "0.0.76"
 end

data/test/nested_resource.rb

@@ -95,25 +95,6 @@ class NestedResourcesTest < Test::Unit::TestCase
 
   end
 
-  def test_custom_belongs_to
-
-    new_zoo = @scope.Zoo.new({:name => "Foo"})
-    new_zoo.save
-
-    c = @scope.CustomNamedBelongsTo.new({:name => 'Bar', :schinken => new_zoo.id, :batzen => new_zoo.id})
-
-    c.save
-    assert_not_nil c.id, "Persisted object should have id"
-    assert_equal  "Foo", c.zoo_thing.name
-    assert_equal  "Foo", c.zoo.name
-
-
-    assert_not_nil c.id, "Persisted zoo should have id"
-    c_reloaded = @scope.CustomNamedBelongsTo.all.first
-    assert_equal  "Foo", c_reloaded.zoo_thing.name
-    assert_equal  "Foo", c_reloaded.zoo.name
-
-  end
 
   def assert_equal_hashes expected, actual
     assert_equal_hashes_ expected, actual, ''

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.75
+  version: 0.0.76
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000Z
+date: 2012-07-26 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &24274620 !ruby/object:Gem::Requirement
+  requirement: &2158672560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *24274620
+  version_requirements: *2158672560
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &24274120 !ruby/object:Gem::Requirement
+  requirement: &2158671820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *24274120
+  version_requirements: *2158671820
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &24273620 !ruby/object:Gem::Requirement
+  requirement: &2158671080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *24273620
+  version_requirements: *2158671080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &24273160 !ruby/object:Gem::Requirement
+  requirement: &2158670480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *24273160
+  version_requirements: *2158670480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &24272780 !ruby/object:Gem::Requirement
+  requirement: &2158669820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24272780
+  version_requirements: *2158669820
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &24272320 !ruby/object:Gem::Requirement
+  requirement: &2158669040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24272320
+  version_requirements: *2158669040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &24271820 !ruby/object:Gem::Requirement
+  requirement: &2158661900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *24271820
+  version_requirements: *2158661900
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &24271400 !ruby/object:Gem::Requirement
+  requirement: &2158661380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24271400
+  version_requirements: *2158661380
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &24270940 !ruby/object:Gem::Requirement
+  requirement: &2158660540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24270940
+  version_requirements: *2158660540
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &24270520 !ruby/object:Gem::Requirement
+  requirement: &2158659220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *24270520
+  version_requirements: *2158659220
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -144,7 +144,6 @@ files:
 - lib/arrest/attributes/nested_attribute.rb
 - lib/arrest/attributes/nested_collection.rb
 - lib/arrest/attributes/polymorphic_attribute.rb
-- lib/arrest/class_utils.rb
 - lib/arrest/exceptions.rb
 - lib/arrest/handler.rb
 - lib/arrest/helper/child_collection.rb
@@ -155,19 +154,22 @@ files:
 - lib/arrest/helper/ids_collection.rb
 - lib/arrest/helper/logger.rb
 - lib/arrest/helper/ordered_collection.rb
-- lib/arrest/http_source.rb
-- lib/arrest/mem_source.rb
 - lib/arrest/nested_resource.rb
 - lib/arrest/rest_child.rb
 - lib/arrest/root_resource.rb
 - lib/arrest/single_resource.rb
-- lib/arrest/source.rb
-- lib/arrest/string_utils.rb
+- lib/arrest/transport/http_source.rb
+- lib/arrest/transport/mem_source.rb
+- lib/arrest/transport/request_context.rb
+- lib/arrest/transport/resource_proxy.rb
+- lib/arrest/transport/scoped_root.rb
+- lib/arrest/transport/source.rb
+- lib/arrest/utils/class_utils.rb
+- lib/arrest/utils/string_utils.rb
 - lib/arrest/version.rb
 - spec/arrest_spec.rb
 - spec/spec_helper.rb
 - spec/support/models/user.rb
-- test/context.rb
 - test/has_attributed.rb
 - test/models.rb
 - test/nested_resource.rb
@@ -185,16 +187,30 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2183449960608707573
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2183449960608707573
 requirements: []
 rubyforge_project: arrest
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Another ruby rest client
-test_files: []
+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
+- test/validations.rb

data/test/context.rb

@@ -1,35 +0,0 @@
-require 'test/unit'
-require 'arrest'
-class ContextTest < Test::Unit::TestCase
-
-  def setup
-    Arrest::Source.source = nil
-  end
-
-  class Facility < Arrest::RootResource
-  end
-  
-
-  class HeaderDeco
-    def self.headers
-      puts "MAAAAAHH"
-      {}
-    end
-  end
-
-  def test_context
-    context = Arrest::RequestContext.new()
-    context.header_decorator = HeaderDeco
-    scope = Arrest::ScopedRoot.new(context)
-    assert_not_nil scope.Facility
-    assert_not_nil scope.Facility.all
-
-    f0 = scope.Facility.new(:name => 'Foo')
-    assert f0.save
-
-    f1 = scope.Facility.all.first
-    f2 = scope.Facility.find(f1.id)
-
-  end
-end
-