dm-persevere-adapter 0.15 → 0.16.0

data/.gitignore

@@ -0,0 +1,3 @@
+pkg
+tmp
+coverage

data/Manifest.txt

@@ -4,6 +4,7 @@ Manifest.txt
 README.txt
 Rakefile
 lib/persevere_adapter.rb
+lib/persevere_adapter/version.rb
 spec/integration/persevere_adapter_spec.rb
 spec/spec.opts
 spec/spec_helper.rb

data/Rakefile

@@ -1,38 +1,29 @@
-require 'pathname'
 require 'rubygems'
-require 'hoe'
+require 'pathname'
+
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gemspec|
+    gemspec.name = %q{dm-persevere-adapter}
+    gemspec.summary = %q{A DataMapper Adapter for persevere}
+    gemspec.description = %q{A DataMapper Adapter for persevere}
+    gemspec.email = ["irjudson [a] gmail [d] com"]
+    gemspec.homepage = %q{http://github.com/yogo/dm-persevere-adapter}
+    gemspec.authors = ["Ivan R. Judson", "The Yogo Data Management Development Team" ]
+    gemspec.rdoc_options = ["--main", "README.txt"]
+    gemspec.add_dependency(%q<dm-core>, [">= 0.10.1"])
+    gemspec.add_dependency(%q<persevere>, [">= 1.1"])
+    gemspec.add_dependency(%q<extlib>)
+  end
+rescue LoadError
+  puts "Jeweler not available. Install it with: gem install jeweler"
+end
 
 ROOT    = Pathname(__FILE__).dirname.expand_path
 JRUBY   = RUBY_PLATFORM =~ /java/
 WINDOWS = Gem.win_platform?
 SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-#require ROOT + 'lib/persevere_adapter/version'
-
-# define some constants to help with task files
-GEM_NAME    = 'dm-persevere-adapter'
-#GEM_VERSION = DataMapper::PersevereAdapter::VERSION
-GEM_VERSION = "0.15"
-
-Hoe.spec(GEM_NAME) do |p|
-  p.developer('Ivan R. Judson', 'irjudson [a] gmail [d] com')
-
-  p.description = 'A DataMapper Adapter for persevere'
-  p.summary = 'A DataMapper Adapter for persevere'
-  p.url = 'http://github.com/USERNAME/dm-persevere-adapter'
-
-  p.clean_globs |= %w[ log pkg coverage ]
-  p.spec_extras = {
-    :has_rdoc => true,
-    :extra_rdoc_files => %w[ README.txt LICENSE.txt History.txt ]
-  }
-
-  p.extra_deps = [
-    ['dm-core', ">= 0.9.10"],
-    ['extlib', ">= 0.9.10"],
-    ['persevere', "~> 1.0"]
-  ]
-
-end
+require ROOT + 'lib/persevere_adapter'
 
-Pathname.glob(ROOT.join('tasks/**/*.rb').to_s).each { |f| require f }
+Pathname.glob(ROOT.join('tasks/**/*.rb').to_s).each { |f| require f }

data/VERSION

@@ -0,0 +1 @@
+0.16.0

data/dm-persevere-adapter.gemspec

@@ -0,0 +1,73 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dm-persevere-adapter}
+  s.version = "0.16.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Ivan R. Judson", "The Yogo Data Management Development Team"]
+  s.date = %q{2010-01-06}
+  s.description = %q{A DataMapper Adapter for persevere}
+  s.email = ["irjudson [a] gmail [d] com"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+     "README.txt"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "LICENSE.txt",
+     "Manifest.txt",
+     "README.txt",
+     "Rakefile",
+     "VERSION",
+     "dm-persevere-adapter.gemspec",
+     "lib/persevere_adapter.rb",
+     "spec/integration/persevere_adapter_spec.rb",
+     "spec/persevere_adapter_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/unit/create_spec.rb",
+     "spec/unit/delete_spec.rb",
+     "spec/unit/read_spec.rb",
+     "spec/unit/update_spec.rb",
+     "tasks/spec.rb"
+  ]
+  s.homepage = %q{http://github.com/yogo/dm-persevere-adapter}
+  s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{A DataMapper Adapter for persevere}
+  s.test_files = [
+    "spec/persevere_adapter_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/integration/persevere_adapter_spec.rb",
+     "spec/unit/create_spec.rb",
+     "spec/unit/delete_spec.rb",
+     "spec/unit/read_spec.rb",
+     "spec/unit/update_spec.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.1"])
+      s.add_runtime_dependency(%q<persevere>, [">= 1.1"])
+      s.add_runtime_dependency(%q<extlib>, [">= 0"])
+    else
+      s.add_dependency(%q<dm-core>, [">= 0.10.1"])
+      s.add_dependency(%q<persevere>, [">= 1.1"])
+      s.add_dependency(%q<extlib>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<dm-core>, [">= 0.10.1"])
+    s.add_dependency(%q<persevere>, [">= 1.1"])
+    s.add_dependency(%q<extlib>, [">= 0"])
+  end
+end
+

