merb_datamapper 0.9.2 → 0.9.3

data/datamapper_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb

@@ -13,4 +13,4 @@ module Merb
 <%= "  " * counter %>end # <%= mod %>
 <% counter = counter - 1 -%>
 <% end -%>
-end
+end

data/datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb

@@ -1,3 +1,21 @@
 <h1><%= full_controller_const %> controller, edit action</h1>
 
-<p>Edit this file in <tt>app/views/<%= controller_file_name %>/edit.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/edit.html.erb</tt></p>
+
+<%%= error_messages_for :<%= singular_model %> %>
+
+<%% form_for(@<%= singular_model %>, :action => url(:<%= singular_model %>, @<%= singular_model %>)) do %>
+<% for property in properties.select{|p| !p.key?} -%>
+  <p>
+    <b><%= Extlib::Inflection.humanize(property.field) %></b><br />
+    <%%= <%= field_from_type(property.type) %> :<%= property.getter %> %>
+  </p>
+
+<% end -%>
+  <p>
+    <%%= submit_button "Update" %>
+  </p>
+<%% end %>
+
+<%%= link_to 'Show', url(:<%= singular_model %>, @<%= singular_model %>) %> |
+<%%= link_to 'Back', url(:<%= plural_model %>) %>

data/datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb

@@ -1,3 +1,24 @@
 <h1><%= full_controller_const %> controller, index action</h1>
 
-<p>Edit this file in <tt>app/views/<%= controller_file_name %>/index.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/index.html.erb</tt></p>
+
+<table>
+  <tr>
+<% for property in properties.reject{|p| p.lazy?} -%>
+    <th><%= Extlib::Inflection.humanize(property.field) %></th>
+<% end -%>
+  </tr>
+
+<%% for <%= singular_model %> in @<%= plural_model %> %>
+  <tr>
+<% for property in properties.reject{|p| p.lazy?} -%>
+    <td><%%=h <%= singular_model %>.<%= property.getter %> %></td>
+<% end -%>
+    <td><%%= link_to 'Show', url(:<%= singular_model %>, <%= singular_model %>) %></td>
+    <td><%%= link_to 'Edit', url(:edit_<%= singular_model %>,  <%= singular_model %>) %></td>
+    <td><%%= delete_button :<%= singular_model %>, <%= singular_model %> %></td>
+  </tr>
+<%% end %>
+</table>
+
+<%%= link_to 'New', url(:new_<%= singular_model %>) %>

data/datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb

@@ -1,3 +1,20 @@
 <h1><%= full_controller_const %> controller, new action</h1>
 
-<p>Edit this file in <tt>app/views/<%= controller_file_name %>/new.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/new.html.erb</tt></p>
+
+<%%= error_messages_for :<%= singular_model %> %>
+
+<%% form_for(@<%= singular_model %>, :action => url(:<%= plural_model %>) ) do |f| %>
+<% for property in properties.select{|p| !p.key?} -%>
+  <p>
+    <b><%= Extlib::Inflection.humanize(property.field) %></b><br />
+    <%%= <%= field_from_type(property.type) %> :<%= property.getter %> %>
+  </p>
+
+<% end -%>
+  <p>
+    <%%= submit_button "Create" %>
+  </p>
+<%% end %>
+
+<%%= link_to 'Back', url(:<%= plural_model %>) %>

data/datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb

@@ -1,3 +1,14 @@
 <h1><%= full_controller_const %> controller, show action</h1>
 
-<p>Edit this file in <tt>app/views/<%= controller_file_name %>/show.html.erb</tt></p>
+<p>Edit this file in <tt>app/views/<%= controller_file_name %>/show.html.erb</tt></p>
+
+<% for property in properties -%>
+<p>
+  <b><%= Extlib::Inflection.humanize(property.field) %>:</b>
+  <%%=h @<%= singular_model %>.<%= property.getter %> %>
+</p>
+
+<% end -%>
+
+<%%= link_to 'Edit',  url(:edit_<%= singular_model %>,  @<%= singular_model %>) %> |
+<%%= link_to 'Back', url(:<%= plural_model %>) %>

data/datamapper_generators/resource_migration/USAGE

@@ -0,0 +1,4 @@
+Description:
+
+
+Usage:

data/datamapper_generators/resource_migration/resource_migration_generator.rb

