query_string_interface 0.5.0 → 0.6.0

data/Gemfile

@@ -2,16 +2,10 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rake", "0.8.7"
+gem "rake"
 gem "i18n"
 gem "tzinfo"
 
-platforms :mri_18 do
-  gem "ruby-debug"
-end
-
-platforms :mri_19 do
-  gem "ruby-debug19", :require => 'ruby-debug' if RUBY_VERSION < "1.9.3"
-  gem 'simplecov', :require => false
-end
+gem "debugger"
+gem 'simplecov', :require => false
 

data/Gemfile.lock

@@ -1,63 +1,55 @@
 PATH
   remote: .
   specs:
-    query_string_interface (0.5.0)
+    query_string_interface (0.6.0)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.1.3)
-      multi_json (~> 1.0)
-    archive-tar-minitar (0.5.2)
-    columnize (0.3.5)
-    diff-lcs (1.1.3)
-    i18n (0.6.0)
-    linecache (0.46)
-      rbx-require-relative (> 0.0.4)
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
-    multi_json (1.0.4)
-    rake (0.8.7)
-    rbx-require-relative (0.0.5)
-    rspec (2.7.0)
-      rspec-core (~> 2.7.0)
-      rspec-expectations (~> 2.7.0)
-      rspec-mocks (~> 2.7.0)
-    rspec-core (2.7.1)
-    rspec-expectations (2.7.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.7.0)
-    ruby-debug (0.10.4)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.4.0)
-    ruby-debug-base (0.10.4)
-      linecache (>= 0.3)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    atomic (1.1.10)
+    columnize (0.3.6)
+    debugger (1.6.0)
       columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
-    simplecov (0.5.4)
-      multi_json (~> 1.0.3)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    tzinfo (0.3.31)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.1)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.3)
+    diff-lcs (1.2.4)
+    i18n (0.6.4)
+    minitest (4.7.5)
+    multi_json (1.7.7)
+    rake (10.1.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    thread_safe (0.1.0)
+      atomic
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  debugger
   i18n
   query_string_interface!
-  rake (= 0.8.7)
+  rake
   rspec (>= 2.6.0)
-  ruby-debug
-  ruby-debug19
   simplecov
   tzinfo

data/lib/query_string_interface/filter.rb

@@ -70,8 +70,8 @@ module QueryStringInterface
 
     private
       def parsed_attribute
-        if raw_attribute.respond_to?(:key)
-          raw_attribute.key.to_s
+        if raw_attribute.respond_to?(:name)
+          raw_attribute.name.to_s
         elsif or_attribute?
           '$or'
         elsif raw_attribute =~ QueryStringInterface::ATTRIBUTE_REGEX

data/lib/query_string_interface/sorting_filters.rb

@@ -27,8 +27,8 @@ module QueryStringInterface
 
     private
       def replace(filter)
-        if filter.respond_to?(:key) && filter.respond_to?(:operator)
-          replaced_item_for filter.key, filter.operator
+        if filter.respond_to?(:name) && filter.respond_to?(:operator)
+          replaced_item_for filter.name, filter.operator == 1 ? :asc : :desc
         elsif filter.is_a?(String) or filter.is_a?(Symbol)
           if match = matches?(filter)
             replaced_item_for match[1], match[2]
@@ -48,4 +48,4 @@ module QueryStringInterface
         filter.match(SORTING_FIELD_REGEXP)
       end
   end
-end
+end

data/lib/query_string_interface/version.rb

@@ -1,3 +1,3 @@
 module QueryStringInterface
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: query_string_interface
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2168557900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2168557900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2168557380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *2168557380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.6.0
 description: This gem extracts params given as a hash to structured data, that can
   be used when creating queries
 email:
@@ -69,15 +79,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 984341770598898315
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 984341770598898315
 requirements: []
 rubyforge_project: query_string_interface
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Extracts query string params to a structured data, suitable to use for model