scaffolding_extensions 1.4.2 → 1.4.3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2008 Jeremy Evans
+Copyright (c) 2005-2010 Jeremy Evans
 
 Permission is hereby granted, free of charge, to any person obtaining a copy 
 of this software and associated documentation files (the "Software"), to deal

data/README

@@ -21,20 +21,37 @@ to better suit your needs.
 Scaffolding Extensions currently supports:
 
 * Web Frameworks
-  * Rails 2.3.5 (with or without RailsXss plugin)
-  * Ramaze 2010.04.04
-  * Camping 2.0
+  * Rails 2.3.8 (with or without RailsXss plugin)
+  * Ramaze 2010.06.18
+  * Camping 2.1
   * Sinatra 1.0
   * Merb 1.0.4
   * Rack 1.1.0
 * Object Relational Mappers
-  * ActiveRecord 2.3.5
-  * Sequel 3.10.0
-  * DataMapper 0.10.2 (see doc/datamapper.txt for details)
+  * ActiveRecord 2.3.8
+  * Sequel 3.14.0
+  * DataMapper 1.0 (see doc/datamapper.txt for details)
 * Javascript Libaries (used for Ajax/Autocompleting)
   * Prototype 1.6.0.3
   * JQuery 1.2.3
   
+There are differing levels of support for the web frameworks, mostly related
+to whether or not you can use custom views and layouts.  Custom views mean
+that you can keep the scaffolded controller action, and change how the
+view is displayed.  Custom layouts mean you can provide your own layout,
+which the scaffolded views use.  Here's the current level of support:
+
+* Scaffold view, scaffold layout (all)
+* Scaffold view, custom layout (Rails, Sinatra)
+* Custom view, custom layout (Rails, Sinatra)
+* Custom view, scaffold layout (Sinatra)
+
+For the web frameworks that don't have support for custom layouts and views,
+you can still customize the scaffolded views and layout, but you need to copy
+the scaffold template directory from the plugin and set the
+@scaffold_template_dir class instance variable in the controller to the path
+to your scaffold template directory.
+
 Support for other web frameworks and ORMs can be added, see the
 controller_spec.txt and model_spec.txt files for the methods that need to be
 defined.

data/doc/ramaze.txt

@@ -18,3 +18,6 @@ controllers have been loaded.
 
 Also, note that Scaffolding Extensions uses the :Erubis engine in Ramaze,
 so you must have Erubis installed to use it.
+
+Finally, note that should not call map after calling a scaffolding method
+in your controller.

data/doc/testing.txt

@@ -17,6 +17,6 @@ There is an automated test suite that tests the plugin against all supported web
 frameworks and ORMs. It is now available in the same github repository as the
 plugin itself.
 
-It requires the ruby-sytle, hpricot, and mongrel gems (in addition to gems for
+It requires the unicorn and hpricot gems (in addition to gems for
 all of the frameworks and ORMs), and does black box testing of the plugin by
 running a web crawler against a running application that uses the plugin.

data/lib/scaffolding_extensions/controller/ramaze.rb

@@ -92,17 +92,30 @@ module ScaffoldingExtensions
     # Adds a default scaffolded layout if none has been set.  Activates the Erubis
     # engine.  Includes the necessary scaffolding helper and controller methods.
     def scaffold_setup_helper
-      map generate_mapping, :scaffolding_extensions
-      map_views '/'
-      map_layouts '/'
       engine :Erubis
       layout(:layout){|name, wish| !request.xhr? }
-
-      o = Ramaze::App[:scaffolding_extensions].options
-      o.roots = [scaffold_template_dir]
-      o.views = ['/']
-      o.layouts = ['/']
-
+      
+      # Instantiates the controller's App (necessary to have a valid
+      # Ramaze::Controller.options, which is actually just a shortcut
+      # to controller's App options)
+      setup
+      
+      # Retrieves current controller options, and ensure the required ones
+      # are properly initialized
+      o = options
+      o.roots ||= []
+      o.views ||= []
+      o.layouts ||= []
+      
+      # Adds scaffold_template_dir to the controller roots
+      o.roots += [scaffold_template_dir] unless o.roots.include?(scaffold_template_dir)
+      
+      # The scaffolding_extensions templates are located directly in the
+      # scaffold_template_dir, not in a view/ or layout/ subdirectory,
+      # so adds '/' to the views et layout default search paths
+      o.views << '/' unless o.views.include? '/'
+      o.layouts << '/' unless o.layouts.include? '/'
+      
       include ScaffoldingExtensions::Controller
       include ScaffoldingExtensions::RamazeController
       include ScaffoldingExtensions::Helper

data/lib/scaffolding_extensions/model/datamapper.rb

@@ -228,13 +228,13 @@ module ScaffoldingExtensions::MetaDataMapper
   end
   
   # The column type for the given table column, or nil if it isn't a table column
-  def scaffold_table_column_type(column)
-    column = self.properties[column]
+  def scaffold_table_column_type(c)
+    column = self.properties[c]
     if column then
-      if column.type == DataMapper::Types::Text
+      if column.type == DataMapper::Property::Text
         :text
       else
-        column.type.to_s.split("::").last.downcase.intern
+        column.class.to_s.split("::").last.downcase.intern
       end
     else
       nil

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scaffolding_extensions
 version: !ruby/object:Gem::Version 
-  version: 1.4.2
+  hash: 1
+  prerelease: false
+  segments: 
+  - 1
+  - 4
+  - 3
+  version: 1.4.3
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 -07:00
+date: 2010-08-26 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -103,21 +109,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 59
+      segments: 
+      - 1
+      - 8
+      - 6
       version: 1.8.6
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: scaffolding-ext
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Administrative database front-end for multiple web-frameworks and ORMs