nexter 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9fe3377bb4621f5dd4334001c71bfc251c1aab7a
-  data.tar.gz: b40d8a4a5dd7cfc932313cbceb18b538008e9bad
+  metadata.gz: bb5f5647cea17c363cbc0c3bdd0a0dbffaf60e4d
+  data.tar.gz: 05a68031d96af8db94742064b8f5efe6e831f3a3
 SHA512:
-  metadata.gz: b19d7a48206c5276a18d6d6805c771d5d3f443047504d54b074a72ee1cfe9f77bf57743b5381f7a1738d276d72980f15f5df7af21168f7912edd13a8f33aa587
-  data.tar.gz: 7214177fefacbade18b798b5058a4b01979199fc4837ecfe5858af830fa3012a59e6fc184eddd0d13b0ce52e304589cd211bb07c0a9f4fbe867c2fd3d97121fc
+  metadata.gz: 3a989deebd5e880d7710c5ca97adac906b554a184d0efd701305497d961975f2be5f632192aa23d3a28587d215c5abb96a4875b5364b5b8d5edeb666a51bfaa2
+  data.tar.gz: e87cbdb667b506e39116e63b6fe4c2dbf62525161471d9b92d6d2bda8ca2364a5def9230280531d1917c9c73df6bccc318cead3a06470dee575adb200e0463e1

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
 rvm:
-  - "1.9.3"
+  #- "1.9.3"
   - "2.0.0"
+  - "2.2.2"
   #- jruby-18mode # JRuby in 1.8 mode
   #- jruby-19mode # JRuby in 1.9 mode
   #- rbx

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+## Nexter 0.2.0 (Mars 2016)
+
+* properly do order parsing so it works with arel or plain string
+* quote or not values of a column (e.g "title > 'sweet bean'" or "num < 18")
+* some dirty hack on float values to make comparaison work
+
+## Nexter 0.1.0 (Dec 2015)
+
+* All model values for building the query moved in wrap
+* Query now only takes a hash of values to build itself
+* Query relies on Section for the possible records
+* Query uses Direction to look at the next bigger or smaller
+* Nexter now **handles NULL** yey
+
+
+## Nexter 0.0.5
+
+* sanitize SQL (wonky still needs work)

data/README.md

@@ -5,7 +5,7 @@
 
 What is Nexter ? A misspelled tv show or a killer feature ? Not sure but it wraps your ActiveRecord model with an ordered scope and consistently cuts out the _next_ and _previous_ records. It also works with associations & nested columns : `Book.order("books.genre, authors.name, published_at desc")` 
 
-## Installation
+## Installation (RUBY 2)
 
     gem 'nexter'
     # (edge) gem 'nexter', git: 'https://github.com/charly/nexter'
