brainstem 0.2.5 → 0.2.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NDQ4OWNhYzY3M2FjZDI3NTAwMGY3MjhmNTc4NTFmZTY5NmU0MDc4YQ==
-  data.tar.gz: !binary |-
-    MjNhMGMzZjdlYTE0MzZkZjJmNzNhN2VkZDUwYzJmOWMyMGI4ZDRkZQ==
+SHA1:
+  metadata.gz: 7c38b868345e5b3aaadc1c2746e6963d1daf1f1f
+  data.tar.gz: cccbd5c71854048fb2331fc909e2a7a98c0345ed
 SHA512:
-  metadata.gz: !binary |-
-    ZmI4MDIwN2JjODg0YWMxYzFjODBjYWY4ZDdmMDgzNzM4YWFjNGQyY2Q4NTg4
-    ZGI2NDljNzdkNjBkYzNmNjkzZWUyNjIzZjBiNjc4OWUxMGUzZDFhYjY3Yzhj
-    MzM2YTA5ZmY1OTM1MmU0MGU5NDM0ZTk4OGU1NDdhY2RlZTE4Mjg=
-  data.tar.gz: !binary |-
-    OWExMGE5Nzk5ODk2NzBjMjJhNzhjZWM4NTRiNjE4MWY5NDk0MDExNTNiZTk4
-    ZmYzNzkwNzE0Mzc1MTIzYmQ1Y2ZhYjYzOTU1MGQ0MjI3N2YwMTNjODFlNGFm
-    OTI5NDkwMjQzNDQwNDI1N2JiMWFjNGFmZjMxZGI3YjAzMGVlZGU=
+  metadata.gz: fec3d2771167970f5198ece98f6febc2d903599167ea2b15ac2d60558e50e8c8ef9cc650e1129cfb29c333dd8d080fcf8705615fb7b445c25ec7a49be9b8e826
+  data.tar.gz: 06a68af6770a08acf1c6ca3379eb5ee2b050b14acc80982af2afb2be8b65e60cc5f257f0de2cd8825741fa040c74c0121f397c9f400cff91b639d649adcc1028

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    brainstem (0.2.5)
+    brainstem (0.2.6)
       activerecord (>= 3.2)
 
 GEM

data/lib/brainstem/presenter_collection.rb

@@ -251,8 +251,8 @@ module Brainstem
       return scope unless searching? options
 
       search_options = HashWithIndifferentAccess.new(
-          :include => includes,
-          :order => { :sort_order => sort_name, :direction => direction },
+        :include => includes,
+        :order => { :sort_order => sort_name, :direction => direction },
       )
 
       if options[:params][:limit].present? && options[:params][:offset].present?
@@ -297,11 +297,11 @@ module Brainstem
 
       case order
         when Proc
-          order.call(scope, direction == "desc" ? "desc" : "asc")
+          order.call(scope, direction)
         when nil
           scope
         else
-          scope.order(order.to_s + " " + (direction == "desc" ? "desc" : "asc"))
+          scope.order(order.to_s + " " + direction)
       end
     end
 
@@ -322,7 +322,7 @@ module Brainstem
         direction = default_direction
       end
 
-      [sort_name, direction]
+      [sort_name, direction == 'desc' ? 'desc' : 'asc']
     end
 
     def perform_preloading(records, includes_hash)

data/lib/brainstem/version.rb

@@ -1,3 +1,3 @@
 module Brainstem
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/brainstem/presenter_collection_spec.rb

@@ -487,6 +487,7 @@ describe Brainstem::PresenterCollection do
     describe "search" do
       context "with search method defined" do
         before do
+          WorkspacePresenter.sort_order(:description, "workspaces.description")
           WorkspacePresenter.search do |string|
             [[5, 3], 2]
           end
@@ -541,14 +542,14 @@ describe Brainstem::PresenterCollection do
                 expect(string).to eq("blah")
                 expect(options[:include]).to eq(["tasks", "lead_user"])
                 expect(options[:owned_by]).to eq(false)
-                expect(options[:order][:sort_order]).to eq("updated_at")
+                expect(options[:order][:sort_order]).to eq("description")
                 expect(options[:order][:direction]).to eq("desc")
                 expect(options[:page]).to eq(2)
                 expect(options[:per_page]).to eq(5)
                 [[1], 1] # returned ids, count - not testing this in this set of specs
               end
 
