arrest 0.0.15 → 0.0.16

data/lib/arrest.rb

@@ -5,6 +5,9 @@ require 'arrest/helper/logger'
 
 require "arrest/attributes/belongs_to"
 require "arrest/attributes/has_attributes"
+require "arrest/attributes/attribute"
+require "arrest/attributes/nested_attribute"
+require "arrest/attributes/polymorphic_attribute"
 require "arrest/attributes/converter"
 require "arrest/handler"
 require "arrest/source"
@@ -15,8 +18,8 @@ require "arrest/exceptions"
 require "arrest/http_source"
 require "arrest/mem_source"
 require "arrest/source"
-require "arrest/nested_resource"
 require "arrest/abstract_resource"
+require "arrest/nested_resource"
 require "arrest/root_resource"
 require "arrest/rest_child"
 

data/lib/arrest/abstract_resource.rb

@@ -116,7 +116,6 @@ module Arrest
           add_attribute Attribute.new(name, true, clazz)
         end
       end
-
     end
 
     include BelongsTo

data/lib/arrest/attributes/attribute.rb

@@ -0,0 +1,31 @@
+module Arrest
+  class Attribute
+    attr_accessor :name, :read_only, :clazz, :json_name
+    def initialize name, read_only, clazz
+      @name = name.to_sym
+      @read_only = read_only
+      @clazz = clazz
+      @json_name = Source.json_key_converter.key_to_json(name).to_sym
+    end
+
+    def from_hash value
+      return if value == nil
+      converter = CONVERTER[@clazz]
+      if converter == nil
+        puts "No converter for: #{@clazz.name}"
+        converter = IdentConv
+      end
+      converter.convert value
+    end
+
+    def to_hash value
+      return nil unless value != nil
+      converter = CONVERTER[@clazz]
+      if converter == nil
+        puts "No converter for: #{@clazz.name}"
+        converter = IdentConv
+      end
+      converter.mk_json value
+    end
+  end  
+end

data/lib/arrest/attributes/belongs_to.rb

@@ -7,28 +7,55 @@ module Arrest
     end
 
     module BelongsToMethods
+      def create_field_name(name, params, polymorphic)
+        if (params && params[:field_name])
+          params[:field_name]
+        elsif polymorphic
+          "#{name}_ref"
+        else
+          "#{name}_id"
+        end
+      end
+      
+      def create_and_add_attribute(field_name, polymorphic, read_only)
+        if polymorphic
+          add_attribute(PolymorphicAttribute.new(field_name.to_sym, read_only))
+        else
+          add_attribute(Attribute.new(field_name.to_sym, read_only, String))
+        end
+      end
+      
       def belongs_to(*args)
         arg = args[0]
         name = arg.to_s.downcase
         class_name = StringUtils.classify name
         params = args[1] unless args.length < 2
-        field_name = "#{name}_id"
         if params
-          field_name = params[:field_name] unless params[:field_name] == nil
-          class_name = params[:class_name].to_s unless params[:class_name] == nil
           read_only =  params[:read_only] == true
+          polymorphic = params[:polymorphic] unless params[:polymorphic] == nil
+          class_name = params[:class_name].to_s unless params[:class_name] == nil
         end
-        add_attribute(Attribute.new(field_name.to_sym, read_only, String))
+
+        field_name = create_field_name(name, params, polymorphic)
+
+        create_and_add_attribute(field_name, polymorphic, read_only)
+        
         send :define_method, name do
           val = self.send(field_name)
           if val == nil || val == ""
             return nil
-          end
+          end 
+          
           begin
-            Arrest::Source.mod.const_get(class_name).find(val)
+            if polymorphic
+              Arrest::Source.mod.const_get(polymorphic[val.type.to_sym]).find(val.id)
+            else
+              Arrest::Source.mod.const_get(class_name).find(val)
+            end
           rescue Errors::DocumentNotFoundError => e
             raise Errors::DocumentNotFoundError, "Couldnt find a #{class_name} with id #{val}"
           end
+          
         end
       end
     end

data/lib/arrest/attributes/converter.rb

@@ -4,52 +4,6 @@ end
 
 module Arrest
 
