revelry_data 0.0.8.1 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a57b18574b99199842afc5cd31456a9fecaeee63
-  data.tar.gz: 6c885121517a05658e658948b633b427573adbde
+  metadata.gz: 1beb262d66e95114e390158d5e307d0689117b1e
+  data.tar.gz: 91409632a5232c3af42d5059192fc9d948db40ae
 SHA512:
-  metadata.gz: cb0997aec122b06921f16b7144fcc2311b63dbe46d3959a8e263a4551a1099a7c2bf8c40e5bd4810f4e0751c6d9cd962946bec555194300e7a18ab5afa757c9d
-  data.tar.gz: 55ad445cbc2b9ef619d415e48b331e9be2f7d8646da4b584395fbb19665ff2e2cf3b91bfb0e77a60a6beb438e9255fa3d80548989c4d838715c640d77585fa03
+  metadata.gz: 1d43388eb4286560a50145b80480008403c392129405b89467116163c1bb30bd730e5740e5d7bf7523e9e41a9972e541b026e67fa07810714b152923fb021482
+  data.tar.gz: dc7c981fb5b175f7a8cca068e45d3ab6d4cb97dfca6d40ce3c6d174d5735e9fddb517d8077e2b1f45ca021b7df47c3a44cd545b14f9ff7c2867420e1a3a52c12

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,38 +96,6 @@ 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)
    */
@@ -161,34 +129,6 @@ 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)
    */
@@ -196,47 +136,6 @@ 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.
@@ -280,18 +179,8 @@ class CollectionQueryParameters {
   get fetchData() {
     // Pagination options
     let params = {
-      page: {},
-    }
-
-    // The size option if set, otherwise skip
-    if(this.paginatorType === "paged") {
-      _.extend(params.page, {size: this.size, number: this.page})
+      page: 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_routing_patch.rb

@@ -0,0 +1,58 @@
+# This exists because JSON API Resources won't let you route to 'new' or 'edit'
+# and clobbers the value of the :except param to jsonapi_resources
+# In order to support new and edit forms we have to patch these routing helpers
+# for now
+module ActionDispatch
+  module Routing
+    class Mapper
+      Resources.class_eval do
+        def jsonapi_resource(*resources, &_block)
+          @resource_type = resources.first
+          res = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(@resource_type))
+
+          options = resources.extract_options!.dup
+          options[:controller] ||= @resource_type
+          options.merge!(res.routing_resource_options)
+          options[:path] = format_route(@resource_type)
+
+          resource @resource_type, options do
+            @scope[:jsonapi_resource] = @resource_type
+
+            if block_given?
+              yield
+            else
+              jsonapi_relationships
+            end
+          end
+        end
+
+        def jsonapi_resources(*resources, &_block)
+          @resource_type = resources.first
+          res = JSONAPI::Resource.resource_for(resource_type_with_module_prefix(@resource_type))
+
+          options = resources.extract_options!.dup
+          options[:controller] ||= @resource_type
+          options.merge!(res.routing_resource_options)
+
+          options[:param] = :id
+
+          options[:path] = format_route(@resource_type)
+
+          if res.resource_key_type == :uuid
+            options[:constraints] = {id: /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}(,[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12})*/}
+          end
+
+          resources @resource_type, options do
+            @scope[:jsonapi_resource] = @resource_type
+
+            if block_given?
+              yield
+            else
+              jsonapi_relationships
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/revelry_data/version.rb

@@ -1,3 +1,3 @@
 module RevelryData
-  VERSION = "0.0.8.1"
+  VERSION = "0.0.10"
 end

data/lib/revelry_data.rb

@@ -1,6 +1,7 @@
 require "revelry_core"
 require "jsonapi-resources"
 require "revelry_data/jsonapi_resources_patch"
+require "revelry_data/jsonapi_resources_routing_patch"
 require "revelry_data/resource_controller_concern"
 require "revelry_data/engine"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revelry_data
 version: !ruby/object:Gem::Version
-  version: 0.0.8.1
+  version: 0.0.10
 platform: ruby
 authors:
 - Robert Prehn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -127,9 +127,9 @@ files:
 - lib/revelry_data.rb
 - lib/revelry_data/engine.rb
 - lib/revelry_data/jsonapi_resources_patch.rb
+- lib/revelry_data/jsonapi_resources_routing_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
@@ -730,7 +730,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Revelry Data is a library for managing data within React applications using

data/lib/revelry_data/version.rb.orig

@@ -1,7 +0,0 @@
-module RevelryData
-<<<<<<< HEAD
-  VERSION = "0.0.12"
-=======
-  VERSION = "0.1.2"
->>>>>>> 936d168df25b6786791e8cc1dac501aebfeb45e7
-end