merb_datamapper 0.9.2 → 0.9.3

data/History.txt

@@ -0,0 +1 @@
+

data/Manifest.txt

@@ -0,0 +1,33 @@
+History.txt
+LICENSE
+Manifest.txt
+README.txt
+Rakefile
+TODO
+datamapper_generators/migration/USAGE
+datamapper_generators/migration/migration_generator.rb
+datamapper_generators/migration/templates/new_migration.erb
+datamapper_generators/model/USAGE
+datamapper_generators/model/model_generator.rb
+datamapper_generators/model/templates/app/models/%model_file_name%.rb
+datamapper_generators/resource_controller/USAGE
+datamapper_generators/resource_controller/resource_controller_generator.rb
+datamapper_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb
+datamapper_generators/resource_controller/templates/app/helpers/%controller_file_name%_helper.rb
+datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/edit.html.erb
+datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/index.html.erb
+datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/new.html.erb
+datamapper_generators/resource_controller/templates/app/views/%controller_file_name%/show.html.erb
+datamapper_generators/resource_migration/USAGE
+datamapper_generators/resource_migration/resource_migration_generator.rb
+datamapper_generators/resource_migration/templates/class_migration.erb
+lib/merb/orms/data_mapper/connection.rb
+lib/merb/orms/data_mapper/database.yml.sample
+lib/merb/orms/data_mapper/resource.rb
+lib/merb/session/data_mapper_session.rb
+lib/merb_datamapper.rb
+lib/merb_datamapper/merbtasks.rb
+lib/merb_datamapper/version.rb
+spec/connection_spec.rb
+spec/spec.opts
+spec/spec_helper.rb

data/README.txt

@@ -0,0 +1,13 @@
+= merb_datamapper
+
+A plugin for the Merb framework that provides DataMapper access
+
+To use sessions:
+
+1. set the session store to datamapper in init.rb:
+    Merb::Config.use { |c|
+      c[:session_store] = 'datamapper'
+    }
+
+2. add the dependency in init.rb:
+    use_orm :datamapper

data/Rakefile

@@ -1,46 +1,58 @@
 require 'rubygems'
-require 'rake/gempackagetask'
+require 'spec'
+require 'spec/rake/spectask'
+require 'pathname'
+
+ROOT = Pathname(__FILE__).dirname.expand_path
+require ROOT + 'lib/merb_datamapper/version'
 
-PLUGIN = "merb_datamapper"
-NAME = "merb_datamapper"
-VERSION = "0.9.2"
 AUTHOR = "Jason Toy"
-EMAIL = "jtoy@rubynow.com"
-HOMEPAGE = "http://merbivore.com"
-SUMMARY = "Merb plugin that provides DataMapper support for Merb"
-
-spec = Gem::Specification.new do |s|
-  s.name = NAME
-  s.version = VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README", "LICENSE", 'TODO']
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  s.add_dependency('merb-core', '>= 0.9.2')
-  s.add_dependency('datamapper', '>= 0.2.3')
-  s.require_path = 'lib'
-  s.autorequire = PLUGIN
-  s.files = %w(LICENSE README Rakefile TODO) + Dir.glob("{lib,specs,datamapper_generators}/**/*")
-end
+EMAIL  = "jtoy@rubynow.com"
+GEM_NAME = "merb_datamapper"
+GEM_VERSION = DataMapper::MerbDataMapper::VERSION
+GEM_DEPENDENCIES = [["dm-core", GEM_VERSION], ["dm-migrations", GEM_VERSION], ["merb-core", ">=0.9.3"]]
+GEM_CLEAN = ["log", "pkg", "coverage"]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
+
+PROJECT_NAME = "datamapper"
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/merb_datamapper"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin providing DataMapper support for Merb"
+
+require ROOT.parent + 'tasks/hoe'
 
-windows = (PLATFORM =~ /win32|cygwin/) rescue nil
+task :default => [ :spec ]
 
-SUDO = windows ? "" : "sudo"
+WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
+SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
+desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
+task :install => [ :package ] do
+  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
 end
 
