dm-rest-adapter 1.1.0.rc2 → 1.1.0.rc3

data/Gemfile

@@ -5,7 +5,7 @@ source 'http://rubygems.org'
 SOURCE       = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER   = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION   = '~> 1.1.0.rc2'
+DM_VERSION   = '~> 1.1.0.rc3'
 
 gem 'dm-serializer', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-serializer#{REPO_POSTFIX}"
 

data/VERSION

@@ -1 +1 @@
-1.1.0.rc2
+1.1.0.rc3

data/dm-rest-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-rest-adapter}
-  s.version = "1.1.0.rc2"
+  s.version = "1.1.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Burton @ Joyent Inc"]
-  s.date = %q{2011-03-01}
+  s.date = %q{2011-03-10}
   s.description = %q{REST Adapter for DataMapper}
   s.email = %q{scott.burton [a] joyent [d] com}
   s.extra_rdoc_files = [
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/datamapper/dm-rest-adapter}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{REST Adapter for DataMapper}
   s.test_files = [
     "spec/fixtures/book.rb",
@@ -57,23 +57,23 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.1.0.rc2"])
-      s.add_development_dependency(%q<dm-validations>, ["~> 1.1.0.rc2"])
+      s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.1.0.rc3"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.1.0.rc3"])
       s.add_development_dependency(%q<fakeweb>, ["~> 1.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
-      s.add_dependency(%q<dm-serializer>, ["~> 1.1.0.rc2"])
-      s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc2"])
+      s.add_dependency(%q<dm-serializer>, ["~> 1.1.0.rc3"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc3"])
       s.add_dependency(%q<fakeweb>, ["~> 1.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<dm-serializer>, ["~> 1.1.0.rc2"])
-    s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc2"])
+    s.add_dependency(%q<dm-serializer>, ["~> 1.1.0.rc3"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.1.0.rc3"])
     s.add_dependency(%q<fakeweb>, ["~> 1.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])

data/lib/dm-rest-adapter/adapter.rb

@@ -129,14 +129,16 @@ module DataMapperRest
         raise "No root element matching #{element_name} in xml"
       end
 
-      field_to_property = model.properties(name).map { |p| [ p.field, p ] }.to_hash
+      pairs = model.properties(name).map { |p| [ p.field, p ] }
+      field_to_property = DataMapper::Ext::Array.to_hash(pairs)
       record_from_rexml(entity_element, field_to_property)
     end
 
     def parse_resources(xml, model)
       doc = REXML::Document::new(xml)
 
-      field_to_property = model.properties(name).map { |p| [ p.field, p ] }.to_hash
+      pairs = model.properties(name).map { |p| [ p.field, p ] }
+      field_to_property = DataMapper::Ext::Array.to_hash(pairs)
       element_name      = element_name(model)
 
       doc.elements.collect("/#{resource_name(model)}/#{element_name}") do |entity_element|
@@ -145,7 +147,7 @@ module DataMapperRest
     end
 
     def element_name(model)
-      model.storage_name(self.name).singularize
+      DataMapper::Inflector.singularize(model.storage_name(self.name))
     end
 
     def resource_name(model)
@@ -153,7 +155,7 @@ module DataMapperRest
     end
 
     def update_with_response(resource, response)
-      return unless response.kind_of?(Net::HTTPSuccess) && !response.body.blank?
+      return unless response.kind_of?(Net::HTTPSuccess) && !DataMapper::Ext.blank?(response.body)
 
       model      = resource.model
       properties = model.properties(name)

data/lib/dm-rest-adapter/connection.rb

@@ -1,13 +1,5 @@
 require 'net/http'
-
-begin
-  require 'active_support/inflector'
-rescue LoadError
-  require 'extlib/inflection'
-  module ActiveSupport
-    Inflector = Extlib::Inflection unless defined?(Inflector)
-  end
-end
+require 'dm-core/support/inflector'
 
 module DataMapperRest
   # Somewhat stolen from ActiveResource
@@ -40,7 +32,7 @@ module DataMapperRest
 
       def run_verb(verb, data = nil)
         request do |http|
-          klass = Net::HTTP.find_const(ActiveSupport::Inflector.camelize(verb))
+          klass = DataMapper::Ext::Module.find_const(Net::HTTP, DataMapper::Inflector.camelize(verb))
           request = klass.new(@uri.to_s, @format.header)
           request.basic_auth(@uri.user, @uri.password) if @uri.user && @uri.password
           result = http.request(request, data)

data/spec/semipublic/rest_adapter_spec.rb

@@ -12,7 +12,7 @@ describe DataMapper::Adapters::RestAdapter do
   describe '#create' do
     describe 'when provided a Resource' do
       before :all do
-        body = <<-XML.compress_lines
+        body = DataMapper::Ext::String.compress_lines(<<-XML)
           <book>
             <id type='datamapper::types::serial'>1</id>
             <created_at type='datetime'>2009-05-17T22:38:42-07:00</created_at>
@@ -46,7 +46,7 @@ describe DataMapper::Adapters::RestAdapter do
   describe '#read' do
     describe 'with unscoped query' do
       before :all do
-        body = <<-XML.compress_lines
+        body = DataMapper::Ext::String.compress_lines(<<-XML)
           <books>
             <book>
               <id type='datamapper::types::serial'>1</id>
@@ -82,7 +82,7 @@ describe DataMapper::Adapters::RestAdapter do
       before :all do
         @query = Book.all(:id => 1, :limit => 1).query
 
-        body = <<-XML.compress_lines
+        body = DataMapper::Ext::String.compress_lines(<<-XML)
           <book>
             <id type='datamapper::types::serial'>1</id>
             <created_at type='datetime'>2009-05-17T22:38:42-07:00</created_at>
@@ -105,7 +105,7 @@ describe DataMapper::Adapters::RestAdapter do
 
     describe 'with query scoped by a non-key' do
       before :all do
-        body = <<-XML.compress_lines
+        body = DataMapper::Ext::String.compress_lines(<<-XML)
           <books>
             <book>
               <id type='datamapper::types::serial'>1</id>
@@ -142,7 +142,7 @@ describe DataMapper::Adapters::RestAdapter do
 
     describe 'with a non-standard model <=> storage_name relationship' do
       before :all do
-        body = <<-XML.compress_lines
+        body = DataMapper::Ext::String.compress_lines(<<-XML)
           <books>
             <book>
               <id type='datamapper::types::serial'>1</id>
@@ -172,7 +172,7 @@ describe DataMapper::Adapters::RestAdapter do
 
   describe '#update' do
     before :all do
-      body = <<-XML.compress_lines
+      body = DataMapper::Ext::String.compress_lines(<<-XML)
         <books>
           <book>
             <id type='datamapper::types::serial'>1</id>
@@ -189,7 +189,7 @@ describe DataMapper::Adapters::RestAdapter do
     end
 
     before :all do
-      body = <<-XML.compress_lines
+      body = DataMapper::Ext::String.compress_lines(<<-XML)
         <book>
           <id type='datamapper::types::serial'>1</id>
           <created_at type='datetime'>2009-05-17T22:38:42-07:00</created_at>
@@ -220,7 +220,7 @@ describe DataMapper::Adapters::RestAdapter do
 
   describe '#delete' do
     before :all do
-      body = <<-XML.compress_lines
+      body = DataMapper::Ext::String.compress_lines(<<-XML)
         <books>
           <book>
             <id type='datamapper::types::serial'>1</id>

data/spec/spec_helper.rb

@@ -1,20 +1,8 @@
 require 'rubygems'
 require 'pathname'
 require 'fakeweb'
-
-# use local dm-core if running from a typical dev checkout.
-lib = File.join('..', '..', '..', 'dm-core', 'lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib)
-
-# use local dm-validations if running from a typical dev checkout.
-lib = File.join('..', '..', 'dm-validations', 'lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib)
 require 'dm-validations'
 
-# use local dm-serializer if running from a typical dev checkout.
-lib = File.join('..', '..', 'dm-serializer', 'lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib)
-
 # Support running specs with 'rake spec' and 'spec'
 $LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
 
@@ -24,6 +12,6 @@ ROOT = Pathname(__FILE__).dirname.parent
 
 DataMapper.setup(:default, 'rest://admin:secret@localhost:4000/?format=xml')
 
-Dir[ROOT / 'spec' / 'fixtures' / '**' / '*.rb'].each { |rb| require rb }
+Pathname.glob((ROOT + 'spec/fixtures/**/*.rb').to_s).each { |file| require file }
 
 FakeWeb.allow_net_connect = false

metadata

@@ -2,7 +2,7 @@
 name: dm-rest-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc2
+  version: 1.1.0.rc3
 platform: ruby
 authors: 
 - Scott Burton @ Joyent Inc
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
   type: :development
   prerelease: false
   version_requirements: *id002
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: REST Adapter for DataMapper