arrest 0.0.78 → 0.0.79

data/lib/arrest.rb

@@ -23,7 +23,6 @@ require "arrest/attributes/polymorphic_attribute"
 require "arrest/attributes/converter"
 require "arrest/handler"
 require "arrest/helper/filter"
-require "arrest/helper/child_collection"
 require "arrest/helper/ordered_collection"
 require "arrest/helper/has_many_collection"
 require "arrest/helper/ids_collection"
@@ -34,5 +33,4 @@ require "arrest/abstract_resource"
 require "arrest/nested_resource"
 require "arrest/root_resource"
 require "arrest/single_resource"
-require "arrest/rest_child"
 

data/lib/arrest/abstract_resource.rb

@@ -72,25 +72,6 @@ module Arrest
         end
       end
 
-      def children(*args)
-        method_name, options = args
-        method_name = method_name.to_sym
-
-        clazz_name = method_name.to_s
-        if options
-          clazz = options[:class_name]
-          if clazz
-            clazz_name = clazz.to_s
-          end
-        end
-
-        send :define_method, method_name do
-          @child_collections ||= {}
-          @child_collections[method_name] ||= ChildCollection.new(self, (StringUtils.classify(StringUtils.singular clazz_name)))
-          @child_collections[method_name]
-        end
-      end
-
       def parent(*args)
         method_name = args[0].to_s.to_sym
         class_eval "def #{method_name}; self.parent; end"

data/lib/arrest/root_resource.rb

@@ -33,7 +33,7 @@ module Arrest
         all(context,filter).first
       end
 
-      def end(context, filter={})
+      def last(context, filter={})
         all(context,filter).last
       end
 

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.78"
+  VERSION = "0.0.79"
 end

data/test/models.rb

@@ -14,12 +14,12 @@ class Zoo < Arrest::RootResource
   belongs_to :zoo_owner
 end
 
-class Animal < Arrest::RestChild
+class Animal < Arrest::RootResource
   attribute :kind, String
   attribute :age, Integer
   attribute :male, Boolean
 
-  parent :zoo
+  belongs_to :zoo
 
   scope :server_males_only
   scope(:males_only){|a| a.male}
@@ -93,11 +93,11 @@ class ParentFilter < Arrest::RootResource
   children :child_filters
 end
 
-class ChildFilter < Arrest::RestChild
+class ChildFilter < Arrest::RootResource
   attribute :id, String
   attribute :bfield, String
 
-  parent :parent_filter
+  belongs_to :parent_filter
 
   filter(:child_nnn) {|s| bfield == s}
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.78
+  version: 0.0.79
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000Z
+date: 2012-08-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &26801280 !ruby/object:Gem::Requirement
+  requirement: &19211900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *26801280
+  version_requirements: *19211900
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &26800780 !ruby/object:Gem::Requirement
+  requirement: &19211400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *26800780
+  version_requirements: *19211400
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &26800280 !ruby/object:Gem::Requirement
+  requirement: &19210900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *26800280
+  version_requirements: *19210900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &26799820 !ruby/object:Gem::Requirement
+  requirement: &19210440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *26799820
+  version_requirements: *19210440
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &26799440 !ruby/object:Gem::Requirement
+  requirement: &19210060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26799440
+  version_requirements: *19210060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &26798980 !ruby/object:Gem::Requirement
+  requirement: &19209600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26798980
+  version_requirements: *19209600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &26798480 !ruby/object:Gem::Requirement
+  requirement: &19209100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *26798480
+  version_requirements: *19209100
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &26798060 !ruby/object:Gem::Requirement
+  requirement: &19208680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26798060
+  version_requirements: *19208680
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &26797600 !ruby/object:Gem::Requirement
+  requirement: &19208220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26797600
+  version_requirements: *19208220
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &26782340 !ruby/object:Gem::Requirement
+  requirement: &19207800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26782340
+  version_requirements: *19207800
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -146,7 +146,6 @@ files:
 - lib/arrest/attributes/polymorphic_attribute.rb
 - lib/arrest/exceptions.rb
 - lib/arrest/handler.rb
-- lib/arrest/helper/child_collection.rb
 - lib/arrest/helper/filter.rb
 - lib/arrest/helper/has_many.rb
 - lib/arrest/helper/has_many_collection.rb
@@ -155,7 +154,6 @@ files:
 - lib/arrest/helper/logger.rb
 - lib/arrest/helper/ordered_collection.rb
 - lib/arrest/nested_resource.rb
-- lib/arrest/rest_child.rb
 - lib/arrest/root_resource.rb
 - lib/arrest/single_resource.rb
 - lib/arrest/transport/http_source.rb

data/lib/arrest/helper/child_collection.rb

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

data/lib/arrest/rest_child.rb

@@ -1,97 +0,0 @@
-module Arrest
-  class RestChild < AbstractResource
-    attr_accessor :parent
-    def initialize context, parent, h
-      super(context,h)
-      @parent = parent
-    end
-
-    class << self
-      # class method to generate path to a child resource of aonther resource
-      def resource_path_for parent
-        "#{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)
-        self.new(parent.context, parent, hash)
-      end
-
-      def all_for(parent)
-        raise "Parent has no id yet" unless parent.id
-        begin
-          body_root(source().get(parent.context, self.resource_path_for(parent))).map do |h|
-            self.build(parent, h)
-          end
-        rescue Arrest::Errors::DocumentNotFoundError
-          []
-        end
-      end
-
-      def find(context, id)
-        raise "find cannot be executed for child resources - use find_for with a parent"
-      end
-
-      def find_for(context, parent, id)
-        r = source().get(context, "#{self.resource_path_for(parent)}/#{id}")
-        body = body_root(r)
-        self.build(parent, body)
-      end
-
-      def filter name, &aproc
-        if aproc != nil
-          send :define_singleton_method, name do |*args|
-            self.all_for(args[0]).select do |instance|
-              instance.instance_exec(*(args.drop(1)), &aproc)
-            end
-          end
-        else
-          raise "You must specify a block for a filter"
-        end
-      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(parent.context, 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
-    def resource_path
-      self.class.resource_path_for @parent
-    end
-
-    # unique url for one instance of this class
-    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
-
-    protected
-    def internal_reload
-      @parent.reload
-      self.class.find_for(self.context, self.parent, self.id).to_hash
-    end
-  end
-end
-
-