revelry_data 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 296d23f0e98e46c0664f29d1ad6118e68040397c
-  data.tar.gz: 239ce54dbab4b6b0767210e2d593da8a6f0e8fbf
+  metadata.gz: 10cd7dcfe553e5719b1cb11796a557461db29956
+  data.tar.gz: 7028002a103dc8f9ca5ea086524f534af774d628
 SHA512:
-  metadata.gz: bd54d37f10245203fc85dd18aef903371116c15f80dec10ce34dc27b0959aac3c244236907b2ffc3efe1b746f0cda21c92649d7ff2aa5a5f02a26ce5533f0f7b
-  data.tar.gz: 3fc04359f2d45878ac49bbe49d77250b07c4db59714ff0a9104cade2fa23cfeab886dcebcb86d1ba2650330904cc3e1b802087808ef13f6043605b0100641efa
+  metadata.gz: 9c0731b30fa3ff57853dc9b11de52123dc25a8633478de669d838b1a8e8461bcab870f499ee40a4789cc78dfcc2ff3bdae0a94a9c94c9cf4fc9277b9126e7683
+  data.tar.gz: 26826ec838e7fb5f33f1febdc91a32cd3adb98743c656a5f6da0bff264ba0b31c9db58230928802cc58a9d6e0a22e9d5767d52b8aaecd3087cb9b1b025851f5c

data/app/assets/javascripts/revelry_data/models/CollectionQueryParameters.es6

@@ -65,7 +65,7 @@ class CollectionQueryParameters {
    * @param {String} newValue - the new value of the filter to apply
    */
   setFilter(filterName, newValue) {
-    // if filter changes, reset pagination 
+    // if filter changes, reset pagination
     if (this.filters[filterName] !== newValue) {
       this.resetPage()
     }
@@ -96,6 +96,38 @@ class CollectionQueryParameters {
     this.page = n
   }
 
+  /**
+   * Get the currently selected paginaion size
+   */
+  getSize() {
+    return this.size
+  }
+
+  /**
+   * Set the selected size to a new value and fetch is `fetchExplicitly` is
+   * `false`
+   * @param {Integer} n - the new size number
+   */
+  setSize(n) {
+    this.size = n
+  }
+
+  /**
+   * Get the currently selected pagination limit
+   */
+  getLimit() {
+    return this.offset
+  }
+
+  /**
+   * Set the selected limit to a new value and fetch is `fetchExplicitly` is
+   * `false`
+   * @param {Integer} n - the new limit number
+   */
+  setLimit(n) {
+    this.limit = n
+  }
+
   /**
    * Get the currently selected page number (1 by default)
    */
@@ -129,6 +161,34 @@ class CollectionQueryParameters {
     this.maybeFetch()
   }
 
+  /**
+   * Set the selected size to a new value, limit to null, resets page
+   * and fetch is `fetchExplicitly` is `false`
+   * https://github.com/cerebris/jsonapi-resources#paged-paginator
+   * @param {Integer} n - the new pagination size
+   */
+
+  set size(n) {
+    this._size = n
+    this._limit = null
+    this.resetPage()
+    this.maybeFetch()
+  }
+
+  /**
+   * Set the selected limit to a new value, size to null, resets page
+   * and fetch is `fetchExplicitly` is `false`
+   * https://github.com/cerebris/jsonapi-resources#offset-paginator
+   * @param {Integer} n - the new pagination limit
+   */
+
+  set limit(n) {
+    this._limit = n
+    this._size = null
+    this.resetPage()
+    this.maybeFetch()
+  }
+
   /**
    * Get the currently selected page number (1 by default)
    */
@@ -136,6 +196,47 @@ class CollectionQueryParameters {
     return this._page || 1
   }
 
+  get offset(){
+    if(this.page > 1){
+      return (this.page - 1) * this.limit
+    }
+
+    return 0;
+  }
+
+  /**
+   * Get the currently selected size for pagination
+   */
+
+  get size() {
+    return this._size
+  }
+
+  /**
+   * Get the currently selected limit for pagination
+   */
+
+  get limit() {
+    return this._limit
+  }
+
+  /**
+   * Get the currently selected paginator type:
+   * If size exist it returns paged
+   * If limit exist it returns offset
+   * If no-one exist it returns nil for backward compatibility
+   */
+
+  get paginatorType() {
+    if(this.size){
+      return "paged"
+    }
+
+    if(this.limit){
+      return "offset"
+    }
+  }
+
   /**
    * Set the page back to page 1. Frequently we do this when changing sorting
    * or filtering options so that the user is not disoriented in the result set.
@@ -179,8 +280,18 @@ class CollectionQueryParameters {
   get fetchData() {
     // Pagination options
     let params = {
-      page: this.page,
+      page: {},
+    }
+
+    // The size option if set, otherwise skip
+    if(this.paginatorType === "paged") {
+      _.extend(params.page, {size: this.size, number: this.page})
     }
+
+    if(this.paginatorType === "offset") {
+      _.extend(params.page, {limit: this.limit, offset: this.offset})
+    }
+
     // The sort option if set, otherwise skip
     if(this.sort) {
       _.extend(params, {sort: this.sort})

data/lib/revelry_data/version.rb

@@ -1,3 +1,3 @@
 module RevelryData
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/revelry_data/version.rb.orig

@@ -1,7 +1,7 @@
 module RevelryData
 <<<<<<< HEAD
-  VERSION = "0.1.0"
+  VERSION = "0.0.12"
 =======
-  VERSION = "0.0.10"
->>>>>>> v0.0.10
+  VERSION = "0.1.2"
+>>>>>>> 936d168df25b6786791e8cc1dac501aebfeb45e7
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revelry_data
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Robert Prehn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -731,7 +731,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Revelry Data is a library for managing data within React applications using