arrest 0.0.6 → 0.0.7

data/lib/arrest.rb

@@ -1,5 +1,6 @@
 require "arrest/version"
 
+require "arrest/attributes/belongs_to"
 require "arrest/attributes/has_attributes"
 require "arrest/attributes/converter"
 require "arrest/source"

data/lib/arrest/abstract_resource.rb

@@ -64,7 +64,7 @@ module Arrest
             @child_collections = {}
           end
           if @child_collections[method_name] == nil
-            @child_collections[method_name]  = ChildCollection.new(self, (StringUtils.classify clazz_name))
+            @child_collections[method_name]  = ChildCollection.new(self, (StringUtils.classify (StringUtils.singular clazz_name)))
           end
 
           @child_collections[method_name]
@@ -92,18 +92,10 @@ module Arrest
         end
       end
 
-      def belongs_to(*args)
-        arg = args[0]
-        name = arg.to_s.downcase
-        attributes({"#{name}_id".to_sym => String})
-        send :define_method, name do
-          val = self.instance_variable_get("@#{name}_id")
-          Arrest::Source.mod.const_get(StringUtils.classify name).find(val)
-        end
-      end
-
     end
 
+    include BelongsTo
+
     attr_accessor :id
     attr_reader :stub
 
@@ -132,6 +124,8 @@ module Arrest
            val = self.instance_variable_get("@#{field.name.to_s}")
            if val != nil && val.is_a?(NestedResource)
              val = val.to_hash
+           elsif val != nil && field.is_a?(NestedCollection)
+             val = val.map {|v| v.to_hash}
            end
            result[json_name] = val
         end

data/lib/arrest/attributes/belongs_to.rb

@@ -0,0 +1,32 @@
+module Arrest
+  # Manages an id field of an external resource referenced by this resource.
+  # Provides accessor to load exteral resource.
+  module BelongsTo
+    def self.included(base) # :nodoc:
+      base.extend BelongsToMethods
+    end
+
+    module BelongsToMethods
+      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
+        end
+        attributes({field_name.to_sym => String})
+        send :define_method, name do
+          val = self.send(field_name)
+          begin
+            Arrest::Source.mod.const_get(class_name).find(val)
+          rescue Errors::DocumentNotFoundError => e
+            raise Errors::DocumentNotFoundError, "Couldnt find a #{class_name} with id #{val}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/arrest/attributes/converter.rb

@@ -30,15 +30,23 @@ module Arrest
 
     def convert value
       return unless value
-      resolved_class.new value
+      @clazz.new value
+    end
+  end
+
+  class NestedCollection < Attribute
+    def initialize name, read_only, clazz
+      super name, read_only, clazz
     end
 
-    def resolved_class
-      if @clazz == nil
-        @clazz = Source.mod.const_get(@clazz_name)
+    def convert value
+      return unless value
+      raise "Expected an array but got #{value.class.name}" unless value.is_a?(Array)
+      value.map do |v|
+        @clazz.new v
       end
-      @clazz
     end
+
   end
 
   CONVERTER = {}

data/lib/arrest/attributes/has_attributes.rb

@@ -92,6 +92,22 @@ module Arrest
         
       end
 
+      def nested_array name, clazz
+          add_attribute NestedCollection.new(name, false, clazz)
+
+          send :define_method, "#{name}=" do |v|
+            self.unstub
+            self.instance_variable_set("@#{name}", v)
+          end
+          send :define_method, "#{name}" do
+            self.unstub
+            self.instance_variable_get("@#{name}")
+          end
+        
+      end
+
     end
+
+
   end
 end

data/lib/arrest/nested_resource.rb

@@ -4,6 +4,7 @@ module Arrest
   # an other NestedResource
   class NestedResource
     include HasAttributes
+    include BelongsTo
 
     def initialize h
       init_from_hash h

data/lib/arrest/rest_child.rb

@@ -28,6 +28,10 @@ module Arrest
         end
       end
 
+      def find id
+        raise "find cannot be executed for child resources - use find_for with a parent"
+      end
+
       def find_for parent,id
         r = source().get_one "#{self.resource_path_for(parent)}/#{id}"
         body = body_root(r)

data/lib/arrest/string_utils.rb

@@ -45,7 +45,8 @@ class StringUtils
     def classify(str, upper_first = true)
       result = ""
       upperNext = false
-      (singular str) .each_char do |c|
+      #(singular str) .each_char do |c|
+      (str) .each_char do |c|
         if c == "_"
           upperNext = true
         else

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/models.rb

@@ -41,3 +41,28 @@ class WithNested < Arrest::RootResource
   nested :nested_object, ANestedClass
 end
 
+class WithManyNested < Arrest::RootResource
+  attribute :parent_name, String
+  attribute :bool, Boolean
+  nested_array :nested_objects, ANestedClass
+end
+
+
+class ANestedClassBelonging < Arrest::NestedResource
+  attribute :name, String
+  attribute :bool, Boolean
+
+  belongs_to :zoo
+end
+
+class WithNestedBelongingTo < Arrest::RootResource
+  attribute :parent_name, String
+  attribute :bool, Boolean
+  nested :nested_object, ANestedClassBelonging
+end
+
+class CustomNamedBelongsTo < Arrest::RootResource
+  attribute :name, String
+  belongs_to :zoo_thing, { :field_name => :schinken, :class_name => :Zoo}
+  belongs_to :zoo, { :field_name => :batzen}
+end

data/test/nested_resource.rb

@@ -26,7 +26,6 @@ class NestedResourcesTest < Test::Unit::TestCase
     actual = WithNested.new(input)
     assert_equal 'parent', actual.parent_name
     assert_equal false, actual.bool
-    puts actual.inspect
     assert actual.respond_to? :nested_object, "The parent object should have an accessor for the nested object"
     assert_equal 'iamnested', actual.nested_object.name
     assert_equal true, actual.nested_object.bool
@@ -58,6 +57,97 @@ class NestedResourcesTest < Test::Unit::TestCase
 
   end
 
+  def test_many_to_hash
+    input = {
+      :parent_name => 'parent',
+      :bool => false,
+      :nested_objects => [
+        { 
+        :name => 'iamnested_one',
+        :bool => true
+        },{ 
+        :name => 'iamnested_two',
+        :bool => false
+        } 
+      ]
+    }
+
+    actual = WithManyNested.new(input)
+
+    # we expect camel cased keys
+    expected = {
+      'parentName' => 'parent',
+      'bool' => false,
+      'nestedObjects' => [
+        { 
+        'name' => 'iamnested_one',
+        'bool' => true
+        },{ 
+        'name' => 'iamnested_two',
+        'bool' => false
+        }
+      ]
+    }
+
+    assert_equal_hashes expected, actual.to_hash
+
+  end
+
+  def test_belongd_to_to_hash
+    new_zoo = Zoo.new({:name => "Foo"})
+    new_zoo.save
+
+    input = {
+      :parent_name => 'parent',
+      :bool => false,
+      :nested_object => { 
+        :name => 'iamnested',
+        :bool => true,
+        :zoo_id => new_zoo.id
+      }
+    }
+
+    actual = WithNestedBelongingTo.new(input)
+
+    # we expect camel cased keys
+    expected = {
+      'parentName' => 'parent',
+      'bool' => false,
+      'nestedObject' => { 
+        'name' => 'iamnested',
+        'bool' => true,
+        'zooId' => new_zoo.id
+
+      }
+    }
+
+    assert_equal_hashes expected, actual.to_hash
+
+    zoo = actual.nested_object.zoo
+    assert_equal "Foo", zoo.name
+
+  end
+
+  def test_custom_belongs_to
+
+    new_zoo = Zoo.new({:name => "Foo"})
+    new_zoo.save
+
+    c = 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 = 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, ''
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000Z
+date: 2011-12-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2162431160 !ruby/object:Gem::Requirement
+  requirement: &2154189380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2162431160
+  version_requirements: *2154189380
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &2162430460 !ruby/object:Gem::Requirement
+  requirement: &2154188840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *2162430460
+  version_requirements: *2154188840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2162429700 !ruby/object:Gem::Requirement
+  requirement: &2154188080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2162429700
+  version_requirements: *2154188080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2162428760 !ruby/object:Gem::Requirement
+  requirement: &2154187220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162428760
+  version_requirements: *2154187220
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2162427040 !ruby/object:Gem::Requirement
+  requirement: &2154186100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162427040
+  version_requirements: *2154186100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2162426160 !ruby/object:Gem::Requirement
+  requirement: &2154185300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *2162426160
+  version_requirements: *2154185300
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2162425700 !ruby/object:Gem::Requirement
+  requirement: &2154184880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162425700
+  version_requirements: *2154184880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2162425100 !ruby/object:Gem::Requirement
+  requirement: &2154184380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162425100
+  version_requirements: *2154184380
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2162424460 !ruby/object:Gem::Requirement
+  requirement: &2154183740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2162424460
+  version_requirements: *2154183740
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -125,6 +125,7 @@ files:
 - arrest.gemspec
 - lib/arrest.rb
 - lib/arrest/abstract_resource.rb
+- lib/arrest/attributes/belongs_to.rb
 - lib/arrest/attributes/converter.rb
 - lib/arrest/attributes/has_attributes.rb
 - lib/arrest/exceptions.rb