jsonapi-utils 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 061fed9fa47dbb57c871087a1dc759c62432e08b
-  data.tar.gz: ccd60a2cb0094254c59beb832725a88189b0d826
+  metadata.gz: fbc9435ea77e7a938e5c3cd34b701e48509294aa
+  data.tar.gz: af2c51ee9c5bb6f5baffa1aa8bec5706befd546f
 SHA512:
-  metadata.gz: e9c65099d501f11f4559c84623dbcf27b36ae357c5563885e559ba584ea7f21ed692d0fb91bf851b1028d103e7977a2654f379635c99f62f51f96f83857cda34
-  data.tar.gz: f6585b1f810f2728525f0d9b7b8b57c87381c8bf45a6d5a413fc4434c81ff565233b53e80aefacb2c971f5e4d0dccbe5a612ed6185d3f3980429300f81abd722
+  metadata.gz: f60cd55bdc532063292bdddb6fca175f25d9b82d8fc3d1359481f053499b13eae60174884fd77847131ec3996f5f7ec4e9ca50f5f20c04d51cd0dc036de9aaed
+  data.tar.gz: c37add6ab91aa7a08c2c49131eea9ce478f403250a43cafaed81d3d39273de1db5bf330aadafe5028a502c07e78eeef84cf417583bc7fb7d83b6db2d050b99b3

data/jsonapi-utils.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["tiagopog@gmail.com", "douglas@beautydate.com.br"]
 
   spec.summary       = %q{Full-featured JSON API serialization in a simple way}
-  spec.description   = %q{A Rails-style way to get your API's data serialized, following the standards set by JSON API's specs (http://jsosapi.org)}
+  spec.description   = %q{A Rails-way to get your API's data serialized following the JSON API's specs (http://jsosapi.org)}
   spec.homepage      = "https://github.com/b2beauty/jsonapi-utils"
   spec.license       = "MIT"
 

data/lib/jsonapi/utils.rb

@@ -10,23 +10,40 @@ module JSONAPI
 
     def jsonapi_render(options)
       if options.has_key?(:json)
-        response_body = jsonapi_serialize(options[:json], options[:options] || {})
-        render json: response_body, status: (options[:status] || :ok)
+        response = build_response(options)
+        render json: response[:body], status: options[:status] || response[:status] || :ok
       end
     end
 
+    def jsonapi_render_not_found
+      jsonapi_render json: nil
+    end
+
+    def jsonapi_render_not_found_with_null
+      jsonapi_render json: nil, options: { allow_null: true }
+    end
+
     def jsonapi_serialize(records, options = {})
-      fix_request_options(params, records)
+      return build_nil if records.nil? && options[:allow_null]
       results = JSONAPI::OperationResults.new
 
-      if records.respond_to?(:to_ary)
-        records = fix_when_hash(records, options) if records.all? { |e| e.is_a?(Hash) }
-        @resources = build_collection(records, options)
-        results.add_result(JSONAPI::ResourcesOperationResult.new(:ok, @resources, result_options(options)))
+      if records.nil?
+        id = extract_ids(@request.params)
+        record_not_found = JSONAPI::Exceptions::RecordNotFound.new(id)
+        results.add_result(JSONAPI::ErrorsOperationResult.new(record_not_found.errors[0].code, record_not_found.errors))
       else
-        @resource = turn_into_resource(records, options)
-        results.add_result(JSONAPI::ResourceOperationResult.new(:ok, @resource))
+        fix_request_options(params, records)
+
+        if records.respond_to?(:to_ary)
+          records = fix_when_hash(records, options) if records.all? { |e| e.is_a?(Hash) }
+          @resources = build_collection(records, options)
+          results.add_result(JSONAPI::ResourcesOperationResult.new(:ok, @resources, result_options(options)))
+        else
+          @resource = turn_into_resource(records, options)
+          results.add_result(JSONAPI::ResourceOperationResult.new(:ok, @resource))
+        end
       end
+
       create_response_document(results).contents
     end
 
@@ -36,6 +53,22 @@ module JSONAPI
 
     private
 
+    def build_response(options)
+      {
+        body: jsonapi_serialize(options[:json], options[:options] || {}),
+        status: options[:json].nil? && !options[:allow_null] ? :not_found : :ok
+      }
+    end
+
+    def build_nil
+      { data: nil }
+    end
+
+    def extract_ids(hash)
+      ids = hash.keys.select { |e| e =~ /id$/i }.map { |e| hash[e] }
+      ids.first rescue '(id not identified)'
+    end
+
     def fix_request_options(params, records)
       return if request.method !~ /get/i ||
                 params.nil? ||
@@ -62,31 +95,38 @@ module JSONAPI
       @paginator ||= paginator(params)
       if @paginator && JSONAPI.configuration.top_level_links_include_pagination
         options = {}
-        options[:record_count] = count_records(@resources, options) if @paginator.class.requires_record_count
+        @paginator.class.requires_record_count &&
+          options[:record_count] = count_records(@resources, options)
         return @paginator.links_page_params(options)
       else
         return {}
       end
     end
 
-
     def build_collection(records, options = {})
-      return [] unless records.present?
-      paginator(@request.params).apply(records, nil).map do |record|
-        turn_into_resource(record, options)
-      end
+      return [] if records.nil? || records.empty?
+      JSONAPI.configuration.default_paginator == :none ||
+        records = paginator(@request.params).apply(records, nil)
+      records.map { |record| turn_into_resource(record, options) }
     end
 
     def turn_into_resource(record, options = {})
       if options[:resource]
-        options[:resource].new(record)
+        options[:resource].to_s.constantize.new(record)
       else
         @request.resource_klass.new(record)
       end
     end
 
     def paginator(params)
-      PagedPaginator.new(ActionController::Parameters.new(params[:page]))
+      page_params = ActionController::Parameters.new(params[:page])
+
+      @paginator ||=
+        if JSONAPI.configuration.default_paginator == :paged
+          PagedPaginator.new(page_params)
+        elsif JSONAPI.configuration.default_paginator == :offset
+          OffsetPaginator.new(page_params)
+        end
     end
 
     def fix_when_hash(records, options)

data/lib/jsonapi/utils/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Utils
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-utils
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Tiago Guedes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-12 00:00:00.000000000 Z
+date: 2015-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,8 +53,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Rails-style way to get your API's data serialized, following the standards
-  set by JSON API's specs (http://jsosapi.org)
+description: A Rails-way to get your API's data serialized following the JSON API's
+  specs (http://jsosapi.org)
 email:
 - tiagopog@gmail.com
 - douglas@beautydate.com.br