merb_datamapper 1.1.0 → 1.1.1

data/Rakefile

@@ -27,7 +27,7 @@ begin
     gemspec.files       = %w(Generators LICENSE Rakefile README TODO) + Dir['{lib,spec}/**/*']
 
     # Runtime dependencies
-    gemspec.add_dependency 'merb-core',     "~> #{Merb::VERSION}"
+    gemspec.add_dependency 'merb-core',     "~> 1.1"
     gemspec.add_dependency 'dm-core',       Merb::DataMapper::DM_VERSION_REQUIREMENT
     gemspec.add_dependency 'dm-migrations', Merb::DataMapper::DM_VERSION_REQUIREMENT
 

data/lib/merb_datamapper.rb

@@ -28,6 +28,9 @@ module DataMapper
   end
 end
 
+# Sets DataMapper as ORM
+Merb.orm = :datamapper
+
 class Merb::Orms::DataMapper::Connect < Merb::BootLoader
   after BeforeAppLoads
 
@@ -73,14 +76,15 @@ class Merb::Orms::DataMapper::Associations < Merb::BootLoader
   end
 end
 
-if Merb::Plugins.config[:merb_datamapper][:use_repository_block]
 
-  class Merb::Orms::DataMapper::IdentityMapSupport < Merb::BootLoader
 
-    after RackUpApplication
+class Merb::Orms::DataMapper::IdentityMapSupport < Merb::BootLoader
+
+  after RackUpApplication
 
-    def self.run
+  def self.run
 
+    if Merb::Plugins.config[:merb_datamapper][:use_repository_block]
       app = Merb::Config[:app]
       def app.call(env)
         DataMapper.repository do |r|
@@ -88,12 +92,12 @@ if Merb::Plugins.config[:merb_datamapper][:use_repository_block]
           super
         end
       end
-
     end
-  end
 
+  end
 end
 
+
 generators = File.join(File.dirname(__FILE__), 'generators')
 Merb.add_generators generators / 'data_mapper_model'
 Merb.add_generators generators / 'data_mapper_resource_controller'

data/lib/merb_datamapper/version.rb

@@ -1,6 +1,6 @@
 module Merb
   module DataMapper
-    VERSION                = '1.1.0'.freeze
+    VERSION                = '1.1.1'.freeze
     DM_VERSION_REQUIREMENT = '~> 0.10'.freeze
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Jason Toy
@@ -14,30 +15,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +00:00
+date: 2010-05-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 1
-        - 0
-        version: 1.1.0
+        version: "1.1"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dm-core
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 10
@@ -48,9 +52,11 @@ dependencies:
   name: dm-migrations
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 10
@@ -61,9 +67,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -123,32 +131,36 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Merb plugin that allows you to use datamapper with your merb app
 test_files: 
+- spec/session_store_spec.rb
 - spec/connection_spec.rb
-- spec/datamapper_id_map_controller.rb
-- spec/datamapper_model.rb
-- spec/datamapper_session_controller.rb
 - spec/identity_map_spec.rb
-- spec/session_spec.rb
-- spec/session_store_spec.rb
 - spec/spec_helper.rb
+- spec/datamapper_id_map_controller.rb
+- spec/session_spec.rb
+- spec/datamapper_session_controller.rb
+- spec/datamapper_model.rb