kashiwamochi 0.4.2 → 0.4.3

data/lib/kashiwamochi/action_view.rb

@@ -8,18 +8,13 @@ module Kashiwamochi
       options[:url] ||= url_for
       options[:as] ||= Kashiwamochi.config.search_key
       options[:method] ||= :get
-      options[:html] ||= {}
-      options[:html].tap do |html|
-        html[:id] ||= "#{options[:as]}_#{Kashiwamochi.config.form_class}"
-        html[:class] = [
-          html[:class] || "#{options[:as]}_#{Kashiwamochi.config.form_class}",
-          "#{Kashiwamochi.config.form_class}"
-        ].compact.join(' ')
-        html[:method] ||= :get
-      end
+
+      html_options = options[:html] ||= {}
+      html_options[:id] ||= "#{options[:as]}_#{Kashiwamochi.config.form_class}"
+      html_options[:class] = [Kashiwamochi.config.form_class, html_options[:class]].compact.join(' ')
 
       form_method = options.delete(:form_method) || Kashiwamochi.config.form_method
-      send(form_method, query, *(args << options), &block)
+      __send__(form_method, query, *(args << options), &block)
     end
 
     def search_sort_link_to(query, attribute, *args)

data/lib/kashiwamochi/query.rb

@@ -3,7 +3,7 @@ require 'active_support/core_ext/hash/indifferent_access'
 
 module Kashiwamochi
   class Query
-    attr_accessor :search_params, :sort_params
+    attr_reader :search_params, :sort_params
 
     def initialize(attributes = {})
       @search_params = ActiveSupport::OrderedHash.new.with_indifferent_access
@@ -105,5 +105,9 @@ module Kashiwamochi
     def persisted?
       false
     end
+
+    def searched?
+      !@search_params.empty? || !@sort_params.empty?
+    end
   end
 end

data/lib/kashiwamochi/version.rb

@@ -1,3 +1,3 @@
 module Kashiwamochi
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/helpers/action_view_spec.rb

@@ -2,15 +2,37 @@ require 'spec_helper'
 
 describe Kashiwamochi::ActionView do
   describe '#search_form_for' do
+    def with_concat_form_for(*args, &block)
+      concat helper.search_form_for(*args, &(block || proc {}))
+    end
+
     before do
       @q = Kashiwamochi::Query.new(:name => 'test', :s => 'name desc')
-      helper.search_form_for @q, :url => {:controller => 'users', :action => 'index'} do |f|
-        @f = f
+    end
+
+    describe 'instance of' do
+      before do
+        helper.search_form_for @q, :url => {:controller => 'users', :action => 'index'} do |f|
+          @f = f
+        end
       end
+      subject { @f }
+      it { should be_an_instance_of ActionView::Helpers::FormBuilder }
+    end
+
+    describe 'default id and class' do
+      before { @buffer = with_concat_form_for(@q, :url => '/') }
+      subject { @buffer }
+      it { should match %r(id="q_search") }
+      it { should match %r(class="search") }
     end
-    subject { @f }
 
-    it { should be_an_instance_of ActionView::Helpers::FormBuilder }
+    describe 'user id and class' do
+      before { @buffer = with_concat_form_for(@q, :url => '/', :html => {:id => 'aaa', :class => 'bbb'}) }
+      subject { @buffer }
+      it { should match %r(id="aaa") }
+      it { should match %r(class="search bbb") }
+    end
   end
 
   describe '#search_sort_link_to' do

data/spec/kashiwamochi/query_spec.rb

@@ -90,6 +90,20 @@ describe Kashiwamochi::Query do
     end
   end
 
+  describe '#searched?' do
+    context 'with query' do
+      before { @q = Kashiwamochi::Query.new(:name => 'aira', :s => ["created_at desc"]) }
+      subject { @q }
+      it { should be_searched }
+    end
+
+    context 'without query' do
+      before { @q = Kashiwamochi::Query.new }
+      subject { @q }
+      it { should_not be_searched }
+    end
+  end
+
   describe '#to_option' do
     before { @q = Kashiwamochi::Query.new(:name => 'aira', :s => ["created_at desc"]) }
     subject { @q.to_option }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kashiwamochi
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-02 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -154,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2847632178335067109
+      hash: -4114840748124176109
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -163,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2847632178335067109
+      hash: -4114840748124176109
 requirements: []
 rubyforge_project: kashiwamochi
 rubygems_version: 1.8.21