sinatra_resource 0.3.5 → 0.3.6

data/README.mdown

@@ -15,7 +15,7 @@ You will need gemcutter if you don't have it already:
 
 I recommend a user-level install:
 
-    gem install djsun-resource_sinatra
+    gem install resource_sinatra
     
 Note: in general, beware of `sudo gem install <project_name>` -- it gives elevated privileges. Do you trust `<project name>`? Better to be safe and use a local install to `~/.gem`.
 

data/Rakefile

@@ -11,16 +11,16 @@ begin
     gem.homepage = "http://github.com/djsun/sinatra_resource"
     gem.authors = ["David James"]
 
-    gem.add_dependency 'djsun-mongo_mapper', '>= 0.5.6.3'
-    gem.add_dependency 'mongo', '>= 0.15.1'
-    gem.add_dependency 'sinatra', '>= 0.9.4'
+    gem.add_dependency 'djsun-mongo_mapper', '>= 0.5.8.2', '< 0.6'
+    gem.add_dependency 'mongo', '>= 0.16', '< 1.0'
+    gem.add_dependency 'sinatra', '>= 0.9.4', '< 1.0'
     gem.add_dependency 'query_string_filter', '>= 0.1.2'
 
     gem.add_development_dependency 'crack', '>= 0.1.4'
     gem.add_development_dependency 'djsun-context', '>= 0.5.6'
     gem.add_development_dependency 'jeremymcanally-pending', '>= 0.1'
-    gem.add_development_dependency 'rspec'
-    gem.add_development_dependency 'yard'
+    gem.add_development_dependency 'rspec', '>= 1.2.9'
+    gem.add_development_dependency 'yard', '>= 0.2.3.5'
 
     # gem is a Gem::Specification ...
     # ... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.3.5
+0.3.6

data/examples/datacatalog/config/config.rb

@@ -8,14 +8,14 @@ module Config
   end
   
   def self.setup_mongomapper
-    gem 'djsun-mongo_mapper', '>= 0.5.6.3', '< 0.5.7'
+    gem 'djsun-mongo_mapper', '>= 0.5.8.2', '< 0.6'
     require 'mongo_mapper'
     MongoMapper.connection = new_mongo_connection
     MongoMapper.database = environment_config['mongo_database']
   end
   
   def self.new_mongo_connection
-    gem 'mongo', "= 0.15.1"
+    gem 'mongo', ">= 0.16", '< 1.0'
     require 'mongo'
     Mongo::Connection.new(environment_config["mongo_hostname"])
   end

data/examples/datacatalog/models/categorization.rb

@@ -14,8 +14,8 @@ module DataCatalog
 
     # == Associations
 
-    belongs_to :source
-    belongs_to :category
+    belongs_to :source,   :class_name => 'DataCatalog::Source'
+    belongs_to :category, :class_name => 'DataCatalog::Category'
 
     # == Validations
     

data/examples/datacatalog/models/category.rb

@@ -14,7 +14,9 @@ module DataCatalog
 
     # == Associations
 
-    many :categorizations
+    many :categorizations,
+      :class_name  => 'DataCatalog::Categorization',
+      :foreign_key => :category_id
 
     def sources
       categorizations.map(&:source)

data/examples/datacatalog/models/note.rb

@@ -14,7 +14,7 @@ module DataCatalog
 
     # == Associations
 
-    belongs_to :user
+    belongs_to :user, :class_name => 'DataCatalog::User'
 
     # == Validations
 

data/examples/datacatalog/models/source.rb

@@ -17,8 +17,13 @@ module DataCatalog
 
     # == Associations
 
-    many :usages
-    many :categorizations
+    many :usages,
+      :class_name  => 'DataCatalog::Usage',
+      :foreign_key => :source_id
+
+    many :categorizations,
+      :class_name  => 'DataCatalog::Categorization',
+      :foreign_key => :source_id
 
     def categories
       categorizations.map(&:category)

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

@@ -31,7 +31,7 @@ class CategorizationTest < ModelTestCase
     test "Source#categorization is correct" do
       assert_equal [@categorization], @source.categorizations
     end
-
+    
     test "Category#categorization is correct" do
       assert_equal [@categorization], @category.categorizations
     end

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

@@ -4,13 +4,13 @@ class CategoryTest < ModelTestCase
   
   include DataCatalog
 
-  context "Category" do
-    before do
-      @required = {
-        :name => "Science & Technology"
-      }
-    end
-  
+  before do
+    @required = {
+      :name => "Science & Technology"
+    }
+  end
+
+  context "Category#new" do
     context "correct params" do
       before do
         @category = Category.new(@required)