-  class Attribute
-    attr_accessor :name, :read_only, :clazz, :json_name
-    def initialize name, read_only, clazz
-      @name = name.to_sym
-      @read_only = read_only
-      @clazz = clazz
-      @json_name = Source.json_key_converter.key_to_json(name).to_sym
-    end
-
-    def from_hash value
-      return if value == nil
-      converter = CONVERTER[@clazz]
-      if converter == nil
-        puts "No converter for: #{@clazz.name}"
-        converter = IdentConv
-      end
-      converter.convert value
-    end
-
-    def to_hash value
-      return nil unless value != nil
-      converter = CONVERTER[@clazz]
-      if converter == nil
-        puts "No converter for: #{@clazz.name}"
-        converter = IdentConv
-      end
-      converter.mk_json value
-    end
-  end
-
-  class NestedAttribute < Attribute
-    def initialize name, read_only, clazz
-      super name, read_only, clazz
-    end
-
-    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
     def initialize name, read_only, clazz
       super name, read_only, clazz
@@ -122,6 +76,7 @@ module Arrest
     target Array
   end
 
+
   class TimeConv < Converter
     target Time
 

data/lib/arrest/attributes/nested_attribute.rb

@@ -0,0 +1,17 @@
+module Arrest
+    class NestedAttribute < Attribute
+    def initialize name, read_only, clazz
+      super name, read_only, clazz
+    end
+
+    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
+end

data/lib/arrest/attributes/polymorphic_attribute.rb

@@ -0,0 +1,14 @@
+module Arrest
+  class Ref
+    include HasAttributes
+    
+    attribute :id, String
+    attribute :type, String
+  end
+  
+  class PolymorphicAttribute < NestedAttribute
+    def initialize name, read_only
+      super name, read_only, Ref
+    end
+  end
+end

data/lib/arrest/handler.rb

@@ -1,3 +1,5 @@
+require 'arrest/string_utils'
+
 module Arrest
 
   RequestLog = Struct.new(:method, :url, :body)

data/lib/arrest/http_source.rb

@@ -44,6 +44,19 @@ module Arrest
       response.body
     end
 
+    
+    def delete_all resource_path
+        response = self.connection().delete do |req|
+        req.url(resource_path)
+        add_headers(req.headers)
+      end
+      rql = RequestLog.new(:delete, "#{resource_path}", nil)
+      rsl = ResponseLog.new(response.env[:status], response.body)
+      Arrest::Source.call_logger.log(rql, rsl)
+      
+      response.env[:status] == 200
+    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|

data/lib/arrest/mem_source.rb

@@ -88,6 +88,16 @@ module Arrest
       wrap val.to_jhash.to_json, 1
     end
     
+    def delete_all resource_path
+      id_list = Array.new(@@collections[resource_path] || [])
+      id_list.each do |base_id|
+        @@collections.each_pair do |k,v|
+          v.reject!{ |id| id == base_id }
+        end
+        @@all_objects[base_id].delete
+      end
+    end
+    
     def collection_json values
       single_jsons = values.map do |v|
         v.to_jhash.to_json

data/lib/arrest/root_resource.rb

@@ -112,6 +112,11 @@ module Arrest
         end
         n
       end
+      
+      
+      def delete_all
+        source().delete_all(self.resource_path)
+      end
     end
 
     def resource_path

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/test/models.rb

@@ -101,3 +101,22 @@ class ChildFilter < Arrest::RestChild
 
   filter(:child_nnn) {|s| bfield == s}
 end
+
+class CommentableA < Arrest::RootResource
+end
+class CommentableB < Arrest::RootResource
+end
+class CommentableC < Arrest::RootResource
+end
+class Comment < Arrest::RootResource
+  belongs_to :commentable, :polymorphic => { :coma => "CommentableA",
+                                             :comb => "CommentableB" }
+end
+class ExtendedComment < Comment
+  belongs_to :other_commentable, 
+             :field_name => "special_commentable_ref", 
+             :polymorphic => { :comc => :CommentableC }
+end
+
+class DeleteMeAll < Arrest::RootResource
+end

data/test/unit.rb

