datamapper4rails 0.3.2 → 0.4.0

data/History.txt

@@ -1,4 +1,14 @@
-=== 1.0.0 / 2009-03-18
+=== 0.4.0 / 2009-12-07
+
+* removed obsolete dependency to rails_datamapper
+
+* allow to configure multiple repositories
+
+* fixed problem in rails template with upcoming datamapper 0.10.2
+
+* added pom.xml in rails template to use maven straight away without downloading maven artifacts
+ 
+=== 0.0.0 / 2009-03-18
 
 * 1 major enhancement
 

data/Manifest.txt

@@ -28,6 +28,7 @@ lib/datamapper4rails/integration_test.rb
 lib/datamapper4rails/identity_maps.rb
 lib/datamapper4rails/overlay.rb
 lib/datamapper4rails/preload_models.rb
+lib/datamapper4rails/rails_datamapper.rb
 lib/datamapper4rails/restful_transactions.rb
 lib/datamapper4rails/rspec_default_values.rb
 lib/datamapper4rails/rspec.rb

data/Rakefile

@@ -12,7 +12,7 @@ require './lib/datamapper4rails/version.rb'
 Hoe.spec('datamapper4rails') do |p|
   p.rubyforge_name = 'datamapper4rail'
   p.developer('mkristian', 'm.kristian@web.de')
-  p.extra_deps = [['rack-datamapper', '~>0.2'], ['rails_datamapper', '>= 0']]
+  p.extra_deps = [['rack-datamapper', '~>0.2']]
   p.remote_rdoc_dir = '' # Release to root
   p.rspec_options << '--options' << 'spec/spec.opts'
 end

data/datamapper_rails_templates.rb

@@ -1,8 +1,8 @@
 # inspired by http://www.rowtheboat.com/archives/32
 ###################################################
 
-# get all datamapper related gems
-gem 'addressable', :lib => 'addressable/uri'
+# this pulls in rails_datamapper and rack_datamapper
+gem 'datamapper4rails'
 
 # assume sqlite3 to be database
 gem 'do_sqlite3'
@@ -12,14 +12,15 @@ gem 'dm-validations'
 gem 'dm-timestamps'
 gem 'dm-migrations'
 gem 'dm-serializer' # to allow xml interface to work
+gem 'dm-core'
+
+# get all datamapper related gems
+gem 'addressable', :lib => 'addressable/uri'
 
 # assume you prefer rspec over unit tests
 gem 'rspec', :lib => false
 gem 'rspec-rails', :lib => false
 
-# this pulls in rails_datamapper and rack_datamapper
-gem 'datamapper4rails'
-
 # install all gems
 rake 'gems:install'
 
@@ -76,32 +77,48 @@ if RUBY_PLATFORM =~ /java/
 end
 CODE
 
-file 'prepare_jruby.sh', <<-CODE
-#!/bin/bash
-
-echo
-echo "shall freeze rails and fix a bug which prevents rails to use certain"
-echo "java gems like the dataobjects drivers !!"
-echo
-
-mvn --version
-if [ $? -ne 0 ] ; then
-
-        echo "please install maven >= 2.0.9 from maven.apache.org"
-        exit -1
-fi
-
-mvn de.saumya.mojo:rails-maven-plugin:rails-freeze-gems de.saumya.mojo:rails-maven-plugin:gems-install
-
-echo
-echo "you can run rails with (no need to install jruby !!)"
-echo
-echo "\tmvn de.saumya.mojo:rails-maven-plugin:server"
-echo
-echo "more info on"
-echo "\thttp://github.org/mkristian/rails-maven-plugin"
-echo
-echo
+file 'pom.xml', <<-CODE
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+                      http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.example</groupId>
+  <artifactId>demo</artifactId>
+  <packaging>war</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>rails datamapper demo</name>
+  <url>http://github.com/mkristian/rails-templates/blob/master/datamapper.rb</url>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>saumya</id>
+      <name>Saumyas Plugins</name>
+      <url>http://mojo.saumya.de</url>
+    </pluginRepository>
+  </pluginRepositories>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>rails-maven-plugin</artifactId>
+	<version>0.3.1</version>
+      </plugin>
+      <plugin>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>jruby-maven-plugin</artifactId>
+	<version>0.3.1</version>
+      </plugin>
+      <plugin>
+        <groupId>de.saumya.mojo</groupId>
+        <artifactId>gem-maven-plugin</artifactId>
+	<version>0.3.1</version>
+      </plugin>
+    </plugins>
+  </build>
+  <properties>
+    <jruby.fork>false</jruby.fork>
+  </properties>
+</project>
 CODE
 
 rake 'db:sessions:create'
