revelry_data 0.0.8 → 0.0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93d8ee7d9d743658c83f4c817857bc8af436fd6a
-  data.tar.gz: b0a1e2e1973fcf8ccad5f94fe2171575b27443bf
+  metadata.gz: a57b18574b99199842afc5cd31456a9fecaeee63
+  data.tar.gz: 6c885121517a05658e658948b633b427573adbde
 SHA512:
-  metadata.gz: 45c6973007a7022d1055810ab62d06da47125e4f07d7cb1c568c88024919a6a5f8acb349a4ba01e2938b7eadd99736c4654d9be20c2eecc674b32b0a3068b44e
-  data.tar.gz: d24734ad94162dffd801ff2f457a1433b8f2f568d2575fd2ebdcb9c9f59f3ea08114ca7f67387876e4bbf31f32073d6abd561175e18bdc68b512b36e42a30106
+  metadata.gz: cb0997aec122b06921f16b7144fcc2311b63dbe46d3959a8e263a4551a1099a7c2bf8c40e5bd4810f4e0751c6d9cd962946bec555194300e7a18ab5afa757c9d
+  data.tar.gz: 55ad445cbc2b9ef619d415e48b331e9be2f7d8646da4b584395fbb19665ff2e2cf3b91bfb0e77a60a6beb438e9255fa3d80548989c4d838715c640d77585fa03

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.0.8"
+  VERSION = "0.0.8.1"
 end

data/lib/revelry_data/version.rb.orig

@@ -0,0 +1,7 @@
+module RevelryData
+<<<<<<< HEAD
+  VERSION = "0.0.12"
+=======
+  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.0.8
+  version: 0.0.8.1
 platform: ruby
 authors:
 - Robert Prehn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -129,6 +129,7 @@ files:
 - lib/revelry_data/jsonapi_resources_patch.rb
 - lib/revelry_data/resource_controller_concern.rb
 - lib/revelry_data/version.rb
+- lib/revelry_data/version.rb.orig
 - lib/tasks/revelry_data_tasks.rake
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
@@ -729,7 +730,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