kashiwamochi 0.4.3 → 0.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9f9f22b3c12ccc37765e82e8ff5b194375a52b9c
+  data.tar.gz: 9d573b7fddf42d4606a51d70e37cc85fe0a8d25d
+SHA512:
+  metadata.gz: 3d9853214c276ebd53fa8ba935dbb18f7d98f379c04dc61c15f590ae9dae2c581c4b71d6e29f0b1f7337e976626f143c667a20756dd690abafe8eb4538ea0625
+  data.tar.gz: 7270e911ac99bfbf069eeab9e33f4392be782e7e34c0e337c17af2c13d1da3863d199715f4029146b7f876abdf30271f70c17ad37c1fce4f9c2a541dd653bc35

data/README.md

@@ -15,6 +15,7 @@ gem 'kashiwamochi'
 
 ### In your controllers
 
+#### Build query
 ```ruby
 # use before_filter.
 before_filter :build_query!, :only => [:index]
@@ -22,9 +23,18 @@ before_filter :build_query!, :only => [:index]
 # or write directly.
 def index
   @q = Kashiwamochi.build(params[:q])
-  @users = User.where(:name => @q.name)
 end
+```
+
+#### Use query
+```ruby
+# basic
+@users = User.where(:name => @q.name)
+             .order(@q.sorts(:age))
 
+# mapped order
+@users = User.where(:name => @q.name)
+             .order(@q.sorts(:age => 'years'))
 ```
 
 ### In your views

data/lib/kashiwamochi/query.rb

@@ -6,8 +6,8 @@ module Kashiwamochi
     attr_reader :search_params, :sort_params
 
     def initialize(attributes = {})
-      @search_params = ActiveSupport::OrderedHash.new.with_indifferent_access
-      @sort_params = ActiveSupport::OrderedHash.new.with_indifferent_access
+      @search_params = {}.with_indifferent_access
+      @sort_params = {}.with_indifferent_access
       sort_key = Kashiwamochi.config.sort_key.to_s
 
       attributes.each do |key, value|
@@ -62,24 +62,25 @@ module Kashiwamochi
       end
     end
 
-    def sorts_query(*keys)
-      options = keys.extract_options!
+    def sorts_query(*args)
+      if args.first.is_a? Hash
+        params = args.first
+      else
+        params = Hash[*args.map { |v| [v, v] }.flatten]
+      end
 
-      allowed_keys = keys.flatten.map(&:to_s).uniq
+      params.stringify_keys!
       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
+      if params.empty?
         allowed_sorts = @sort_params.values
+      else
+        allowed_sorts = params.keys.map { |k| @sort_params[k] }
+        allowed_sorts.reject! { |s| s.nil? }
       end
 
-      allowed_sorts.empty? ? nil : allowed_sorts.map(&:to_query).join(', ')
+      return nil if allowed_sorts.empty?
+      allowed_sorts.map { |s| s.to_query(params[s.key]) }.join(', ')
     end
     alias_method :sorts, :sorts_query
 

data/lib/kashiwamochi/sort.rb

@@ -44,8 +44,8 @@ module Kashiwamochi
       !@key.empty?
     end
 
-    def to_query
-      "#{key} #{dir}"
+    def to_query(map = nil)
+      "#{map || key} #{dir}"
     end
 
     def inspect

data/lib/kashiwamochi/version.rb

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

data/spec/kashiwamochi/query_spec.rb

@@ -40,7 +40,7 @@ describe Kashiwamochi::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) }
+        subject { @q.sorts_query(*keys) }
 
         context 'with empty' do
           let(:keys) { [] }
@@ -73,18 +73,18 @@ describe Kashiwamochi::Query do
         end
       end
 
-      context 'unordered' do
+      context 'mapping' do
         before { @q = Kashiwamochi::Query.new(:s => ['name asc', '  ', 'created_at desc']) }
-        subject { @q.sorts_query(keys, :unordered => true) }
+        subject { @q.sorts_query(*keys) }
 
-        context 'with [:name, :created_at]' do
-          let(:keys) { [:name, :created_at] }
-          it { should eq 'name asc, created_at desc' }
+        context "with :name => 'mapped_name'" do
+          let(:keys) { {:name => 'mapped_name'} }
+          it { should eq 'mapped_name asc' }
         end
 
-        context 'with [:created_at, :name]' do
-          let(:keys) { [:created_at, :name] }
-          it { should eq 'name asc, created_at desc' }
+        context "with :created_at => 'mapped_created_at', :name => 'mapped_name'" do
+          let(:keys) { {:created_at => 'mapped_created_at', :name => 'mapped_name'} }
+          it { should eq 'mapped_created_at desc, mapped_name asc' }
         end
       end
     end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: kashiwamochi
 version: !ruby/object:Gem::Version
-  version: 0.4.3
-  prerelease: 
+  version: 0.5.0
 platform: ruby
 authors:
 - mashiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,65 +41,57 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Searching form and sorting query builder
@@ -142,32 +129,25 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/mashiro/kashiwamochi
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4114840748124176109
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4114840748124176109
 requirements: []
 rubyforge_project: kashiwamochi
-rubygems_version: 1.8.21
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Minimal searchng extension for Rails 3
 test_files: []