nexter 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18207b8538b39dd309f1481c2b69fc8b50261cef
-  data.tar.gz: ee8714526f27d7653ff607833daf07070491feb4
+  metadata.gz: e4900260b077482ad9229eaef70c81eb7a5d84cb
+  data.tar.gz: 350f56554e30064f974872056b7201cd37666a89
 SHA512:
-  metadata.gz: 58c0c99e1ef15ebc00c9c1534c09bf68ca7dfb51d8b491c53998ac167a054d35de0a3cefb2b3bcc34925260c33bcad683701ba814a0c418c2ad72538770b4bf3
-  data.tar.gz: 24c2d7d37d54e2f9d62e4eed0d7766ca5e64705a4c3f61ab544def97fddeaa125f36fa884d6f6f35180cc4f8d780b93b263f4fe3a47ecd9e4b78f07cb7a23118
+  metadata.gz: dbdb94b58cc46a2aa2ccb20b1cb2a558de630c5f43fd4078b1bb06b508413fcce155dfa6c2af9235828d2fe8eaab20b6df90ee3f4eae96334849c14b0520254c
+  data.tar.gz: 56263b5b0f2d217fc7c7d5b259ac76d836be5e7ea1cabf0e9f3660367942c4d482e237ee4815de3f39c020cc35f3f44556518c5aace9f20732d2e8536152c50e

data/.pryrc

@@ -1,2 +1,2 @@
 require "nexter"
-require "../spec/book"
+require "./spec/book"

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+  #- jruby-18mode # JRuby in 1.8 mode
+  - jruby-19mode # JRuby in 1.9 mode
+  #- rbx
+# uncomment this line if your project needs to run something other than `rake`:
+# script: bundle exec rspec spec

data/README.md

@@ -1,5 +1,8 @@
 # Nexter
 
