revelry_data 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e50d8ff5a38c9ebc9f025d6d2071037649d3c02
-  data.tar.gz: b398499f4959cc8fe0cbc0af778cd581a2d41806
+  metadata.gz: d499b1c3e5bf1c2b32b9889a0e0f7bf1153dc8f9
+  data.tar.gz: 9be265367378e45c773dc2b8e49256c0589f16ac
 SHA512:
-  metadata.gz: 3dd38dad98c3e8fc14312455f303f9665a66f142571dca818b251ef969e53d0f7e68fd46a9650be5d6762f5677479d996aa9f867375b9dd2fa63ad349075fb45
-  data.tar.gz: 3341bdb1d470a9395ce9a3e712130578aa165dc7cd28066708c3c447fb67e3d87372333fcfbbbad3854581f3c8b73398d6dc6d22b6617e7437907027368a7503
+  metadata.gz: 8e6ed3a95b74b66dc6dfa8824fa166dcaf09047564ee3821c0c65cc2d219f8023146b9faf3ab522c06c876bd70f94511ad57681b93d715134bfd9949805da914
+  data.tar.gz: 81f53e67125f304989ad9696d1ff620aaa149165e57c8ff76117a5cf6edce1f28aad2f027eac38a8c8fa75be1c547d72c1ed85f232173c5c5c445a0e07671e6f

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

@@ -280,16 +280,16 @@ class CollectionQueryParameters {
   get fetchData() {
     // Pagination options
     let params = {
-      page: {},
+      page: this.page
     }
 
     // The size option if set, otherwise skip
     if(this.paginatorType === "paged") {
-      _.extend(params.page, {size: this.size, number: this.page})
+      params.page = {size: this.size, number: this.page}
     }
 
     if(this.paginatorType === "offset") {
-      _.extend(params.page, {limit: this.limit, offset: this.offset})
+      params.page = {limit: this.limit, offset: this.offset}
     }
 
     // The sort option if set, otherwise skip

data/lib/revelry_data/engine.rb

@@ -8,5 +8,10 @@ module RevelryData
         config.always_include_to_many_linkage_data = true
       end
     end
+
+    initializer 'revelry_data.blacklist_props', after: 'execjs_rails.setup_view_helpers' do |app|
+      break unless defined?(ExecJS::Rails)
+      config.execjs_rails.blacklisted_assigns += %w(request response)
+    end
   end
 end

data/lib/revelry_data/jsonapi_resources_patch.rb

@@ -38,8 +38,20 @@ JSONAPI::Request.class_eval do
     @operations.push JSONAPI::NewOperation.new(
                        @resource_klass,
                        {
-                         include_directives: @include_directives
+                         context: @context,
+                         include_directives: @include_directives,
                        }
                      )
   end
 end
+
+JSONAPI::ActsAsResourceController.class_eval do
+  def base_response_meta
+    {
+      current_user: current_user,
+      csrf_token: form_authenticity_token,
+      current_org: current_user.try(:org),
+      flashes: flash,
+    }
+  end
+end

data/lib/revelry_data/resource_controller_concern.rb

@@ -1,63 +1,86 @@
 module RevelryData
   module Resource
     extend ActiveSupport::Concern
-    include JSONAPI::ActsAsResourceController
 
     included do
+      include JSONAPI::ActsAsResourceController
       respond_to :html, :json, :props
       before_filter :setup_request
-    end
 
-    def new
-      process_request_operations
-    end
+      def new
+        if respond_to? :process_request_operations
+          process_request_operations
+        else
+          process_request
+        end
+      end
 
-    def setup_request
-      @request = JSONAPI::Request.new(params, {
-                                              context: context,
-                                              key_formatter: key_formatter
-                                            })
-      render_errors(@request.errors) unless @request.errors.empty?
-    rescue => e
-      handle_exceptions(e)
-    end
+      def setup_request
+        @request = JSONAPI::Request.new(params, {
+                                                context: context,
+                                                key_formatter: key_formatter
+                                              })
+        render_errors(@request.errors) unless @request.errors.empty?
+      rescue => e
+        handle_exceptions(e)
+      end
 
-    def fmt_is_json_api?
-      request.format == 'json'
-    end
+      def process_request
+        @request = JSONAPI::Request.new(params, context: context,
+                                        key_formatter: key_formatter,
+                                        server_error_callbacks: (self.class.server_error_callbacks || []))
+        unless @request.errors.empty?
+          render_errors(@request.errors)
+        else
+          operation_results = create_operations_processor.process(@request)
+          render_results(operation_results)
+        end
 
-    def setup_response
-      return unless fmt_is_json_api?
+      rescue => e
+        handle_exceptions(e)
+      ensure
+        if response.body.size > 0 && fmt_is_json_api?
+          response.headers['Content-Type'] = JSONAPI::MEDIA_TYPE
+        end
+      end
 
-      if response.body.size > 0
-        response.headers['Content-Type'] = JSONAPI::MEDIA_TYPE
+      def fmt_is_json_api?
+        request.format == 'json'
       end
-    end
 
-    def render_results(operation_results)
-      response_doc = create_response_document(operation_results)
+      def setup_response
+        return unless fmt_is_json_api?
 
-      respond_with response_doc.contents do |fmt|
-        fmt.html do
-          @json_api = response_doc.contents
-          render status: response_doc.status
+        if response.body.size > 0
+          response.headers['Content-Type'] = JSONAPI::MEDIA_TYPE
         end
-        fmt.json do
-          render json: response_doc.contents, status: response_doc.status
-        end
-        fmt.props do
-          render json: response_doc.contents, status: response_doc.status
+      end
+
+      def render_results(operation_results)
+        response_doc = create_response_document(operation_results)
+
+        respond_with response_doc.contents do |fmt|
+          fmt.html do
+            @json_api = response_doc.contents
+            render status: response_doc.status
+          end
+          fmt.json do
+            render json: response_doc.contents, status: response_doc.status
+          end
+          fmt.props do
+            render json: response_doc.contents, status: response_doc.status
+          end
         end
       end
-    end
 
-    def base_response_meta
-      {
-        current_user: current_user,
-        csrf_token: form_authenticity_token,
-        current_org: current_user.try(:org),
-        flashes: flash,
-      }
+      def base_response_meta
+        {
+          current_user: current_user,
+          csrf_token: form_authenticity_token,
+          current_org: current_user.try(:org),
+          flashes: flash,
+        }
+      end
     end
   end
 end

data/lib/revelry_data/version.rb

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

data/lib/revelry_data/version.rb.orig

@@ -1,7 +1,7 @@
 module RevelryData
 <<<<<<< HEAD
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 =======
-  VERSION = "0.1.2"
->>>>>>> 936d168df25b6786791e8cc1dac501aebfeb45e7
+  VERSION = "0.1.4"
+>>>>>>> 20b9385c796e405df43a99ae4a9cc5ad8838663f
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revelry_data
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Robert Prehn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1316,3 +1316,4 @@ test_files:
 - spec/javascripts/support/jasmine.yml
 - spec/revelry_data_test.rb
 - spec/spec_helper.rb
+has_rdoc: