arrest 0.0.5 → 0.0.6

data/lib/arrest.rb

@@ -1,10 +1,13 @@
 require "arrest/version"
 
+require "arrest/attributes/has_attributes"
+require "arrest/attributes/converter"
 require "arrest/source"
 require "arrest/helper/child_collection"
 require "arrest/exceptions"
 require "arrest/http_source"
 require "arrest/mem_source"
+require "arrest/nested_resource"
 require "arrest/abstract_resource"
 require "arrest/root_resource"
 require "arrest/rest_child"

data/lib/arrest/abstract_resource.rb

@@ -4,66 +4,11 @@ require 'time'
 
 Scope = Struct.new(:name, :block)
 
-class Boolean
-  # to have a boolean type for attributes
-end
-
 module Arrest
-
-  Attribute = Struct.new(:name, :read_only, :clazz)
-  CONVERTER = {}
-
-  class Converter
-    class << self
-      attr_reader :clazz
-
-      def convert value
-        if value.is_a?(self.clazz)
-          value
-        else
-          self.parse value
-        end
-      end
-
-      def target clazz
-        @clazz = clazz
-        CONVERTER[clazz] = self
-      end
-    end
-  end
-  
-  class IdentConv < Converter
-    def self.convert value
-      value
-    end
-  end
-
-  class StringConv < IdentConv
-    target String
-  end
-
-  class BooleanConv < IdentConv
-    target Boolean
-  end
-
-  class IntegerConv < IdentConv
-    target Integer
-  end
-
-  class TimeConv < Converter
-    target Time
-
-    def self.parse value
-      Time.parse(value)
-    end
-  end
-  
-
-
   class AbstractResource
+    include HasAttributes
     class << self
 
-      attr_accessor :fields
       attr_reader :scopes
       
 
@@ -131,12 +76,6 @@ module Arrest
         class_eval "def #{method_name}; self.parent; end"
       end
 
-      def add_attribute attribute
-          if @fields == nil
-            @fields = []
-          end
-          @fields << attribute
-      end
 
       def scope name, &block 
         if @scopes == nil
@@ -145,16 +84,6 @@ module Arrest
         @scopes << Scope.new(name, &block)
       end
 
-      def all_fields
-        self_fields = self.fields
-        self_fields ||= []
-        if self.superclass.respond_to?('fields') && self.superclass.fields != nil
-          self_fields + self.superclass.fields
-        else
-          self_fields
-        end
-
-      end
 
       def read_only_attributes(args)
         args.each_pair do |name, clazz|
@@ -163,25 +92,6 @@ module Arrest
         end
       end
 
-      def attribute name, clazz
-          add_attribute Attribute.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
-
-      def attributes(args)
-        args.each_pair do |name, clazz|
-          self.attribute name, clazz
-        end
-      end
-
       def belongs_to(*args)
         arg = args[0]
         name = arg.to_s.downcase
@@ -193,7 +103,6 @@ module Arrest
       end
 
     end
-    self.fields = []
 
     attr_accessor :id
     attr_reader :stub
@@ -211,25 +120,7 @@ module Arrest
 
     def init_from_hash as_i={}
       @stub = false
-      as = {}
-      as_i.each_pair do |k,v|
-        as[k.to_sym] = v
-      end
-      unless self.class.all_fields == nil
-        self.class.all_fields.each do |field|
-          value = as[field.name.to_sym]
-          if value
-            converter = CONVERTER[field.clazz]
-            if converter == nil
-              puts "No converter for: #{field.clazz.name}"
-              converter = IdentConv
-            end
-          else
-            converter = IdentConv
-          end
-          self.send("#{field.name.to_s}=", converter.convert(value)) 
-        end
-      end
+      super 
     end
     
 
@@ -238,7 +129,11 @@ module Arrest
       unless self.class.all_fields == nil
         self.class.all_fields.find_all{|a| !a.read_only}.each do |field|
           json_name = StringUtils.classify(field.name.to_s,false)
-          result[json_name] = self.instance_variable_get("@#{field.name.to_s}")
+           val = self.instance_variable_get("@#{field.name.to_s}")
+           if val != nil && val.is_a?(NestedResource)
+             val = val.to_hash
+           end
+           result[json_name] = val
         end
       end
       result[:id] = self.id

data/lib/arrest/attributes/converter.rb

