easy-jsonapi 1.0.1 → 1.0.6

data/lib/easy/jsonapi/parser/document_parser.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'easy/jsonapi/document'
-require 'oj'
+require 'easy/jsonapi/parser/json_parser'
 
 module JSONAPI
   module Parser
@@ -16,7 +16,7 @@ module JSONAPI
       # @raise [JSONAPI::Parser::InvalidDocument] if document is invalid.
       def self.parse(req_body)
         return if req_body.nil?
-        document_hash = Oj.load(req_body, symbol_keys: true) # parse json string into hash
+        document_hash = JSONAPI::Parser::JSONParser.parse(req_body) # parse json string into hash
         parse_hash(document_hash)
       end
 

data/lib/easy/jsonapi/parser/json_parser.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'oj'
+require 'easy/jsonapi/exceptions/json_parse_error'
+
+module JSONAPI
+  module Parser
+    # A wrapper class for OJ parser
+    module JSONParser
+
+      # Parse JSON string into a ruby hash
+      # @param document [String] The JSON string to parse
+      # @raise [JSONAPI::Exceptions::JSONParseError]
+      def self.parse(document, symbol_keys: true)
+        Oj.load(document, symbol_keys: symbol_keys)
+        
+      rescue Oj::ParseError => e
+        raise JSONAPI::Exceptions::JSONParseError, e.message
+      end
+
+      # Convert ruby hash into JSON
+      # @param ruby_hash [Hash] THe hash to convert into JSON
+      def self.dump(ruby_hash)
+        Oj.dump(ruby_hash)
+      end
+
+    end
+  end
+end

data/lib/easy/jsonapi/request/query_param_collection.rb

@@ -8,10 +8,12 @@ module JSONAPI
     # A collection of QueryParam objects 
     class QueryParamCollection < JSONAPI::NameValuePairCollection
 
+      # The special query params defined by the JSON:API specification
+      SPECIAL_QUERY_PARAMS = %i[sorts filters fields page includes].freeze
+
       # @param param_arr [Array<JSONAPI::Request::QueryParamCollection::QueryParam] The
       #   query params to initialize the collection with
       def initialize(param_arr = [])
-        @param_names = []
         super(param_arr, item_type: JSONAPI::Request::QueryParamCollection::QueryParam)
       end
   
@@ -43,8 +45,12 @@ module JSONAPI
       # @param args If any arguments were passed to the method called
       # @param block If a block was passed to the method called
       def method_missing(method_name, *args, &block)
-        super unless include?(method_name)
-        get(method_name)
+        included = include?(method_name)
+        super unless included || SPECIAL_QUERY_PARAMS.include?(method_name)
+        if included
+          return get(method_name)
+        end
+        nil
       end
 
       # Whether or not method missing should be called.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy-jsonapi
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Joshua DeMoss, Joe Viscomi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -132,13 +132,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".dockerignore"
-- ".github/workflows/publish-gem.yml"
+- ".github/workflows/codecov.yml"
+- ".github/workflows/publish.yml"
 - ".gitignore"
 - ".rspec"
 - ".rspec_status"
 - ".rubocop.yml"
 - ".ruby-gemset"
 - ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -197,6 +199,7 @@ files:
 - lib/easy/jsonapi/exceptions.rb
 - lib/easy/jsonapi/exceptions/document_exceptions.rb
 - lib/easy/jsonapi/exceptions/headers_exceptions.rb
+- lib/easy/jsonapi/exceptions/json_parse_error.rb
 - lib/easy/jsonapi/exceptions/naming_exceptions.rb
 - lib/easy/jsonapi/exceptions/query_params_exceptions.rb
 - lib/easy/jsonapi/exceptions/user_defined_exceptions.rb
@@ -210,6 +213,7 @@ files:
 - lib/easy/jsonapi/parser.rb
 - lib/easy/jsonapi/parser/document_parser.rb
 - lib/easy/jsonapi/parser/headers_parser.rb
+- lib/easy/jsonapi/parser/json_parser.rb
 - lib/easy/jsonapi/parser/rack_req_params_parser.rb
 - lib/easy/jsonapi/request.rb
 - lib/easy/jsonapi/request/query_param_collection.rb

data/.github/workflows/publish-gem.yml

@@ -1,74 +0,0 @@
-name: Test Build and Publish
-on:
-  push:
-    branches: [ production ]
-  pull_request:
-    branches: [ production ]
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version: ['2.5', '2.6', '2.7', '3.0']
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby
-    # To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
-    # change this to (see https://github.com/ruby/setup-ruby#versioning):
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby-version }}
-        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run tests
-      run: bundle exec rake
-  build_and_publish:
-    name: Build + Publish + Release
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby 3.0
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 3.0.x
-    - name: Publish to GPR
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:github: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push --KEY github --host https://rubygems.pkg.github.com/${OWNER} *.gem
-      env:
-        GEM_HOST_API_KEY: "Bearer ${{secrets.GITHUB_TOKEN}}"
-        OWNER: ${{ github.repository_owner }}
-    
-    - name: Publish to RubyGems
-      run: |
-        mkdir -p $HOME/.gem
-        touch $HOME/.gem/credentials
-        chmod 0600 $HOME/.gem/credentials
-        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
-        gem build *.gemspec
-        gem push *.gem
-      env:
-        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"
-  release:
-    name: Create Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: Release ${{ github.ref }}
-          body: |
-            Changes in this Release
-            - First Change
-            - Second Change
-          draft: false
-          prerelease: false