scaffolding_extensions 1.4.6 → 1.5.0

data/{LICENSE → MIT-LICENSE}

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2010 Jeremy Evans
+Copyright (c) 2005-2011 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,17 +21,16 @@ to better suit your needs.
 Scaffolding Extensions currently supports:
 
 * Web Frameworks
-  * Rails 3.0.0
+  * Rails 3.0.3
   * Ramaze 2010.06.18
   * Camping 2.1
   * Sinatra 1.1.0
-  * Merb 1.0.4
   * Rack 1.2.1
 * Object Relational Mappers
-  * ActiveRecord 3.0.0
+  * ActiveRecord 3.0.3
   * Sequel 3.19.0
-  * DataMapper 1.0 (see doc/datamapper.txt for details)
-* Javascript Libaries (used for Ajax/Autocompleting)
+  * DataMapper 1.0.2 (see doc/datamapper.txt for details)
+* Javascript Libaries (used for Ajax/Autocompleting, default is now JQuery)
   * Prototype 1.6.0.3
   * JQuery 1.4.2 (with JQuery-Autocomplete 1.1) 
   

data/lib/scaffolding_extensions.rb

@@ -72,7 +72,7 @@ module ScaffoldingExtensions
       auto_complete_skip_style ? '' : AUTO_COMPLETE_CSS
     end
     
-    # The javascript library to use (defaults to Prototype)
+    # The javascript library to use (defaults to JQuery, can be set to 'Prototype')
     def javascript_library=(jslib)
       require "scaffolding_extensions/#{jslib.downcase}_helper"
       ScaffoldingExtensions::Helper.send(:include, const_get("#{jslib}Helper"))
@@ -91,7 +91,6 @@ require 'scaffolding_extensions/controller/action_controller' if defined? Action
 require 'scaffolding_extensions/controller/camping' if defined? Camping::Controllers
 require 'scaffolding_extensions/controller/ramaze' if defined? Ramaze::Controller
 require 'scaffolding_extensions/controller/sinatra' if defined? Sinatra
-require 'scaffolding_extensions/controller/merb' if defined? Merb
 
 require 'scaffolding_extensions/model/active_record' if defined? ActiveRecord::Base
 if defined? DataMapper::Resource
@@ -102,4 +101,4 @@ if defined? Sequel::Model
   require 'scaffolding_extensions/model/sequel'
 end
 
-ScaffoldingExtensions.javascript_library = 'Prototype'
+ScaffoldingExtensions.javascript_library = 'JQuery'

data/lib/scaffolding_extensions/controller/camping.rb

@@ -119,7 +119,6 @@ module ScaffoldingExtensions
         include ScaffoldingExtensions::Controller
         include ScaffoldingExtensions::CampingController
         include ScaffoldingExtensions::Helper
-        include ScaffoldingExtensions::PrototypeHelper
         include ScaffoldingExtensions::CampingHelper
         define_method(:get) do |path, meth, id|
           @scaffold_request_method = 'GET'

data/lib/scaffolding_extensions/controller/rack.rb

@@ -15,7 +15,6 @@ module ScaffoldingExtensions
 
     include ScaffoldingExtensions::Controller
     include ScaffoldingExtensions::Helper
-    include ScaffoldingExtensions::PrototypeHelper
     include Rack::Utils
 
     class Redirect < StandardError
@@ -69,7 +68,7 @@ module ScaffoldingExtensions
         b = 'Not Found'
       end
 
-      [s, h, b]
+      [s, h, [b]]
     end
 
     private

data/lib/scaffolding_extensions/controller/ramaze.rb

@@ -119,7 +119,6 @@ module ScaffoldingExtensions
       include ScaffoldingExtensions::Controller
       include ScaffoldingExtensions::RamazeController
       include ScaffoldingExtensions::Helper
-      include ScaffoldingExtensions::PrototypeHelper
     end
   end
 end

data/lib/scaffolding_extensions/controller/sinatra.rb

@@ -109,7 +109,6 @@ module ScaffoldingExtensions
       include ScaffoldingExtensions::Controller
       include ScaffoldingExtensions::SinatraController
       include ScaffoldingExtensions::Helper
-      include ScaffoldingExtensions::PrototypeHelper
       include ScaffoldingExtensions::SinatraHelper
       p = 'POST'
       block = lambda do

data/lib/scaffolding_extensions/model/datamapper.rb

@@ -1,5 +1,3 @@
-require 'pp'
-
 ScaffoldingExtensions::MODEL_SUPERCLASSES << DataMapper::Resource
 
   def get_key_array_safe(key)
@@ -106,7 +104,7 @@ module ScaffoldingExtensions::MetaDataMapper
   def scaffold_associations
     @scaffold_associations ||= relationships.keys.select { |v|
       relationships[v].send(:target_model).respond_to?(:scaffold_name)
-    }
+    }.sort_by{|name| name.to_s}
   end
 
   # Destroys the object
@@ -252,14 +250,10 @@ module ScaffoldingExtensions::MetaDataMapper
     def scaffold_reflection_merge(reflection, from, to)
       if reflection.class == DataMapper::Associations::OneToMany::Relationship
         foreign_key = get_key_array_safe(reflection.target_key).name
