kashiwamochi 0.2.3 → 0.3.0

data/lib/kashiwamochi/action_view.rb

@@ -27,16 +27,22 @@ module Kashiwamochi
       html_options = options.delete(:html_options) || {}
       default_order = options.delete(:default_order)
 
+      query = query.dup
       attr_name = attribute.to_s
-      sort = query.sort_params[attr_name] || Kashiwamochi::Sort.new(attr_name, default_order)
+      current_sort = query.sort_param
 
-      html_options[:class] = [
-        html_options[:class] || "#{attr_name}_#{Kashiwamochi.config.sort_link_class}",
-        Kashiwamochi.config.sort_link_class,
-        sort.dir.downcase
-      ].compact.join(' ')
+      classes = []
+      classes << (html_options[:class] || "#{attr_name}_#{Kashiwamochi.config.sort_link_class}")
+      classes << Kashiwamochi.config.sort_link_class
 
-      query.sort_params[attr_name] = sort.toggle!
+      if current_sort.valid? && current_sort.key.to_s == attr_name
+        classes << current_sort.dir.downcase
+        query.sort_param = current_sort.toggle
+      else
+        query.sort_param = Kashiwamochi::Sort.new(attr_name, default_order)
+      end
+
+      html_options[:class] = classes.compact.join(' ')
       options[Kashiwamochi.config.search_key] = query.to_option
 
       name = args.shift || attr_name

data/lib/kashiwamochi/query.rb

@@ -1,21 +1,19 @@
 require 'active_support/ordered_hash'
+require 'active_support/core_ext/hash/indifferent_access'
 
 module Kashiwamochi
   class Query
-    attr_accessor :search_params, :sort_params
+    attr_accessor :search_params, :sort_param
 
     def initialize(attributes = {})
-      @search_params = ActiveSupport::OrderedHash.new.with_indifferent_access
-      @sort_params = ActiveSupport::OrderedHash.new.with_indifferent_access
+      attributes = attributes.dup
+      attributes.with_indifferent_access
 
-      sort_key = Kashiwamochi.config.sort_key.to_s
+      @search_params = ActiveSupport::OrderedHash.new.with_indifferent_access
+      @sort_param = Sort.parse(attributes.delete(Kashiwamochi.config.sort_key))
 
       attributes.each do |key, value|
-        if key.to_s == sort_key
-          add_sort_param(key, value)
-        else
-          add_search_param(key, value)
-        end
+        add_search_param(key, value)
       end
     end
 
@@ -23,7 +21,7 @@ module Kashiwamochi
       unless @search_params.key? key
         instance_eval <<-METHOD
           def attribute_#{key}
