datamapper4rails 0.4.0 → 0.5.0

data/generators/datamapper_model/templates/migration.rb

@@ -3,7 +3,7 @@ migration <%= Time.now.utc.strftime("%Y%m%d%H%M%S") %>, :<%= migration_name.unde
     create_table :<%= table_name %> do
       column :id, Integer, :serial => true
 <% Array(attributes).each do |attribute| -%>
-      column :<%= attribute.name if attribute %>, <%= attribute.type.to_s.capitalize %>, :nullable => false<% if attribute.type == :string %>, :length => 255<% end %>
+      column :<%= attribute.name if attribute %>, <%= attribute.type == :boolean ? "::DataMapper::Types::Boolean" : attribute.type.to_s.capitalize %>, :nullable => false<% if attribute.type == :string %>, :length => 255<% end %>
 <% end -%>
 <% unless options[:skip_timestamps] -%>
       column :created_at, DateTime, :nullable => false

data/generators/datamapper_model/templates/model.rb

@@ -4,7 +4,7 @@ class <%= class_name %>
   property :id, Serial
 
 <% Array(attributes).each do |attribute| -%>
-  property :<%= attribute.name %>, <%= attribute.type.to_s.capitalize %>, :nullable => false <% if attribute.type == :string or attribute.type == :text or attribute.type == :slug -%>, :format => /^[^<'&">]*$/<% if attribute.type == :string or attribute.type == :slug %>, :length => 255<% end -%><% end %>
+  property :<%= attribute.name %>, <%= attribute.type.to_s.capitalize %>, :required => true<% if attribute.type == :string or attribute.type == :text or attribute.type == :slug -%>, :format => /^[^<'&">]*$/<% if attribute.type == :string or attribute.type == :slug %>, :length => 255<% end -%><% end %>
 
 <% end -%>
 <% unless options[:skip_timestamps] -%>

data/lib/datamapper4rails/datamapper_store.rb

@@ -1,15 +1,28 @@
 require 'dm-core'
 require 'rack_datamapper/session/datamapper'
-require 'active_support'
+begin
+  require 'securerandom'
+rescue LoadError
+end
 
 module ActionController
   module Session
     class DatamapperStore < AbstractStore
+      SecureRandom =
+        if defined?(::SecureRandom)
+          # Use Ruby's SecureRandom library if available.
+          ::SecureRandom
+        else
+          # try if there is active support around ;-)
+          require 'active_support'
+          ::ActiveSupport::SecureRandom
+        end
 
       def initialize(app, options = {})
         super
+
         id_generator = Proc.new do
-          ::ActiveSupport::SecureRandom.hex(16)
+          SecureRandom.hex(16)
         end
         @store = ::DataMapper::Session::Abstract::Store.new(app, options, id_generator)
         @options = options

data/lib/datamapper4rails/version.rb

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

data/spec/spec_helper.rb

@@ -21,14 +21,14 @@ class Session
  
   property :updated_at, DateTime
 
-  property :data, Text, :nullable => false, :default => ::Base64.encode64(Marshal.dump({}))
+  property :raw_data, Text, :required => true, :default => ::Base64.encode64(Marshal.dump({}))
   
   def data=(data)
-    attribute_set(:data, ::Base64.encode64(Marshal.dump(data)))
+    attribute_set(:raw_data, ::Base64.encode64(Marshal.dump(data)))
   end
   
   def data
-    Marshal.load(::Base64.decode64(attribute_get(:data)))
+    Marshal.load(::Base64.decode64(attribute_get(:raw_data)))
   end 
 end
 

metadata

@@ -1,115 +1,128 @@
 --- !ruby/object:Gem::Specification 
 name: datamapper4rails
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  prerelease: false
+  segments: 
+    - 0
+    - 5
+    - 0
+  version: 0.5.0
 platform: ruby
 authors: 
-- mkristian
+  - mkristian
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-07 00:00:00 +05:30
+date: 2010-06-20 00:00:00 +05:30
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rack-datamapper
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.2"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.3
-    version: 
+  - !ruby/object:Gem::Dependency 
+    name: rack-datamapper
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+              - 3
+              - 0
+            version: 0.3.0
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 1
+              - 3
+              - 0
+            version: 1.3.0
+    type: :development
+    version_requirements: *id002
 description: collection of datamapper related extensions. mostly needed to run within rails. the restful transactions is around filter for rails actions if needed to control such transaction on per action base otherwise use the rack extension from rack-datamapper. datamapper store is a session store for rails which uses datamapper as persistent layer and is just a wrapper around the datamapper session store from rack-datamapper. the generators produces datamapper models for your rails application.
 email: 
-- m.kristian@web.de
+  - m.kristian@web.de
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
+  - History.txt
+  - Manifest.txt
+  - README.txt
 files: 
-- History.txt
-- Manifest.txt
-- README.txt
-- Rakefile
-- datamapper_rails_templates.rb
-- generators/datamapper_install/datamapper_install_generator.rb
-- generators/datamapper_install/templates/datamapper.rake
-- generators/datamapper_model/datamapper_model_generator.rb
-- generators/datamapper_model/templates/migration.rb
-- generators/datamapper_model/templates/model.rb
-- generators/datamapper_rspec_model/datamapper_rspec_model_generator.rb
-- generators/datamapper_rspec_model/templates/model_spec.rb
-- generators/datamapper_rspec_scaffold/datamapper_rspec_scaffold_generator.rb
-- generators/datamapper_rspec_scaffold/templates/controller_spec.rb
-- generators/datamapper_rspec_scaffold/templates/edit_erb_spec.rb
-- generators/datamapper_scaffold/datamapper_scaffold_generator.rb
-- generators/datamapper_scaffold/templates/controller.rb
-- generators/datamapper_scaffold/templates/functional_test.rb
-- generators/datamapper_scaffold/templates/view_edit.html.erb
-- generators/datamapper_scaffold/templates/view_index.html.erb
-- generators/datamapper_scaffold/templates/view_new.html.erb
-- generators/datamapper_scaffold/templates/view_show.html.erb
-- lib/datamapper4rails.rb
-- lib/datamapper4rails/adapters/base_adapter.rb
-- lib/datamapper4rails/adapters/restful_adapter.rb
-- lib/datamapper4rails/datamapper_store.rb
-- 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
-- lib/datamapper4rails/version.rb
-- spec/datamapper_store_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
+  - lib/datamapper4rails.rb
+  - lib/datamapper4rails/rspec_default_values.rb
+  - lib/datamapper4rails/rails_datamapper.rb
+  - lib/datamapper4rails/integration_test.rb
+  - lib/datamapper4rails/restful_transactions.rb
+  - lib/datamapper4rails/identity_maps.rb
+  - lib/datamapper4rails/datamapper_store.rb
+  - lib/datamapper4rails/preload_models.rb
+  - lib/datamapper4rails/overlay.rb
+  - lib/datamapper4rails/rspec.rb
+  - lib/datamapper4rails/version.rb
+  - lib/datamapper4rails/adapters/restful_adapter.rb
+  - lib/datamapper4rails/adapters/base_adapter.rb
+  - History.txt
+  - Manifest.txt
+  - README.txt
+  - generators/datamapper_scaffold/datamapper_scaffold_generator.rb
+  - generators/datamapper_scaffold/templates/functional_test.rb
+  - generators/datamapper_scaffold/templates/controller.rb
+  - generators/datamapper_scaffold/templates/view_new.html.erb
+  - generators/datamapper_scaffold/templates/view_show.html.erb
+  - generators/datamapper_scaffold/templates/view_index.html.erb
+  - generators/datamapper_scaffold/templates/view_edit.html.erb
+  - generators/datamapper_rspec_model/datamapper_rspec_model_generator.rb
+  - generators/datamapper_rspec_model/templates/model_spec.rb
+  - generators/datamapper_install/datamapper_install_generator.rb
+  - generators/datamapper_install/templates/datamapper.rake
+  - generators/datamapper_rspec_scaffold/datamapper_rspec_scaffold_generator.rb
+  - generators/datamapper_rspec_scaffold/templates/controller_spec.rb
+  - generators/datamapper_rspec_scaffold/templates/edit_erb_spec.rb
+  - generators/datamapper_model/datamapper_model_generator.rb
+  - generators/datamapper_model/templates/migration.rb
+  - generators/datamapper_model/templates/model.rb
+  - spec/spec_helper.rb
+  - spec/spec.opts
+  - spec/datamapper_store_spec.rb
 has_rdoc: true
 homepage: http://datamapper4rail.rubyforge.org
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.txt
+  - --main
+  - README.txt
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: datamapper4rail
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: collection of datamapper related extensions
-test_files: []
-
+test_files: 
+  - spec/datamapper_store_spec.rb

data/Rakefile

@@ -1,41 +0,0 @@
-# -*- ruby -*-
-
-require 'rubygems'
-require 'hoe'
-
-require 'spec'
-require 'spec/rake/spectask'
-require 'pathname'
-
-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']]
-  p.remote_rdoc_dir = '' # Release to root
-  p.rspec_options << '--options' << 'spec/spec.opts'
-end
-
-desc 'Install the package as a gem.'
-task :install => [:clean, :package] do
-  gem = Dir['pkg/*.gem'].first
-  sh "gem install --local #{gem} --no-ri --no-rdoc"
-end
-
-desc 'generate rails using all generators and run the specs'
-task :integration_tests => [:spec, :install] do
-  require 'datamapper4rails/integration_test'
-  Datamapper4Rails::IntegrationTest.new do |t|
-    t.generate "datamapper_model role name:string"
-    t.generate "datamapper_scaffold domain name:string"
-    t.generate "datamapper_rspec_model user name:string"
-    t.generate "datamapper_rspec_scaffold group name:string"
-  end
-end
-
-require 'yard'
-
-YARD::Rake::YardocTask.new
-
-# vim: syntax=Ruby

data/datamapper_rails_templates.rb

@@ -1,146 +0,0 @@
-# inspired by http://www.rowtheboat.com/archives/32
-###################################################
-
-# this pulls in rails_datamapper and rack_datamapper
-gem 'datamapper4rails'
-
-# assume sqlite3 to be database
-gem 'do_sqlite3'
-
-# assume you want to have validations and timestamps in your models
-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
-
-# install all gems
-rake 'gems:install'
-
-# install specs rake tasks
-generate('rspec', '-f')
-
-# install datamapper rake tasks
-generate('datamapper_install')
-
-# fix config files to work with datamapper instead of active_record
-environment ''
-environment 'config.frameworks -= [ :active_record ]'
-environment '# deactive active_record'
-gsub_file 'spec/spec_helper.rb', /^\s*config[.]/, '  #\0'
-gsub_file 'test/test_helper.rb', /^[^#]*fixtures/, '  #\0'
-
-file 'spec/support/datamapper.rb', <<-CODE
-require 'datamapper4rails/rspec'
-CODE
-
-# add middleware
-def middleware(name)
-  log 'middleware', name
-  environment "config.middleware.use '#{name}'"
-end
-
-environment ''
-middleware 'DataMapper::RestfulTransactions'
-middleware 'DataMapper::IdentityMaps'
-middleware 'Rack::Deflater'
-environment '# add middleware'
-
-# init a session store
-initializer 'datamapper_store.rb', <<-CODE
-# init a session store which uses a memory cache and a persistent store
-# cleanup can be a problem. jruby uses soft-references for the cache so
-# memory cleanup with jruby is not a problem.
-require 'datamapper4rails/datamapper_store'
-ActionController::Base.session_store = :datamapper_store
-ActionController::Base.session = {
-  :cache       => true,
-}
-CODE
-
-# gzip fix for jruby
-initializer 'monkey_patches.rb', <<-CODE
-if RUBY_PLATFORM =~ /java/
-  require 'zlib'
-  class Zlib::GzipWriter
-    def <<(arg)
-      write(arg)
-    end
-  end
-end
-CODE
-
-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'
-
-logger.info 
-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