arrest 0.0.39 → 0.0.40

data/lib/arrest/attributes/belongs_to.rb

@@ -51,7 +51,7 @@ module Arrest
 
           begin
             if polymorphic
-              Arrest::Source.mod.const_get(polymorphic[val.ref_type.to_sym]).find(self.context, val.ref_id)
+              Arrest::Source.mod.const_get(polymorphic[val.type.to_sym]).find(self.context, val.id)
             else
               Arrest::Source.mod.const_get(class_name).find(self.context, val)
             end

data/lib/arrest/attributes/polymorphic_attribute.rb

@@ -2,8 +2,8 @@ module Arrest
   class Ref
     include HasAttributes
 
-    attribute :ref_id, String
-    attribute :ref_type, String
+    attribute :id, String
+    attribute :type, String
   end
 
   class PolymorphicAttribute < NestedAttribute

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.39"
+  VERSION = "0.0.40"
 end

data/test/unit.rb

@@ -426,14 +426,14 @@ class FirstTest < Test::Unit::TestCase
     comb = @scope.CommentableB.new()
     comb.save
 
-    c = @scope.Comment.new(:commentable_ref => { :ref_id => coma.id, :ref_type => "coma"})
+    c = @scope.Comment.new(:commentable_ref => { :id => coma.id, :type => "coma"})
     result = c.commentable
-    assert_equal coma.id, c.commentable_ref.ref_id
+    assert_equal coma.id, c.commentable_ref.id
     assert_equal result.class, CommentableA
 
-    c2 = @scope.Comment.new(:commentable_ref => { :ref_id => comb.id, :ref_type => "comb"})
+    c2 = @scope.Comment.new(:commentable_ref => { :id => comb.id, :type => "comb"})
     result2 = c2.commentable
-    assert_equal comb.id, c2.commentable_ref.ref_id
+    assert_equal comb.id, c2.commentable_ref.id
     assert_equal result2.class, CommentableB
   end
 
@@ -443,14 +443,14 @@ class FirstTest < Test::Unit::TestCase
     comc = @scope.CommentableC.new()
     comc.save
 
-    c = @scope.ExtendedComment.new({ :special_commentable_ref => { :ref_id => comc.id, :ref_type => "comc"},
-                                     :commentable_ref => { :ref_id => coma.id, :ref_type => "coma" }})
+    c = @scope.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 = @scope.ExtendedComment.find(c.id)
-    assert_equal comc.id, c_reloaded.special_commentable_ref.ref_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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.39
+  version: 0.0.40
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000Z
+date: 2012-03-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &8538040 !ruby/object:Gem::Requirement
+  requirement: &11103100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8538040
+  version_requirements: *11103100
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &8537280 !ruby/object:Gem::Requirement
+  requirement: &11102320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *8537280
+  version_requirements: *11102320
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &8536440 !ruby/object:Gem::Requirement
+  requirement: &11101580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *8536440
+  version_requirements: *11101580
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &8535940 !ruby/object:Gem::Requirement
+  requirement: &11099500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *8535940
+  version_requirements: *11099500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &8535460 !ruby/object:Gem::Requirement
+  requirement: &11098680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8535460
+  version_requirements: *11098680
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &8534860 !ruby/object:Gem::Requirement
+  requirement: &11097600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8534860
+  version_requirements: *11097600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8534160 !ruby/object:Gem::Requirement
+  requirement: &11096500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *8534160
+  version_requirements: *11096500
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &8533560 !ruby/object:Gem::Requirement
+  requirement: &11095780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8533560
+  version_requirements: *11095780
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &8532880 !ruby/object:Gem::Requirement
+  requirement: &11094740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8532880
+  version_requirements: *11094740
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &8532460 !ruby/object:Gem::Requirement
+  requirement: &11094220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8532460
+  version_requirements: *11094220
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com