active_scaffold-sequel 0.4.0 → 0.5.0

data/frontends/default/views/_list_column_headings.html.erb

@@ -1,8 +1,8 @@
 <%
 sorting = active_scaffold_config.list.user.sorting
-sorting_stages = ['reset', 'ASC', 'DESC']
+sorting_stages = ActiveScaffold::Ring.new(['reset', 'ASC', 'DESC'])
 default_sorting = active_scaffold_config.list.user.default_sorting
-default_sorting_stages = ['ASC', 'DESC']
+default_sorting_stages = ActiveScaffold::Ring.new(['ASC', 'DESC'])
 -%>
 <% columns.each do |column| -%>
   <% stages = default_sorting.sorts_on?(column) ? default_sorting_stages : sorting_stages -%>

data/frontends/default/views/_list_record.html.erb

@@ -10,5 +10,4 @@ action_links ||= active_scaffold_config.action_links.member
 <tr class="record <%= tr_class %>" id="<%= element_row_id(:action => :list, :id => record.id) %>" data-refresh="<%= url_for(params_for(:action => :row, :id => record.id, :_method => :get)).html_safe %>">
   <%= render :partial => 'list_record_columns', :locals => {:record => record, :columns => columns} %>
   <%= render :partial => 'list_actions', :locals => {:record => record, :url_options => url_options, :action_links => action_links} unless action_links.empty? %>
-  <%= render_nested_view(action_links, url_options, record) unless @nested_auto_open.nil? %>
 </tr>

data/frontends/default/views/destroy.js.erb

@@ -1,16 +1,6 @@
 <%messages_id = active_scaffold_messages_id%>
 <%if controller.send(:successful?)%>
-  <%if render_parent? && controller.respond_to?(:render_component_into_view)%>
-    <%render_parent_options%>
-    <%if render_parent_action == :row%>
-      <%# TODO: That s not working with delete....%>
-      ActiveScaffold.delete_record_row('<%=element_row_id(:controller_id => "as_#{id_from_controller(params[:eid] || params[:parent_sti])}", :action => 'list', :id => params[:id])%>', '<%=url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max))%>');
-      <%messages_id = active_scaffold_messages_id(:controller_id => "as_#{id_from_controller(params[:eid] || params[:parent_sti])}")%>
-    <%elsif render_parent_action == :index%>
-      <%= escape_javascript(controller.send(:render_component_into_view, render_parent_options))%>
-    <%end%>
-    <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-  <%elsif (active_scaffold_config.delete.refresh_list)%>
+  <% if (active_scaffold_config.delete.refresh_list)%>
     ActiveScaffold.replace('<%=active_scaffold_content_id%>', '<%=escape_javascript(render(:partial => 'list', :layout => false))%>');
   <%else%>
     ActiveScaffold.delete_record_row('<%=element_row_id(:action => 'list', :id => params[:id])%>', '<%=url_for(params_for(:action => :index, :id => nil, :page => [active_scaffold_config.list.user.page.to_i - 1, 1].max))%>');

data/frontends/default/views/on_create.js.erb

@@ -4,22 +4,7 @@ insert_at ||= :top %>
 var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
 action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages'))%>');
 <% if controller.send :successful? %>
-  <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
-    <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
-    <% if nested_singular_association? %>
-      action_link.close('<%= escape_javascript(parent_rendered)%>');
-    <% else %>
-      <% if render_parent_action == :row %>
-        ActiveScaffold.create_record_row(action_link.scaffold(),'<%=  escape_javascript(parent_rendered)%>', <%= {:insert_at => insert_at}.to_json.html_safe %>);
-      <% elsif render_parent_action == :index %>
-        <%= escape_javascript(parent_rendered) %>
-      <% end %>
-      action_link.close();
-    <% end %>
-    <% if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-      ActiveScaffold.replace('<%=active_scaffold_calculations_id%>', '<%=escape_javascript(render(:partial => 'list_calculations'))%>');
-    <% end %>
-  <% elsif (active_scaffold_config.create.refresh_list) %>
+  <% if (active_scaffold_config.create.refresh_list) %>
     ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false)) %>');
   <% elsif params[:parent_controller].nil? %>
     <% new_row = render :partial => 'list_record', :locals => {:record => @record} %>