-        p reflection
-        p reflection.target_model
         table = reflection.target_model
       elsif reflection.class == DataMapper::Associations::ManyToMany::Relationship
         foreign_key = get_key_array_safe(reflection.through.child_key).name
-        p reflection
         table = reflection.send(:through_model)
-        p table
       else
         return
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scaffolding_extensions
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 3
   prerelease: false
   segments: 
   - 1
-  - 4
-  - 6
-  version: 1.4.6
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Jeremy Evans
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-21 00:00:00 -08:00
+date: 2011-01-24 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -28,7 +28,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- LICENSE
+- MIT-LICENSE
 - README
 - lib/scaffolding_extensions/model/active_record.rb
 - lib/scaffolding_extensions/model/sequel.rb
@@ -37,7 +37,6 @@ files:
 - lib/scaffolding_extensions/controller/camping.rb
 - lib/scaffolding_extensions/controller/ramaze.rb
 - lib/scaffolding_extensions/controller/sinatra.rb
-- lib/scaffolding_extensions/controller/merb.rb
 - lib/scaffolding_extensions/controller/rack.rb
 - lib/scaffolding_extensions/jquery_helper.rb
 - lib/scaffolding_extensions/meta_controller.rb

data/lib/scaffolding_extensions/controller/merb.rb

@@ -1,123 +0,0 @@
-module ScaffoldingExtensions
-  class << self
-    private
-      # Use whatever model directory Merb is using.
-      def model_files
-        @model_files ||= Dir["#{Merb.dir_for(:model)}/*.rb"]
-      end
-  end
-
-  # Helper methods for Merb that override the defaults in Scaffolding Extensions
-  module MerbControllerHelper
-    private
-      # Merb apparently requires that params that are desired to be lists have
-      # the suffix '[]'
-      def scaffold_param_list_suffix
-        '[]'
-      end
-  end
-  
-  # Instance methods for Merb necessary for Scaffolding Extensions
-  module MerbController
-    private
-      def scaffold_flash
-        message
-      end
-      
-      def scaffold_method_not_allowed
-        render('', :status=>405)
-      end
-      
-      def scaffold_redirect_to(url)
-        redirect("#{request.protocol}://#{request.host}#{url}")
-      end
-      
-      # Renders user provided template if it exists, otherwise renders a scaffold template.
-      # If a layout is specified (either in the controller or as an render_option), use that layout,
-      # otherwise uses the scaffolded layout.  If :inline is one of the render_options,
-      # use the contents of it as the template without the layout.
-      #
-      # There may well be a much better way to do this via modifying the _template_roots, but
-      # I didn't have much luck and decided to take the path I used with Camping,
-      # rendering the templates directly.
-      def scaffold_render_template(action, options = {}, render_options = {})
-        suffix = options[:suffix]
-        suffix_action = "#{action}#{suffix}".to_sym
-        @scaffold_options ||= options
-        @scaffold_suffix ||= suffix
-        @scaffold_class ||= @scaffold_options[:class]
-        begin
-          render(suffix_action, render_options)
-        rescue Merb::ControllerExceptions::TemplateNotFound
-          if render_options.include?(:inline)
-            headers['Content-Type'] = 'text/javascript' if @scaffold_javascript
-            render(Erubis::Eruby.new(render_options[:inline]).result(binding), {:layout=>false}.merge(render_options))
-          else
-            html = Erubis::Eruby.new(File.read(scaffold_path(action))).result(binding)
-            merb_layout = begin
-              merb_layout = _get_layout
-            rescue Merb::ControllerExceptions::TemplateNotFound
-              merb_layout = false
-            end
-            if merb_layout
-              render(html, render_options)
-            else
-              @content = html
-              render(Erubis::Eruby.new(File.read(scaffold_path('layout'))).result(binding), render_options.merge(:layout=>false))
-            end
-          end
-        end
-      end
-      
-      def scaffold_request_action
-        params[:action]
-      end
-      
-      def scaffold_request_env
-        request.env
-      end
-      
-      # Merb overrides any given query params with the path params even if the
-      # path params are nil.  Work around it by getting the query params
-      # directly.
-      def scaffold_request_id
-        params[:id] || request.send(:query_params)[:id]
-      end
-      
-      def scaffold_request_method
-        request.method.to_s.upcase
-      end
-      
-      def scaffold_request_param(v)
-        params[v]
-      end
-      
-      def scaffold_session
-        session
-      end
-      
-      def scaffold_url(action, options = {})
-        url(options.merge(:controller=>controller_name, :action=>action))
-      end
-  end
-  
-  # Class methods for Merb necessary for Scaffolding Extensions
-  module MetaMerbController
-    private
-      # Adds a before filter for checking nonidempotent requests use method POST
-      def scaffold_setup_helper
-        include ScaffoldingExtensions::Helper
-        include ScaffoldingExtensions::MerbControllerHelper
-        include ScaffoldingExtensions::PrototypeHelper
-        include ScaffoldingExtensions::Controller
-        include ScaffoldingExtensions::MerbController
-        before :scaffold_check_nonidempotent_requests
-      end
-  end
-end
-
-# Add class methods necessary for Scaffolding Extensions
-class Merb::Controller
-  extend ScaffoldingExtensions::MetaController
-  extend ScaffoldingExtensions::MetaMerbController
-end