-              @presenter_collection.presenting("workspaces", :params => { :search => "blah", :include => "tasks,lead_user", :owned_by => "false", :order => "updated_at:desc", :page => 2, :per_page => 5 }) { Workspace.order("id asc") }
+              @presenter_collection.presenting("workspaces", :params => { :search => "blah", :include => "tasks,lead_user", :owned_by => "false", :order => "description:desc", :page => 2, :per_page => 5 }) { Workspace.order("id asc") }
             end
 
             describe "includes" do
@@ -614,6 +615,16 @@ describe Brainstem::PresenterCollection do
 
                 @presenter_collection.presenting("workspaces", :params => { :search => "blah", :order => "created_at:asc"}) { Workspace.order("id asc") }
               end
+
+              it "sanitizes sort orders" do
+                WorkspacePresenter.search do |string, options|
+                  expect(options[:order][:sort_order]).to eq("description")
+                  expect(options[:order][:direction]).to eq("asc")
+                  [[1], 1]
+                end
+
+                @presenter_collection.presenting("workspaces", :params => { :search => "blah", :order => "description:owned"}) { Workspace.order("id asc") }
+              end
             end
 
             describe "pagination" do
@@ -738,15 +749,38 @@ describe Brainstem::PresenterCollection do
       end
 
       it "cleans the params" do
-        WorkspacePresenter.sort_order(:description, "workspaces.description")
+        last_direction = nil
+        WorkspacePresenter.sort_order(:description, "workspaces.description") do |scope, direction|
+          last_direction = direction
+          scope
+        end
+        WorkspacePresenter.sort_order(:title, "workspaces.title")
         WorkspacePresenter.default_sort_order("description:desc")
 
-        result = @presenter_collection.presenting("workspaces", :params => { :order => "updated_at:drop table" }) { Workspace.where("id is not null") }
+        result = @presenter_collection.presenting("workspaces", :params => { :order => "description:drop table" }) { Workspace.where("id is not null") }
+        expect(last_direction).to eq('asc')
         expect(result.keys).to match_array([:count, :workspaces, :results])
 
+        result = @presenter_collection.presenting("workspaces", :params => { :order => "description:;;hacker;;" }) { Workspace.where("id is not null") }
+        expect(last_direction).to eq('asc')
+
+        result = @presenter_collection.presenting("workspaces", :params => { :order => "description:desc" }) { Workspace.where("id is not null") }
+        expect(last_direction).to eq('desc')
+
+        result = @presenter_collection.presenting("workspaces", :params => { :order => "description:asc" }) { Workspace.where("id is not null") }
+        expect(last_direction).to eq('asc')
+
         result = @presenter_collection.presenting("workspaces", :params => { :order => "drop table:desc" }) { Workspace.where("id is not null") }
-        expect(result.keys).to match_array([:count, :workspaces, :results])
-        expect(result[:results].map {|i| result[:workspaces][i[:id]][:description] }).to eq(%w(c b a 3 2 1))
+        expect(last_direction).to eq('desc')
+
+        result = @presenter_collection.presenting("workspaces", :params => { :order => "title:desc" }) { Workspace.where("id is not null") }
+        expect(result[:results].map {|i| result[:workspaces][i[:id]][:title] }).to eq(["jane workspace 2", "jane workspace 1", "bob workspace 4", "bob workspace 3", "bob workspace 2", "bob workspace 1"])
+
+        result = @presenter_collection.presenting("workspaces", :params => { :order => "title:hacker" }) { Workspace.where("id is not null") }
+        expect(result[:results].map {|i| result[:workspaces][i[:id]][:title] }).to eq(["bob workspace 1", "bob workspace 2", "bob workspace 3", "bob workspace 4", "jane workspace 1", "jane workspace 2"])
+
+        result = @presenter_collection.presenting("workspaces", :params => { :order => "title:;;;drop table;;" }) { Workspace.where("id is not null") }
+        expect(result[:results].map {|i| result[:workspaces][i[:id]][:title] }).to eq(["bob workspace 1", "bob workspace 2", "bob workspace 3", "bob workspace 4", "jane workspace 1", "jane workspace 2"])
       end
 
       it "can take a proc" do

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: brainstem
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Mavenlink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2015-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Brainstem allows you to create rich API presenters that know how to filter,
@@ -134,6 +134,7 @@ files:
 - lib/brainstem/test_helpers.rb
 - lib/brainstem/time_classes.rb
 - lib/brainstem/version.rb
+- pkg/brainstem-0.2.5.gem
 - spec/brainstem/controller_methods_spec.rb
 - spec/brainstem/presenter_collection_spec.rb
 - spec/brainstem/presenter_spec.rb
@@ -152,17 +153,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: ActiveRecord presenters with a rich request API