dm-rest-adapter 1.1.0 → 1.2.0.rc1

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'
+DM_VERSION   = '~> 1.2.0.rc1'
 
 gem 'dm-serializer', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-serializer#{REPO_POSTFIX}"
 
@@ -13,18 +13,18 @@ group :development do
 
   gem 'dm-validations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-validations#{REPO_POSTFIX}"
   gem 'fakeweb',        '~> 1.3'
-  gem 'jeweler',        '~> 1.5.2'
-  gem 'rake',           '~> 0.8.7'
-  gem 'rspec',          '~> 1.3.1'
+  gem 'jeweler',        '~> 1.6.4'
+  gem 'rake',           '~> 0.9.2'
+  gem 'rspec',          '~> 1.3.2'
 
 end
 
 platforms :mri_18 do
   group :quality do
 
-    gem 'rcov',      '~> 0.9.9'
-    gem 'yard',      '~> 0.6'
-    gem 'yardstick', '~> 0.2'
+    gem 'rcov',      '~> 0.9.10'
+    gem 'yard',      '~> 0.7.2'
+    gem 'yardstick', '~> 0.4'
 
   end
 end

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.5.2'
+  gem 'jeweler', '~> 1.6.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -12,7 +12,6 @@ begin
     gem.email       = 'scott.burton [a] joyent [d] com'
     gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
     gem.authors     = [ 'Scott Burton @ Joyent Inc' ]
-    gem.has_rdoc    = 'yard'
 
     gem.rubyforge_project = 'datamapper'
   end
@@ -21,5 +20,5 @@ begin
 
   FileList['tasks/**/*.rake'].each { |task| import task }
 rescue LoadError
-  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.5.2'
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler -v 1.6.4'
 end

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0.rc1

data/dm-rest-adapter.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{dm-rest-adapter}
-  s.version = "1.1.0"
+  s.name = "dm-rest-adapter"
+  s.version = "1.2.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  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-16}
-  s.description = %q{REST Adapter for DataMapper}
-  s.email = %q{scott.burton [a] joyent [d] com}
+  s.date = "2011-09-09"
+  s.description = "REST Adapter for DataMapper"
+  s.email = "scott.burton [a] joyent [d] com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -40,44 +40,37 @@ Gem::Specification.new do |s|
     "tasks/yard.rake",
     "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-rest-adapter}
+  s.homepage = "http://github.com/datamapper/dm-rest-adapter"
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{REST Adapter for DataMapper}
-  s.test_files = [
-    "spec/fixtures/book.rb",
-    "spec/fixtures/difficult_book.rb",
-    "spec/semipublic/connection_spec.rb",
-    "spec/semipublic/rest_adapter_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubyforge_project = "datamapper"
+  s.rubygems_version = "1.8.10"
+  s.summary = "REST Adapter for DataMapper"
 
   if s.respond_to? :specification_version then
     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"])
-      s.add_development_dependency(%q<dm-validations>, ["~> 1.1.0"])
+      s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.2.0.rc1"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.2.0.rc1"])
       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"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
     else
-      s.add_dependency(%q<dm-serializer>, ["~> 1.1.0"])
-      s.add_dependency(%q<dm-validations>, ["~> 1.1.0"])
+      s.add_dependency(%q<dm-serializer>, ["~> 1.2.0.rc1"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.2.0.rc1"])
       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"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.2"])
     end
   else
-    s.add_dependency(%q<dm-serializer>, ["~> 1.1.0"])
-    s.add_dependency(%q<dm-validations>, ["~> 1.1.0"])
+    s.add_dependency(%q<dm-serializer>, ["~> 1.2.0.rc1"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.2.0.rc1"])
     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"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.2"])
   end
 end
 

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

@@ -83,7 +83,7 @@ module DataMapperRest
             :path         => @options[:path],
             :query_values => query,
             :fragment     => @options[:fragment]
-          ).freeze
+          )
         end
     end
 
@@ -129,16 +129,14 @@ module DataMapperRest
         raise "No root element matching #{element_name} in xml"
       end
 
-      pairs = model.properties(name).map { |p| [ p.field, p ] }
-      field_to_property = DataMapper::Ext::Array.to_hash(pairs)
+      field_to_property = Hash[ model.properties(name).map { |p| [ p.field, p ] } ]
       record_from_rexml(entity_element, field_to_property)
     end
 
     def parse_resources(xml, model)
       doc = REXML::Document::new(xml)
 
-      pairs = model.properties(name).map { |p| [ p.field, p ] }
-      field_to_property = DataMapper::Ext::Array.to_hash(pairs)
+      field_to_property = Hash[ model.properties(name).map { |p| [ p.field, p ] } ]
       element_name      = element_name(model)
 
       doc.elements.collect("/#{resource_name(model)}/#{element_name}") do |entity_element|

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

@@ -1,5 +1,4 @@
 require 'net/http'
-require 'dm-core/support/inflector'
 
 module DataMapperRest
   # Somewhat stolen from ActiveResource

data/spec/spec_helper.rb

@@ -15,3 +15,9 @@ DataMapper.setup(:default, 'rest://admin:secret@localhost:4000/?format=xml')
 Pathname.glob((ROOT + 'spec/fixtures/**/*.rb').to_s).each { |file| require file }
 
 FakeWeb.allow_net_connect = false
+
+Spec::Runner.configure do |config|
+  config.before :suite do
+    DataMapper.finalize
+  end
+end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dm-rest-adapter
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.0
+  hash: 15424023
+  prerelease: 6
+  segments: 
+  - 1
+  - 2
+  - 0
+  - rc
+  - 1
+  version: 1.2.0.rc1
 platform: ruby
 authors: 
 - Scott Burton @ Joyent Inc
@@ -10,75 +17,107 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
-default_executable: 
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-serializer
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :runtime
+        hash: 15424023
+        segments: 
+        - 1
+        - 2
+        - 0
+        - rc
+        - 1
+        version: 1.2.0.rc1
   prerelease: false
-  version_requirements: *id001
+  requirement: *id001
+  name: dm-serializer
 - !ruby/object:Gem::Dependency 
-  name: dm-validations
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :development
+        hash: 15424023
+        segments: 
+        - 1
+        - 2
+        - 0
+        - rc
+        - 1
+        version: 1.2.0.rc1
   prerelease: false
-  version_requirements: *id002
+  requirement: *id002
+  name: dm-validations
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
         version: "1.3"
-  type: :development
   prerelease: false
-  version_requirements: *id003
+  requirement: *id003
+  name: fakeweb
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   prerelease: false
-  version_requirements: *id004
+  requirement: *id004
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.7
-  type: :development
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
   prerelease: false
-  version_requirements: *id005
+  requirement: *id005
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.1
-  type: :development
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
   prerelease: false
-  version_requirements: *id006
+  requirement: *id006
+  name: rspec
 description: REST Adapter for DataMapper
 email: scott.burton [a] joyent [d] com
 executables: []
@@ -111,7 +150,6 @@ files:
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: true
 homepage: http://github.com/datamapper/dm-rest-adapter
 licenses: []
 
@@ -125,23 +163,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: REST Adapter for DataMapper
-test_files: 
-- spec/fixtures/book.rb
-- spec/fixtures/difficult_book.rb
-- spec/semipublic/connection_spec.rb
-- spec/semipublic/rest_adapter_spec.rb
-- spec/spec_helper.rb
+test_files: []
+