@@ -25,7 +25,7 @@ nexter.next
 
 It helps you cycle consistentely through each record of any filtered collection instead of helplessly hit the back button of your browser to find the next item of your search. It plays well with gem which keeps the state of an `ActiveRelation` like [siphon](https://github.com/charly/siphon), [ransack](https://github.com/activerecord-hackery/ransack) & others.
 
-### New way (bleeding edge)
+### New way
 
 With the new view helper `nexter` no need to inject previous/next in the ActiveRecord model.
 However there's an assumptions : the formobject responds to `result` and returns an activerelation (like ransack does)
@@ -93,7 +93,7 @@ end
 - (docs) How it works
 - (feature) Joins ?
 - (docs) previous/next through ctrl (not preloaded)
-- (fix) for nil values you need a reorder with default delimiter
+x (fix) for nil values you need a reorder with default delimiter
 
 ## Contributing
 

data/lib/nexter.rb

@@ -5,6 +5,9 @@ require "active_support/all"
 
 require "nexter/version"
 require "nexter/wrap"
+require "nexter/model"
+require "nexter/model/parse_order"
+
 require "nexter/query"
 require "nexter/query/section"
 require "nexter/query/direction"

data/lib/nexter/model.rb

@@ -0,0 +1,32 @@
+module Nexter
+  class Model
+    attr_reader :model
+    attr_reader :order_values, :associations
+
+    def initialize(model, relation)
+      @model = model
+      @order_values = ParseOrder.parse(relation.order_values)
+    end
+
+    def values
+      @values ||= @order_values.map do |column|
+        { col: column[0],
+          val: value_of(column[0]),
+          dir: column[1]
+        }
+      end
+    end
+
+  private
+    def value_of(cursor)
+      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
+        asso = model.send(asso) and asso.send(splits.last)
+      end
+    end
+
+  end
+end

data/lib/nexter/model/parse_order.rb

@@ -0,0 +1,35 @@
+class Nexter::Model
+  class ParseOrder
+    attr_reader :order_values
+
+    def self.parse(order_values)
+      new(order_values).parse
+    end
+
+    def initialize(order_values)
+      @order_values = order_values
+    end
+
+
+    def parse
+      order_values.flat_map do |value|
+        value.is_a?(String) ? parse_string(value) : parse_arel(value)
+      end
+    end
+
+    # helper to turn mixed order attributes to a consistant array of vals
+    def parse_string(string)
+      string.split(",").map(&:strip).map do |column|
+        splits = column.split(" ").map(&:strip).map(&:downcase)
+        splits << "asc" if splits.size == 1
+        splits
+      end
+    end
+
+    def parse_arel(arel)
+      ["#{arel.value.name}", "#{arel.direction}"]
+    end
+
+
+  end
+end

data/lib/nexter/query.rb

@@ -5,12 +5,12 @@ module Nexter
     def initialize(columns, goto)
       @columns = columns
       @compass = Compass.new(goto)
-      @wheres = []
       @reorders = []
       iterate
     end
 
     def iterate
+      @wheres = []
       columns = @columns.dup
 
       while column = columns.pop do

data/lib/nexter/query/direction.rb

@@ -11,7 +11,7 @@ class Nexter::Query
 
     def slice
       if column[:val].present?
-        delimited = "#{column[:col]} #{bracket} '#{column[:val]}'"
+        delimited = "#{column[:col]} #{bracket} #{quote(column[:val])}"
         delimited.concat(" OR #{column[:col]} IS NULL") if @compass.sign == 1
         "(#{delimited})"
       elsif @compass.sign == -1
@@ -20,6 +20,19 @@ class Nexter::Query
     end
     alias sql slice
 
+    private
+    def quote(value)
+      if value.is_a?(Float)
+        @compass.sign == 1 ? value + 0.0001 : value - 0.0001
+      elsif value.is_a?(Integer)
+        value
+      else #value.is_a?(String)
+        "'#{value}'"
+      end
+    end
+
+
+
   end
 end
 

data/lib/nexter/query/section.rb

@@ -22,7 +22,7 @@ class Nexter::Query
     def iterate
       @where ||= columns.map do |column|
         if column[:val]
-          "#{column[:col]} = '#{column[:val]}'"
+          "#{column[:col]} = #{quote(column[:val])}"
         else
           "#{column[:col]} IS NULL"
         end
@@ -34,5 +34,19 @@ class Nexter::Query
       iterate.blank?
     end
 
+    private
+    def quote(value)
+      if value.is_a?(Integer)
+        value
+      # TODO: lookat numeric precision e.g.
+      #   round(vat::numeric, 2) = 19.66;
+      elsif value.is_a?(Float)
+        value
+      else #value.is_a?(String)
+        "'#{value}'"
+      end
+    end
+
+
   end #section
 end

data/lib/nexter/version.rb

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

data/lib/nexter/wrap.rb

@@ -1,65 +1,34 @@
 module Nexter
   class Wrap
-
     # the current model & the scope
     attr_reader :model, :relation
 
-    # extracted values from the relation
-    attr_reader :order_values, :associations
-
     def initialize(relation, model)
       @relation = relation
-      @model = model
-      @order_values = parse_order( relation.order_values )
-      @associations = relation.includes_values
+      @model = Model.new(model, relation)
     end
 
     # TODO : let user determine which strategy to choose:
-    # e.g: carousel or stay there
+    # e.g: carousel or stay on last
     def next
-      after.first
+      @next||=after.first
     end
 
     def previous
-      before.first
+      @prev||=before.first
     end
 
     def after
-      query = Query.new(map_column_values, :next)
+      query = Query.new(model.values, :next)
       relation.where( query.wheres.join(' OR ') )
     end
 
     def before
-      query = Query.new(map_column_values, :previous)
+      query = Query.new(model.values, :previous)
       relation.where( query.wheres.join(' OR ') ).
               reorder( query.reorders.join(", ") )
     end
 
-    def map_column_values
-      @column_values ||= @order_values.map do |column|
-        {col: column[0], val: value_of(column[0]), dir: column[1]}
-      end
-    end
-
-  private
-    def value_of(cursor)
-      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
-        asso = model.send(asso) and asso.send(splits.last)
-      end
-    end
-
-    # helper to turn mixed order attributes to a consistant
-    def parse_order(array)
-      array.join(",").split(",").map(&:strip).map do |column|
-        splits = column.split(" ").map(&:strip).map(&:downcase)
-        splits << "asc" if splits.size == 1
-        splits
-      end
-    end
 
   end
 end

data/spec/nexter/compass_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Nexter::Compass, focus: true do
+describe Nexter::Compass do
 
   describe "#arrwo or #bracket" do
     context "when looking for *next*" do

data/spec/nexter/model/parse_order_spec.rb

@@ -0,0 +1,38 @@
+require "spec_helper"
+
+describe Nexter::Model::ParseOrder do
+
+  context "String with MANY order values" do
+    let(:parser) {Nexter::Model::ParseOrder.new ["authors.name ASC, title DESC"]}
+
+    describe "#parse" do
+      it "should create an array of ALL order values" do
+        expect(parser.parse).to eq([["authors.name", "asc"], ["title", "desc"]])
+      end
+    end
+  end
+
+  context "String with ONE order value" do
+    let(:parser) {Nexter::Model::ParseOrder.new ["authors.name"]}
+
+    describe "#parse" do
+      it "should create an array of ONE order values" do
+        expect(parser.parse).to eq([["authors.name", "asc"]])
+      end
+    end
+  end
+
+
+
+
+  # describe "#parse" do
+  #   let(:relation) {
+  #     Relation.new.tap{|r| r.order_values=["authors.name ASC, title DESC"] }}
+
+  #   it "should create hashes of attributes out of the order values" do
+  #     model = Nexter::Model.new(book, relation)
+  #     expect(model.values).to eq("fvhjk")
+  #     expect(model.order_values).to eq("fvhjk")
+  #   end
+  # end
+end

data/spec/nexter/model_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+describe Nexter::Model do
+  let(:relation) {
+    Relation.new.tap{|r| r.order_values=["authors.name","genre","title"]}}
+
+  let(:book) { Book.new("novel", "nabokov", "ada") }
+
+  describe "#values" do
+    it "should create hashes of attributes out of the order values" do
+      model = Nexter::Model.new(book, relation)
+
+      expect(model.values).to eq([
+        {col: "authors.name",  val: "nabokov", dir: "asc"},
+        {col: "genre",         val: "novel",   dir: "asc"},
+        {col: "title",         val: "ada",     dir: "asc"}
+      ])
+    end
+  end
+
+
+end

data/spec/nexter/query/direction_spec.rb

@@ -9,7 +9,7 @@ describe Nexter::Query::Direction do
     {col: "title",         val: "ada",     dir: "asc"}
   ]}
 
