dm-rest-adapter 0.10.2 → 1.0.0.rc3

data/.gitignore

@@ -0,0 +1,35 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## Rubinius
+*.rbc
+
+## PROJECT::GENERAL
+*.gem
+coverage
+rdoc
+pkg
+tmp
+doc
+log
+.yardoc
+measurements
+
+## BUNDLER
+.bundle
+Gemfile.local
+Gemfile.lock
+
+## PROJECT::SPECIFIC

data/Gemfile

@@ -0,0 +1,84 @@
+# If you're working on more than one datamapper gem at a time, then it's
+# recommended to create a local Gemfile and use this instead of the git
+# sources. This will make sure that you are  developing against your
+# other local datamapper sources that you currently work on. Gemfile.local
+# will behave identically to the standard Gemfile apart from the fact that
+# it fetches the gems from local paths. This means that you can use the
+# same environment variables, like ADAPTER when running bundle commands.
+# Gemfile.local is added to .gitignore, so you don't need to worry about
+# accidentally checking local development paths into git.
+#
+#   bundle exec rake local_gemfile
+#
+# will give you a Gemfile.local file that points to your local clones of
+# the various datamapper gems. It's assumed that all datamapper repo clones
+# reside in the same directory. You can use the Gemfile.local like so for
+# running any bundle command:
+#
+#   BUNDLE_GEMFILE=Gemfile.local bundle foo
+#
+# To speed up running bundle tasks, it's recommended to run
+#
+#   bundle lock
+#
+# after running 'bundle install' for the first time. This will make 'bundle exec' run
+# a lot faster compared to the unlocked version. With an unlocked bundle you would
+# typically just run 'bundle install' from time to time to fetch the latest sources from
+# upstream. When you locked your bundle, you need to run
+#
+#   bundle install --relock
+#
+# to make sure to fetch the latest updates and then lock the bundle again. Gemfile.lock
+# is added to the .gitignore file, so you don't need to worry about accidentally checking
+# it into version control.
+
+source 'http://rubygems.org'
+
+DATAMAPPER = 'git://github.com/datamapper'
+DM_VERSION = '~> 1.0.0.rc3'
+
+group :runtime do # Runtime dependencies (as in the gemspec)
+
+  gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+  gem 'dm-serializer',   DM_VERSION, :git => "#{DATAMAPPER}/dm-serializer.git"
+
+end
+
+group(:development) do # Development dependencies (as in the gemspec)
+
+  gem 'dm-validations',  DM_VERSION, :git => "#{DATAMAPPER}/dm-validations.git"
+
+  gem 'fakeweb',         '~> 1.2.8'
+  gem 'rake',            '~> 0.8.7'
+  gem 'rspec',           '~> 1.3'
+  gem 'jeweler',         '~> 1.4'
+
+end
+
+group :datamapper do # We need this because we want to pin these dependencies to their git master sources
+
+  if ENV['EXTLIB']
+    gem 'extlib',        '~> 0.9.15',      :git => "#{DATAMAPPER}/extlib.git", :require => nil
+  else
+    gem 'activesupport', '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
+  end
+
+  plugins = ENV['PLUGINS'] || ENV['PLUGIN']
+  plugins = plugins.to_s.tr(',', ' ').split(' ').uniq
+
+  plugins.each do |plugin|
+    gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"
+  end
+
+end
+
+group :quality do # These gems contain rake tasks that check the quality of the source code
+
+  gem 'metric_fu',       '~> 1.3'
+  gem 'rcov',            '~> 0.9.7'
+  gem 'reek',            '~> 1.2.7'
+  gem 'roodi',           '~> 2.1'
+  gem 'yard',            '~> 0.5'
+  gem 'yardstick',       '~> 0.1'
+
+end

data/Rakefile

@@ -10,17 +10,17 @@ begin
     gem.summary     = 'REST Adapter for DataMapper'
     gem.description = gem.summary
     gem.email       = 'scott.burton [a] joyent [d] com'
-    gem.homepage    = 'http://github.com/datamapper/dm-more/tree/master/adapters/%s' % gem.name
+    gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
     gem.authors     = [ 'Scott Burton @ Joyent Inc' ]
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core',       '~> 0.10.2'
-    gem.add_dependency 'dm-serializer', '~> 0.10.2'
+    gem.add_dependency 'dm-core',       '~> 1.0.0.rc3'
+    gem.add_dependency 'dm-serializer', '~> 1.0.0.rc3'
 