data/lib/persevere_adapter.rb

@@ -7,7 +7,6 @@ require 'persevere'
 module DataMapper
   module Adapters
     class PersevereAdapter < AbstractAdapter
-      VERSION='0.15'
       ##
       # Used by DataMapper to put records into a data-store: "INSERT"
       # in SQL-speak.  It takes an array of the resources (model
@@ -154,7 +153,7 @@ module DataMapper
         resources = Array.new
         json_query = make_json_query(query)
 
-        tblname = Extlib::Inflection.classify(query.model).pluralize
+        tblname = Extlib::Inflection.classify(query.model)
         path = "/#{tblname}/#{json_query}"
 
         response = @persevere.retrieve(path)
@@ -172,8 +171,6 @@ module DataMapper
           end
 
           resources = query.model.load(results, query)
-        else
-          return false
         end
 
         query.filter_records(resources)
@@ -215,6 +212,32 @@ module DataMapper
         return deleted
       end
 
+      ##
+      #
+      # Other methods for the Yogo Data Management Toolkit
+      #
+      ##
+      def get_schema(name = nil, project = nil)
+        path = nil
+        if name.nil? & project.nil?
+          path = "/Class/"
+        elsif project.nil?
+          path = "/Class/#{name}"
+        elsif name.nil?
+          path = "/Class/#{project}/"
+        else
+          path = "/Class/#{project}/#{name}"
+        end
+
+        response = @persevere.retrieve(path)
+
+        if response.code == "200"
+          return JSON.parse(response.body)
+        else
+          return nil
+        end        
+      end
+
       private
 
       ##
@@ -254,12 +277,16 @@ module DataMapper
         @classes = []
         @persevere = nil
         @prepped = false
+
+        connect
       end
 
       def connect
-        uri = URI::HTTP.build(@options).to_s
-        @persevere = Persevere.new(uri)
-        prep_persvr unless @prepped
+        if ! @prepped
+          uri = URI::HTTP.build(@options).to_s
+          @persevere = Persevere.new(uri)
+          prep_persvr unless @prepped
+        end
       end
 
       def prep_persvr

data/spec/persevere_adapter_spec.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+
+require DataMapper.root / 'lib' / 'dm-core' / 'spec' / 'adapter_shared_spec'
+
+describe DataMapper::Adapters::PersevereAdapter do
+  before :all do
+    # This needs to point to a valid ldap server
+    @adapter = DataMapper.setup(:default, { :adapter => 'persevere',
+                                :host => 'localhost',
+                                :port => '8080' }
+                                )
+  end
+
+  it_should_behave_like 'An Adapter'
+  
+  describe '#schema' do
+    it 'should return all of the schemas (in json) if no name is provided' do
+      @adapter.get_schema()
+    end 
+
+    it 'should return the json schema of the class specified' do
+      @adapter.get_schema("Object")
+    end
+    
+    it 'should return all of the schemas (in json) for a project if no name is provided' do
+      @adapter.get_schema(nil, "Class")
+    end 
+    
+    it 'should return all of the schemas (in json) if no name is provided' do
+      @adapter.get_schema("Object", "Class")
+    end 
+  end
+end

data/spec/unit/create_spec.rb

@@ -0,0 +1,22 @@
+$LOAD_PATH << File.dirname(__FILE__)
+
+require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+
+describe 'A Persevere adapter' do
+
+  before do
+    @adapter = DataMapper::Repository.adapters[:default]
+  end
+  
+  describe 'when saving a resource' do
+
+    before do
+      @book = Book.new(:title => 'Hello, World!', :author => 'Anonymous')
+    end
+
+    it 'should call the adapter create method' do
+      #@adapter.should_receive(:create).with([@book])
+      @book.save
+    end
+  end
+end

