api_me 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6b29b1a465714cdcc7feedeebd6c5d33f1a5372570d12a15aa34bcd703abea5
-  data.tar.gz: d6508859d1824d21da8317575310a7b86d449a4b8de223bf50d9fa10dafbc03f
+  metadata.gz: '0309df280a0738df9908bd663210fd71390c6495eb3f89ab5132b51200b98013'
+  data.tar.gz: a886ff6a38a273964da8982933ad9adc1232e70acab477cb635bf02422ae2390
 SHA512:
-  metadata.gz: 39e6b061f1f38eeb5c78b686a9ff0fca4c41abaa45d065f02b85790ea5ac0ce8133d948cc15d375a21ca4db7c1ac570125b0b8f57c0a50a16aee568a70714ae9
-  data.tar.gz: 9f0909bbc887578ed2caea5c5924ddb6671b754bed90e059f502f582355e71b4fbca5440218b96e8ec04c2b2f6ea7ded6e35b3ce3aae340baa437b857d83b7a1
+  metadata.gz: 0c6f7161dd7154ab4e52b211fcd63c6200c29644bffc7c3d866f59f241d583dd7edc72b20fbec0eecb82cd2bc61fc08b1139a50d8d67e8ff7bcb8b35c45782c9
+  data.tar.gz: 511c29eaa0bb6a3018cb208135beddffb003001af4f5be9b48f004d163f00bf02a3ac22515816464c00733d945ee008df31f957e6a219c16396a00727054596d

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -14,15 +16,15 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 load 'rails/tasks/statistics.rake'
 
 Bundler::GemHelper.install_tasks
-require "rake"
-require "rspec/core/rake_task"
+require 'rake'
+require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = Dir.glob("spec/**/*_spec.rb")
-  t.rspec_opts = "--format documentation"
+  t.pattern = Dir.glob('spec/**/*_spec.rb')
+  t.rspec_opts = '--format documentation'
 end
 task default: :spec

data/lib/api_me.rb

@@ -16,6 +16,7 @@ module ApiMe
 
   included do
     rescue_from Pundit::NotAuthorizedError, with: :user_not_authorized
+    rescue_from ActiveRecord::ActiveRecordError, with: :handle_active_record_errors
     rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found
   end
 
@@ -55,11 +56,11 @@ module ApiMe
     end
 
     def serializer_klass_name
-      @serializer_klass_name ||= "#{name.demodulize.sub(/Controller$/, '').singularize}Serializer"
+      @serializer_klass_name ||= "#{model_klass_name}Serializer"
     end
 
     def filter_klass_name
-      @filter_klass_name ||= "#{name.demodulize.sub(/Controller$/, '').singularize}Filter"
+      @filter_klass_name ||= "#{model_klass_name}Filter"
     end
   end
 
@@ -73,7 +74,7 @@ module ApiMe
     @sorted_scope = sort_scope(@filter_scope)
     @pagination_object = paginate_scope(@sorted_scope, page_params)
 
-    render({
+    render(
       json: @pagination_object.results,
       root: collection_root_key,
       each_serializer: serializer_klass,
@@ -81,7 +82,7 @@ module ApiMe
         page: @pagination_object.page_meta,
         sort: sorting_meta(@filter_scope)
       }
-    })
+    )
   end
 
   def show
@@ -101,11 +102,9 @@ module ApiMe
   def create
     @object = build_resource
     authorize_resource @object
-    @object.save!(object_params)
+    create_resource!
 
     render status: 201, json: @object, root: singular_root_key, serializer: serializer_klass
-  rescue ActiveRecord::RecordInvalid => e
-    handle_active_record_errors(e)
   end
 
   def edit
@@ -118,21 +117,17 @@ module ApiMe
   def update
     @object = find_resource
     authorize_resource @object
-    @object.update!(object_params)
+    update_resource!
 
     head 204
-  rescue ActiveRecord::RecordInvalid => e
-    handle_active_record_errors(e)
   end
 
   def destroy
     @object = find_resource
     authorize_resource @object
-    @object.destroy
+    destroy_resource!
 
     head 204
-  rescue ActiveRecord::RecordInvalid => e
-    handle_active_record_errors(e)
   end
 
   protected
@@ -242,6 +237,18 @@ module ApiMe
     @build_resource ||= model_klass.new(object_params)
   end
 
+  def create_resource!
+    @object.save!(object_params)
+  end
+
+  def update_resource!
+    @object.update!(object_params)
+  end
+
+  def destroy_resource!
+    @object.destroy!
+  end
+
   def authorize_resource(resource)
     authorize resource
   end

data/lib/api_me/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ApiMe
-  VERSION = '0.10.3'
+  VERSION = '0.10.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_me
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Sam Clopton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -25,6 +25,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: actionview
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.11.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.11.1
+- !ruby/object:Gem::Dependency
+  name: activejob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.11
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.11
 - !ruby/object:Gem::Dependency
   name: pundit
   requirement: !ruby/object:Gem::Requirement
@@ -85,30 +113,16 @@ dependencies:
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.6.1
-- !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.8.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.8.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement