nexter 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb5f5647cea17c363cbc0c3bdd0a0dbffaf60e4d
-  data.tar.gz: 05a68031d96af8db94742064b8f5efe6e831f3a3
+  metadata.gz: fa27845095fbceddc5060d15a5649166bca1c028
+  data.tar.gz: 73948d478174c7ff9550a4e25908b7d9a24850c6
 SHA512:
-  metadata.gz: 3a989deebd5e880d7710c5ca97adac906b554a184d0efd701305497d961975f2be5f632192aa23d3a28587d215c5abb96a4875b5364b5b8d5edeb666a51bfaa2
-  data.tar.gz: e87cbdb667b506e39116e63b6fe4c2dbf62525161471d9b92d6d2bda8ca2364a5def9230280531d1917c9c73df6bccc318cead3a06470dee575adb200e0463e1
+  metadata.gz: 44e8a6909a2ad1dfadbb4bba479d160ac2f7bbf5f0947a8f45b64ea830ce3b4e6d4e685f858851eb203092cdc31a06a12833a047c6f0ba6847035c427ccc5995
+  data.tar.gz: 8463803e201191cd9d8161b36749854fddec605279c7d54f5aa07fd7adec4b524f3deb03877f5b459012ba8d20a8973902ffcf1f1e82aafb778c0f92fa73c2b0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Nexter 0.2.1 (Mars 2016)
+
+* fixed non existing column problem with pg_search
+* Order parsing : arel consistent with string parsing
+
 ## Nexter 0.2.0 (Mars 2016)
 
 * properly do order parsing so it works with arel or plain string

data/lib/nexter/model.rb

@@ -10,11 +10,12 @@ module Nexter
 
     def values
       @values ||= @order_values.map do |column|
+        next unless value = value_of(column[0])
         { col: column[0],
-          val: value_of(column[0]),
+          val: value,
           dir: column[1]
         }
-      end
+      end.compact
     end
 
   private
@@ -22,9 +23,10 @@ module Nexter
       splits = cursor.split(".")
       result = if splits.first == model.class.table_name || splits.size == 1
         model.send(splits.last) if model.respond_to?(splits.last)
-      else
-        asso = model.class.reflections.keys.grep(/#{splits.first.singularize}/).first
+      elsif asso = model.class.reflections.keys.grep(/#{splits.first.singularize}/).first
         asso = model.send(asso) and asso.send(splits.last)
+      else
+        false
       end
     end
 

data/lib/nexter/model/parse_order.rb

@@ -27,7 +27,7 @@ class Nexter::Model
     end
 
     def parse_arel(arel)
-      ["#{arel.value.name}", "#{arel.direction}"]
+      [["#{arel.value.name}", "#{arel.direction}"]]
     end
 
 

data/lib/nexter/version.rb

@@ -1,3 +1,3 @@
 module Nexter
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/nexter/model_spec.rb

@@ -16,6 +16,15 @@ describe Nexter::Model do
         {col: "title",         val: "ada",     dir: "asc"}
       ])
     end
+
+    it "should skip non existing columns (for now ?)" do
+      relation = Relation.new.tap{|r| r.order_values=["pg_search_8bf729ffe074caee622c02.rank","title"]}
+      model = Nexter::Model.new(book, relation)
+
+      expect(model.values).to eq([
+        {col: "title",         val: "ada",     dir: "asc"}
+      ])
+    end
   end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Charles Sistovaris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord