dm-rest-adapter 0.9.7 → 0.9.8

data/History.txt

@@ -1 +1,3 @@
+=== 0.9.8 / 2008-12-07
 
+* No changes this version

data/Manifest.txt

@@ -95,3 +95,6 @@ stories/resources/helpers/book.rb
 stories/resources/helpers/story_helper.rb
 stories/resources/steps/read.rb
 stories/resources/steps/using_rest_adapter.rb
+tasks/install.rb
+tasks/spec.rb
+tasks/stories.rb

data/Rakefile

@@ -1,45 +1,25 @@
-require 'rubygems'
-require 'spec'
-require 'spec/rake/spectask'
 require 'pathname'
+require 'rubygems'
 
-ROOT = Pathname(__FILE__).dirname.expand_path
-require ROOT + 'lib/rest_adapter/version'
-
-AUTHOR = "Potomac Ruby Hackers"
-EMAIL  = "potomac-ruby-hackers@googlegroups.com"
-GEM_NAME = "dm-rest-adapter"
-GEM_VERSION = DataMapper::More::RestAdapter::VERSION
-GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
-GEM_CLEAN = ["log", "pkg"]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
-
-PROJECT_NAME = "datamapper"
-PROJECT_URL  = "http://github.com/pjb3/dm-more/tree/master/adapters/dm-rest-adapter"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY = "REST Adapter for DataMapper"
-
-require ROOT.parent.parent + 'tasks/hoe'
+ROOT    = Pathname(__FILE__).dirname.expand_path
+JRUBY   = RUBY_PLATFORM =~ /java/
+WINDOWS = Gem.win_platform?
+SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-task :default => [ :spec ]
+require ROOT + 'lib/rest_adapter/version'
 
-WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
-SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
+AUTHOR = 'Potomac Ruby Hackers'
+EMAIL  = 'potomac-ruby-hackers [a] googlegroups [d] com'
+GEM_NAME = 'dm-rest-adapter'
+GEM_VERSION = DataMapper::RestAdapter::VERSION
+GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"]]
+GEM_CLEAN = %w[ log pkg coverage ]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
 
-desc "Install #{GEM_NAME} #{GEM_VERSION}"
-task :install => [ :package ] do
-  sh "#{SUDO} gem install pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
-end
-
-desc 'Run specifications'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  if File.exists?('spec/spec.opts')
-    t.spec_opts << '--options' << 'spec/spec.opts'
-  end
-  t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
-end
+PROJECT_NAME = 'datamapper'
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/adapters/#{GEM_NAME}"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'REST Adapter for DataMapper'
 
-desc "Run all stories"
-task :stories do
-  # TODO Re-migrate the book service or else you won't have test data!
-  ruby "stories/all.rb --colour --format plain"
+[ ROOT, ROOT.parent.parent ].each do |dir|
+  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
 end

data/TODO

@@ -1 +0,0 @@
-TODO

data/fixtures/book_service/config/boot.rb

@@ -60,7 +60,7 @@ module Rails
       else
         gem 'rails'
       end
-    rescue Gem::LoadError => load_error
+    rescue LoadError => load_error
       $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
       exit 1
     end

data/lib/rest_adapter.rb

@@ -1,16 +1,18 @@
-require 'rubygems'
+require 'net/http'
 require 'pathname'
-require Pathname(__FILE__).dirname + 'rest_adapter/version'
+require 'rexml/document'
+require 'rubygems'
 
-gem 'dm-core', DataMapper::More::RestAdapter::VERSION
+gem 'dm-core', '~>0.9.8'
 require 'dm-core'
 
-gem 'extlib', '~>0.9.8'
+gem 'extlib', '~>0.9.9'
 require 'extlib'
 
+#gem 'dm-serializer', '~>0.9.8'
 require 'dm-serializer'
-require 'net/http'
-require 'rexml/document'
+
+require Pathname(__FILE__).dirname + 'rest_adapter/version'
 
 # TODO: Abstract XML support out from the protocol
 # TODO: Build JSON support