-            search = @search_params["#{key}"]
+            search = @search_params[:#{key}]
             search.value
           end
           alias original_#{key} #{key} if defined? #{key}
@@ -35,14 +33,6 @@ module Kashiwamochi
       @search_params[search.key] = search
     end
 
-    def add_sort_param(key, value)
-      values = value.is_a?(Array) ? value : [value]
-      values.each do |v|
-        sort = Sort.parse(v)
-        @sort_params[sort.key] = sort if sort.valid?
-      end
-    end
-
     def respond_to?(method_id, include_private = false)
       super || respond_to_missing?(method_id, include_private)
     end
@@ -62,23 +52,24 @@ module Kashiwamochi
       end
     end
 
-    def sorts_query(*keys)
+    def sort_query(*keys)
       allowed_keys = keys.flatten.map(&:to_s).uniq
-      allowed_sorts = @sort_params.values.reject do |sort|
-        !allowed_keys.empty? && !allowed_keys.include?(sort.key.to_s)
+      if allowed_keys.empty? || allowed_keys.include?(@sort_param.key.to_s)
+        @sort_param.to_query
+      else
+        nil
       end
-      allowed_sorts.empty? ? nil : allowed_sorts.map(&:to_query).join(', ')
     end
-    alias_method :sorts, :sorts_query
+    alias_method :sort, :sort_query
 
     def to_option
       hash = Hash[*@search_params.values.map { |search| [search.key, search.value] }.flatten]
-      hash[Kashiwamochi.config.sort_key] = @sort_params.values.map(&:to_query)
+      hash[Kashiwamochi.config.sort_key] = @sort_param.to_query
       hash
     end
 
     def inspect
-      "<Query search: #{@search_params}, sort: #{@sort_params}>"
+      "<Query search: #{@search_params}, sort: #{@sort_param}>"
     end
 
     def persisted?

data/lib/kashiwamochi/sort.rb

@@ -41,7 +41,7 @@ module Kashiwamochi
     end
 
     def valid?
-      @key.present?
+      !@key.empty?
     end
 
     def to_query
@@ -53,6 +53,7 @@ module Kashiwamochi
     end
 
     def self.sanitize(value)
+      value = value.first if value.is_a?(Array)
       value.to_s.strip
     end
 

data/lib/kashiwamochi/version.rb

@@ -1,3 +1,3 @@
 module Kashiwamochi
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/spec/helpers/action_view_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Kashiwamochi::ActionView do
   describe '#search_form_for' do
     before do
-      @q = Kashiwamochi::Query.new(:name => 'test', :s => ['name desc'])
+      @q = Kashiwamochi::Query.new(:name => 'test', :s => 'name desc')
       helper.search_form_for @q, :url => {:controller => 'users', :action => 'index'} do |f|
         @f = f
       end
@@ -14,14 +14,64 @@ describe Kashiwamochi::ActionView do
   end
 
   describe '#search_sort_link_to' do
-    before do
-      @q = Kashiwamochi::Query.new(:name => 'test', :s => ['name desc'])
-      @link = helper.search_sort_link_to(@q, :name, 'User name', :controller => 'users', :action => 'index')
+    context 'with sort' do
+      before do
+        @q = Kashiwamochi::Query.new(:name => 'test', :s => 'name desc')
+        @link1 = helper.search_sort_link_to(@q, :name, 'User name', :controller => 'users', :action => 'index')
+        @link2 = helper.search_sort_link_to(@q, :age, 'User Age', :controller => 'users', :action => 'index')
+        @link3 = helper.search_sort_link_to(@q, :sex, 'User Sex', :controller => 'users', :action => 'index', :default_order => 'desc')
+      end
+
+      describe 'name' do
+        subject { @link1 }
+        it { should match %r(href="/users\?q%5Bname%5D=test&q%5Bs%5D=name\+asc") }
+        it { should match %r(class="name_sort_link sort_link desc") }
+        it { should match %r(User name) }
+      end
+
+      describe 'age' do
+        subject { @link2 }
+        it { should match %r(href="/users\?q%5Bname%5D=test&q%5Bs%5D=age\+asc") }
+        it { should match %r(class="age_sort_link sort_link") }
+        it { should match %r(User Age) }
+      end
+
+      describe 'sex' do
+        subject { @link3 }
+        it { should match %r(href="/users\?q%5Bname%5D=test&q%5Bs%5D=sex\+desc") }
+        it { should match %r(class="sex_sort_link sort_link") }
+        it { should match %r(User Sex) }
+      end
     end
-    subject { @link }
 
-    it { should match %r(href="/users\?q%5Bname%5D=test&q%5Bs%5D%5B%5D=name\+asc") }
-    it { should match %r(class="name_sort_link sort_link desc") }
-    it { should match %r(User name) }
+    context 'without sort' do
+      before do
+        @q = Kashiwamochi::Query.new(:name => 'test')
+        @link1 = helper.search_sort_link_to(@q, :name, 'User name', :controller => 'users', :action => 'index')
+        @link2 = helper.search_sort_link_to(@q, :age, 'User age', :controller => 'users', :action => 'index')
+        @link3 = helper.search_sort_link_to(@q, :sex, 'User sex', :controller => 'users', :action => 'index', :default_order => 'desc')
+      end
+
+      describe 'name' do
+        subject { @link1 }
+        it { should match %r(href="/users\?q%5Bname%5D=test&q%5Bs%5D=name\+asc") }
+        it { should match %r(class="name_sort_link sort_link") }
+        it { should match %r(User name) }
+      end
+
+      describe 'age' do
+        subject { @link2 }
+        it { should match %r(href="/users\?q%5Bname%5D=test&q%5Bs%5D=age\+asc") }
+        it { should match %r(class="age_sort_link sort_link") }
+        it { should match %r(User age) }
+      end
+
+      describe 'sex' do
+        subject { @link3 }
+        it { should match %r(href="/users\?q%5Bname%5D=test&q%5Bs%5D=sex\+desc") }
+        it { should match %r(class="sex_sort_link sort_link") }
+        it { should match %r(User sex) }
+      end
+    end
   end
 end

data/spec/kashiwamochi/query_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe Kashiwamochi::Query do
   describe '#initialize' do
-    context 'with {:foo => 1, :bar => 2, :to_s => 3, :s => ["name asc", "  ", "created_at desc"]}' do
-      before { @q = Kashiwamochi::Query.new(:foo => 1, :bar => 2, :to_s => 3, :s => ["name asc", "  ", "created_at desc"]) }
+    context 'with {:foo => 1, :bar => 2, :to_s => 3, :s => "name asc"]}' do
+      before { @q = Kashiwamochi::Query.new(:foo => 1, :bar => 2, :to_s => 3, :s => "name asc") }
       subject { @q }
 
       describe 'length' do
@@ -11,24 +11,19 @@ describe Kashiwamochi::Query do
           subject { @q.search_params }
           its(:length) { should eq 3 }
         end
-
-        context 'sort_params' do
-          subject { @q.sort_params }
-          its(:length) { should eq 2 }
-        end
       end
 
-      context 'having' do
+      describe 'having' do
         its(:foo) { should eq 1 }
         its(:bar) { should eq 2 }
         its(:to_s) { should eq 3 }
       end
 
-      context 'missing' do
+      describe 'missing' do
         its(:buzz) { should be_nil }
       end
 
-      context 'alias' do
+      describe 'alias' do
         its(:attribute_foo) { should eq 1 }
         its(:original_to_s) { should be_an_instance_of String }
       end
@@ -36,14 +31,14 @@ describe Kashiwamochi::Query do
     end
   end
 
-  describe '#sorts_query' do
-    context 'build with {:s => ["name asc", "  ", "created_at desc"]}' do
-      before { @q = Kashiwamochi::Query.new(:s => ["name asc", "  ", "created_at desc"]) }
-      subject { @q.sorts_query(keys) }
+  describe '#sort_query' do
+    context 'build with {:s => "name asc"}' do
+      before { @q = Kashiwamochi::Query.new(:s => "name asc") }
+      subject { @q.sort_query(keys) }
 
       context 'with empty' do
         let(:keys) { [] }
-        it { should eq 'name asc, created_at desc' }
+        it { should eq 'name asc' }
       end
 
       context 'with :name' do
@@ -53,12 +48,12 @@ describe Kashiwamochi::Query do
 
       context 'with :created_at' do
         let(:keys) { [:created_at] }
-        it { should eq 'created_at desc' }
+        it { should be_nil }
       end
 
       context 'with [:name, :created_at]' do
         let(:keys) { [:name, :created_at] }
-        it { should eq 'name asc, created_at desc' }
+        it { should eq 'name asc' }
       end
 
       context 'with [:foo, :bar]' do
@@ -69,10 +64,10 @@ describe Kashiwamochi::Query do
   end
 
   describe '#to_option' do
-    before { @q = Kashiwamochi::Query.new(:name => 'aira', :s => ["created_at desc"]) }
+    before { @q = Kashiwamochi::Query.new(:name => 'aira', :s => "created_at desc") }
     subject { @q.to_option }
     it { should be_an_instance_of Hash }
-    it { should eq ({:name => 'aira', :s => ['created_at desc']}) }
+    it { should eq ({:name => 'aira', :s => 'created_at desc'}) }
   end
 
   describe '#build' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kashiwamochi
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -152,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 743234285744904988
+      hash: 373352056748660302
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 743234285744904988
+      hash: 373352056748660302
 requirements: []
 rubyforge_project: kashiwamochi
 rubygems_version: 1.8.21