revelry_data 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc11d7fda2f207a9d60a5d32087cf0eced4a302a
-  data.tar.gz: 3b36b696278de9ffa1f8881e8d841aa2ddead2cd
+  metadata.gz: 1e50d8ff5a38c9ebc9f025d6d2071037649d3c02
+  data.tar.gz: b398499f4959cc8fe0cbc0af778cd581a2d41806
 SHA512:
-  metadata.gz: 339359d9a54eb97eab8869e034fb438ceb18b241528089379c8fa67a335e1f90d2390dccc58b777826337a6d8da5c4b31a549f19b56a6eb282d46cee25e6d9e1
-  data.tar.gz: 5c63aa09cb73c9e7f3c4a6a2660336a923ae7d94a07c5dd26f0ecb8a87e1d70f117587d63fdb149b53bc305e73e7ce4c57d0f1682ab391d73d29e2944ef854dd
+  metadata.gz: 3dd38dad98c3e8fc14312455f303f9665a66f142571dca818b251ef969e53d0f7e68fd46a9650be5d6762f5677479d996aa9f867375b9dd2fa63ad349075fb45
+  data.tar.gz: 3341bdb1d470a9395ce9a3e712130578aa165dc7cd28066708c3c447fb67e3d87372333fcfbbbad3854581f3c8b73398d6dc6d22b6617e7437907027368a7503

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/jsonapi_resources_patch.rb

@@ -38,8 +38,7 @@ JSONAPI::Request.class_eval do
     @operations.push JSONAPI::NewOperation.new(
                        @resource_klass,
                        {
-                         context: @context,
-                         include_directives: @include_directives,
+                         include_directives: @include_directives
                        }
                      )
   end

data/lib/revelry_data/version.rb

@@ -1,3 +1,3 @@
 module RevelryData
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revelry_data
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 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