rails-rapido 0.3.9 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a056bb244867b2d2970ada94d0085a94ac82f28
-  data.tar.gz: 4408b3b402c5dc2e3a9f4d3e84a0296eeb8b629c
+  metadata.gz: 04bd1cc6e6fd9527fc1b90022653cf1f8d48c041
+  data.tar.gz: bb1d6b86f00de708625b1b62f0aeb8363f4e6571
 SHA512:
-  metadata.gz: d0aaec6064ddfe0b16a378ff11a6d69fa9b54ab36c7dc7ebc43234e95523fb52a0042b8fafe4b6d6fbe35b55451da4a7de1bd446c32872a626045bcd3f9dffa3
-  data.tar.gz: a58920ce0a110085221819f8546f3c95e8a9b02528e2594c96256f963a1310d5315af218e4f8a72e1d85a02db4e0ede36c59c49cf00feb47557797c1d76383b9
+  metadata.gz: 6ff34955402b0927030447e6cf25314cc0be498ebe8da896d0d490902753fb0d2efd4d9cbf3961f7b2651d0bcf12e3934b2eb27bb88b56159cc411c1245651ef
+  data.tar.gz: 2966b6c780cd4b58e85719e338bd2ef7b4780199aaa523bc1d348c474efdd759e866877514f254cd6c2a8ac3a116a26291c1b93c5d57d082b91e7d46b7a764ce

data/README.md

@@ -1,7 +1,6 @@
 # Rapido
 
 [![Code Climate](https://codeclimate.com/github/starfighterheavy/rapido/badges/gpa.svg)](https://codeclimate.com/github/starfighterheavy/rapido)
-[![Dependency Status](https://gemnasium.com/starfighterheavy/rapido.svg)](https://gemnasium.com/starfighterheavy/rapido)
 
 Rapido is a simple, highly opinionated library that can be included into your Rails controllers to enforce standardized behavior and security.
 

data/lib/rapido.rb

@@ -2,7 +2,6 @@ require 'rapido/version'
 require 'rapido/controller'
 require 'rapido/api_controller'
 require 'rapido/app_controller'
-require 'rapido/app_views'
 require 'rapido/app_record_not_found'
 require 'rapido/auth/api_key'
 

data/lib/rapido/app_controller.rb

@@ -30,11 +30,13 @@ module Rapido
       new_resource = build_resource(resource_params)
       if new_resource.save
         after_create_success(new_resource)
-        redirect_to after_create_path(new_resource) unless performed?
+        return if performed?
+        redirect_to after_create_path(new_resource)
       else
         flash[:error] = new_resource.errors.full_messages.join('. ')
         after_create_failure(new_resource)
-        redirect_to new_path unless performed?
+        return if performed?
+        redirect_to new_path
       end
     end
 
@@ -43,7 +45,8 @@ module Rapido
         flash[:error] = resource.errors.full_messages.join('. ')
       end
       after_destroy_success(resource)
-      redirect_to after_delete_path(resource) unless performed?
+      return if performed?
+      redirect_to after_delete_path(resource)
     end
 
     def edit
@@ -54,12 +57,14 @@ module Rapido
       resource.assign_attributes(resource_params)
       if resource.save
         after_update_success(resource)
-        redirect_to after_update_path(resource) unless performed?
+        return if performed?
+        redirect_to after_update_path(resource)
       else
         flash[:error] = resource.errors.full_messages.join('. ')
         resource.reload
         after_update_failure(resource)
-        redirect_to edit_path(resource) unless performed?
+        return if performed?
+        redirect_to edit_path(resource)
       end
     end
 

data/lib/rapido/controller.rb

@@ -24,14 +24,6 @@ module Rapido
     end
 
     class_methods do
-      def authority(sym)
-        @authority_getter = sym.to_sym
-      end
-
-      def belongs_to_nothing!
-        @belongs_to_nothing = true
-      end
-
       def belongs_to(sym, opts = {})
         @owner_class = sym.to_sym
         define_method @owner_class do
@@ -41,6 +33,7 @@ module Rapido
           helper_method @owner_class
         end
         @has_one = opts[:has_one]
+        @owners_owner = opts[:owner]
         return @owner_getter = opts[:getter] if opts[:getter]
         return owner_lookup_defaults unless opts[:foreign_key]
         @owner_lookup_field = opts[:foreign_key]
@@ -51,11 +44,6 @@ module Rapido
         end
       end
 
-      def has_many(sym)
-        @owned_resources ||= []
-        @owned_resources << sym
-      end
-
       def owner_lookup_defaults
         owner_lookup_param(@owner_class, :id)
         owner_lookup_field(:id)
@@ -70,8 +58,8 @@ module Rapido
         @owner_lookup_field = str.to_sym
       end
 
-      def resource_class(str)
-        @resource_class = str.to_sym
+      def permit_no_params!
+        @permit_no_params = true
       end
 
       def lookup_param(str)
@@ -82,66 +70,33 @@ module Rapido
         @resource_permitted_params = ary
       end
 
-      def free_from_authority!
-        @free_from_authority = true
-      end
-
       def permit_all_params!
         @permit_all_params = true
       end
 
-      def resource_class_name
+      def resource_class_from_controller
         self.name.split('::')[-1].remove('Controller').singularize.underscore
       end
-    end
 
-    private
-
-      def authority
-        @authority ||= begin
-          if setting(:free_from_authority)
-            nil
-          else
-            send(setting(:authority_getter) ||
-              self.class.superclass.instance_variable_get(:@authority_getter))
-          end
-        end
-      end
-
-      def resource_permitted_params
-        @resource_permitted_params ||=
-          setting(:resource_permitted_params)
+      def resource_class_name
+        resource_class_from_controller
       end
+    end
 
-      def resource_params
-        base = params.require(resource_class_name)
-        if setting(:permit_all_params)
-          base.permit!
-        else
-          base.permit(resource_permitted_params)
-        end
-      end
+    private
 
       def build_resource(params = {})
-        if setting(:has_one)
-          resource_base.send("build_" + resource_class_name, params)
-        else
-          resource_base.send(resource_class_name.pluralize).build(params)
-        end
-      end
-
-      def resource_collection
-        @resource_collection ||= begin
-          raise RecordNotFound unless setting(:belongs_to_nothing) || owner
-          if setting(:has_one)
-            resource_base.send(resource_class_name)
-          else
-            resource_base.send(resource_class_name.pluralize).page(params[:page])
-          end
+        return owner.send("build_" + resource_class_name, params) if setting(:has_one)
+        return owner.send(resource_class_name.pluralize).build(params) if owner && owner.respond_to?(resource_class_name.pluralize)
+        begin
+          send(:build)
+        rescue NoMethodError
+          raise "Rapido::Controller must belong to something that responds to build or define a build method"
         end
       end
 
       def owner_class
+        return nil unless setting(:owner_class)
         @owner_class ||= begin
           name = setting(:owner_class)
           name.to_s.camelize.constantize
@@ -166,62 +121,80 @@ module Rapido
 
       def owner
         @owner ||= begin
-          if setting(:belongs_to_nothing)
-            nil
-          elsif setting(:owner_getter)
+          if setting(:owner_getter)
             send(setting(:owner_getter))
-          else
-            if setting(:free_from_authority)
-              base = owner_class
+          elsif setting(:owner_class)
+            if setting(:owners_owner)
+              base = send(setting(:owners_owner)).send(owner_class_name.pluralize)
             else
-              base = authority.send(owner_class_name.pluralize)
+              base = owner_class
             end
             base.find_by!(owner_lookup_field => params[owner_lookup_param])
+          else
+            nil
           end
         rescue ActiveRecord::RecordNotFound
           raise RecordNotFound
         end
       end
 
-      def resource_base
-        setting(:belongs_to_nothing) ? authority : owner
-      end
-
       def resource
         @resource ||= begin
           if setting(:has_one)
-            resource_base.send(resource_class_name)
-          else
-            resource_base
+            owner.send(resource_class_name)
+          elsif owner && owner.respond_to?(resource_class_name.pluralize)
+            owner
               .send(resource_class_name.pluralize)
               .find_by!(resource_lookup_param => params[resource_lookup_param])
+          else
+            begin NoMethodError
+              send(:find)
+            rescue
+              raise "Rapido::Controller must belong to something that has many or has one of resource, or define a find method"
+            end
           end
        rescue ActiveRecord::RecordNotFound
          raise RecordNotFound
         end
       end
 
-      def resource_lookup_param
-        @resource_lookup_param ||=
-          setting(:resource_lookup_param) || :id
+      def resource_class
+        @resource_class ||= resource_class_name.to_s.camelize.constantize
       end
 
-      def resource_class
-        @resource_class ||=
-          (setting(:resource_class) ||
-          resource_class_from_controller).to_s.camelize.constantize
+      def resource_class_name
+        self.class.resource_class_name
+      end
+
+      # Todo: FIXME
+      def resource_collection
+        @resource_collection ||= begin
+          if setting(:has_one)
+            owner.send(resource_class_name)
+          else
+            owner.send(resource_class_name.pluralize).page(params[:page])
+          end
+        end
       end
 
-      def resource_class_name(name = nil)
-        @resource_class_name ||= resource_class.name.underscore
+      def resource_lookup_param
+        @resource_lookup_param ||=
+          setting(:resource_lookup_param) || :id
       end
 
-      def resource_class_from_controller
-        self.class.name.split('::')[-1].remove('Controller').singularize.underscore
+      def resource_permitted_params
+        @resource_permitted_params ||=
+          setting(:resource_permitted_params)
       end
 
-      def owned_resources
-        @owned_resources ||= setting(:owned_resources) || []
+      def resource_params
+        return {} if setting(:permit_no_params)
+        base = params.require(resource_class_name)
+        if setting(:permit_all_params)
+          base.permit!
+        else
+          base.permit(resource_permitted_params)
+        end
       end
 
       def setting(var)

data/lib/rapido/version.rb

@@ -1,3 +1,3 @@
 module Rapido
-  VERSION = '0.3.9'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-rapido
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Jonathan Kirst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-16 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -78,7 +78,6 @@ files:
 - lib/rapido/api_controller.rb
 - lib/rapido/app_controller.rb
 - lib/rapido/app_record_not_found.rb
-- lib/rapido/app_views.rb
 - lib/rapido/auth.rb
 - lib/rapido/auth/api_key.rb
 - lib/rapido/controller.rb
@@ -105,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Rails API Dryer-o

data/lib/rapido/app_views.rb

@@ -1,21 +0,0 @@
-module Rapido
-  module AppViews
-    extend ActiveSupport::Concern
-
-    included do
-      before_action do
-        append_view_path (Rapido::Engine.root + 'app/views/rapido')
-        new_path
-        index_path
-        resource_class
-      end
-    end
-
-    class_methods do
-      def local_prefixes
-        [controller_path, 'app']
-      end
-    end
-  end
-end
-