arrest 0.0.59 → 0.0.60

data/lib/arrest/abstract_resource.rb

@@ -79,11 +79,14 @@ module Arrest
 
     attr_accessor :context
 
+    @@POLYMORPHIC_TYPE_MAP = {}
+
     class << self
       attr_reader :scopes
 
       def inherited(child)
         ScopedRoot::register_resource(child)
+        @@POLYMORPHIC_TYPE_MAP[ClassUtils.simple_name(child).to_sym] = child
       end
 
       def mk_proxy(context_provider)
@@ -184,6 +187,32 @@ module Arrest
         end
         all_filters
       end
+
+      def json_type_map
+        @@POLYMORPHIC_TYPE_MAP
+      end
+
+      def custom_json_type(new_key)
+        old_key = Arrest::ClassUtils.simple_name(self).to_sym
+        value = @@POLYMORPHIC_TYPE_MAP.delete(old_key) # remove default key for self
+        @@POLYMORPHIC_TYPE_MAP[new_key.to_sym] = value # add custom key for type
+      end
+
+      def json_type_to_class(type)
+        @@POLYMORPHIC_TYPE_MAP[type.to_sym]
+      end
+
+      def to_json_type
+        @@POLYMORPHIC_TYPE_MAP.invert[self]
+      end
+
+      def active_resource_classes
+        @@POLYMORPHIC_TYPE_MAP.values
+      end
+    end
+
+    def to_json_type
+      self.class.to_json_type
     end
 
     include BelongsTo
@@ -244,7 +273,7 @@ module Arrest
     # convenience method printing curl command
     def curl
       hs = ""
-      Arrest::Source.header_decorator.headers.each_pair do |k,v|
+      self.context.header_decorator.headers.each_pair do |k,v|
         hs << " -H '#{k}:#{v}' "
       end
 

data/lib/arrest/attributes/belongs_to.rb

@@ -34,7 +34,7 @@ module Arrest
 
         if params
           read_only =  params[:read_only] == true
-          polymorphic = params[:polymorphic] unless params[:polymorphic] == nil
+          polymorphic = !!params[:polymorphic]
           class_name = params[:class_name].to_s unless params[:class_name] == nil
           foreign_key = params[:foreign_key].to_s unless params[:foreign_key] == nil
         end
@@ -51,7 +51,8 @@ module Arrest
 
           begin
             if polymorphic
-              Arrest::Source.mod.const_get(polymorphic[val.type.to_sym]).find(self.context, val.id)
+              clazz = self.class.json_type_to_class(val.type)
+              clazz.find(self.context, val.id)
             else
               Arrest::Source.mod.const_get(class_name).find(self.context, val)
             end

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.59"
+  VERSION = "0.0.60"
 end

data/test/models.rb

@@ -108,14 +108,16 @@ class CommentableB < Arrest::RootResource
 end
 class CommentableC < Arrest::RootResource
 end
+class CommentableD < Arrest::RootResource
+  custom_json_type :ComD
+end
 class Comment < Arrest::RootResource
-  belongs_to :commentable, :polymorphic => { :coma => "CommentableA",
-                                             :comb => "CommentableB" }
+  belongs_to :commentable, :polymorphic => true
 end
 class ExtendedComment < Comment
   belongs_to :other_commentable,
              :field_name => "special_commentable_ref",
-             :polymorphic => { :comc => :CommentableC }
+             :polymorphic => true
 end
 
 class DeleteMeAll < Arrest::RootResource

data/test/unit.rb

@@ -426,15 +426,23 @@ class FirstTest < Test::Unit::TestCase
     comb = @scope.CommentableB.new()
     comb.save
 
-    c = @scope.Comment.new(:commentable_ref => { :id => coma.id, :type => "coma"})
+    c = @scope.Comment.new(:commentable_ref => { :id => coma.id, :type => coma.to_json_type.to_s})
     result = c.commentable
     assert_equal coma.id, c.commentable_ref.id
     assert_equal result.class, CommentableA
 
-    c2 = @scope.Comment.new(:commentable_ref => { :id => comb.id, :type => "comb"})
+    c2 = @scope.Comment.new(:commentable_ref => { :id => comb.id, :type => comb.to_json_type.to_s})
     result2 = c2.commentable
     assert_equal comb.id, c2.commentable_ref.id
     assert_equal result2.class, CommentableB
+
+    comd = @scope.CommentableD.new()
+    comd.save
+
+    c3 = @scope.Comment.new(:commentable_ref => { :id => comd.id, :type => comd.to_json_type.to_s})
+    result = c3.commentable
+    assert_equal comd.id, c3.commentable_ref.id
+    assert_equal result.class, CommentableD
   end
 
   def test_polymorphic_belongs_to_extended
@@ -443,8 +451,8 @@ class FirstTest < Test::Unit::TestCase
     comc = @scope.CommentableC.new()
     comc.save
 
-    c = @scope.ExtendedComment.new({ :special_commentable_ref => { :id => comc.id, :type => "comc"},
-                                     :commentable_ref => { :id => coma.id, :type => "coma" }})
+    c = @scope.ExtendedComment.new({ :special_commentable_ref => { :id => comc.id, :type => comc.to_json_type.to_s},
+                                     :commentable_ref => { :id => coma.id, :type => coma.to_json_type.to_s }})
     assert_equal c.commentable.class, CommentableA
     assert_equal c.other_commentable.class, CommentableC
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.59
+  version: 0.0.60
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000Z
+date: 2012-06-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &10269940 !ruby/object:Gem::Requirement
+  requirement: &20022840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10269940
+  version_requirements: *20022840
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &10254540 !ruby/object:Gem::Requirement
+  requirement: &20022340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *10254540
+  version_requirements: *20022340
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &10249920 !ruby/object:Gem::Requirement
+  requirement: &20021840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *10249920
+  version_requirements: *20021840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10234280 !ruby/object:Gem::Requirement
+  requirement: &20021380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *10234280
+  version_requirements: *20021380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10231280 !ruby/object:Gem::Requirement
+  requirement: &20021000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10231280
+  version_requirements: *20021000
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &10225860 !ruby/object:Gem::Requirement
+  requirement: &20020540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10225860
+  version_requirements: *20020540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10222700 !ruby/object:Gem::Requirement
+  requirement: &20020040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *10222700
+  version_requirements: *20020040
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &10211000 !ruby/object:Gem::Requirement
+  requirement: &20019620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10211000
+  version_requirements: *20019620
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &10210280 !ruby/object:Gem::Requirement
+  requirement: &20019160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10210280
+  version_requirements: *20019160
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &10209440 !ruby/object:Gem::Requirement
+  requirement: &20018740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10209440
+  version_requirements: *20018740
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com