data/frontends/default/views/on_update.js.erb

@@ -3,19 +3,7 @@ try {
 var action_link = ActiveScaffold.find_action_link('<%= form_selector%>');
 action_link.update_flash_messages('<%=escape_javascript(render(:partial => 'messages'))%>');
 <% if controller.send :successful? %>
-  <% if render_parent? && controller.respond_to?(:render_component_into_view) %>
-    <% parent_rendered = controller.send(:render_component_into_view, render_parent_options) %>
-    <% if nested_singular_association? %>
-      action_link.close('<%= escape_javascript(parent_rendered)%>');
-    <% else %>
-      <% if render_parent_action == :row %>
-        action_link.close('<%= escape_javascript(parent_rendered)%>');
-      <% elsif render_parent_action == :index %>
-        <%= escape_javascript(parent_rendered) %>
-      <% end %>
-    <% end %>
-    <%#page.call 'ActiveScaffold.replace', active_scaffold_calculations_id, render(:partial => 'list_calculations') if active_scaffold_config.list.columns.any? {|c| c.calculation?}%>
-  <% elsif update_refresh_list? %>
+  <% if update_refresh_list? %>
     ActiveScaffold.replace_html('<%= active_scaffold_content_id%>', '<%= escape_javascript(render(:partial => 'list', :layout => false))%>');
    <% else %>
     <% updated_row = render :partial => 'list_record', :locals => {:record => @record}%>

data/lib/active_scaffold.rb

@@ -2,12 +2,6 @@ unless Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR >= 1
   raise "This version of ActiveScaffold requires Rails 3.1 or higher.  Please use an earlier version."
 end
 
-begin
-  require 'render_component'
-rescue LoadError
-end
-
-
 require 'active_scaffold/version'
 require 'active_scaffold/engine' unless defined? ACTIVE_SCAFFOLD_PLUGIN
 require 'json'  # for js_config
@@ -15,7 +9,9 @@ require 'json'  # for js_config
 module ActiveScaffold
   require 'active_scaffold/paginator'
   require 'active_scaffold/responds_to_parent'
-  require 'active_scaffold/active_record_permissions'
+  require 'active_scaffold/model_permissions'
+  require 'active_scaffold/render'
+  require 'active_scaffold/ring'
 
   autoload :AttributeParams, 'active_scaffold/attribute_params'
   autoload :Configurable, 'active_scaffold/configurable'
@@ -171,6 +167,9 @@ module ActiveScaffold
       # run the configuration
       @active_scaffold_config = ActiveScaffold::Config::Core.new(model_id)
       @active_scaffold_config_block = block
+
+      @active_scaffold_config.model.class_eval {include ActiveScaffold::ModelPermissions::Permissions}
+
       self.links_for_associations
 
       @active_scaffold_frontends = []
@@ -190,6 +189,7 @@ module ActiveScaffold
 
       # include the rest of the code into the controller: the action core and the included actions
       module_eval do
+        include ActiveScaffold::Render
         include ActiveScaffold::Finder
         include ActiveScaffold::Constraints
         include ActiveScaffold::AttributeParams

data/lib/active_scaffold/actions/core.rb

@@ -142,7 +142,7 @@ module ActiveScaffold::Actions
     # Overide this method on your controller to provide model with named scopes
     # This method returns a model class or a dataset.
     def beginning_of_chain
-      active_scaffold_config.model
+      active_scaffold_config.model.qualify
     end
 
     # This method returns a model class.
@@ -158,7 +158,7 @@ module ActiveScaffold::Actions
     def conditions_from_params
       conditions = nil
       params.reject {|key, value| [:controller, :action, :id, :page, :sort, :sort_direction].include?(key.to_sym)}.each do |key, value|
-        next unless active_scaffold_config.model.columns.include?(key)
+        next unless active_scaffold_config.model.columns.include?(key.to_sym)
         conditions = merge_conditions(conditions, {"#{active_scaffold_config.model.table_name}__#{key}".to_sym => value})
       end
       conditions

data/lib/active_scaffold/actions/list.rb

@@ -17,7 +17,6 @@ module ActiveScaffold::Actions
 
     def list
       do_list
-      @nested_auto_open = active_scaffold_config.list.nested_auto_open
       respond_to_action(:list)
     end
     

data/lib/active_scaffold/actions/nested.rb

@@ -80,10 +80,11 @@ module ActiveScaffold::Actions
         if nested.association.returns_array?
           nested.parent_scope.send("#{nested.association[:name]}_dataset")
         elsif nested.child_association[:type] == :many_to_one
-          active_scaffold_config.model.where((nested.child_association[:key] || nested.child_association[:left_key]) => nested.parent_id)
+          active_scaffold_config.model.qualify.where((nested.child_association[:key] || nested.child_association[:left_key]) => nested.parent_id)
         end
       else
-        active_scaffold_config.model
+        # specified in actions/core.rb
+        super
       end
     end
 

data/lib/active_scaffold/config/core.rb

@@ -40,7 +40,6 @@ module ActiveScaffold::Config
 
     # access to the permissions configuration.
     # configuration options include:
-    #  * current_user_method - what method on the controller returns the current user. default: :current_user
     #  * default_permission - what the default permission is. default: true
     def self.security
       ModelPermissions

data/lib/active_scaffold/config/list.rb

@@ -132,13 +132,7 @@ module ActiveScaffold::Config
     def hide_nested_column
       @hide_nested_column.nil? ? true : @hide_nested_column
     end
-    
-    # might be set to open nested_link automatically in view
-    # conf.nested.add_link(:players)
-    # conf.list.nested_auto_open = {:players => 2}
-    # will open nested players view if there are 2 or less records in parent
-    attr_accessor :nested_auto_open
-    
+
     class UserSettings < UserSettings
       # This label has alread been localized.
       def label

data/lib/active_scaffold/extensions/action_view_rendering.rb

@@ -73,25 +73,20 @@ module ActionView::Helpers #:nodoc:
         id = "as_#{eid}-embedded"
         url_options = {:controller => remote_controller.to_s, :action => 'index'}.merge(options[:params])
 
-        if controller.respond_to?(:render_component_into_view)
-          controller.send(:render_component_into_view, url_options)
-        else
-          content_tag(:div, :id => id, :class => 'active-scaffold-component') do
-            url = url_for(url_options)
-            # parse the ActiveRecord model name from the controller path, which
-            # might be a namespaced controller (e.g., 'admin/admins')
-            model = remote_controller.to_s.sub(/.*\//, '').singularize
-            content_tag(:div, :class => 'active-scaffold-header') do
-              content_tag :h2, link_to(args.first[:label] || active_scaffold_config_for(model).list.label, url, :remote => true)
-            end <<
-            if ActiveScaffold.js_framework == :prototype
-              javascript_tag("new Ajax.Updater('#{id}', '#{url}', {method: 'get', evalScripts: true});")
-            elsif ActiveScaffold.js_framework == :jquery
-              javascript_tag("jQuery('##{id}').load('#{url}');")
-            end
+        content_tag(:div, :id => id, :class => 'active-scaffold-component') do
+          url = url_for(url_options)
+          # parse the ActiveRecord model name from the controller path, which
+          # might be a namespaced controller (e.g., 'admin/admins')
+          model = remote_controller.to_s.sub(/.*\//, '').singularize
+          content_tag(:div, :class => 'active-scaffold-header') do
+            content_tag :h2, link_to(args.first[:label] || active_scaffold_config_for(model).list.label, url, :remote => true)
+          end <<
+          if ActiveScaffold.js_framework == :prototype
+            javascript_tag("new Ajax.Updater('#{id}', '#{url}', {method: 'get', evalScripts: true});")
+          elsif ActiveScaffold.js_framework == :jquery
+            javascript_tag("jQuery('##{id}').load('#{url}');")
           end
         end
-
       else
         options = args.first
         if options.is_a?(Hash)

data/lib/active_scaffold/finder.rb

@@ -365,7 +365,7 @@ module ActiveScaffold
         value = '' if value.nil?
         value
       }
-      collection.reverse! if order.downcase == 'desc'
+      collection.reverse! if order[:descending]
       collection
     end
   end

data/lib/active_scaffold/helpers/list_column_helpers.rb

@@ -305,7 +305,6 @@ module ActiveScaffold
         content_tag(:th, column_heading_value(column, sorting, sort_direction) + inplace_edit_control(column), tag_options)
       end
 
-
       def column_heading_value(column, sorting, sort_direction)
         if column.sortable?
           options = {:id => nil, :class => "as_sort",
@@ -322,19 +321,6 @@ module ActiveScaffold
           end
         end
       end
-      
-      def render_nested_view(action_links, url_options, record)
-        rendered = []
-        action_links.member.each do |link|
-          if link.column && @nested_auto_open[link.column.name] && @records.length <= @nested_auto_open[link.column.name] && controller.respond_to?(:render_component_into_view)
-            link_url_options = {:adapter => '_list_inline_adapter', :format => :js}.merge(action_link_url_options(link, url_options, record, options = {:reuse_eid => true})) 
-            link_id = get_action_link_id(link_url_options, record, link.column)
-            rendered << (controller.send(:render_component_into_view, link_url_options) + javascript_tag("ActiveScaffold.ActionLink.get('#{link_id}').set_opened();"))
-          end 
-        end
-        rendered.join(' ').html_safe
-      end  
-      
     end
   end
 end

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -79,7 +79,7 @@ module ActiveScaffold
 
       # a general-use loading indicator (the "stuff is happening, please wait" feedback)
       def loading_indicator_tag(options)
-        image_tag(active_scaffold_config.class.asset_path('indicator.gif'), :style => "visibility:hidden;", :id => loading_indicator_id(options), :alt => "loading indicator", :class => "loading-indicator")
+        image_tag "active_scaffold/indicator.gif", :style => "visibility:hidden;", :id => loading_indicator_id(options), :alt => "loading indicator", :class => "loading-indicator"
       end
 
       # Creates a javascript-based link that toggles the visibility of some element on the page.

data/lib/active_scaffold/{active_record_permissions.rb → model_permissions.rb}

@@ -1,79 +1,25 @@
-# This module attempts to create permissions conventions for your ActiveRecord models. It supports english-based
+# This module attempts to create permissions conventions for your models. It supports english-based
 # methods that let you restrict access per-model, per-record, per-column, per-action, and per-user. All at once.
 #
 # You may define instance methods in the following formats:
 #  def #{column}_authorized_for_#{action}?
 #  def #{column}_authorized?
 #  def authorized_for_#{action}?
-#
-# Your methods should allow for the following special cases:
-#   * cron scripts
-#   * guest users (or nil current_user objects)
+
 module ActiveScaffold
   module ModelPermissions
-    # ModelPermissions needs to know what method on your ApplicationController will return the current user,
-    # if available. This defaults to the :current_user method. You may configure this in your environment.rb if you
-    # have a different setup.
-    def self.current_user_method=(v); @@current_user_method = v; end
-    def self.current_user_method; @@current_user_method; end
-    @@current_user_method = :current_user
-
     # Whether the default permission is permissive or not
     # If set to true, then everything's allowed until configured otherwise
     def self.default_permission=(v); @@default_permission = v; end
     def self.default_permission; @@default_permission; end
     @@default_permission = true
 
-    # This is a module aimed at making the current_user available to ActiveRecord models for permissions.
-    module ModelUserAccess
-      module Controller
-        def self.included(base)
-          base.prepend_before_filter :assign_current_user_to_models
-        end
-
-        # We need to give the ActiveRecord classes a handle to the current user. We don't want to just pass the object,
-        # because the object may change (someone may log in or out). So we give ActiveRecord a proc that ties to the
-        # current_user_method on this ApplicationController.
-        def assign_current_user_to_models
-          Sequel::Model.current_user_proc = proc {send(ModelPermissions.current_user_method)}
-        end
-      end
-
-      module Model
-        def self.included(base)
-          base.extend ClassMethods
-        end
-
-        module ClassMethods
-          # The proc to call that retrieves the current_user from the ApplicationController.
-          attr_accessor :current_user_proc
-
-          # Class-level access to the current user
-          def current_user
-            Sequel::Model.current_user_proc.call if Sequel::Model.current_user_proc
-          end
-        end
-
-        # Instance-level access to the current user
-        def current_user
-          self.class.current_user
-        end
-      end
-    end
-
     module Permissions
       def self.included(base)
         base.extend SecurityMethods
         base.send :include, SecurityMethods
       end
 
-      # Because any class-level queries get delegated to the instance level via a new record,
-      # it's useful to know when the authorization query is meant for a specific record or not.
-      # But using new? is confusing, even though accurate. So this is basically just a wrapper.
-      def existing_record_check?
-        !new?
-      end
-
       module SecurityMethods
         # A generic authorization query. This is what will be called programatically, since
         # the actual permission methods can't be guaranteed to exist. And because we want to

data/lib/active_scaffold/{extensions/action_controller_rendering.rb → render.rb}

@@ -1,22 +1,18 @@
-# wrap the action rendering for ActiveScaffold controllers
-module ActionController #:nodoc:
-  class Base
-    def render_with_active_scaffold(*args, &block)
-      if self.class.uses_active_scaffold? and params[:adapter] and @rendering_adapter.nil?
+module ActiveScaffold
+  # wrap the action rendering for ActiveScaffold controllers
+  module Render
+    def render(*args, &block)
+      if params[:adapter] and @rendering_adapter.nil?
         @rendering_adapter = true # recursion control
         # if we need an adapter, then we render the actual stuff to a string and insert it into the adapter template
         opts = args.blank? ? Hash.new : args.first
-        render :partial => params[:adapter][1..-1],
+        super :partial => params[:adapter][1..-1],
         :locals => {:payload => render_to_string(opts.merge(:layout => false), &block).html_safe},
                :use_full_path => true, :layout => false, :content_type => :html
         @rendering_adapter = nil # recursion control
       else
-        render_without_active_scaffold(*args, &block)
+        super
       end
     end
-    alias_method_chain :render, :active_scaffold
-
-    # Rails 2.x implementation is post-initialization on :active_scaffold method
   end
 end
-

data/lib/active_scaffold/ring.rb

@@ -0,0 +1,6 @@
+class ActiveScaffold::Ring < ::Array
+  # Returns the value after the given value. Wraps around.
+  def after(value)
+    include?(value) ? self[(index(value).to_i + 1) % length] : nil
+  end
+end

data/lib/active_scaffold/version.rb

@@ -1,7 +1,7 @@
 module ActiveScaffold
   module Version
     MAJOR = 0
-    MINOR = 4
+    MINOR = 5
     PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')

data/lib/active_scaffold_env.rb

@@ -5,7 +5,3 @@ ActionController::Base.send(:include, ActiveScaffold)
 ActionController::Base.send(:include, ActiveScaffold::RespondsToParent)
 ActionController::Base.send(:include, ActiveScaffold::Helpers::ControllerHelpers)
 ActionView::Base.send(:include, ActiveScaffold::Helpers::ViewHelpers)
-
-ActionController::Base.class_eval {include ActiveScaffold::ModelPermissions::ModelUserAccess::Controller}
-Sequel::Model.class_eval     {include ActiveScaffold::ModelPermissions::ModelUserAccess::Model}
-Sequel::Model.class_eval     {include ActiveScaffold::ModelPermissions::Permissions}

metadata

@@ -2,7 +2,7 @@
 name: active_scaffold-sequel
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Many, see README
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 Z
+date: 2012-03-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -186,7 +186,8 @@ files:
 - lib/active_scaffold/actions/show.rb
 - lib/active_scaffold/actions/subform.rb
 - lib/active_scaffold/actions/update.rb
-- lib/active_scaffold/active_record_permissions.rb
+- lib/active_scaffold/render.rb
+- lib/active_scaffold/ring.rb
 - lib/active_scaffold/attribute_params.rb
 - lib/active_scaffold/bridges.rb
 - lib/active_scaffold/bridges/calendar_date_select.rb
@@ -238,17 +239,13 @@ files:
 - lib/active_scaffold/data_structures/set.rb
 - lib/active_scaffold/data_structures/sorting.rb
 - lib/active_scaffold/engine.rb
-- lib/active_scaffold/extensions/action_controller_rendering.rb
-- lib/active_scaffold/extensions/action_view_rendering.rb
-- lib/active_scaffold/extensions/active_record_offset.rb
 - lib/active_scaffold/extensions/to_label.rb
-- lib/active_scaffold/extensions/array.rb
+- lib/active_scaffold/extensions/action_view_rendering.rb
+- lib/active_scaffold/extensions/unsaved_associated.rb
+- lib/active_scaffold/extensions/unsaved_record.rb
 - lib/active_scaffold/extensions/paginator_extensions.rb
 - lib/active_scaffold/extensions/localize.rb
 - lib/active_scaffold/extensions/name_option_for_datetime.rb
-- lib/active_scaffold/extensions/nil_id_in_url_params.rb
-- lib/active_scaffold/extensions/unsaved_associated.rb
-- lib/active_scaffold/extensions/unsaved_record.rb
 - lib/active_scaffold/extensions/routing_mapper.rb
 - lib/active_scaffold/extensions/usa_state.rb
 - lib/active_scaffold/finder.rb
@@ -266,6 +263,7 @@ files:
 - lib/active_scaffold/paginator.rb
 - lib/active_scaffold/responds_to_parent.rb
 - lib/active_scaffold/version.rb
+- lib/active_scaffold/model_permissions.rb
 - lib/active_scaffold_env.rb
 - lib/generators/active_scaffold/USAGE
 - lib/generators/active_scaffold/active_scaffold_generator.rb

data/lib/active_scaffold/extensions/active_record_offset.rb

@@ -1,12 +0,0 @@
-# Bugfix: Team.offset(1).limit(1) throws an error
-Sequel::Model.instance_eval do
-  def offset(*args, &block) 
-    scoped.__send__(:offset, *args, &block)
-  rescue NoMethodError       
-    if scoped.nil?           
-      'depends on :allow_nil'
-    else                     
-      raise                  
-    end                      
-  end       
-end

data/lib/active_scaffold/extensions/array.rb

@@ -1,7 +0,0 @@
-class Array
-  # returns the value after the given value. wraps around. defaults to first element in array.
-  def after(value)
-    return nil unless include? value
-    self[(index(value).to_i + 1) % length]
-  end
-end

data/lib/active_scaffold/extensions/nil_id_in_url_params.rb

@@ -1,7 +0,0 @@
-class ActionController::Routing::RouteSet
-  def generate_with_nil_id_awareness(*args)
-    args[0].delete(:id) if args[0][:id].nil?
-    generate_without_nil_id_awareness(*args)
-  end
-  alias_method_chain :generate, :nil_id_awareness
-end