revelry_data 0.0.15 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d499b1c3e5bf1c2b32b9889a0e0f7bf1153dc8f9
-  data.tar.gz: 9be265367378e45c773dc2b8e49256c0589f16ac
+  metadata.gz: 941b631f89ccb04d292163dd7fc343f30b4d1c26
+  data.tar.gz: 0cd2218849f1704da95160d678c246168c287a4f
 SHA512:
-  metadata.gz: 8e6ed3a95b74b66dc6dfa8824fa166dcaf09047564ee3821c0c65cc2d219f8023146b9faf3ab522c06c876bd70f94511ad57681b93d715134bfd9949805da914
-  data.tar.gz: 81f53e67125f304989ad9696d1ff620aaa149165e57c8ff76117a5cf6edce1f28aad2f027eac38a8c8fa75be1c547d72c1ed85f232173c5c5c445a0e07671e6f
+  metadata.gz: 02747c0200c3a7f0989768a819390f2d7b38a2bb396a0af4e801f2a519aaf2bc44e90174cf8c3808558f6eca30bb69961125c5ede1ee5753d5e262b83ab4a547
+  data.tar.gz: a867a944244f160f78c1bec9fc7a18f3acd6db77fafdb84003dc3cf73e97233cbafa82522413db2f98be6f101188f2d249572407537021c80780242c758b841d

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: this.page
-    }
-
-    // The size option if set, otherwise skip
-    if(this.paginatorType === "paged") {
-      params.page = {size: this.size, number: this.page}
+      page: this.page,
     }
-
-    if(this.paginatorType === "offset") {
-      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

@@ -17,8 +17,8 @@ module JSONAPI
       super(resource_klass, options)
     end
 
-    def apply
-      resource_record = resource_klass.create(@context)
+    def apply(context)
+      resource_record = resource_klass.create(context)
       return JSONAPI::ResourceOperationResult.new(:ok, resource_record)
 
     rescue JSONAPI::Exceptions::Error => e
@@ -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.15"
+  VERSION = "0.1.0"
 end

data/lib/revelry_data.rb

@@ -1,7 +1,6 @@
 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.15
+  version: 0.1.0
 platform: ruby
 authors:
 - Robert Prehn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: revelry_core
   requirement: !ruby/object:Gem::Requirement
@@ -127,10 +127,8 @@ 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
@@ -731,7 +729,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
@@ -1316,4 +1314,3 @@ test_files:
 - spec/javascripts/support/jasmine.yml
 - spec/revelry_data_test.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/lib/revelry_data/jsonapi_resources_routing_patch.rb

@@ -1,58 +0,0 @@
-# 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.orig

@@ -1,7 +0,0 @@
-module RevelryData
-<<<<<<< HEAD
-  VERSION = "0.0.13"
-=======
-  VERSION = "0.1.4"
->>>>>>> 20b9385c796e405df43a99ae4a9cc5ad8838663f
-end