@@ -0,0 +1,94 @@
+class Boolean
+  # to have a boolean type for attributes
+end
+
+module Arrest
+
+  class Attribute
+    attr_accessor :name, :read_only, :clazz
+    def initialize name, read_only, clazz
+      @name = name
+      @read_only = read_only
+      @clazz = clazz
+    end
+
+    def convert value
+      return if value == nil
+      converter = CONVERTER[@clazz]
+      if converter == nil
+        puts "No converter for: #{@clazz.name}"
+        converter = IdentConv
+      end
+      converter.convert value
+    end
+  end
+
+  class NestedAttribute < Attribute
+    def initialize name, read_only, clazz
+      super name, read_only, clazz
+    end
+
+    def convert value
+      return unless value
+      resolved_class.new value
+    end
+
+    def resolved_class
+      if @clazz == nil
+        @clazz = Source.mod.const_get(@clazz_name)
+      end
+      @clazz
+    end
+  end
+
+  CONVERTER = {}
+
+  def add_converter key, converter
+    CONVERTER[key] = converter
+  end
+
+  class Converter
+    class << self
+      attr_reader :clazz
+
+      def convert value
+        if value.is_a?(self.clazz)
+          value
+        else
+          self.parse value
+        end
+      end
+
+      def target clazz
+        @clazz = clazz
+        CONVERTER[clazz] = self
+      end
+    end
+  end
+  
+  class IdentConv < Converter
+    def self.convert value
+      value
+    end
+  end
+
+  class StringConv < IdentConv
+    target String
+  end
+
+  class BooleanConv < IdentConv
+    target Boolean
+  end
+
+  class IntegerConv < IdentConv
+    target Integer
+  end
+
+  class TimeConv < Converter
+    target Time
+
+    def self.parse value
+      Time.parse(value)
+    end
+  end
+end

data/lib/arrest/attributes/has_attributes.rb

@@ -0,0 +1,97 @@
+module Arrest
+  module HasAttributes
+
+    def self.included(base) # :nodoc:
+      base.extend HasAttributesMethods
+    end
+
+    def unstub
+
+    end
+
+    def init_from_hash as_i={}
+      as = {}
+      as_i.each_pair do |k,v|
+        as[k.to_sym] = v
+      end
+      unless self.class.all_fields == nil
+        self.class.all_fields.each do |field|
+          value = as[field.name.to_sym]
+          converted = field.convert(value)
+          self.send("#{field.name.to_s}=", converted) 
+        end
+      end
+    end
+
+    def to_hash
+      result = {}
+      unless self.class.all_fields == nil
+        self.class.all_fields.find_all{|a| !a.read_only}.each do |field|
+          json_name = StringUtils.classify(field.name.to_s,false)
+           val = self.instance_variable_get("@#{field.name.to_s}")
+           if val != nil && val.is_a?(NestedResource)
+             val = val.to_hash
+           end
+           result[json_name] = val
+        end
+      end
+      result
+    end
+
+    module HasAttributesMethods
+      attr_accessor :fields
+
+      
+      def attribute name, clazz
+          add_attribute Attribute.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
+
+      def attributes(args)
+        args.each_pair do |name, clazz|
+          self.attribute name, clazz
+        end
+      end
+
+      def add_attribute attribute
+          if @fields == nil
+            @fields = []
+          end
+          @fields << attribute
+      end
+
+      def all_fields
+        self_fields = self.fields
+        self_fields ||= []
+        if self.superclass.respond_to?('fields') && self.superclass.fields != nil
+          self_fields + self.superclass.fields
+        else
+          self_fields
+        end
+      end
+
+      def nested name, clazz
+          add_attribute NestedAttribute.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

@@ -0,0 +1,28 @@
+module Arrest
+  # A nested resource has no own url
+  # It is an embedded entity in an actual RestResource or
+  # an other NestedResource
+  class NestedResource
+    include HasAttributes
+
+    def initialize h
+      init_from_hash h
+    end
+
+    class << self
+      def to_hash
+        result = {}
+        unless self.class.all_fields == nil
+          self.class.all_fields.find_all{|a| !a.read_only}.each do |field|
+            json_name = StringUtils.classify(field.name.to_s,false)
+            result[json_name] = self.instance_variable_get("@#{field.name.to_s}")
+          end
+        end
+        result[:id] = self.id
+        result
+
+      end
+
+    end
+  end
+end

data/lib/arrest/version.rb

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

data/test/models.rb

@@ -30,3 +30,14 @@ class SpecialZoo < Zoo
 
 end
 
+class ANestedClass < Arrest::NestedResource
+  attribute :name, String
+  attribute :bool, Boolean
+end
+
+class WithNested < Arrest::RootResource
+  attribute :parent_name, String
+  attribute :bool, Boolean
+  nested :nested_object, ANestedClass
+end
+

data/test/nested_resource.rb