@@ -111,4 +128,19 @@ logger.info
 logger.info "info mavenized rails application"
 logger.info "\thttp://github.org/mkristian/rails-maven-plugin"
 logger.info 
+logger.info "if you want to run jruby please uninstall"
+logger.info "the native extension of do_sqlite3 and install the java version"
+logger.info "\truby -S gem uninstall do_sqlite3"
+logger.info "\tjruby -S rake gems:install"
+logger.info 
+logger.info "rake gems:unpack does NOT work with jruby due to a bug in rails <=2.3.5"
+logger.info "you can try"
+logger.info "\tmvn rails:rails-freeze-gems"
+logger.info "which patches rails after freezing it"
+logger.info 
 logger.info 
+logger.info
+logger.info
+logger.info "for dm-core version 0.10.2 there are a lot of deprecated warning but everything works as expected"
+logger.info
+logger.info

data/lib/datamapper4rails.rb

@@ -1,4 +1,4 @@
-require 'rails_datamapper'
+require 'datamapper4rails/rails_datamapper'
 require 'rack-datamapper'
 require 'datamapper4rails/datamapper_store'
 

data/lib/datamapper4rails/rails_datamapper.rb

@@ -0,0 +1,65 @@
+# taken from http://github.com/datamapper/dm-more/tree/master/rails_datamapper
+# added multi repositories config
+
+module Rails
+  module DataMapper
+    class << self
+      extend ActiveSupport::Memoizable
+
+      def create_connection
+        # TODO: handle Rails and Merb style database.yml files
+        conf = config.dup
+        repositories = conf.delete(:repositories)
+        if(repositories)
+          repositories.each do |key, config|
+            ::DataMapper.setup(key.to_sym, config)
+          end
+        else
+          ::DataMapper.setup(:default, conf) unless conf.empty?
+        end
+      end
+
+    private
+
+      def config_file
+        Rails.root / 'config' / 'database.yml'
+      end
+
+      def full_config
+        YAML::load(ERB.new(config_file.read).result)
+      end
+
+      memoize :full_config
+
+      def config
+        if hash = full_config[Rails.env] || full_config[Rails.env.to_sym]
+          normalize_config(hash)
+        else
+          raise ArgumentError, "missing environment '#{Rails.env}' in config file #{config_file}"
+        end
+      end
+
+      memoize :config
+
+      def normalize_config(hash)
+        config = {}
+
+        hash.symbolize_keys.each do |key, value|
+          config[key] = if value.kind_of?(Hash)
+            normalize_config(value)
+          elsif key == :port
+            value.to_i
+          elsif key == :adapter && value == 'postgresql'
+            'postgres'
+          else
+            value
+          end
+        end
+
+        config
+      end
+    end
+  end
+end
+
+Rails::DataMapper.create_connection

data/lib/datamapper4rails/version.rb

@@ -1,3 +1,3 @@
 class Datamapper4rails
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: datamapper4rails
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - mkristian
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +05:30
+date: 2009-12-07 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0.2"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rails_datamapper
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -84,6 +74,7 @@ files:
 - lib/datamapper4rails/identity_maps.rb
 - lib/datamapper4rails/overlay.rb
 - lib/datamapper4rails/preload_models.rb
+- lib/datamapper4rails/rails_datamapper.rb
 - lib/datamapper4rails/restful_transactions.rb
 - lib/datamapper4rails/rspec_default_values.rb
 - lib/datamapper4rails/rspec.rb