data/spec/unit/delete_spec.rb

@@ -0,0 +1,23 @@
+# $LOAD_PATH << File.dirname(__FILE__)
+# 
+# require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+# 
+# describe 'A Persevere adapter' do
+# 
+#   before do
+#     @adapter = DataMapper::Repository.adapters[:default]
+#   end
+# 
+#   describe 'when deleting an existing resource' do
+#     before do
+#       @book = Book.new(:title => 'Hello, World!', :author => 'Anonymous')
+#       @book.stub!(:new_record?).and_return(false)
+#     end
+# 
+#     it 'should do an HTTP DELETE' do
+#       @adapter.should_receive(:delete)
+#       @book.destroy
+#     end
+# 
+#   end
+# end

data/spec/unit/read_spec.rb

@@ -0,0 +1,102 @@
+$LOAD_PATH << File.dirname(__FILE__)
+
+require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+
+describe 'A Persevere adapter' do
+
+  before do
+    @adapter = DataMapper::Repository.adapters[:default]
+  end
+
+  # describe 'when getting one resource' do
+  # 
+  #   describe 'if the resource exists' do
+  # 
+  #     before do
+  #       book_xml = <<-BOOK
+  #       <?xml version='1.0' encoding='UTF-8'?>
+  #       <book>
+  #         <author>Stephen King</author>
+  #         <created-at type='datetime'>2008-06-08T17:03:07Z</created-at>
+  #         <id type='integer'>1</id>
+  #         <title>The Shining</title>
+  #         <updated-at type='datetime'>2008-06-08T17:03:07Z</updated-at>
+  #       </book>
+  #       BOOK
+  #       @id = 1
+  #       @response = mock(Net::HTTPResponse)
+  #       @response.stub!(:body).and_return(book_xml)
+  #       @adapter.stub!(:http_get).and_return(@response)
+  #     end
+  # 
+  #     it 'should return the resource' do
+  #       book = Book.get(@id)
+  #       book.should_not be_nil
+  #       book.id.should be_an_instance_of(Fixnum)
+  #       book.id.should == 1
+  #     end
+  # 
+  #     it 'should do an HTTP GET' do
+  #       @adapter.should_receive(:http_get).with('/books/1.xml').and_return(@response)
+  #       Book.get(@id)
+  #     end
+  # 
+  #     it "it be equal to itself" do
+  #       Book.get(@id).should == Book.get(@id)
+  #     end
+  #   end
+  # 
+  # 
+  #   describe 'if the resource does not exist' do
+  #     it 'should return nil' do
+  #       @id = 1
+  #       @response = mock(Net::HTTPNotFound)
+  #       @response.stub!(:content_type).and_return('text/html')
+  #       @response.stub!(:body).and_return('<html></html>')
+  #       @adapter.stub!(:http_get).and_return(@response)
+  #       id = 4200
+  #       Book.get(id).should be_nil
+  #     end
+  #   end
+  # end
+  # 
+  # describe 'when getting all resource of a particular type' do
+  #   before do
+  #     books_xml = <<-BOOK
+  #     <?xml version='1.0' encoding='UTF-8'?>
+  #     <books type='array'>
+  #       <book>
+  #         <author>Ursula K LeGuin</author>
+  #         <created-at type='datetime'>2008-06-08T17:02:28Z</created-at>
+  #         <id type='integer'>1</id>
+  #         <title>The Dispossed</title>
+  #         <updated-at type='datetime'>2008-06-08T17:02:28Z</updated-at>
+  #       </book>
+  #       <book>
+  #         <author>Stephen King</author>
+  #         <created-at type='datetime'>2008-06-08T17:03:07Z</created-at>
+  #         <id type='integer'>2</id>
+  #         <title>The Shining</title>
+  #         <updated-at type='datetime'>2008-06-08T17:03:07Z</updated-at>
+  #       </book>
+  #     </books>
+  #     BOOK
+  #     @response = mock(Net::HTTPResponse)
+  #     @response.stub!(:body).and_return(books_xml)
+  #     @adapter.stub!(:http_get).and_return(@response)
+  #   end
+  # 
+  #   it 'should get a non-empty list' do
+  #     Book.all.should_not be_empty
+  #   end
+  # 
+  #   it 'should receive one Resource for each entity in the XML' do
+  #     Book.all.size.should == 2
+  #   end
+  # 
+  #   it 'should do an HTTP GET' do
+  #     @adapter.should_receive(:http_get).and_return(@response)
+  #     Book.first
+  #   end
+  # end
+end