-    gem.add_development_dependency 'fakeweb', '~> 1.2.7'
-    gem.add_development_dependency 'rspec',   '~> 1.2.9'
-    gem.add_development_dependency 'yard',    '~> 0.4.0'
+    gem.add_development_dependency 'rspec',          '~> 1.3'
+    gem.add_development_dependency 'dm-validations', '~> 1.0.0.rc3'
+    gem.add_development_dependency 'fakeweb',        '~> 1.2.7'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.10.2
+1.0.0.rc3

data/dm-rest-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-rest-adapter}
-  s.version = "0.10.2"
+  s.version = "1.0.0.rc3"
 
-  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{2009-12-11}
+  s.date = %q{2010-05-27}
   s.description = %q{REST Adapter for DataMapper}
   s.email = %q{scott.burton [a] joyent [d] com}
   s.extra_rdoc_files = [
@@ -17,16 +17,19 @@ Gem::Specification.new do |s|
      "README.rdoc"
   ]
   s.files = [
-    "LICENSE",
+    ".gitignore",
+     "Gemfile",
+     "LICENSE",
      "README.rdoc",
      "Rakefile",
      "VERSION",
      "dm-rest-adapter.gemspec",
-     "lib/rest_adapter.rb",
-     "lib/rest_adapter/adapter.rb",
-     "lib/rest_adapter/connection.rb",
-     "lib/rest_adapter/exceptions.rb",
-     "lib/rest_adapter/formats.rb",
+     "lib/dm-rest-adapter.rb",
+     "lib/dm-rest-adapter/adapter.rb",
+     "lib/dm-rest-adapter/connection.rb",
+     "lib/dm-rest-adapter/exceptions.rb",
+     "lib/dm-rest-adapter/formats.rb",
+     "lib/dm-rest-adapter/spec/setup.rb",
      "spec/fixtures/book.rb",
      "spec/fixtures/difficult_book.rb",
      "spec/rcov.opts",
@@ -35,41 +38,49 @@ Gem::Specification.new do |s|
      "spec/spec.opts",
      "spec/spec_helper.rb",
      "tasks/ci.rake",
+     "tasks/local_gemfile.rake",
      "tasks/metrics.rake",
      "tasks/spec.rake",
      "tasks/yard.rake",
      "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-more/tree/master/adapters/dm-rest-adapter}
+  s.homepage = %q{http://github.com/datamapper/dm-rest-adapter}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   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"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.2"])
-      s.add_runtime_dependency(%q<dm-serializer>, ["~> 0.10.2"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_runtime_dependency(%q<dm-serializer>, ["~> 1.0.0.rc3"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_development_dependency(%q<dm-validations>, ["~> 1.0.0.rc3"])
       s.add_development_dependency(%q<fakeweb>, ["~> 1.2.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
-      s.add_development_dependency(%q<yard>, ["~> 0.4.0"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
-      s.add_dependency(%q<dm-serializer>, ["~> 0.10.2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<dm-serializer>, ["~> 1.0.0.rc3"])
+      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc3"])
       s.add_dependency(%q<fakeweb>, ["~> 1.2.7"])
-      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-      s.add_dependency(%q<yard>, ["~> 0.4.0"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
-    s.add_dependency(%q<dm-serializer>, ["~> 0.10.2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<dm-serializer>, ["~> 1.0.0.rc3"])
+    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<dm-validations>, ["~> 1.0.0.rc3"])
     s.add_dependency(%q<fakeweb>, ["~> 1.2.7"])
-    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
-    s.add_dependency(%q<yard>, ["~> 0.4.0"])
   end
 end
 

data/lib/{rest_adapter.rb → dm-rest-adapter.rb}

@@ -2,11 +2,13 @@ require 'rexml/document'
 
 require 'cgi'  # for CGI.escape
 require 'addressable/uri'
+
+require 'dm-core'
 require 'dm-serializer'
 
-require 'rest_adapter/adapter'
-require 'rest_adapter/connection'
-require 'rest_adapter/formats'
-require 'rest_adapter/exceptions'
+require 'dm-rest-adapter/adapter'
+require 'dm-rest-adapter/connection'
+require 'dm-rest-adapter/formats'
+require 'dm-rest-adapter/exceptions'
 
 DataMapper::Adapters::RestAdapter = DataMapperRest::Adapter

data/lib/{rest_adapter → dm-rest-adapter}/adapter.rb

@@ -145,7 +145,7 @@ module DataMapperRest
     end
 
     def element_name(model)
-      model.storage_name(self.name).singular
+      model.storage_name(self.name).singularize
     end
 
     def resource_name(model)

data/lib/{rest_adapter → dm-rest-adapter}/connection.rb

@@ -1,10 +1,18 @@
 require 'net/http'
 
+begin
+  require 'active_support/inflector'
+rescue LoadError
+  require 'extlib/inflection'
+  module ActiveSupport
+    Inflector = Extlib::Inflection unless defined?(Inflector)
+  end
+end
+
 module DataMapperRest
   # Somewhat stolen from ActiveResource
   # TODO: Support https?
   class Connection
-    include Extlib
     attr_accessor :uri, :format
 
     def initialize(uri, format)
@@ -32,7 +40,7 @@ module DataMapperRest
 
       def run_verb(verb, data = nil)
         request do |http|
-          klass = Net::HTTP.find_const(Inflection.camelize(verb))
+          klass = Net::HTTP.find_const(ActiveSupport::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/lib/dm-rest-adapter/spec/setup.rb

@@ -0,0 +1,15 @@
+require 'dm-rest-adapter'
+require 'dm-core/spec/setup'
+
+module DataMapper
+  module Spec
+    module Adapters
+
+      class RestAdapter < Adapter
+      end
+
+      use RestAdapter
+
+    end
+  end
+end

data/spec/rcov.opts

@@ -1,4 +1,4 @@
---exclude "spec"
+--exclude "spec,^/"
 --sort coverage
 --callsites
 --xrefs

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ 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)
-require 'dm-core'
 
 # use local dm-validations if running from a typical dev checkout.
 lib = File.join('..', '..', 'dm-validations', 'lib')
@@ -15,12 +14,11 @@ 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)
-require 'dm-serializer'
 
 # Support running specs with 'rake spec' and 'spec'
 $LOAD_PATH.unshift('lib') unless $LOAD_PATH.include?('lib')
 
-require 'rest_adapter'
+require 'dm-rest-adapter'
 
 ROOT = Pathname(__FILE__).dirname.parent
 

data/tasks/local_gemfile.rake

@@ -0,0 +1,18 @@
+desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
+task :local_gemfile do |t|
+
+  root              = Pathname(__FILE__).dirname.parent
+  datamapper        = root.parent
+
+  source_regex     = /DATAMAPPER = 'git:\/\/github.com\/datamapper'/
+  gem_source_regex = /:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/
+
+  root.join('Gemfile.local').open('w') do |f|
+    root.join('Gemfile').open.each do |line|
+      line.sub!(source_regex,     "DATAMAPPER = '#{datamapper}'")
+      line.sub!(gem_source_regex, ':path => "#{DATAMAPPER}/\1"')
+      f.puts line
+    end
+  end
+
+end

metadata

@@ -1,7 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-rest-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  hash: 977940572
+  prerelease: true
+  segments: 
+  - 1
+  - 0
+  - 0
+  - rc3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - Scott Burton @ Joyent Inc
@@ -9,59 +16,91 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 -08:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.2
-    version: 
+        hash: 977940572
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc3
+        version: 1.0.0.rc3
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dm-serializer
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.2
-    version: 
+        hash: 977940572
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc3
+        version: 1.0.0.rc3
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.7
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: dm-validations
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: yard
+        hash: 977940572
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc3
+        version: 1.0.0.rc3
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.0
-    version: 
+        hash: 17
+        segments: 
+        - 1
+        - 2
+        - 7
+        version: 1.2.7
+  type: :development
+  version_requirements: *id005
 description: REST Adapter for DataMapper
 email: scott.burton [a] joyent [d] com
 executables: []
@@ -72,16 +111,19 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - dm-rest-adapter.gemspec
-- lib/rest_adapter.rb
-- lib/rest_adapter/adapter.rb
-- lib/rest_adapter/connection.rb
-- lib/rest_adapter/exceptions.rb
-- lib/rest_adapter/formats.rb
+- lib/dm-rest-adapter.rb
+- lib/dm-rest-adapter/adapter.rb
+- lib/dm-rest-adapter/connection.rb
+- lib/dm-rest-adapter/exceptions.rb
+- lib/dm-rest-adapter/formats.rb
+- lib/dm-rest-adapter/spec/setup.rb
 - spec/fixtures/book.rb
 - spec/fixtures/difficult_book.rb
 - spec/rcov.opts
@@ -90,12 +132,13 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/ci.rake
+- tasks/local_gemfile.rake
 - tasks/metrics.rake
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
 has_rdoc: true
-homepage: http://github.com/datamapper/dm-more/tree/master/adapters/dm-rest-adapter
+homepage: http://github.com/datamapper/dm-rest-adapter
 licenses: []
 
 post_install_message: 
@@ -104,23 +147,35 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: REST Adapter for DataMapper
-test_files: []
-
+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