sinatra_resource 0.4.20 → 0.4.21

data/Rakefile

@@ -11,14 +11,12 @@ begin
     gem.homepage = "http://github.com/djsun/sinatra_resource"
     gem.authors = ["David James"]
 
-    gem.add_dependency 'mongo_mapper', '>= 0.7'
-    gem.add_dependency 'mongo', '>= 0.18.3'
-    gem.add_dependency 'mongo_ext', '>= 0.18.3'
+    gem.add_dependency 'mongo_mapper', '= 0.8.2'
     gem.add_dependency 'sinatra', '>= 1.0'
     gem.add_dependency 'query_string_filter', '>= 0.1.4'
 
     gem.add_development_dependency 'crack', '>= 0.1.4'
-    gem.add_development_dependency 'djsun-context', '>= 0.5.6'
+    gem.add_development_dependency 'tu-context', '>= 0.5.8'
     gem.add_development_dependency 'pending', '>= 0.1.1'
     gem.add_development_dependency 'rspec', '>= 1.2.9'
     gem.add_development_dependency 'yard', '>= 0.2.3.5'

data/VERSION

@@ -1 +1 @@
-0.4.20
+0.4.21

data/examples/datacatalog/config/config.rb

@@ -1,16 +1,6 @@
 require 'rubygems'
-gem 'activesupport', '= 2.3.5' 
-require 'active_support' 
 
-# Note: mongo_mapper-0.7.0 requires 0.18.3 specifically.
-# However, there is a more recent mongo and mongo_ext (0.19).
-# Unless we specifically require mongo-0.18.3 and mongo_ext-0.18.3,
-# there will be a "Notice: C extension not loaded" warning.
-gem 'mongo', "= 0.18.3", '< 1.0'
-gem 'mongo_ext', "= 0.18.3", '< 1.0'
-require 'mongo'
-
-gem 'mongo_mapper', '= 0.7.0'
+gem 'mongo_mapper', '= 0.8.2'
 require 'mongo_mapper'
 
 module Config

data/examples/datacatalog/test/helpers/resource_test_helper.rb

@@ -2,4 +2,4 @@ require File.dirname(__FILE__) + '/test_helper'
 require File.expand_path(File.dirname(__FILE__) + '/../../app')
 
 BAD_API_KEY = "123400005678"
-FAKE_ID = Mongo::ObjectID.new.to_s
+FAKE_ID = BSON::ObjectID.new.to_s

data/examples/datacatalog/test/helpers/shared/model_counts.rb

@@ -22,7 +22,8 @@ class ResourceTestCase
 
   shared "category unchanged" do
     test "should not change category in database" do
-      assert_equal @category_copy, DataCatalog::Category.find_by_id(@category.id)
+      original = DataCatalog::Category.find_by_id(@category.id)
+      assert_equal @category_copy.name, original.name
     end
   end
 
@@ -48,7 +49,9 @@ class ResourceTestCase
 
   shared "note unchanged" do
     test "should not change note in database" do
-      assert_equal @note_copy, DataCatalog::Note.find_by_id(@note.id)
+      original = DataCatalog::Note.find_by_id(@note.id)
+      assert_equal @note_copy.text, original.text
+      assert_equal @note_copy.user_id, original.user_id
     end
   end
 
@@ -74,7 +77,10 @@ class ResourceTestCase
 
   shared "source unchanged" do
     test "should not change source in database" do
-      assert_equal @source_copy, DataCatalog::Source.find_by_id(@source.id)
+      original = DataCatalog::Source.find_by_id(@source.id)
+      assert_equal @source_copy.title, original.title
+      assert_equal @source_copy.description, original.description
+      assert_equal @source_copy.url, original.url
     end
   end
 
@@ -132,7 +138,10 @@ class ResourceTestCase
 
   shared "user unchanged" do
     test "should not change user in database" do
-      assert_equal @user_copy, DataCatalog::User.find_by_id(@user.id)
+      original = DataCatalog::User.find_by_id(@user.id)
+      assert_equal @user_copy.name, original.name
+      assert_equal @user_copy.email, original.email
+      assert_equal @user_copy.role, original.role
     end
   end
 

data/examples/datacatalog/test/helpers/test_helper.rb

@@ -8,8 +8,8 @@ require 'rr'
 gem 'crack', '>= 0.1.4'
 require 'crack/json'
 
-gem 'djsun-context', '>= 0.5.6'
-require 'context'
+gem 'tu-context', '>= 0.5.8'
+require 'tu-context'
 
 gem 'pending', '>= 0.1.1'
 require 'pending'

data/examples/datacatalog/test/models/category_test.rb

@@ -61,16 +61,16 @@ class CategoryTest < ModelTestCase
     test "#sources should have 3 categorizations" do
       categorizations = @category.categorizations
       assert_equal 3, categorizations.length