@@ -32,4 +32,47 @@ class CategoryTest < ModelTestCase
     end
   end
   
+  context "Category with 0 categorizations" do
+    before do
+      @category = Category.create(@required)
+    end
+    
+    test "#sources should be empty" do
+      assert_equal [], @category.sources
+    end
+  end
+  
+  context "Category with 3 categorizations" do
+    before do
+      @category = Category.create(@required)
+      @sources = 3.times.map do |i|
+        create_source(
+          :title => "Source #{i}"
+        )
+      end
+      @categorizations = 3.times.map do |i|
+        create_categorization(
+          :category_id => @category.id,
+          :source_id   => @sources[i].id
+        )
+      end
+    end
+  
+    test "#sources should have 3 categorizations" do
+      categorizations = @category.categorizations
+      assert_equal 3, categorizations.length
+      3.times do |i|
+        assert_include @categorizations[i], 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
+      end
+    end
+  end
+
 end

data/sinatra_resource.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_resource}
-  s.version = "0.3.5"
+  s.version = "0.3.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
-  s.date = %q{2009-10-30}
+  s.date = %q{2009-11-04}
   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 = [
@@ -196,36 +196,36 @@ 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<djsun-mongo_mapper>, [">= 0.5.6.3"])
-      s.add_runtime_dependency(%q<mongo>, [">= 0.15.1"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4"])
+      s.add_runtime_dependency(%q<djsun-mongo_mapper>, [">= 0.5.8.2", "< 0.6"])
+      s.add_runtime_dependency(%q<mongo>, [">= 0.16", "< 1.0"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0.9.4", "< 1.0"])
       s.add_runtime_dependency(%q<query_string_filter>, [">= 0.1.2"])
       s.add_development_dependency(%q<crack>, [">= 0.1.4"])
       s.add_development_dependency(%q<djsun-context>, [">= 0.5.6"])
       s.add_development_dependency(%q<jeremymcanally-pending>, [">= 0.1"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<yard>, [">= 0.2.3.5"])
     else
-      s.add_dependency(%q<djsun-mongo_mapper>, [">= 0.5.6.3"])
-      s.add_dependency(%q<mongo>, [">= 0.15.1"])
-      s.add_dependency(%q<sinatra>, [">= 0.9.4"])
+      s.add_dependency(%q<djsun-mongo_mapper>, [">= 0.5.8.2", "< 0.6"])
+      s.add_dependency(%q<mongo>, [">= 0.16", "< 1.0"])
+      s.add_dependency(%q<sinatra>, [">= 0.9.4", "< 1.0"])
       s.add_dependency(%q<query_string_filter>, [">= 0.1.2"])
       s.add_dependency(%q<crack>, [">= 0.1.4"])
       s.add_dependency(%q<djsun-context>, [">= 0.5.6"])
       s.add_dependency(%q<jeremymcanally-pending>, [">= 0.1"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<yard>, [">= 0.2.3.5"])
     end
   else
-    s.add_dependency(%q<djsun-mongo_mapper>, [">= 0.5.6.3"])
-    s.add_dependency(%q<mongo>, [">= 0.15.1"])
-    s.add_dependency(%q<sinatra>, [">= 0.9.4"])
+    s.add_dependency(%q<djsun-mongo_mapper>, [">= 0.5.8.2", "< 0.6"])
+    s.add_dependency(%q<mongo>, [">= 0.16", "< 1.0"])
+    s.add_dependency(%q<sinatra>, [">= 0.9.4", "< 1.0"])
     s.add_dependency(%q<query_string_filter>, [">= 0.1.2"])
     s.add_dependency(%q<crack>, [">= 0.1.4"])
     s.add_dependency(%q<djsun-context>, [">= 0.5.6"])
     s.add_dependency(%q<jeremymcanally-pending>, [">= 0.1"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<yard>, [">= 0.2.3.5"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_resource
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - David James
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-30 00:00:00 -04:00
+date: 2009-11-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.6.3
+        version: 0.5.8.2
+    - - <
+      - !ruby/object:Gem::Version 
+        version: "0.6"
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongo
@@ -30,7 +33,10 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.15.1
+        version: "0.16"
+    - - <
+      - !ruby/object:Gem::Version 
+        version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -41,6 +47,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.9.4
+    - - <
+      - !ruby/object:Gem::Version 
+        version: "1.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: query_string_filter
@@ -90,7 +99,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.2.9
     version: 
 - !ruby/object:Gem::Dependency 
   name: yard
@@ -100,7 +109,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.2.3.5
     version: 
 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