ransack_ui 0.0.2 → 0.0.3

data/app/views/ransack/_advanced_search.html.haml

@@ -1,10 +1,10 @@
 = search_form_for search, :url => url_for(:action => :index), :html => {:method => :get, :class => "advanced_search"}, :remote => true do |f|
 
   = f.grouping_fields do |g|
-    = render 'ransack/grouping_fields', :f => g, :options => options
+    = render 'ransack/grouping_fields', :f => g
 
   %p
-    = link_to_add_fields t(:advanced_search_add_group), f, :grouping, options
+    = link_to_add_fields t(:advanced_search_add_group), f, :grouping
 
   %p
     = hidden_field_tag :distinct, '1'

data/app/views/ransack/_condition_fields.html.haml

@@ -4,9 +4,9 @@
 
     = f.attribute_fields do |a|
       %span.fields{ "data-object-name" => f.object_name }
-      = a.attribute_select({:associations => %w(account tags activities emails addresses)}, :class => 'ransack_attribute')
+      = a.attribute_select({}, :class => 'ransack_attribute')
 
-    = f.predicate_select options[:predicate_options] || {}, :class => 'ransack_predicate'
+    = f.predicate_select({}, :class => 'ransack_predicate')
 
     = f.value_fields do |v|
       %span.fields.value{ 'data-object-name' => f.object_name }

data/app/views/ransack/_grouping_fields.html.haml

@@ -6,7 +6,7 @@
   .filters
     - f.object.build_condition unless f.object.conditions.any?
     = f.condition_fields do |c|
-      = render 'ransack/condition_fields', :f => c, :options => options
+      = render 'ransack/condition_fields', :f => c
 
     %p
-      = link_to_add_fields t(:advanced_search_add_condition), f, :condition, options
+      = link_to_add_fields t(:advanced_search_add_condition), f, :condition

data/app/views/ransack/_search.html.haml

@@ -6,8 +6,8 @@
       %li
         = link_to 'Advanced Search', '#', :"data-search-form" => "advanced_search", :class => (!params[:q] ? "" : " active")
 
-  .search_form#basic_search{ hidden_if(params[:q]) }
-    = render "ransack/basic_search", :options => options
+  .search_form#basic_search{ :style => (params[:q] ? 'display: none;' : '') }
+    = render "ransack/basic_search"
 
-  .search_form#advanced_search{ hidden_if(!params[:q]) }
-    = render "ransack/advanced_search", :options => options
+  .search_form#advanced_search{ :style => (!params[:q] ? 'display: none;' : '') }
+    = render "ransack/advanced_search"

data/lib/ransack_ui/ransack_overrides/adapters/active_record/base.rb

@@ -10,7 +10,32 @@ module Ransack
           columns.map{|c| [c.name, c.type] } +
           _ransackers.keys.map {|k| [k, :string] }
         end
+
+        def self.extended(base)
+          alias :search :ransack unless base.method_defined? :search
+          base.class_eval do
+            class_attribute :_ransackers
+            class_attribute :_ransackable_associations
+            self._ransackers ||= {}
+            self._ransackable_associations ||= []
+          end
+        end
+
+        def has_ransackable_associations(associations)
+          self._ransackable_associations = associations
+        end
+
+        def ransackable_associations(auth_object = nil)
+          all_associations = reflect_on_all_associations.map {|a| a.name.to_s}
+          if self._ransackable_associations.any?
+            # Return intersection of all associations, and associations defined on the model
+            all_associations & self._ransackable_associations
+          else
+            all_associations
+          end
+        end
+
       end
     end
   end
-end
+end

data/lib/ransack_ui/ransack_overrides/configuration.rb

@@ -0,0 +1,11 @@
+require 'ransack/configuration'
+
+module Ransack
+  Configuration.class_eval do
+    # Set default predicate options for predicate_select in form builder
+    # This is ignored if any options are passed
+    def default_predicates=(options)
+      self.options[:default_predicates] = options
+    end
+  end
+end

data/lib/ransack_ui/ransack_overrides/helpers/form_builder.rb

@@ -6,6 +6,12 @@ module Ransack
       def attribute_select(options = {}, html_options = {})
         raise ArgumentError, "attribute_select must be called inside a search FormBuilder!" unless object.respond_to?(:context)
         options[:include_blank] = true unless options.has_key?(:include_blank)
+
+        # Set default associations set on model with 'has_ransackable_associations'
+        if options[:associations].nil?
+          options[:associations] = object.context.klass.ransackable_associations
+        end
+
         bases = [''] + association_array(options[:associations])
         if bases.size > 1
           @template.select(
@@ -27,6 +33,20 @@ module Ransack
         end
       end
 
+      def predicate_select(options = {}, html_options = {})
+        options = Ransack.options[:default_predicates] || {} if options.blank?
+
+        options[:compounds] = true if options[:compounds].nil?
+        keys = predicate_keys(options)
+        # If condition is newly built with build_condition(),
+        # then replace the default predicate with the first in the ordered list
+        @object.predicate_name = keys.first if @object.default?
+        @template.collection_select(
+          @object_name, :p, keys.map {|k| [k, Translate.predicate(k)]}, :first, :last,
+          objectify_options(options), @default_options.merge(html_options)
+        )
+      end
+
       def attribute_collection_for_bases(bases)
         bases.map do |base|
           begin

data/lib/ransack_ui/version.rb

@@ -1,3 +1,3 @@
 module RansackUI
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/ransack_ui/view_helpers.rb

@@ -1,13 +1,13 @@
 module RansackUI
   module ViewHelpers
-    def ransack_search_form(options={})
-      render 'ransack/search', :options => options
+    def ransack_search_form
+      render 'ransack/search'
     end
 
-    def link_to_add_fields(name, f, type, options={})
+    def link_to_add_fields(name, f, type)
       new_object = f.object.send "build_#{type}"
       fields = f.send("#{type}_fields", new_object, :child_index => "new_#{type}") do |builder|
-        render "ransack/#{type.to_s}_fields", :f => builder, :options => options
+        render "ransack/#{type.to_s}_fields", :f => builder
       end
       link_to name, nil, :class => "add_fields", "data-field-type" => type, "data-content" => "#{fields}"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack_ui
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-05 00:00:00.000000000 Z
+date: 2012-11-06 00:00:00.000000000 Z
 dependencies: []
 description: Framework for building a search UI with Ransack
 email:
@@ -36,6 +36,7 @@ files:
 - lib/ransack_ui.rb
 - lib/ransack_ui/rails/engine.rb
 - lib/ransack_ui/ransack_overrides/adapters/active_record/base.rb
+- lib/ransack_ui/ransack_overrides/configuration.rb
 - lib/ransack_ui/ransack_overrides/context.rb
 - lib/ransack_ui/ransack_overrides/helpers/form_builder.rb
 - lib/ransack_ui/version.rb
@@ -56,7 +57,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3873248513587750645
+      hash: -2955605175423395892
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -65,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3873248513587750645
+      hash: -2955605175423395892
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24