@@ -0,0 +1,122 @@
+# require 'merb'
+class ResourceMigrationGenerator < RubiGen::Base
+
+  # these define datamapper specific properties, not general database concepts
+  UNWANTED_PROPERTIES = [:public, :protected, :private, :accessor,
+                         :reader, :writer, :lazy, :lock, :field, :ordinal,
+                         :track, :auto_validation, :validates]
+
+  default_options :author => nil
+
+  attr_reader :name, :klass
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+    usage if args.empty?
+    @name = args.shift
+    extract_options
+  end
+
+  def manifest
+    unless @name
+      puts banner
+      exit 1
+    end
+
+    # first see if we can find our model file where it should be!
+    model_file = File.join(Dir.pwd, "app/models","#{@name.snake_case}.rb")
+    unless File.exist?(model_file)
+      puts "Couldn't find the model file for #{@name}"
+      exit 1
+    end
+
+    # next, check we actually have a class!
+    require model_file
+    @klass = Module.const_get(@name.camel_case)
+    if @klass.nil?
+      puts "File didn't seem to include the model #{@name.camel_case}"
+      exit 1
+    end
+
+
+
+
+    record do |m|
+      # Ensure appropriate folders exists
+      m.directory 'schema/migrations'
+
+      @migration_name = "create_%s_table" % @name.snake_case.pluralize
+
+      filename = format("%03d_%s", (highest_migration+1), @migration_name)
+
+      m.template "class_migration.erb", "schema/migrations/#{filename}.rb",
+      :assigns => {
+        :migration_name => @migration_name ,
+        :number => (highest_migration+1),
+        :klass_name => klass.storage_name,
+        :properties => properties_as_strings
+      }
+
+    end
+  end
+
+  protected
+    def banner
+      <<-EOS
+Creates a new migration for merb using DataMapper
+
+USAGE: #{$0} #{spec.name} ResourceClass
+
+Example:
+  #{$0} #{spec.name} Post
+
+  If you already have 3 migrations, this will create the Post migration in
+  schema/migration/004_create_posts_table.rb
+
+NB: Currently the generator doesn't make any columns for 'belongs_to'-type
+associations.
+EOS
+    end
+
+    def add_options!(opts)
+      # opts.separator ''
+      # opts.separator 'Options:'
+      # For each option below, place the default
+      # at the top of the file next to "default_options"
+      # opts.on("-a", "--author=\"Your Name\"", String,
+      #         "Some comment about this option",
+      #         "Default: none") { |options[:author]| }
+      # opts.on("-v", "--version", "Show the #{File.basename($0)} version number and quit.")
+    end
+
+    def extract_options
+      # for each option, extract it into a local variable (and create an "attr_reader :author" at the top)
+      # Templates can access these value via the attr_reader-generated methods, but not the
+      # raw instance variable value.
+      # @author = options[:author]
+    end
+
+    def highest_migration
+      @highest_migration ||= Dir[Dir.pwd+'/schema/migrations/*'].map{ |f|
+        File.basename(f) =~ /^(\d+)/
+        $1}.max.to_i
+    end
+
+    def property_as_string(p)
+      name = p.field
+      type = p.type.to_s
+      # clear out non-db related properties
+      options = p.options.reject { |key, value| UNWANTED_PROPERTIES.include? key }
+      options_as_array = []
+      options.each do |key, value|
+        options_as_array << ":#{key} => #{value}"
+      end
+
+      (options_as_array.empty?) ? ":#{name}, #{type}" :
+        ":#{name}, #{type}, #{options_as_array.join(', ')}"
+    end
+
+    def properties_as_strings
+      @properties_as_strings ||= klass.properties.map {|p| property_as_string(p) }
+    end
+end

data/datamapper_generators/resource_migration/templates/class_migration.erb

@@ -0,0 +1,13 @@
+migration(<%= number %>, :<%= migration_name %>) do
+  up do
+    create_table :<%= klass_name %> do
+<% properties.each do |p| %>
+      column <%= p -%>
+<% end %>
+    end
+  end
+
+  down do
+    drop_table :<%= klass_name %>
+  end
+end

data/lib/merb/orms/data_mapper/connection.rb

@@ -1,40 +1,33 @@
 require 'fileutils'
-require 'data_mapper'
 
 module Merb
   module Orms
     module DataMapper
       class << self