-      3.times do |i|
-        assert_include @categorizations[i], categorizations
+      categorizations.each do |categorization|
+        assert_include categorization, @categorizations
       end
     end
 
     test "#sources should have 3 sources" do
       sources = @category.sources
       assert_equal 3, sources.length
-      3.times do |i|
-        assert_include @sources[i], sources
+      sources.each do |source|
+        assert_include source, @sources
       end
     end
   end

data/sinatra_resource.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_resource}
-  s.version = "0.4.20"
+  s.version = "0.4.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
-  s.date = %q{2010-04-26}
+  s.date = %q{2010-07-15}
   s.description = %q{A DSL for creating RESTful actions with Sinatra and MongoMapper. It embraces the Resource Oriented Architecture as explained by Leonard Richardson and Sam Ruby.}
   s.email = %q{djames@sunlightfoundation.com}
   s.extra_rdoc_files = [
@@ -205,36 +205,30 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongo_mapper>, [">= 0.7"])
-      s.add_runtime_dependency(%q<mongo>, [">= 0.18.3"])
-      s.add_runtime_dependency(%q<mongo_ext>, [">= 0.18.3"])
+      s.add_runtime_dependency(%q<mongo_mapper>, ["= 0.8.2"])
       s.add_runtime_dependency(%q<sinatra>, [">= 1.0"])
       s.add_runtime_dependency(%q<query_string_filter>, [">= 0.1.4"])
       s.add_development_dependency(%q<crack>, [">= 0.1.4"])
-      s.add_development_dependency(%q<djsun-context>, [">= 0.5.6"])
+      s.add_development_dependency(%q<tu-context>, [">= 0.5.8"])
       s.add_development_dependency(%q<pending>, [">= 0.1.1"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<yard>, [">= 0.2.3.5"])
     else
-      s.add_dependency(%q<mongo_mapper>, [">= 0.7"])
-      s.add_dependency(%q<mongo>, [">= 0.18.3"])
-      s.add_dependency(%q<mongo_ext>, [">= 0.18.3"])
+      s.add_dependency(%q<mongo_mapper>, ["= 0.8.2"])
       s.add_dependency(%q<sinatra>, [">= 1.0"])
       s.add_dependency(%q<query_string_filter>, [">= 0.1.4"])
       s.add_dependency(%q<crack>, [">= 0.1.4"])
-      s.add_dependency(%q<djsun-context>, [">= 0.5.6"])
+      s.add_dependency(%q<tu-context>, [">= 0.5.8"])
       s.add_dependency(%q<pending>, [">= 0.1.1"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<yard>, [">= 0.2.3.5"])
     end
   else
-    s.add_dependency(%q<mongo_mapper>, [">= 0.7"])
-    s.add_dependency(%q<mongo>, [">= 0.18.3"])
-    s.add_dependency(%q<mongo_ext>, [">= 0.18.3"])
+    s.add_dependency(%q<mongo_mapper>, ["= 0.8.2"])
     s.add_dependency(%q<sinatra>, [">= 1.0"])
     s.add_dependency(%q<query_string_filter>, [">= 0.1.4"])
     s.add_dependency(%q<crack>, [">= 0.1.4"])
-    s.add_dependency(%q<djsun-context>, [">= 0.5.6"])
+    s.add_dependency(%q<tu-context>, [">= 0.5.8"])
     s.add_dependency(%q<pending>, [">= 0.1.1"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<yard>, [">= 0.2.3.5"])

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 20
-  version: 0.4.20
+  - 21
+  version: 0.4.21
 platform: ruby
 authors: 
 - David James
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 -04:00
+date: 2010-07-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,46 +22,19 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 7
-        version: "0.7"
+        - 8
+        - 2
+        version: 0.8.2
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mongo
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 18
-        - 3
-        version: 0.18.3
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mongo_ext
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 18
-        - 3
-        version: 0.18.3
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -70,11 +43,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: query_string_filter
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -84,11 +57,11 @@ dependencies:
         - 4
         version: 0.1.4
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: crack
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -98,25 +71,25 @@ dependencies:
         - 4
         version: 0.1.4
   type: :development
-  version_requirements: *id006
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: djsun-context
+  name: tu-context
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 5
-        - 6
-        version: 0.5.6
+        - 8
+        version: 0.5.8
   type: :development
-  version_requirements: *id007
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: pending
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -126,11 +99,11 @@ dependencies:
         - 1
         version: 0.1.1
   type: :development
-  version_requirements: *id008
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -140,11 +113,11 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id009
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -155,7 +128,7 @@ dependencies:
         - 5
         version: 0.2.3.5
   type: :development
-  version_requirements: *id010
+  version_requirements: *id008
 description: A DSL for creating RESTful actions with Sinatra and MongoMapper. It embraces the Resource Oriented Architecture as explained by Leonard Richardson and Sam Ruby.
 email: djames@sunlightfoundation.com
 executables: []