@@ -397,7 +397,59 @@ class FirstTest < Test::Unit::TestCase
     expected = now.strftime "%FT%T%z"
     t = TimeClass.new(:time => now)
     assert_equal expected, t.to_jhash[:time], "This is the expected default format"
-
+  end
+  
+  def test_polymorphic_belongs_to
+    coma = CommentableA.new()
+    coma.save
+    comb = CommentableB.new()
+    comb.save
+    
+    c = Comment.new(:commentable_ref => { :id => coma.id, :type => "coma"})
+    result = c.commentable
+    assert_equal coma.id, c.commentable_ref.id
+    assert_equal result.class, CommentableA
+    
+    c2 = Comment.new(:commentable_ref => { :id => comb.id, :type => "comb"})
+    result2 = c2.commentable
+    assert_equal comb.id, c2.commentable_ref.id
+    assert_equal result2.class, CommentableB
+  end
+  
+  def test_polymorphic_belongs_to_extended
+    coma = CommentableA.new()
+    coma.save
+    comc = CommentableC.new()
+    comc.save
+    
+    c = ExtendedComment.new({ :special_commentable_ref => { :id => comc.id, :type => "comc"}, 
+                              :commentable_ref => { :id => coma.id, :type => "coma" }})
+    assert_equal c.commentable.class, CommentableA
+    assert_equal c.other_commentable.class, CommentableC
+    
+    c.save
+    c_reloaded = ExtendedComment.find(c.id)
+    assert_equal comc.id, c_reloaded.special_commentable_ref.id
+    assert_equal CommentableC, c_reloaded.other_commentable.class
+    assert_equal CommentableA, c_reloaded.commentable.class
+  end
+  
+  def test_delete_all_root_resources
+    d1 = DeleteMeAll.new()
+    d1.save
+    d2 = DeleteMeAll.new()
+    d2.save
+    
+    d1_rel = DeleteMeAll.find(d1.id)
+    assert_not_nil d1_rel
+    d2_rel = DeleteMeAll.find(d2.id)
+    assert_not_nil d2_rel
+    all = DeleteMeAll.all
+    assert_equal 2, all.length
+    
+    DeleteMeAll.delete_all
+    all = DeleteMeAll.all
+    assert_equal [], all
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-12 00:00:00.000000000Z
+date: 2012-01-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &13130900 !ruby/object:Gem::Requirement
+  requirement: &18586060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13130900
+  version_requirements: *18586060
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &13129960 !ruby/object:Gem::Requirement
+  requirement: &18585500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *13129960
+  version_requirements: *18585500
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &13129460 !ruby/object:Gem::Requirement
+  requirement: &18585000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *13129460
+  version_requirements: *18585000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13128960 !ruby/object:Gem::Requirement
+  requirement: &18584540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *13128960
+  version_requirements: *18584540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &13128580 !ruby/object:Gem::Requirement
+  requirement: &18584160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13128580
+  version_requirements: *18584160
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &13128080 !ruby/object:Gem::Requirement
+  requirement: &18583700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13128080
+  version_requirements: *18583700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13127520 !ruby/object:Gem::Requirement
+  requirement: &18583040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *13127520
+  version_requirements: *18583040
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &13113200 !ruby/object:Gem::Requirement
+  requirement: &18582580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13113200
+  version_requirements: *18582580
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &13112540 !ruby/object:Gem::Requirement
+  requirement: &18581960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13112540
+  version_requirements: *18581960
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &13111800 !ruby/object:Gem::Requirement
+  requirement: &18581440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13111800
+  version_requirements: *18581440
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -136,9 +136,12 @@ files:
 - arrest.gemspec
 - lib/arrest.rb
 - lib/arrest/abstract_resource.rb
+- lib/arrest/attributes/attribute.rb
 - lib/arrest/attributes/belongs_to.rb
 - lib/arrest/attributes/converter.rb
 - lib/arrest/attributes/has_attributes.rb
+- lib/arrest/attributes/nested_attribute.rb
+- lib/arrest/attributes/polymorphic_attribute.rb
 - lib/arrest/exceptions.rb
 - lib/arrest/handler.rb
 - lib/arrest/helper/child_collection.rb