recordselect 3.3.6 → 3.3.7

data/app/assets/stylesheets/record_select.css.erb

@@ -38,6 +38,11 @@
   clear: both;
 }
 
+.record-select ol.scrollable {
+  max-height: 200px;
+  overflow: auto;
+}
+
 .record-select .record, .record-select a {
   cursor: pointer;
   color: #0066cc;

data/app/views/record_select/_list.html.erb

@@ -5,7 +5,7 @@ pagination_url_params = params.merge(:controller => controller, :action => :brow
 prev_url = url_for(pagination_url_params.merge(:page => page.prev.number)) if page.prev?
 next_url = url_for(pagination_url_params.merge(:page => page.next.number)) if page.next?
 -%>
-<ol>
+<%= content_tag :ol, :class => ('scrollable' unless record_select_config.pagination?) do %>
   <li class="found"><%= rs_(:records_found, :count => page.pager.count,
 :model => record_select_config.model.model_name.human(:count => page.pager.count).downcase) %></li>
   <% if page.prev? -%>
@@ -21,11 +21,11 @@ next_url = url_for(pagination_url_params.merge(:page => page.next.number)) if pa
     <%= render_record_from_config(record) %>
   </li>
   <% end -%>
-  <% if page.next? -%>
+  <% if record_select_config.pagination? && page.next? -%>
   <li class="pagination next">
   <%= link_to (rs_(:next_items, :count => page.pager.per_page) + " " + image_tag('record_select/next.gif', :alt => rs_(:next))).html_safe,
                         {:url => next_url},
                         {:href => next_url, :method => :get, :remote => true} %>
   </li>
   <% end -%>
-</ol>
+<% end %>

data/lib/record_select/actions.rb

@@ -4,11 +4,15 @@ module RecordSelect
     # params => [:page, :search]
     def browse
       conditions = record_select_conditions
-      klass = record_select_model.where(conditions).includes(record_select_includes)
-      @count = klass.count
+      user_includes = record_select_includes
+      klass = record_select_model.where(conditions).includes(user_includes)
+      klass = klass.references(user_includes) if Rails::VERSION::MAJOR >= 4 && user_includes.present?
+      @count = klass.count if record_select_config.pagination?
       @count = @count.length if @count.is_a? ActiveSupport::OrderedHash
       pager = ::Paginator.new(@count, record_select_config.per_page) do |offset, per_page|
-        klass.select(record_select_select).includes(record_select_config.include).order(record_select_config.order_by).limit(per_page).offset(offset).to_a
+        search = record_select_select ? klass.select(record_select_select) : klass
+        search = search.limit(per_page).offset(offset) if record_select_config.pagination?
+        search.includes(record_select_config.include).order(record_select_config.order_by).to_a
       end
       @page = pager.page(params[:page] || 1)
 

data/lib/record_select/conditions.rb

@@ -32,7 +32,6 @@ module RecordSelect
     # mainly to define extra fields that can be used for 
     # specialized sorting.
     def record_select_select
-      '*'
     end
 
     # generate conditions from params[:search]

data/lib/record_select/config.rb

@@ -3,20 +3,14 @@ module RecordSelect
   class Config
     def initialize(klass, options = {})
       @klass = klass
-
       @notify = block_given? ? proc : options[:notify]
-
       @per_page = options[:per_page]
-
       @search_on = [options[:search_on]].flatten unless options[:search_on].nil?
-
       @order_by = options[:order_by]
-
       @full_text_search = options[:full_text_search]
-
       @label = options[:label]
-
       @include = options[:include]
+      @pagination = options.include?(:pagination) ? options[:pagination] : true
     end
     
     def self.js_framework=(framework)
@@ -31,6 +25,10 @@ module RecordSelect
       end
     end
 
+    def pagination?
+      @pagination
+    end
+
     # The model object we're browsing
     def model
       @model ||= klass.to_s.camelcase.constantize

data/lib/record_select/helpers/record_select_helper.rb

@@ -13,7 +13,7 @@ module RecordSelectHelper
 
     assert_controller_responds(options[:params][:controller])
 
-    html = link_to_function(name, '', options[:html])
+    html = link_to(name, '#', options[:html])
     html << javascript_tag("new RecordSelect.Dialog(#{options[:html][:id].to_json}, #{url_for(options[:params]).to_json}, {onselect: #{options[:onselect] || ''}})")
 
     return html
@@ -37,8 +37,6 @@ module RecordSelectHelper
     options[:class] ||= ''
     options[:class] << ' recordselect'
 
-    ActiveSupport::Deprecation.warn 'onchange option is deprecated. Bind recordselect:change event instead.' if options[:onchange]
-
     controller = assert_controller_responds(options.delete(:controller))
     params = options.delete(:params)
     record_select_options = {}
@@ -72,8 +70,6 @@ module RecordSelectHelper
     options[:class] ||= ''
     options[:class] << ' recordselect'
 
-    ActiveSupport::Deprecation.warn 'onchange option is deprecated. Bind recordselect:change event instead.' if options[:onchange]
-
     controller = assert_controller_responds(options.delete(:controller))
     params = options.delete(:params)
     record_select_options = {}
@@ -88,23 +84,6 @@ module RecordSelectHelper
     return html
   end
 
-  # Assists with the creation of an observer for the :onchange option of the record_select_field method.
-  # Currently only supports building an Ajax.Request based on the id of the selected record.
-  #
-  # options[:url] should be a hash with all the necessary options *except* :id. that parameter
-  # will be provided based on the selected record.
-  #
-  # Question: if selecting users, what's more likely?
-  #   /users/5/categories
-  #   /categories?user_id=5
-  def record_select_observer(options = {})
-    fn = ""
-    fn << "function(id, value) {"
-    fn <<   "var url = #{url_for(options[:url].merge(:id => ":id:")).to_json}.replace(/:id:/, id);"
-    fn <<   "new Ajax.Request(url);"
-    fn << "}"
-  end
-
   # Adds a RecordSelect-based form field for multiple selections. The values submit using a list of hidden inputs.
   #
   # *Arguments*
@@ -132,10 +111,8 @@ module RecordSelectHelper
     html << hidden_field_tag("#{name}[]", '', :id => nil)
     html << content_tag('ul', '', :class => 'record-select-list');
 
-    # js identifier so we can talk to it.
-    widget = "rs_%s" % name.gsub(/[\[\]]/, '_').chomp('_')
     url = url_for({:action => :browse, :controller => controller.controller_path}.merge(params))
-    html << javascript_tag("#{widget} = new RecordSelect.Multiple(#{options[:id].to_json}, #{url.to_json}, #{record_select_options.to_json});")
+    html << javascript_tag("new RecordSelect.Multiple(#{options[:id].to_json}, #{url.to_json}, #{record_select_options.to_json});")
 
     return html
   end

data/lib/record_select/version.rb

@@ -2,7 +2,7 @@ module RecordSelect
   module Version
     MAJOR = 3
     MINOR = 3
-    PATCH = 6
+    PATCH = 7
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: recordselect
 version: !ruby/object:Gem::Version 
-  version: 3.3.6
+  hash: 5
+  prerelease: 
+  segments: 
+  - 3
+  - 3
+  - 7
+  version: 3.3.7
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -11,39 +17,54 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-05-20 00:00:00 Z
+date: 2014-09-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - &id004 
-      - ">="
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   version_requirements: *id001
-  prerelease: false
-  type: :development
   name: shoulda
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   version_requirements: *id002
-  prerelease: false
-  type: :development
   name: bundler
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        - 3
         version: 3.1.3
   version_requirements: *id003
-  prerelease: false
-  type: :runtime
   name: rails
+  prerelease: false
 description: RecordSelect is a Rails widget to help you pick one record out of many. I designed it as a more usable and performant alternative to generating a massive dropdown list
 email: activescaffold@googlegroups.com
 executables: []
@@ -80,31 +101,40 @@ files:
 - lib/recordselect.rb
 - vendor/assets/javascripts/jquery.visible.min.js
 - MIT-LICENSE
-- CHANGELOG
 - README
 - test/recordselect_test.rb
 homepage: http://github.com/scambra/recordselect
 licenses: 
 - MIT
-metadata: {}
-
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - *id004
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - *id004
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 1.8.29
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: RecordSelect widget as a replacement for massive drop down lists
 test_files: 
 - test/recordselect_test.rb

checksums.yaml

@@ -1,7 +0,0 @@
---- 
-SHA512: 
-  metadata.gz: 96e935c1dd9b5a9d862c2ce81b5de91cf93e049579cc44bf86b0c1eccfa3837ff0ac255993179c51c46e406f31ff6a8c568c074a9434c743a630b7089ef19c55
-  data.tar.gz: 2ff6e3c2b1616188c9ce3cf30972b51d909bc0d94e13e7094e9ebbdf30368d3690c3fc1286cefd94c1e8e8592459588822e6911ad4c729465eea37e2a108e919
-SHA1: 
-  metadata.gz: c3f0107ec456816f71388d623c3ed258c0876601
-  data.tar.gz: efeca11a9905d60ffe6ef1420aa3aaed394dc9ba

data/CHANGELOG

@@ -1,25 +0,0 @@
-1.0
-* record_select_field always searches on the latest string
-* R.S. dialog closes on mousedown instead of click (because sometimes clicks are intercepted)
-* R.S. layers over <select> boxes in IE 6
-* record_select_field now opens R.S. even when the field loads with focus
-* new :onchange option for record_select_field, to observe selection events
-
-1.0rc1
-* helpers complain if the controller they're configured for doesn't use recordselect
-* when using keyboard navigation, hitting "enter" to select a record no longer submits the form
-* if text field is empty when dialog is closed, then recordselect will empty the hidden field as well (lets you deselect)
-* support for multiple selections (record_multi_select_helper)
-* param-based search conditions are smarter - can search numeric fields as well
-* using record_select_conditions_from_controller instead of conditions_for_collection. also added a new record_select_includes override method.
-* helpers now accept a :class option
-* fixed bug with url escaping when helpers were configured with multiple parameters
-* new :label configuration option. it's a proc - the default one calls record.to_label (for backwards compatibility).
-* cleaned up merge_conditions to use activerecord's sanitize_sql.
-* div.record-select-container now has a high z-index so it will by default be visible above other absolutely positioned elements.
-
-0.9
-stuff
-
-0.1
-stuff