data/lib/rest_adapter/version.rb

@@ -1,7 +1,5 @@
 module DataMapper
-  module More
-    class RestAdapter
-      VERSION = "0.9.7"
-    end
+  class RestAdapter
+    VERSION = '0.9.8'
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,13 @@
 require 'pathname'
-require Pathname(__FILE__).dirname.parent.expand_path + 'lib/rest_adapter'
+require 'rubygems'
+
+ROOT = Pathname(__FILE__).dirname.parent.expand_path
+
+# use local dm-serializer if running from dm-more directly
+lib = ROOT.parent.parent.join('dm-serializer', 'lib').expand_path
+$LOAD_PATH.unshift(lib) if lib.directory?
+
+require ROOT + 'lib/rest_adapter'
 
 DataMapper.setup(:default, {
   :adapter  => 'rest',

data/stories/crud/create

@@ -2,36 +2,36 @@ Story: remote app wants to create a resource
   As a remote app
   I want to create a resource
   So that I can store some data about a particular item
-  
-  Scenario: remote app supplies a new valid Resource 
+
+  Scenario: remote app supplies a new valid Resource
     Given a valid DataMapper::Resource
     When I try to save the Resource
     Then the Resource should save
 
-  Scenario: remote app supplies a new invalid Resource 
+  Scenario: remote app supplies a new invalid Resource
     Given a valid DataMapper::Resource
     When I make invalid changes to that Resource
     When I try to save the Resource
     Then the Resource should not save
-    
+
   Scenario: remote app supplies a new valid Resource associated with another new valid Resource
     Given a new Resource
     And another new Resource associated with the first
     When I try to save the first Resource
     Then both Resources should save
-    
+
   Scenario: remote app supplies a new invalid Resource associated with another new valid Resource
     Given a new invalid Resouce
     And another new Resource associated with the first
     When I try to save the first Resource
     Neither Resource should save
-    
+
   Scenario: remote app supplies a new valid Resource associated with another new invalid Resource
     Given a new Resource
     And another new invalid Resource associated with the first
     When I try to save the first Resource
     Neither Resource should save
-    
+
   Scenario: remote app supplies a new invalid Resource associated with another new invalid Resource
     Given a new invalid Resource
     And another new invalid Resource associated with the first

data/stories/crud/read

@@ -7,30 +7,30 @@ Story: remote app wants to access one or more Resources
     Given a type of Resource
     When I request all of the Resources of that type
     Then I should not receive an empty list
-    
+
   Scenario: GET <resource>/<id>
     Given a type of Resource
     And the ID of an existing Resource
     When I request the Resource
     Then I should receive that Resource
-    
+
   Scenario: GET <resource>/<invalid id>
     Given a type of Resource
     And the ID of a nonexistent Resource
     When I request the Resource
     Then I should get nothing in return
-  
+
   Scenario: GET <nested resource>/<id>
     Given a Resource that returns associated resources
     And the ID of an existing Resource that has associated Resources
-    And I have all of the necessary class definitions 
+    And I have all of the necessary class definitions
     When I GET <nested resource>/<id>
     Then I should get the Resource
     And the Resource will have associated Resources
-    
+
   Scenario: GET <nested resource>/<id> but we are missing some class definitions
     Given a Resource that returns associated resources
     And the ID of an existing Resource that has associated Resources
-    And I do not have all of the necessary class definitions 
+    And I do not have all of the necessary class definitions
     When I GET <nested resource>/<id>
     Then I should get an Exception

data/stories/crud/update

@@ -7,28 +7,28 @@ Story: remote app wants to update a resource
     Given a local representation of a remote Resource
     When I make valid changes to that Resource
     And I try to save the Resource
-    Then the Resource should save 
-    
+    Then the Resource should save
+
   Scenario: remote app updates with invalid changes to a resource's state
     Given a local representation of a remote Resource
     When I make invalid changes to that Resource
     And I try to save the Resource
     Then the Resource should not save
-    
+
   Scenario: remote app updates with changes to an object and one of its children
     Given a local representation of a remote Resource
     And a local representation of one of that Resource's child Resources
     When I make valid changes to the parent Resource
     And I make valid changes to the child Resource
     Then both Resources should save
-    
+
   Scenario: remote app updates with valid changes to an object and invalid changes to one of its children
     Given a local representation of a remote Resource
     And a local representation of one of that Resource's child Resources
     When I make valid changes to the parent Resource
     And I make invalid changes to the child Resource
     Then neither Resource should save
-  
+
   Scenario: remote app updates with invalid changes to an object and valid changes to one of its children
     Given a local representation of a remote Resource
     And a local representation of one of that Resource's child Resources
@@ -36,7 +36,7 @@ Story: remote app wants to update a resource
     And I make valid changes to the child Resource
     Then neither Resource should save
 
-  Scenario: remote app updates with invalid changes to an object and invalid changes to one of its children          
+  Scenario: remote app updates with invalid changes to an object and invalid changes to one of its children
     Given a local representation of a remote Resource
     And a local representation of one of that Resource's child Resources
     When I make invalid changes to the parent Resource

data/stories/helper.rb

@@ -1,9 +1,19 @@
-$LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/../lib/rest_adapter")
+require 'pathname'
 require 'rubygems'
-require 'spec'
 require 'tempfile'
+
+gem 'dm-core', '~>0.9.8'
 require 'dm-core'
-#require 'pathname'
-#require Pathname(__FILE__).dirname.parent.expand_path + '../../lib/rest_adapter'
-require File.join(File.dirname(__FILE__), *%w[resources helpers story_helper])
-require File.join(File.dirname(__FILE__), *%w[resources steps using_rest_adapter])
+
+gem 'rspec', '~>1.1.11'
+require 'spec'
+
+ROOT = Pathname(__FILE__).dirname.parent.expand_path
+
+# use local dm-serializer if running from dm-more directly
+lib = ROOT.parent.parent.join('dm-serializer', 'lib').expand_path
+$LOAD_PATH.unshift(lib) if lib.directory?
+
+require ROOT + 'lib/rest_adapter'
+require ROOT + 'stories/resources/helpers/story_helper'
+require ROOT + 'stories/resources/steps/using_rest_adapter'

data/tasks/install.rb

@@ -0,0 +1,13 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
+end

data/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  desc 'Run specifications'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+
+    begin
+      gem 'rcov', '~>0.8'
+      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
+      t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

data/tasks/stories.rb

@@ -0,0 +1,5 @@
+desc 'Run all stories'
+task :stories do
+  # TODO Re-migrate the book service or else you won't have test data!
+  ruby 'stories/all.rb --colour --format plain'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-rest-adapter
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Potomac Ruby Hackers
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,23 +18,13 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.7
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 0.9.8
     version: 
 description: REST Adapter for DataMapper
 email: 
-- potomac-ruby-hackers@googlegroups.com
+- potomac-ruby-hackers [a] googlegroups [d] com
 executables: []
 
 extensions: []
@@ -43,6 +33,7 @@ extra_rdoc_files:
 - README.txt
 - LICENSE
 - TODO
+- History.txt
 files: 
 - History.txt
 - LICENSE
@@ -141,8 +132,11 @@ files:
 - stories/resources/helpers/story_helper.rb
 - stories/resources/steps/read.rb
 - stories/resources/steps/using_rest_adapter.rb
+- tasks/install.rb
+- tasks/spec.rb
+- tasks/stories.rb
 has_rdoc: true
-homepage: http://github.com/pjb3/dm-more/tree/master/adapters/dm-rest-adapter
+homepage: http://github.com/sam/dm-more/tree/master/adapters/dm-rest-adapter
 post_install_message: 
 rdoc_options: 
 - --main