-        def config_file() Merb.root / "config" / "database.yml" end
-        def sample_dest() Merb.root / "config" / "database.yml.sample" end
+        def config_file() Merb.dir_for(:config) / "database.yml" end
+        def sample_dest() Merb.dir_for(:config) / "database.yml.sample" end
         def sample_source() File.dirname(__FILE__) / "database.yml.sample" end
-      
+
         def copy_sample_config
           FileUtils.cp sample_source, sample_dest unless File.exists?(sample_dest)
         end
-      
+
+        def full_config
+          @full_config ||= Erubis.load_yaml_file(config_file)
+        end
+
         def config
-          @config ||=
-            begin
-              # Convert string keys to symbols
-              full_config = Erubis.load_yaml_file(config_file)
-              config = (Merb::Plugins.config[:merb_datamapper] = {})
-              (full_config[Merb.environment.to_sym] || full_config[Merb.environment]).each do |k, v| 
-                if k == 'port'
-                  config[k.to_sym] = v.to_i
-                else
-                  config[k.to_sym] = v
-                end
-              end
-              config
-            end
+          if !Merb::Plugins.config[:merb_datamapper].nil? && Merb::Plugins.config[:merb_datamapper].empty?
+             Merb::Plugins.config[:merb_datamapper] = get_config_for_environment
+          end
+          @config ||= Merb::Plugins.config[:merb_datamapper] ||= get_config_for_environment
         end
-      
+
         # Database connects as soon as the gem is loaded
         def connect
           if File.exists?(config_file)
-            Merb.logger.info!("Connecting to database...")
-            ::DataMapper::Database.setup(config)
+            start_logging
+            setup_connections
           else
             copy_sample_config
             Merb.logger.error! "No database.yml file found in #{Merb.root}/config."
@@ -42,15 +35,57 @@ module Merb
             exit(1)
           end
         end
-        
+
+        def start_logging
+          ::DataMapper.logger = Merb.logger
+          ::DataMapper.logger.info("Connecting to database...")
+        end
+
+        def setup_connections
+          conf = config.dup
+          repositories = conf.delete(:repositories)
+          ::DataMapper.setup(:default, conf) unless conf.empty?
+          repositories.each { |name, opts| ::DataMapper.setup(name, opts) } if repositories
+        end
+
         # Registering this ORM lets the user choose DataMapper as a session store
         # in merb.yml's session_store: option.
         def register_session_type
           Merb.register_session_type("datamapper",
-          "merb/session/data_mapper_session",
-          "Using DataMapper database sessions")
+            "merb/session/data_mapper_session",
+            "Using DataMapper database sessions")
+        end
+
+        def symbolize_keys(h)
+          config = {}
+
+          h.each do |k, v|
+            if k == 'port'
+              config[k.to_sym] = v.to_i
+            elsif k == 'adapter' && v == 'postgresql'
+              config[k.to_sym] = 'postgres'
+            elsif v.is_a?(Hash)
+              config[k.to_sym] = symbolize_keys(v)
+            else
+              config[k.to_sym] = v
+            end
+          end
+
+          config
+        end
+
+        private
+
+        def get_config_for_environment
+          if hash = full_config[Merb.environment]
+            symbolize_keys(hash)
+          elsif hash = full_config[Merb.environment.to_sym]
+            hash
+          else
+            raise ArgumentError, "missing environment '#{Merb.environment}' in config file #{config_file}"
+          end
         end
       end
     end
   end
-end
+end

data/lib/merb/orms/data_mapper/database.yml.sample

@@ -1,16 +1,36 @@
 ---
 # This is a sample database file for the DataMapper ORM
-:development: &defaults
-  :adapter: postgresql
-  :database: sample_development
-  :username: the_user
-  :password: secrets
-  :host: localhost
+development: &defaults
+  # These are the settings for repository :default
+  adapter:  postgres
+  database: sample_development
+  username: the_user
+  password: secrets
+  host:     localhost
 
-:test:
-  <<: *defaults
-  :database: sample_test
+  # Add more repositories
+  # repositories:
+  #   repo1:
+  #     adapter:  postgresql
+  #     database: sample_development
+  #     username: the_user
+  #     password: secrets
+  #     host:     localhost
+  #   repo2:
+  #     ...
 
