kashiwamochi 0.3.0 → 0.4.0

data/lib/kashiwamochi/action_view.rb

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

data/lib/kashiwamochi/query.rb

@@ -3,17 +3,19 @@ require 'active_support/core_ext/hash/indifferent_access'
 
 module Kashiwamochi
   class Query
-    attr_accessor :search_params, :sort_param
+    attr_accessor :search_params, :sort_params
 
     def initialize(attributes = {})
-      attributes = attributes.dup
-      attributes.with_indifferent_access
-
       @search_params = ActiveSupport::OrderedHash.new.with_indifferent_access
-      @sort_param = Sort.parse(attributes.delete(Kashiwamochi.config.sort_key))
+      @sort_params = ActiveSupport::OrderedHash.new.with_indifferent_access
+      sort_key = Kashiwamochi.config.sort_key.to_s
 
       attributes.each do |key, value|
-        add_search_param(key, value)
+        if key.to_s == sort_key
+          add_sort_param key, value
+        else
+          add_search_param key, value
+        end
       end
     end
 
@@ -33,6 +35,14 @@ module Kashiwamochi
       @search_params[search.key] = search
     end
 
+    def add_sort_param(key, value)
+      values = Array(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
@@ -52,24 +62,44 @@ module Kashiwamochi
       end
     end
 
-    def sort_query(*keys)
+    def sorts_query(*keys)
+      options = keys.extract_options!
+
       allowed_keys = keys.flatten.map(&:to_s).uniq
-      if allowed_keys.empty? || allowed_keys.include?(@sort_param.key.to_s)
-        @sort_param.to_query
+      allowed_sorts = []
+
+      unless allowed_keys.empty?
+        if options[:unordered]
+          allowed_sorts = @sort_params.values
+          allowed_sorts.reject! { |s| !allowed_keys.include?(s.key.to_s) }
+        else
+          allowed_keys.each { |key| allowed_sorts << @sort_params[key] if @sort_params.key? key }
+        end
       else
-        nil
+        allowed_sorts = @sort_params.values
       end
+
+      allowed_sorts.empty? ? nil : allowed_sorts.map(&:to_query).join(', ')
     end
-    alias_method :sort, :sort_query
+    alias_method :sorts, :sorts_query
+
+    def to_option(*sort_keys)
+      sort_keys = sort_keys.flatten.map(&:to_s).uniq
+      sorts = @sort_params.values
+      sorts.reject! { |s| !sort_keys.include?(s.key.to_s) } unless sort_keys.empty?
 
-    def to_option
       hash = Hash[*@search_params.values.map { |search| [search.key, search.value] }.flatten]
-      hash[Kashiwamochi.config.sort_key] = @sort_param.to_query
+      unless sorts.empty?
+        hash[Kashiwamochi.config.sort_key] = case sorts.length
+                                             when 1 then sorts.first.to_query
+                                             else        sorts.map(&:to_query)
+                                             end
+      end
       hash
     end
 
     def inspect
-      "<Query search: #{@search_params}, sort: #{@sort_param}>"
+      "<Query search: #{@search_params}, sort: #{@sort_params}>"
     end
 
     def persisted?

data/lib/kashiwamochi/version.rb

@@ -1,3 +1,3 @@
 module Kashiwamochi
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 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"]}' do
-      before { @q = Kashiwamochi::Query.new(:foo => 1, :bar => 2, :to_s => 3, :s => "name asc") }
+    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']) }
       subject { @q }
 
       describe 'length' do
@@ -11,6 +11,11 @@ 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
 
       describe 'having' do
@@ -31,40 +36,62 @@ describe Kashiwamochi::Query do
     end
   end
 
-  describe '#sort_query' do
-    context 'build with {:s => "name asc"}' do
-      before { @q = Kashiwamochi::Query.new(:s => "name asc") }
-      subject { @q.sort_query(keys) }
+  describe '#sorts_query' do
+    context "build with {:s => ['name asc', '  ', 'created_at desc']}" do
+      context 'default' do
+        before { @q = Kashiwamochi::Query.new(:s => ['name asc', '  ', 'created_at desc']) }
+        subject { @q.sorts_query(keys) }
 
-      context 'with empty' do
-        let(:keys) { [] }
-        it { should eq 'name asc' }
-      end
+        context 'with empty' do
+          let(:keys) { [] }
+          it { should eq 'name asc, created_at desc' }
+        end
 
-      context 'with :name' do
-        let(:keys) { [:name] }
-        it { should eq 'name asc' }
-      end
+        context 'with :name' do
+          let(:keys) { [:name] }
+          it { should eq 'name asc' }
+        end
 
-      context 'with :created_at' do
-        let(:keys) { [:created_at] }
-        it { should be_nil }
-      end
+        context 'with :created_at' do
+          let(:keys) { [:created_at] }
+          it { should eq 'created_at desc' }
+        end
 
-      context 'with [:name, :created_at]' do
-        let(:keys) { [:name, :created_at] }
-        it { should eq 'name asc' }
+        context 'with [:name, :created_at]' do
+          let(:keys) { [:name, :created_at] }
+          it { should eq 'name asc, created_at desc' }
+        end
+
+        context 'with [:created_at, :name]' do
+          let(:keys) { [:created_at, :name] }
+          it { should eq 'created_at desc, name asc' }
+        end
+
+        context 'with [:foo, :bar]' do
+          let(:keys) { [:foo, :bar] }
+          it { should be_nil }
+        end
       end
 
-      context 'with [:foo, :bar]' do
-        let(:keys) { [:foo, :bar] }
-        it { should be_nil }
+      context 'unordered' do
+        before { @q = Kashiwamochi::Query.new(:s => ['name asc', '  ', 'created_at desc']) }
+        subject { @q.sorts_query(keys, :unordered => true) }
+
+        context 'with [:name, :created_at]' do
+          let(:keys) { [:name, :created_at] }
+          it { should eq 'name asc, created_at desc' }
+        end
+
+        context 'with [:created_at, :name]' do
+          let(:keys) { [:created_at, :name] }
+          it { should eq 'name asc, created_at desc' }
+        end
       end
     end
   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'}) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kashiwamochi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-05-02 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: 373352056748660302
+      hash: -3790293919526034477
 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: 373352056748660302
+      hash: -3790293919526034477
 requirements: []
 rubyforge_project: kashiwamochi
 rubygems_version: 1.8.21