sinatra-dm 0.1.3 → 0.1.4

data/README.rdoc

@@ -172,8 +172,7 @@ There are a number of things I'd love to have help with through a fork:
 * Add tests for it. This is important so I don't break it in a
   future version unintentionally.
 * Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
+  * (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
 == Copyright

data/Rakefile

@@ -3,6 +3,7 @@ require 'rake'
 
 begin
   require 'jeweler'
+  
   Jeweler::Tasks.new do |gem|
     gem.name = "sinatra-dm"
     gem.summary = %Q{Sinatra Extension for working with DataMapper}
@@ -10,13 +11,14 @@ begin
     gem.email = "kematzy@gmail.com"
     gem.homepage = "http://github.com/kematzy/sinatra-dm"
     gem.authors = ["kematzy"]
-    gem.add_dependency('sinatra', '>= 0.10.1')
-    gem.add_dependency('dm-core', '>= 0.10.1')
-    gem.add_dependency('kematzy-tasks', '>= 0.1.0')
+    gem.add_dependency('sinatra')
+    gem.add_dependency('dm-core', '1.0.0')
+    gem.add_dependency('kematzy-tasks')
     # gem.add_dependency('dependency', '>=x.x.x')
-    gem.add_development_dependency("sinatra-tests", '>= 0.1.5')
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_development_dependency("sinatra-tests", '0.1.6')
+    gem.add_development_dependency('dm-migrations', '1.0.0')
   end
+  
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/sinatra/dm.rb

@@ -1,5 +1,4 @@
 
-require 'sinatra/base'
 require 'dm-core'
 
 module Sinatra
@@ -145,7 +144,7 @@ module Sinatra
   # 
   module DataMapperExtension 
     
-    VERSION = '0.1.3' unless const_defined?(:VERSION)
+    VERSION = '0.1.4' unless const_defined?(:VERSION)
     def self.version; "Sinatra::DataMapperExtension v#{VERSION}"; end
     
     module Helpers 
@@ -331,6 +330,6 @@ module Sinatra
     
   end #/ DataMapperExtension
   
-  # register(Sinatra::DataMapperExtension)
+  register(Sinatra::DataMapperExtension)
   
 end #/ Sinatra

data/sinatra-dm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra-dm}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kematzy"]
-  s.date = %q{2010-02-22}
+  s.date = %q{2010-06-09}
   s.description = %q{Sinatra Extension for working with DataMapper (another Sinatra-Sequel Rip-off)}
   s.email = %q{kematzy@gmail.com}
   s.extra_rdoc_files = [
@@ -36,7 +36,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/kematzy/sinatra-dm}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Sinatra Extension for working with DataMapper}
   s.test_files = [
     "spec/dm_bootstrap.rb",
@@ -50,21 +50,24 @@ 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<sinatra>, [">= 0.10.1"])
-      s.add_runtime_dependency(%q<dm-core>, [">= 0.10.1"])
-      s.add_runtime_dependency(%q<kematzy-tasks>, [">= 0.1.0"])
-      s.add_development_dependency(%q<sinatra-tests>, [">= 0.1.5"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
+      s.add_runtime_dependency(%q<dm-core>, ["= 1.0.0"])
+      s.add_runtime_dependency(%q<kematzy-tasks>, [">= 0"])
+      s.add_development_dependency(%q<sinatra-tests>, ["= 0.1.6"])
+      s.add_development_dependency(%q<dm-migrations>, ["= 1.0.0"])
     else
-      s.add_dependency(%q<sinatra>, [">= 0.10.1"])
-      s.add_dependency(%q<dm-core>, [">= 0.10.1"])
-      s.add_dependency(%q<kematzy-tasks>, [">= 0.1.0"])
-      s.add_dependency(%q<sinatra-tests>, [">= 0.1.5"])
+      s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<dm-core>, ["= 1.0.0"])
+      s.add_dependency(%q<kematzy-tasks>, [">= 0"])
+      s.add_dependency(%q<sinatra-tests>, ["= 0.1.6"])
+      s.add_dependency(%q<dm-migrations>, ["= 1.0.0"])
     end
   else
-    s.add_dependency(%q<sinatra>, [">= 0.10.1"])
-    s.add_dependency(%q<dm-core>, [">= 0.10.1"])
-    s.add_dependency(%q<kematzy-tasks>, [">= 0.1.0"])
-    s.add_dependency(%q<sinatra-tests>, [">= 0.1.5"])
+    s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<dm-core>, ["= 1.0.0"])
+    s.add_dependency(%q<kematzy-tasks>, [">= 0"])
+    s.add_dependency(%q<sinatra-tests>, ["= 0.1.6"])
+    s.add_dependency(%q<dm-migrations>, ["= 1.0.0"])
   end
 end
 

data/spec/sinatra/dm_sqlite3_spec.rb

@@ -71,7 +71,7 @@ describe "Sinatra" do
           describe "#database" do 
             
             it "should return an SQLite3 Adapter" do 
-              app.database.should be_a_kind_of(DataMapper::Adapters::Sqlite3Adapter)
+              app.database.should be_a_kind_of(DataMapper::Adapters::SqliteAdapter)
             end
             
             it "should be configured with the correct DB path [../db/db.< environment >.db]" do 
@@ -132,7 +132,7 @@ describe "Sinatra" do
           describe "#database" do 
             
             it "should return an SQLite3 Adapter" do 
-              MyTestApp.database.should be_a_kind_of(DataMapper::Adapters::Sqlite3Adapter)
+              MyTestApp.database.should be_a_kind_of(DataMapper::Adapters::SqliteAdapter)
             end
             
             it "should be configured with the correct DB path [../db/db.< environment >.db]" do 
@@ -248,7 +248,7 @@ describe "Sinatra" do
           describe "#database" do 
             
             it "should return an SQLite3 Adapter" do 
-              app.database.should be_a_kind_of(DataMapper::Adapters::Sqlite3Adapter)
+              app.database.should be_a_kind_of(DataMapper::Adapters::SqliteAdapter)
             end
             
             it "should be configured with the correct DB path [../db/db.my_custom_test_app.db]" do 

data/spec/spec_helper.rb

@@ -4,10 +4,23 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'rubygems'
-require 'sinatra/dm'
-require 'sinatra/tests'
-require 'dm-core'
+#--
+# DEPENDENCIES
+#++
+%w( 
+sinatra/base 
+dm-core
+dm-migrations
+).each {|lib| require lib }
+
+#--
+## SINATRA EXTENSIONS
+#++
+%w(
+sinatra/dm
+sinatra/tests
+).each {|ext| require ext }
+
 
 ENV['RACK_ENV'] = 'test'
 
@@ -15,7 +28,7 @@ ENV['RACK_ENV'] = 'test'
 Spec::Runner.configure do |config|
   config.include RspecHpricotMatchers
   config.include Sinatra::Tests::TestCase
-  config.include Sinatra::Tests::SharedSpecs
+  config.include Sinatra::Tests::RSpec::SharedSpecs
 end
 
 def fixtures_path 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-dm
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - kematzy
@@ -9,49 +14,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 +08:00
+date: 2010-06-09 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.1
-    version: 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.10.1
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: kematzy-tasks
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.0
-    version: 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sinatra-tests
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 6
+        version: 0.1.6
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: dm-migrations
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: 0.1.5
-    version: 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id005
 description: Sinatra Extension for working with DataMapper (another Sinatra-Sequel Rip-off)
 email: kematzy@gmail.com
 executables: []
@@ -90,18 +121,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Sinatra Extension for working with DataMapper