-:production:
-  <<: *defaults
-  :database: sample_production
+test:
+  <<:       *defaults
+  database: sample_test
+
+  # repositories:
+  #   repo1:
+  #     database: sample_development
+
+production:
+  <<:       *defaults
+  database: sample_production
+
+  # repositories:
+  #   repo1:
+  #     database: sample_development

data/lib/merb/orms/data_mapper/resource.rb

@@ -0,0 +1,12 @@
+module Merb
+  module Orms
+    module DataMapper
+      module Resource
+        def to_param
+          key
+        end
+      end
+    end
+  end
+end
+DataMapper::Resource.send(:include, Merb::Orms::DataMapper::Resource)

data/lib/merb/session/data_mapper_session.rb

@@ -1,4 +1,10 @@
-require 'data_mapper'
+begin
+  gem 'dm-core', '=0.9.3'
+  require 'dm-core'
+rescue LoadError => e
+  require 'data_mapper'
+end
+
 require 'base64'
 module Merb
   module SessionMixin
@@ -20,27 +26,31 @@ module Merb
   end
 
   table_name = (Merb::Plugins.config[:merb_datamapper][:session_table_name] || "sessions")
-  
-  class DataMapperSession < DataMapper::Base
-    
-    set_table_name "sessions"
-    property :session_id, :string, :length => 255, :lazy => false, :key => true
-    property :data,       :text, :lazy => false
-    property :updated_at, :datetime
-  
+
+  class DataMapperSession
+    include DataMapper::Resource
+
+    storage_names[:default] = "sessions"
+    property :session_id, String, :length => 255, :lazy => false, :key => true
+    property :data,       Text, :lazy => false
+    property :updated_at, DateTime
+
     attr_accessor :needs_new_cookie
-  
+
     class << self
       # Generates a new session ID and creates a row for the new session in the database.
       def generate
-        create(:session_id => Merb::SessionMixin::rand_uuid, :data =>{})
+        new_session = self.new(:data =>{})
+        new_session.session_id = Merb::SessionMixin::rand_uuid
+        new_session.save
+        new_session
       end
-    
+
       # Gets the existing session based on the <tt>session_id</tt> available in cookies.
       # If none is found, generates a new session.
       def persist(session_id)
-        if session_id
-          session = self[session_id]
+        if !session_id.blank?
+          session = self.first :session_id => session_id
         end
         unless session
           session = generate
@@ -51,62 +61,59 @@ module Merb
       def marshal(data) Base64.encode64(Marshal.dump(data)) if data end
       def unmarshal(data) Marshal.load(Base64.decode64(data)) if data end
     end
-  
+
     # Regenerate the Session ID
     def regenerate
       self.session_id = Merb::SessionMixin::rand_uuid
       self.needs_new_cookie = true
       self.save
-    end 
-  
-    # Recreates the cookie with the default expiration time 
-    # Useful during log in for pushing back the expiration date 
+    end
+
+    # Recreates the cookie with the default expiration time
+    # Useful during log in for pushing back the expiration date
     def refresh_expiration
       self.needs_new_cookie = true
     end
-  
-    # Lazy-delete of session data 
+
+    # Lazy-delete of session data
     def delete(key = nil)
       key ? self.data.delete(key) : self.data.clear
     end
-    
+
     def empty?
       data.empty?
     end
-  
+
     def each(&b)
       data.each(&b)
     end
-    
+
+    def each_with_index(&b)
+      data.each_with_index(&b)
+    end
+
     def [](key)
       data[key]
     end
-  
+
     def []=(key, val)
       data[key] = val
     end
-  
+
     def data
-      @unmarshalled_data || @unmarshalled_data = self.class.unmarshal(@data)
+      @unmarshalled_data ||= self.class.unmarshal(@data) || {}
     end
-    
+
     def data=(data)
       @data, @unmarshalled_data = data, data
     end
-  
+
   private
-    
-    before_save :serialize_data
-    
+
+    before :save, :serialize_data
+
     def serialize_data
-      @data = self.class.marshal(self.data)
+      attribute_set :data, self.class.marshal(self.data)
     end
   end
-
-  
-  unless DataMapper.database.table_exists?(table_name)
-    puts "Warning: The database did not contain a '#{table_name}' table for sessions."
-    DataMapperSession.auto_migrate!
-    puts "Created sessions table."
-  end
 end