arrest 0.0.12 → 0.0.13

data/.gitignore

@@ -1,7 +1,8 @@
-*.gem
 .bundle
-Gemfile.lock
-pkg/*
+.project
+*.gem
 *.swp
 coverage
+Gemfile.lock
 log/*
+pkg/*

data/lib/arrest.rb

@@ -6,6 +6,7 @@ require 'arrest/helper/logger'
 require "arrest/attributes/belongs_to"
 require "arrest/attributes/has_attributes"
 require "arrest/attributes/converter"
+require "arrest/handler"
 require "arrest/source"
 require "arrest/helper/filter"
 require "arrest/helper/child_collection"

data/lib/arrest/attributes/converter.rb

@@ -25,7 +25,12 @@ module Arrest
 
     def to_hash value
       return nil unless value != nil
-      value
+      converter = CONVERTER[@clazz]
+      if converter == nil
+        puts "No converter for: #{@clazz.name}"
+        converter = IdentConv
+      end
+      converter.mk_json value
     end
   end
 
@@ -84,6 +89,10 @@ module Arrest
         end
       end
 
+      def mk_json obj
+        obj
+      end
+
       def target clazz
         @clazz = clazz
         CONVERTER[clazz] = self
@@ -119,5 +128,9 @@ module Arrest
     def self.parse value
       Time.parse(value)
     end
+
+    def self.mk_json time
+      time.strftime "%FT%T%z"
+    end
   end
 end

data/lib/arrest/handler.rb

@@ -0,0 +1,45 @@
+module Arrest
+
+  # The classes in this module supply default behaviour
+  # for certain processing steps in the consumttion ot the 
+  # rest api
+  module Handlers
+
+    class HeaderDecorator
+      # must return a hash from header name to value
+      def self.headers
+        {}
+      end
+    end
+
+
+    # a converter to transform between the name of the field in
+    # the json object and the name of the field in ruby code.
+    # Default behaviour is that for an underscored name in ruby
+    # a camel cased version in json expected:
+    #     ruby    ->     json
+    #   started_at    startedAt
+    class KeyConverter
+      class << self
+        def key_from_json name
+          StringUtils.underscore(name.to_s)
+        end
+
+        def key_to_json name
+          StringUtils.classify(name.to_s,false)
+        end
+      end
+    end
+
+    class ErrorHandler
+      # a function to convert the body of an http response
+      # to a meaningful error message
+      def self.convert body, statuscode
+        body
+      end
+    end
+
+  end
+
+end
+

data/lib/arrest/http_source.rb

@@ -80,6 +80,10 @@ module Arrest
         rest_resource.id= id
         true
       else
+        if response.env[:status] != 201
+          err = Arrest::Source.error_handler.convert(response.body, response.env[:status])
+          rest_resource.errors.add(:base, err)
+        end
         puts "unable to create: #{response.env[:response_headers]} body: #{response.body} "
         false
       end

data/lib/arrest/source.rb

@@ -1,3 +1,4 @@
+require "arrest/handler"
 module Arrest
   def self.debug s
     if Arrest::Source.debug
@@ -13,6 +14,7 @@ module Arrest
       attr_reader :header_decorator
       attr_accessor :json_key_converter
       attr_accessor :skip_validations
+      attr_accessor :error_handler
 
       def source=(host=nil)
         if [nil, ""].include?(host)
@@ -38,32 +40,20 @@ module Arrest
       def header_decorator=(hd=nil)
         Arrest::debug "Setting headerd to #{hd}"
         if hd == nil
-          @header_decorator = self
+          @header_decorator = Handlers::Header_decorator
         elsif hd.respond_to?(:headers)
           @header_decorator = hd
         else
           raise "Header_decorator must be an object that returns an hash for the method headers"
         end
       end
-
-      def headers
-        {}
-      end
-
-      def key_from_json name
-        StringUtils.underscore(name.to_s)
-      end
-
-      def key_to_json name
-        StringUtils.classify(name.to_s,false)
-      end
-
     end
   end
   Source.mod = nil
-  Source.header_decorator = Source
+  Source.header_decorator = Handlers::HeaderDecorator
   Source.debug = false
-  Source.json_key_converter = Source
+  Source.json_key_converter = Handlers::KeyConverter
+  Source.error_handler = Handlers::ErrorHandler
   Source.skip_validations = false
 
 end

data/lib/arrest/version.rb

@@ -1,3 +1,3 @@
 module Arrest
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/test/models.rb

@@ -41,6 +41,10 @@ class SpecialZoo < Zoo
 
 end
 
+class TimeClass < Arrest::RootResource
+  attribute :time, Time
+end
+
 class ANestedClass < Arrest::NestedResource
   attribute :name, String
   attribute :underscore_name, String

data/test/unit.rb

@@ -391,5 +391,13 @@ class FirstTest < Test::Unit::TestCase
     assert_equal "Foo1", v1_reloaded.zoos.open_filter.first.name
     assert_equal 3, Zoo.all.length
   end
+
+  def test_time
+    now = Time.now
+    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
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arrest
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000Z
+date: 2012-01-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &15777380 !ruby/object:Gem::Requirement
+  requirement: &13647940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15777380
+  version_requirements: *13647940
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &15776240 !ruby/object:Gem::Requirement
+  requirement: &13647020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *15776240
+  version_requirements: *13647020
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &15775480 !ruby/object:Gem::Requirement
+  requirement: &13646240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *15775480
+  version_requirements: *13646240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15749340 !ruby/object:Gem::Requirement
+  requirement: &13645500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *15749340
+  version_requirements: *13645500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15748420 !ruby/object:Gem::Requirement
+  requirement: &13645080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15748420
+  version_requirements: *13645080
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &15747940 !ruby/object:Gem::Requirement
+  requirement: &13644600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15747940
+  version_requirements: *13644600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15747400 !ruby/object:Gem::Requirement
+  requirement: &13644080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *15747400
+  version_requirements: *13644080
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &15746680 !ruby/object:Gem::Requirement
+  requirement: &13643640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15746680
+  version_requirements: *13643640
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &15746220 !ruby/object:Gem::Requirement
+  requirement: &13643160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15746220
+  version_requirements: *13643160
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &15745800 !ruby/object:Gem::Requirement
+  requirement: &13642740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15745800
+  version_requirements: *13642740
 description: Consume a rest API in a AR like fashion
 email:
 - axel.tetzlaff@fortytools.com
@@ -140,6 +140,7 @@ files:
 - lib/arrest/attributes/converter.rb
 - lib/arrest/attributes/has_attributes.rb
 - lib/arrest/exceptions.rb
+- lib/arrest/handler.rb
 - lib/arrest/helper/child_collection.rb
 - lib/arrest/helper/filter.rb
 - lib/arrest/helper/has_many_collection.rb