+[![Gem Version](https://badge.fury.io/rb/nexter.png)](http://badge.fury.io/rb/nexter)
+[![Build Status](https://travis-ci.org/charly/nexter.png?branch=master)](https://travis-ci.org/charly/nexter)
+
 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 : `order("books.genre, authors.name, published_at desc")` 
 
 ## Installation
@@ -12,7 +15,7 @@ What is Nexter ? A misspelled tv show or a killer feature ? Not sure but it wrap
 @books = Book.includes(:author).bestsellers.
               order("genre", "authors.name", "published_at desc")
 
-nexter = Nexter.wrap( @books.find(56), @books )
+nexter = Nexter.wrap( @books, @books.find(params[:id]) )
 nexter.previous
 nexter.next
 ```
@@ -70,3 +73,7 @@ end
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/charly/nexter/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/Rakefile

@@ -1 +1,5 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/lib/nexter.rb

@@ -4,6 +4,7 @@ require "active_support/core_ext"
 
 require "nexter/version"
 require "nexter/wrap"
+require "nexter/derange"
 
 
 module Nexter

data/lib/nexter/derange.rb

@@ -0,0 +1,53 @@
+module Nexter
+  class Derange
+
+    attr_reader :model, :table_name
+
+    attr_accessor :delimiter, :columns
+
+    attr_accessor :sign, :direction, :trunks
+
+    def initialize(model)
+      @model = model
+      @table_name = model.class.table_name
+      @trunks = []
+    end
+
+    def trunk
+      raise unless columns
+
+      trunk = columns.map do |col|
+        if range_value = value_of(col[0])
+          "#{col[0]} = '#{range_value}'"
+        else
+          "#{col[0]} IS NULL"
+        end
+      end.join(' AND ')
+
+      trunks << trunk
+      "#{trunk} AND" unless trunk.blank?
+    end
+
+    def bigger_than
+      if delimiter_value = value_of(delimiter)
+        "#{delimiter} #{get_bracket(sign)} '#{delimiter_value}'"
+      else
+        "#{delimiter} IS NULL AND #{table_name}.id > #{model.id}"
+      end
+    end
+
+    def get_bracket(sign)
+      sign == -1 ? '<' : '>'
+    end
+
+    def value_of(cursor)
+      splits = cursor.split(".")
+      if splits.first == table_name || splits.size == 1
+        model.send(splits.last)
+      else
+        asso = model.reflections.keys.grep(/#{splits.first.singularize}/).first
+        asso = model.send(asso) and asso.send(splits.last)
+      end
+    end
+  end
+end

data/lib/nexter/version.rb

@@ -1,3 +1,3 @@
 module Nexter
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/nexter/wrap.rb

@@ -1,6 +1,10 @@
 module Nexter
   class Wrap
 
+    # the gui concatenating strings
+    attr_reader :derange
+
+    # the current model & the scope
     attr_reader :model, :relation
 
     # extracted values from the relation
@@ -19,6 +23,7 @@ module Nexter
       @associations = relation.includes_values
       # @cursor_column = extract_attr( @ranges.pop )
       # @cursor = model.send( @cursor_column.to_sym, )
+      @derange = Nexter::Derange.new(model)
     end
 
     def next
@@ -52,16 +57,13 @@ module Nexter
 
       while order_col = order_vals.pop do
 
-        inrange_of = order_vals.map {|col| "#{col[0]} = '#{value_of(col[0])}'"}.join(' AND ')
-        inrange_of = "#{inrange_of} AND" unless inrange_of.blank?
-
-        direction = order_col[1]
-        sign      = signature(direction, goto)
+        derange.columns = order_vals
+        derange.delimiter = order_col[0]
+        derange.direction = order_col[1]
+        derange.sign      = signature(derange.direction, goto)
 
-        bigger_than  = "#{order_col[0]} #{get_bracket(sign)} '#{value_of(order_col[0])}'"
-
-        wheres << "( #{inrange_of} #{bigger_than} )"
-        reorders.unshift(" #{order_col[0]} #{get_direction(sign)}")
+        wheres << "( #{derange.trunk} #{derange.bigger_than} )"
+        reorders.unshift(" #{order_col[0]} #{get_direction(derange.sign)}")
       end
     end
 
@@ -69,24 +71,10 @@ module Nexter
       sign = DIREC[dir.to_sym] * GOTO[goto]
     end
 
-    def get_bracket(sign)
-      sign == -1 ? '<' : '>'
-    end
-
     def get_direction(sign)
       sign == -1 ? 'desc' : 'asc'
     end
 
-    def value_of(cursor)
-      splits = cursor.split(".")
-      if splits.first == model.class.table_name || splits.size == 1
-        model.send(splits.last)
-      else
-        asso = model.reflections.keys.grep(/#{splits.first.singularize}/).first
-        model.send(asso).send(splits.last)
-      end
-    end
-
     # helper to turn mixed order attributes to a consistant
     def arrayize(array)
       array.join(",").split(",").map(&:strip).map do |column|

data/nexter.gemspec

@@ -19,13 +19,14 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
 
-  spec.add_dependency "activerecord", "~> 3.2"
-  spec.add_dependency "activesupport", "~> 3.2"
+  spec.add_dependency "activerecord", ">= 3.1"
+  spec.add_dependency "activesupport", ">= 3.1"
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-plus"
 
 
 end

data/spec/book.rb

@@ -1,6 +1,8 @@
-Author = Struct.new(:b)
+Author = Struct.new(:name)
 
-Book = Struct.new(:a, :b, :c) do
+Book = Struct.new(:genre, :name, :title) do
+
+  def id; 71; end
 
   def self.table_name
     "books"
@@ -19,7 +21,7 @@ class Relation
   attr_accessor :order_values, :includes_values
 
   def order_values
-    @order_values ||= ["books.a", "authors.b", "books.c"]
+    @order_values ||= ["books.genre", "authors.name", "books.title"]
   end
 
   def includes_values

data/spec/nexter/wrap_spec.rb

@@ -2,39 +2,62 @@ require "spec_helper"
 
 describe Nexter::Wrap do
 
-  describe "#wheres" do
-    it "has the right SQL condition" do
-      relation = Relation.new.tap {|rel| rel.order_values=["authors.b", "c"]}
-      book = Book.new("novel", "nabokov", "ada")
-      nexter = Nexter::Wrap.new(relation, book)
-      nexter.after
-
-      expect(nexter.wheres[0]).to eq("( authors.b = 'nabokov' AND c > 'ada' )")
-      expect(nexter.wheres[1]).to eq("(  authors.b > 'nabokov' )")
+  context "no missing values" 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' )")
+        expect(nexter.wheres[1]).to eq("(  authors.name > 'nabokov' )")
+      end
     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
 
-  describe "#reorders" do
-    it "has the right SQL condition" do
-      relation = Relation.new.tap {|rel| rel.order_values=["authors.b", "c"]}
-      book = Book.new("novel", "nabokov", "ada")
-      nexter = Nexter::Wrap.new(relation, book)
-      nexter.before
+      it "has the right SQL order by" do
+        nexter = Nexter::Wrap.new(relation, book)
+        nexter.before
 
-      expect(nexter.wheres[0]).to eq("( authors.b = 'nabokov' AND c < 'ada' )")
+        expect(nexter.reorders[0]).to eq(" authors.name desc")
+      end
     end
+  end
+
+  context "nil values" do
+    let(:relation) { Relation.new.tap {|rel| rel.order_values=["genre", "title"]} }
+
+    describe "#wheres" do
+      let(:book) { Book.new(nil, "nabokov", "Ada") }
 
-    it "has the right SQL order by" do
-      relation = Relation.new.tap {|rel| rel.order_values=["authors.b", "c"]}
-      book = Book.new("novel", "nabokov", "ada")
-      nexter = Nexter::Wrap.new(relation, book)
-      nexter.before
+      it "has the right SQL condition" do
+        nexter = Nexter::Wrap.new(relation, book)
+        nexter.after
 
-      expect(nexter.reorders[0]).to eq(" authors.b desc")
+        expect(nexter.wheres[0]).to eq("( genre IS NULL AND title > 'Ada' )")
+      end
     end
-  end
 
+    describe "#wheres" 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 books.id > #{book.id} )")
+      end
+    end
 
+  end #contextr
 
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@
 require "book"
 require "nexter"
 require "active_support"
+require "pry-rescue/rspec"
 
 
 RSpec.configure do |config|
@@ -18,5 +19,5 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = 'random'
+  #  config.order = 'random'
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: nexter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Charles Sistovaris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2014-01-09 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'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-plus
+  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: 'What is Nexter ? A misspelled tv show or a killer feature ? Almost :
   it wraps your model with an ordered scope and cuts out the next and previous record.
   It also works with associations & nested columns.'
@@ -107,11 +121,13 @@ files:
 - .pryrc
 - .rspec
 - .ruby-version
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/nexter.rb
+- lib/nexter/derange.rb
 - lib/nexter/version.rb
 - lib/nexter/wrap.rb
 - nexter.gemspec
@@ -138,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Wrap your model with an ordered scope and cut out the _next_ and _previous_