-  describe "#slice", focus: true do
+  describe "#slice" do
 
     it "should be awesome" do
       direction = Nexter::Query::Direction.new(columns.pop, compass)

data/spec/nexter/query/section_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Nexter::Query::Section, focus: true do
+describe Nexter::Query::Section do
 
   # let(:compass) {Nexter::Compass.new(:next)}
   let(:columns) {[

data/spec/nexter/query_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Nexter::Query, broken: true do
+describe Nexter::Query do
 
   let(:columns) {[
     {col: "authors.name",  val: "nabokov", dir: "asc"},
@@ -8,16 +8,60 @@ describe Nexter::Query, broken: true do
     {col: "title",         val: "ada",     dir: "asc"}
   ]}
 
-  describe "#where" do
+  context "on a next query" do
+    let(:query) { Nexter::Query.new(columns, :next) }
 
-    it "builds the query from its ashes" do
+    describe "#where" do
+      it "builds the query from its ashes" do
+        expect(query.wheres).to include(
+          "authors.name = 'nabokov' AND (genre > 'novel' OR genre IS NULL)")
+      end
+    end
+
+    describe "#reloads" do
+      it "keeps the original order" do
+        expect(query.reorders).to eq([
+          "authors.name ASC", "genre ASC", "title ASC"])
+      end
+    end
+  end
+
+  context "on a previous query" do
+    let(:query) { Nexter::Query.new(columns, :previous) }
+
+    describe "#where" do
+      it "builds the query from its ashes" do
+        expect(query.wheres.size).to eq(3)
+        expect(query.wheres).to include(
+          "authors.name = 'nabokov' AND genre = 'novel' AND (title < 'ada')")
+      end
+    end
+
+    describe "#reloads" do
+      it "reverses the original order" do
+        expect(query.reorders).to eq([
+          "authors.name DESC", "genre DESC", "title DESC"])
+      end
+    end
+  end
+
+  context "when some value (title) is null (AND nulls come last!)" do
+
+    it "it skips **next** null (not possible) and moves to higher section" do
+      columns.last.merge!({val: nil})
       query = Nexter::Query.new(columns, :next)
 
-      expect(query.wheres).to eq(
-        [ "authors.name = 'nabokov' AND genre = 'novel' AND title > 'ada'",
-          "authors.name = 'nabokov' AND genre > 'novel'",
-          "authors.name > 'nabokov'"])
+      expect(query.wheres.size).to eq(2)
+    end
+
+    it "it looks for **previous** non null value of title" do
+      columns.last.merge!({val: nil})
+      query = Nexter::Query.new(columns, :previous)
+
+      expect(query.wheres[0]).to eq(
+        "authors.name = 'nabokov' AND genre = 'novel' AND title IS NOT NULL")
     end
   end
 
+
 end

data/spec/nexter/wrap_spec.rb

@@ -4,102 +4,14 @@ describe Nexter::Wrap do
   let(:relation) {Relation.new.tap{|r| r.order_values=["authors.name","genre","title"]}}
   let(:book)     {Book.new("novel", "nabokov", "ada")}
 
-  describe "#map_column_values", focus: true do
+  describe "#after" do
 
-    it "should create hashes of attributes out of the order values" do
+    it "should create a realtion" do
+      skip
       nexter = Nexter::Wrap.new(relation, book)
 
-      expect(nexter.map_column_values).to eq(
-        [ {col: "authors.name",  val: "nabokov", dir: "asc"},
-          {col: "genre",         val: "novel",   dir: "asc"},
-          {col: "title",         val: "ada",     dir: "asc"}
-        ])
+      expect(nexter.after).to eq("dfgjk")
     end
   end
 
-  context "no missing values", broken: true do
-    let(:relation) { Relation.new.tap {|rel| rel.order_values=["authors.name", "title"]} }
-    let(:book)     { Book.new("novel", "nabokov", "ada") }
-
-    describe "#wheres" do
-      it "has the right SQL condition" do
-        nexter = Nexter::Wrap.new(relation, book)
-        nexter.after
-
-        expect(nexter.wheres[0]).to eq("(authors.name = 'nabokov' AND title > 'ada')")
-      end
-    end
-
-    describe "#reorders" do
-      it "has the right SQL condition" do
-        nexter = Nexter::Wrap.new(relation, book)
-        nexter.before
-
-        expect(nexter.wheres[0]).to eq("(authors.name = 'nabokov' AND title < 'ada')")
-      end
-
-      it "has the right SQL order by" do
-        nexter = Nexter::Wrap.new(relation, book)
-        nexter.before
-
-        expect(nexter.reorders[0]).to eq(" authors.name DESC")
-      end
-    end
-  end
-
-  context "nil values", broken: true do
-    let(:relation) {Relation.new.tap {|r| r.order_values=["genre", "title", "id"]} }
-
-    describe "#wheres with Book#genre IS NULL" do
-      let(:book) { Book.new(nil, "nabokov", "Ada") }
-
-      it "has the right SQL condition" do
-        skip
-        nexter = Nexter::Wrap.new(relation, book)
-        nexter.after
-
-        expect(nexter.wheres).to eq("(genre IS NULL AND title > 'Ada')")
-      end
-    end
-
-    describe "#wheres with Book#title IS NULL" do
-      let(:book) { Book.new("novel", "nabokov", nil) }
-
-      it "has the right SQL condition for NEXT" do
-        nexter = Nexter::Wrap.new(relation, book)
-        nexter.after
-
-        expect(nexter.wheres[0]).to \
-          eq("(genre = 'novel' AND title IS NULL AND id > '#{book.id}')")
-
-        expect(nexter.wheres[1]).to \
-          eq("(  genre > 'novel')")
-      end
-
-
-      it "has the right SQL condition for PREVIOUS" do
-        nexter = Nexter::Wrap.new(relation, book)
-        nexter.before
-
-        expect(nexter.wheres[0]).to \
-          eq("(genre = 'novel' AND title IS NULL AND id < '#{book.id}')")
-
-        expect(nexter.wheres[1]).to \
-          eq("(  genre > 'novel')")
-      end
-    end
-
-    describe "#after with Book#title IS NULL" do
-      let(:book) { Book.new("novel", "nabokov", nil) }
-
-      it "has the right SQL condition" do
-        nexter = Nexter::Wrap.new(relation, book)
-        nexter.after
-
-        expect(nexter.wheres[0]).to \
-          eq("(genre = 'novel' AND title IS NULL AND id > '#{book.id}')")
-      end
-    end
-  end #contextr
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nexter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Charles Sistovaris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -108,6 +108,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -115,6 +116,8 @@ files:
 - lib/nexter.rb
 - lib/nexter/compass.rb
 - lib/nexter/eyecontact.rb
+- lib/nexter/model.rb
+- lib/nexter/model/parse_order.rb
 - lib/nexter/query.rb
 - lib/nexter/query/direction.rb
 - lib/nexter/query/section.rb
@@ -123,6 +126,8 @@ files:
 - nexter.gemspec
 - spec/book.rb
 - spec/nexter/compass_spec.rb
+- spec/nexter/model/parse_order_spec.rb
+- spec/nexter/model_spec.rb
 - spec/nexter/query/direction_spec.rb
 - spec/nexter/query/section_spec.rb
 - spec/nexter/query_spec.rb
@@ -156,6 +161,8 @@ summary: Wrap your model with an ordered scope and cut out the _next_ and _previ
 test_files:
 - spec/book.rb
 - spec/nexter/compass_spec.rb
+- spec/nexter/model/parse_order_spec.rb
+- spec/nexter/model_spec.rb
 - spec/nexter/query/direction_spec.rb
 - spec/nexter/query/section_spec.rb
 - spec/nexter/query_spec.rb