@@ -0,0 +1,81 @@
+require 'test/unit'
+load 'test/models.rb'
+
+class NestedResourcesTest < Test::Unit::TestCase
+
+  def setup
+     Arrest::Source.source = nil
+     #Arrest::Source.debug = true
+  end
+
+  def test_instance_test
+    n = ANestedClass.new({:name => "foo"})
+    assert_equal "foo", n.name
+  end
+
+  def test_from_hash
+    input = {
+      :parent_name => 'parent',
+      :bool => false,
+      :nested_object => { 
+        :name => 'iamnested',
+        :bool => true
+      }
+    }
+
+    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
+  end
+
+  def test_to_hash
+    input = {
+      :parent_name => 'parent',
+      :bool => false,
+      :nested_object => { 
+        :name => 'iamnested',
+        :bool => true
+      }
+    }
+
+    actual = WithNested.new(input)
+
+    # we expect camel cased keys
+    expected = {
+      'parentName' => 'parent',
+      'bool' => false,
+      'nestedObject' => { 
+        'name' => 'iamnested',
+        'bool' => true
+      }
+    }
+
+    assert_equal_hashes expected, actual.to_hash
+
+  end
+
+  def assert_equal_hashes expected, actual
+    assert_equal_hashes_ expected, actual, ''
+  end
+
+  def assert_equal_hashes_ expected, actual, prefix
+    more_expected_keys = (expected.keys - actual.keys).map{|k| prefix + k.to_s }
+    assert more_expected_keys.empty?, "Actual misses keys: #{more_expected_keys}"
+    more_actual_keys = (actual.keys - expected.keys).map{|k| prefix + k.to_s }
+    assert more_expected_keys.empty?, "Actual has more keys: #{more_actual_keys}"
+
+    expected.each_pair do |ek, ev|
+      av = actual[ek]
+      if ev != nil && ev.is_a?(Hash)
+        assert_equal_hashes_ ev, av, "#{prefix}."
+      end
+      assert_equal ev, av
+    end
+  end
+
+
+end

data/test/unit.rb

@@ -200,9 +200,9 @@ class FirstTest < Test::Unit::TestCase
     new_zoo.save
     
     assert_not_nil new_zoo.id
-
     # this is where the magic hapens
     stubbed = Zoo.stub(new_zoo.id)
+    return
 
     new_animal = Animal.new new_zoo, {:kind => "foo", :age => 42}
     new_animal.save

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000Z
+date: 2011-12-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &10579480 !ruby/object:Gem::Requirement
+  requirement: &2162431160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10579480
+  version_requirements: *2162431160
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &10578980 !ruby/object:Gem::Requirement
+  requirement: &2162430460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *10578980
+  version_requirements: *2162430460
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &10578480 !ruby/object:Gem::Requirement
+  requirement: &2162429700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *10578480
+  version_requirements: *2162429700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10578100 !ruby/object:Gem::Requirement
+  requirement: &2162428760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10578100
+  version_requirements: *2162428760
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &10577640 !ruby/object:Gem::Requirement
+  requirement: &2162427040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10577640
+  version_requirements: *2162427040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &10577140 !ruby/object:Gem::Requirement
+  requirement: &2162426160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *10577140
+  version_requirements: *2162426160
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &10576720 !ruby/object:Gem::Requirement
+  requirement: &2162425700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10576720
+  version_requirements: *2162425700
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &10576260 !ruby/object:Gem::Requirement
+  requirement: &2162425100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10576260
+  version_requirements: *2162425100
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &10575840 !ruby/object:Gem::Requirement
+  requirement: &2162424460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *10575840
+  version_requirements: *2162424460
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -125,10 +125,13 @@ files:
 - arrest.gemspec
 - lib/arrest.rb
 - lib/arrest/abstract_resource.rb
+- lib/arrest/attributes/converter.rb
+- lib/arrest/attributes/has_attributes.rb
 - lib/arrest/exceptions.rb
 - lib/arrest/helper/child_collection.rb
 - lib/arrest/http_source.rb
 - lib/arrest/mem_source.rb
+- lib/arrest/nested_resource.rb
 - lib/arrest/rest_child.rb
 - lib/arrest/root_resource.rb
 - lib/arrest/source.rb
@@ -138,6 +141,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/models/user.rb
 - test/models.rb
+- test/nested_resource.rb
 - test/unit.rb
 homepage: ''
 licenses: []
@@ -163,4 +167,10 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Another ruby rest client
-test_files: []
+test_files:
+- spec/arrest_spec.rb
+- spec/spec_helper.rb
+- spec/support/models/user.rb
+- test/models.rb
+- test/nested_resource.rb
+- test/unit.rb