-desc "Install merb_datamapper"
-task :install => :package do
-  sh %{#{SUDO} gem install pkg/#{NAME}-#{VERSION} --no-rdoc --no-ri --no-update-sources}
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
+task :uninstall => [ :clobber ] do
+  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
 end
 
-desc 'Release the current version on rubyforge'
-task :release => :package do
-  sh %{rubyforge add_release merb #{PLUGIN} #{VERSION} pkg/#{NAME}-#{VERSION}.gem}
+namespace :jruby do
+  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
+  task :install => [ :package ] do
+    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
+  end
+end
+
+desc 'Run specifications'
+Spec::Rake::SpecTask.new(:spec) do |t|
+  t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+  t.spec_files = Pathname.glob(Pathname.new(__FILE__).dirname + 'spec/**/*_spec.rb')
+
+  begin
+    t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
+    t.rcov_opts << '--exclude' << 'spec'
+    t.rcov_opts << '--text-summary'
+    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+  rescue Exception
+    # rcov not installed
+  end
 end

data/TODO

@@ -1,4 +1,10 @@
-TODO:
-Add proper migration support as soon as its released
-Fix session support
-finish rake tasks
+TODO
+====
+
+* Add proper migration support as soon as its released
+* Fix session support
+* Finish rake tasks
+
+---
+TODO tickets may also be found in the DataMapper Issue Tracker:
+http://wm.lighthouseapp.com/projects/4819-datamapper/overview

data/datamapper_generators/migration/USAGE

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

data/datamapper_generators/migration/migration_generator.rb

@@ -1,10 +1,10 @@
 # require 'merb'
 class MigrationGenerator < RubiGen::Base
-  
+
   default_options :author => nil
-  
+
   attr_reader :name
-  
+
   def initialize(runtime_args, runtime_options = {})
     super
     usage if args.empty?
@@ -24,7 +24,7 @@ class MigrationGenerator < RubiGen::Base
       # Create stubs
       highest_migration = Dir[Dir.pwd+'/schema/migrations/*'].map{|f| File.basename(f) =~ /^(\d+)/; $1}.max
       filename = format("%03d_%s", (highest_migration.to_i+1), @name.snake_case)
-      m.template "new_migration.erb", "schema/migrations/#{filename}.rb", :assigns => { :class_name => @name }
+      m.template "new_migration.erb", "schema/migrations/#{filename}.rb", :assigns => { :class_name => @name , :number => (highest_migration.to_i+1) }
 
     end
   end
@@ -54,11 +54,11 @@ EOS
       #         "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
-end
+end

data/datamapper_generators/migration/templates/new_migration.erb

@@ -1,7 +1,7 @@
-class <%= class_name.snake_case.camel_case %> < DataMapper::Migration
-  def self.up
+migration(<%= number %>, :<%= class_name.snake_case %>) do
+  up do
   end
 
-  def self.down
+  down do
   end
 end

data/datamapper_generators/model/model_generator.rb

@@ -1,31 +1,31 @@
 class ModelGenerator < Merb::GeneratorBase
   attr_reader :model_attributes, :model_class_name, :model_file_name
-  
+
   def initialize(args, runtime_args = {})
     @base =                 File.dirname(__FILE__)
     super
     @model_file_name =      args.shift.snake_case
     @model_class_name =     @model_file_name.to_const_string
-    @model_attributes =     Hash[*(args.map{|a| a.split(":") }.flatten)]
+    @model_attributes =     normalize_attributes(args)
     @model_file_name =      "#{@model_class_name.snake_case}"
-   
+
   end
-  
+
   def manifest
     record do |m|
       @m = m
-    
-      @assigns = {  :model_file_name  => model_file_name, 
+
+      @assigns = {  :model_file_name  => model_file_name,
                     :model_attributes => model_attributes,
                     :model_class_name => model_class_name
                   }
       copy_dirs
       copy_files
-      
+
       m.dependency "merb_model_test", [model_file_name], @assigns
     end
   end
-  
+
   protected
   def banner
     <<-EOS.split("\n").map{|x| x.strip}.join("\n")
@@ -34,5 +34,12 @@ class ModelGenerator < Merb::GeneratorBase
       USAGE: #{spec.name}"
     EOS
   end
-      
-end
+
+  def normalize_attributes(attributes_input)
+    attributes_input.map do |a|
+      name, type = a.split(":")
+      [name.snake_case, type.to_const_string]
+    end
+  end
+
+end

data/datamapper_generators/model/templates/app/models/%model_file_name%.rb

@@ -1,5 +1,7 @@
-class <%= model_class_name %> < DataMapper::Base
-<% model_attributes.each do |attr| -%>
-  <%= "property :#{attr.first}, :#{attr.last}" %>
-<% end -%>
-end
+class <%= model_class_name %>
+  include DataMapper::Resource
+
+  <% model_attributes.each do |name,type| -%>
+  property :<%=name-%>, <%=type%>
+  <% end %>
+end

data/datamapper_generators/resource_controller/resource_controller_generator.rb

@@ -1,51 +1,62 @@
 class ResourceControllerGenerator < Merb::GeneratorBase
-  
-  attr_reader :controller_class_name, 
-              :controller_file_name, 
+
+  attr_reader :controller_class_name,
+              :controller_file_name,
               :controller_base_path,
               :controller_modules,
               :model_class_name,
               :full_controller_const,
               :singular_model,
-              :plural_model
-  
+              :plural_model,
+              :properties
+
   def initialize(args, runtime_args = {})
-    @base =             File.dirname(__FILE__)
-    
+    @base = File.dirname(__FILE__)
+
     super
+
     name = args.shift
-    nfp = name.snake_case.gsub("::", "/")
-    nfp = nfp.split("/")
+    nfp  = name.snake_case.gsub("::", "/").split("/")
+
     @model_class_name = nfp.pop.singularize.to_const_string
     @model_class_name = runtime_args[:model_class_name] if runtime_args[:model_class_name]
-    @singular_model         = @model_class_name.snake_case
-    @plural_model           = @singular_model.pluralize
-    
+    @singular_model   = @model_class_name.snake_case
+    @plural_model     = @singular_model.pluralize
+
     nfp << @plural_model
-    
+
     @controller_file_name = nfp.join("/")
-    
+
     # Need to setup the directories
     unless @controller_file_name == File.basename(@controller_file_name)
-      @controller_base_path   = controller_file_name.split("/")[0..-2].join("/") 
+      @controller_base_path = controller_file_name.split("/")[0..-2].join("/")
     end
-    
-    @controller_modules     = @controller_file_name.to_const_string.split("::")[0..-2]
-    @controller_class_name  = @controller_file_name.to_const_string.split("::").last
+
+    @controller_modules    = @controller_file_name.to_const_string.split("::")[0..-2]
+    @controller_class_name = @controller_file_name.to_const_string.split("::").last
 
     @full_controller_const = ((@controller_modules.dup || []) << @controller_class_name).join("::")
+
+    # Gets the properties of the model
+    # FIXME: the model file needs to be required
+    @properties = if Object.const_defined?(@model_class_name)
+      model_class = Object.const_get(@model_class_name)
+      model_class.properties if model_class.respond_to?(:properties)
+    else
+      []
+    end
   end
-  
+
   def manifest
     record do |m|
       @m = m
-      
+
       # Create the controller directory
       m.directory File.join("app/controllers", controller_base_path) if controller_base_path
-      
+
       # Create the helpers directory
       m.directory File.join("app/helpers", controller_base_path) if controller_base_path
-      
+
       @assigns =  {
                     :controller_modules         => controller_modules,
                     :controller_class_name      => controller_class_name,
@@ -54,15 +65,39 @@ class ResourceControllerGenerator < Merb::GeneratorBase
                     :full_controller_const      => full_controller_const,
                     :model_class_name           => model_class_name,
                     :singular_model             => singular_model,
-                    :plural_model               => plural_model
-                  }      
+                    :plural_model               => plural_model,
+                    :properties                 => properties
+                  }
       copy_dirs
       copy_files
-      
+
       m.dependency "merb_resource_controller_test", [@controller_class_name], @assigns
     end
   end
-  
+
+  # methods used by the templates
+
+  def field_from_type(type)
+    case type.name.to_sym
+    when :String
+      "text_control"
+    when :TrueClass
+      "checkbox_control"
+    when :"DataMapper::Types::Text"
+      "text_area_control"
+    else
+      "text_control"
+    end
+  end
+
+  #returns the params needed for getting the object.
+  # uses params[:id] as a default if no keys has been set in the model.
+  def params_for_get
+    params = properties.select{|p| p.key?}.map{|p| "params[:#{p.field}]"}.join(', ')
+    @params_for_get ||= (params == "" ? "params[:id]" : params)
+  end
+
+
   protected
   def banner
     <<-EOS.split("\n").map{|x| x.strip}.join("\n")
@@ -71,4 +106,4 @@ class ResourceControllerGenerator < Merb::GeneratorBase
       USAGE: #{spec.name} my_resource
     EOS
   end
-end
+end

data/datamapper_generators/resource_controller/templates/app/controllers/%controller_file_name%.rb

@@ -13,7 +13,7 @@
 <%= "  " * counter %>  end
 
 <%= "  " * counter %>  def show
-<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.first(params[:id])
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.get(<%= params_for_get %>)
 <%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
 <%= "  " * counter %>    display @<%= singular_model %>
 <%= "  " * counter %>  end
@@ -26,7 +26,7 @@
 
 <%= "  " * counter %>  def edit
 <%= "  " * counter %>    only_provides :html
-<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.first(params[:id])
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.get(<%= params_for_get %>)
 <%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
 <%= "  " * counter %>    render
 <%= "  " * counter %>  end
@@ -41,9 +41,9 @@
 <%= "  " * counter %>  end
 
 <%= "  " * counter %>  def update
-<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.first(params[:id])
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.get(<%= params_for_get %>)
 <%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
-<%= "  " * counter %>    if @<%= singular_model %>.update_attributes(params[:<%= singular_model %>])
+<%= "  " * counter %>    if @<%= singular_model %>.update_attributes(params[:<%= singular_model %>]) || !@<%= singular_model %>.dirty?
 <%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>, @<%= singular_model %>)
 <%= "  " * counter %>    else
 <%= "  " * counter %>      raise BadRequest
@@ -51,9 +51,9 @@
 <%= "  " * counter %>  end
 
 <%= "  " * counter %>  def destroy
-<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.first(params[:id])
+<%= "  " * counter %>    @<%= singular_model %> = <%= model_class_name %>.get(<%= params_for_get %>)
 <%= "  " * counter %>    raise NotFound unless @<%= singular_model %>
-<%= "  " * counter %>    if @<%= singular_model %>.destroy!
+<%= "  " * counter %>    if @<%= singular_model %>.destroy
 <%= "  " * counter %>      redirect url(:<%= (controller_modules.collect{|m| m.downcase} << singular_model).join("_") %>)
 <%= "  " * counter %>    else
 <%= "  " * counter %>      raise BadRequest