data/spec/unit/update_spec.rb

@@ -0,0 +1,37 @@
+# $LOAD_PATH << File.dirname(__FILE__)
+# 
+# require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+# 
+# describe 'A Persevere adapter' do
+# 
+#   describe 'when updating an existing resource' do
+#     # before do
+#     #   @books_xml = <<-XML
+#     #   <book>
+#     #     <id type='integer'>42</id>
+#     #     <title>Starship Troopers</title>
+#     #     <author>Robert Heinlein</author>
+#     #     <created-at type='datetime'>2008-06-08T17:02:28Z</created-at>
+#     #   </book>
+#     #   XML
+#     #   repository do |repo|
+#     #     @repository = repo
+#     #     @book = Book.new(:id => 42,
+#     #                      :title => 'Starship Troopers',
+#     #                      :author => 'Robert Heinlein',
+#     #                      :created_at => DateTime.parse('2008-06-08T17:02:28Z'))
+#     #     @book.instance_eval { @new_record = false }
+#     #     @repository.identity_map(Book)[@book.key] = @book
+#     #     @book.title = "Mary Had a Little Lamb"
+#     #   end
+#     # end
+#     # 
+#     # it 'should do an HTTP PUT' do
+#     #   adapter = @repository.adapter #DataMapper::Repository.adapters[:default]
+#     #   adapter.should_receive(:http_put).with('/books/42.xml', @book.to_xml)
+#     #   @repository.scope do
+#     #     @book.save
+#     #   end
+#     # end
+#   end
+# end

metadata

@@ -1,108 +1,111 @@
 --- !ruby/object:Gem::Specification 
 name: dm-persevere-adapter
 version: !ruby/object:Gem::Version 
-  version: "0.15"
+  version: 0.16.0
 platform: ruby
 authors: 
-- Ivan R. Judson
+  - Ivan R. Judson
+  - The Yogo Data Management Development Team
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-15 00:00:00 -06:00
+date: 2010-01-06 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 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.10
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: extlib
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.10
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: persevere
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+  - !ruby/object:Gem::Dependency 
+    name: dm-core
+    type: :runtime
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.10.1
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: persevere
+    type: :runtime
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "1.1"
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: extlib
+    type: :runtime
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+      version: 
 description: A DataMapper Adapter for persevere
 email: 
-- irjudson [a] gmail [d] com
+  - irjudson [a] gmail [d] com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
-- LICENSE.txt
-- History.txt
+  - LICENSE.txt
+  - README.txt
 files: 
-- History.txt
-- LICENSE.txt
-- Manifest.txt
-- README.txt
-- Rakefile
-- lib/persevere_adapter.rb
-- spec/integration/persevere_adapter_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- tasks/install.rb
-- tasks/spec.rb
+  - .gitignore
+  - History.txt
+  - LICENSE.txt
+  - Manifest.txt
+  - README.txt
+  - Rakefile
+  - VERSION
+  - dm-persevere-adapter.gemspec
+  - lib/persevere_adapter.rb
+  - spec/integration/persevere_adapter_spec.rb
+  - spec/persevere_adapter_spec.rb
+  - spec/spec.opts
+  - spec/spec_helper.rb
+  - spec/unit/create_spec.rb
+  - spec/unit/delete_spec.rb
+  - spec/unit/read_spec.rb
+  - spec/unit/update_spec.rb
+  - tasks/spec.rb
 has_rdoc: true
-homepage: http://github.com/USERNAME/dm-persevere-adapter
+homepage: http://github.com/yogo/dm-persevere-adapter
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+  - --main
+  - README.txt
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
 requirements: []
 
-rubyforge_project: dm-persevere-adapter
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: A DataMapper Adapter for persevere
-test_files: []
-
+test_files: 
+  - spec/persevere_adapter_spec.rb
+  - spec/spec_helper.rb
+  - spec/integration/persevere_adapter_spec.rb
+  - spec/unit/create_spec.rb
+  - spec/unit/delete_spec.rb
+  - spec/unit/read_spec.rb
+  - spec/unit/update_spec.rb

data/tasks/install.rb

@@ -1,13 +0,0 @@
-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