mongo-search 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mongo-search (0.0.1)
+    mongo-search (0.0.3)
 
 GEM
   remote: http://rubygems.org/

data/lib/mongo-search/sorter.rb

@@ -2,6 +2,7 @@ module MongoSearch
   class Sorter
     def initialize(attr, opts = nil)
       @attr, @opts = attr, opts || {}
+      @mappings    = @opts[:mappings] || {}
     end
 
     def call(params)
@@ -10,9 +11,9 @@ module MongoSearch
       if order_by = params[@attr] || @opts[:default]
         order_by.split(/\s*,\s*/).each do |attr_order|
           if attr_order =~ /([^\s]+)(?:\s*(asc|desc)?)$/
-            attr_name, dir = $1, ($2 || :asc)
-            sort << [:"#{attr_name}_ordenacao", :"#{dir}"]
-            sort << [:"#{attr_name}", :"#{dir}"]
+            attr_name, dir = $1.to_sym, ($2 || :asc).to_sym
+            attr_name = @mappings[attr_name] if @mappings[attr_name]
+            sort << [attr_name, dir]
           else
             raise ArgumentError, "invalid sorting parameters: #{order_by}"
           end

data/lib/mongo-search/version.rb

@@ -1,5 +1,5 @@
 module Mongo
   module Search
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/spec/search_spec.rb

@@ -16,7 +16,7 @@ describe "Search integration" do
       c.intersect :tags
       c.less_than :updated_before, :field => :updated_at, :type => :time, :equal => true
       c.greater_than :updated_since, :field => :updated_at, :type => :time, :equal => true
-      c.sort_with :order, :default => "name asc"
+      c.sort_with :order, :default => "name asc", :mappings => {:titulo => :titulo_ordenacao}
     end
   end
 
@@ -52,19 +52,18 @@ describe "Search integration" do
     c.should == {:updated_at => {:$lte => time}}
   end
 
-  it "uses specified sorting and includes a _ordenacao prefix also" do
+  it "uses specified sorting respecting custom mappings" do
     _, s = subject.criteria_for :order => "titulo desc"
-    s.should == [[:titulo_ordenacao, :desc], [:titulo, :desc]]
+    s.should == [[:titulo_ordenacao, :desc]]
   end
 
-  it "defaults sorting direction to asc if not specified" do
+  it "combine sortings properly" do
     _, s = subject.criteria_for :order => "titulo, categoria"
-    s.should include([:titulo, :asc])
-    s.should include([:categoria, :asc])
+    s.should == [[:titulo_ordenacao, :asc], [:categoria, :asc]]
   end
 
   it "uses default sorting if no specified" do
     _, s = subject.criteria_for({})
-    s.should == [[:name_ordenacao, :asc], [:name, :asc]]
+    s.should == [[:name, :asc]]
   end
 end

metadata

@@ -1,57 +1,76 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mongo-search
-version: !ruby/object:Gem::Version
-  version: 0.0.2
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
-authors:
+authors: 
 - Rodrigo Kochenburger <divoxx@gmail.com>
 - Tomas Mattia <tomas.mattia@gmail.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70349984450400 !ruby/object:Gem::Requirement
+
+date: 2012-07-04 00:00:00 -03:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id001
+  name: rspec
   prerelease: false
-  version_requirements: *70349984450400
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: &70349984449940 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *70349984449940
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &70349984449320 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id002
+  name: guard
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id003
+  name: guard-rspec
   prerelease: false
-  version_requirements: *70349984449320
+  type: :development
 description: 
-email:
+email: 
 - abril_vejasp_dev@thoughtworks.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -71,31 +90,40 @@ files:
 - mongo-search.gemspec
 - spec/search_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+has_rdoc: true
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: mongo-search
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Easy search for mongodb
-test_files:
+test_files: 
 - spec/search_spec.rb
 - spec/spec_helper.rb
-has_rdoc: