rails-rapido 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d0cc71591ad6a2b6b8b2226f0c8c7a6a336599a
-  data.tar.gz: 0560d78f59cdc2e438558dc83b8eaa4375f1534b
+  metadata.gz: ca32937003fab6959385c900d1fdc932944ec353
+  data.tar.gz: 5f3c3f531a06425f60450498f1901fc7408ebc57
 SHA512:
-  metadata.gz: 39b81c33f1dbd7dfdbf72c2c0640698e4805df177d92916b447d954df1b922c8dd4861881d7f6a5546e80ec3f56aff728005d8229688510388046c2d72eaab0f
-  data.tar.gz: cd4497effc05b8e1b62d8774065fec76c7b5332857896dc133be45b782e1250cbb4c46ce3cc287f9fbb925dedbd261ee3fa8d81e804d60e9335504addce236cc
+  metadata.gz: 98cde731a822eb1c3071f3c910d6ca73f0ab60263a65ce60f3c3dd98213a2a169825eb5fb511353ff2f78ce060f42105d5103e4fef331ad23c6e82cf1825d595
+  data.tar.gz: a139dd6fb0fe5a694433ba90afc432b813484c3988e6b2764bf19a000a3b1576ca9a59c0d1947db0f21f4d660d99cee2dda802f8b832819372587f1cdf249090

data/app/views/rapido/app/index.slim

@@ -1,4 +1,4 @@
-h2= [@owner.name, @resource_class.name.capitalize.pluralize].compact.join(" ")
+h2= [@owner&.name, @resource_class.name.capitalize.pluralize].compact.join(" ")
 = link_to "New #{@resource_class.name.capitalize}", @new_path
 table
   thead
@@ -11,4 +11,5 @@ table
         - if index == 0
           td= link_to resource.name, url_for([@owner, resource].compact)
         - else
+          - next if resource.name == resource[key]
           td= resource[key]

data/app/views/rapido/app/new.slim

@@ -1,3 +1,4 @@
+h1 New #{@resource.class.name}
 = simple_form_for([@owner, @resource].compact) do |f|
   - @resource_permitted_params.each do |param|
     = f.input param

data/app/views/rapido/app/show.slim

@@ -8,3 +8,6 @@ dl
   - @resource.to_h.each do |key, value|
     dt= key
     dd= value
+
+- owned_resources.each do |owned_resource|
+  = link_to "View #{owned_resource.to_s.pluralize.capitalize}", url_for([nil, @owner, @resource, owned_resource].compact)

data/lib/rapido/app_controller.rb

@@ -11,6 +11,7 @@ module Rapido
       before_action do
         resource_permitted_params
       end
+      helper_method :owned_resources
     end
 
     def index
@@ -22,7 +23,7 @@ module Rapido
     end
 
     def new
-      @resource = owner.send(resource_class_name.pluralize).new
+      @resource = resource_base.send(resource_class_name.pluralize).new
     end
 
     def create
@@ -36,7 +37,9 @@ module Rapido
     end
 
     def destroy
-      resource.destroy
+      unless resource.destroy
+        flash[:error] = resource.errors.full_messages.join('. ')
+      end
       redirect_to after_delete_path(resource)
     end
 

data/lib/rapido/controller.rb

@@ -13,6 +13,10 @@ module Rapido
         @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
         return @owner_getter = opts[:getter] if opts[:getter]
@@ -25,6 +29,11 @@ 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)
@@ -67,7 +76,8 @@ module Rapido
           if setting(:free_from_authority)
             nil
           else
-            send(setting(:authority_getter))
+            send(setting(:authority_getter) ||
+              self.class.superclass.instance_variable_get(:@authority_getter))
           end
         end
       end
@@ -87,13 +97,13 @@ module Rapido
       end
 
       def build_resource
-        owner.send(resource_class_name.pluralize).new(resource_params)
+        resource_base.send(resource_class_name.pluralize).new(resource_params)
       end
 
       def resource_collection
         @resource_collection ||= begin
-          raise RecordNotFound unless owner
-          owner.send(resource_class_name.pluralize).page(params[:page])
+          raise RecordNotFound unless setting(:belongs_to_nothing) || owner
+          resource_base.send(resource_class_name.pluralize).page(params[:page])
         end
       end
 
@@ -122,7 +132,9 @@ module Rapido
 
       def owner
         @owner ||= begin
-          if setting(:owner_getter)
+          if setting(:belongs_to_nothing)
+            nil
+          elsif setting(:owner_getter)
             send(setting(:owner_getter))
           else
             if setting(:free_from_authority)
@@ -137,13 +149,17 @@ module Rapido
         end
       end
 
+      def resource_base
+        setting(:belongs_to_nothing) ? authority : owner
+      end
+
       def resource
         @resource ||= begin
-          owner
-            .send(resource_class_name.pluralize)
-            .find_by!(resource_lookup_param => params[resource_lookup_param])
-        rescue ActiveRecord::RecordNotFound
-          raise RecordNotFound
+          resource_base
+           .send(resource_class_name.pluralize)
+           .find_by!(resource_lookup_param => params[resource_lookup_param])
+       rescue ActiveRecord::RecordNotFound
+         raise RecordNotFound
         end
       end
 
@@ -166,6 +182,10 @@ module Rapido
         self.class.name.split('::')[-1].remove('Controller').singularize.underscore
       end
 
+      def owned_resources
+        @owned_resources ||= setting(:owned_resources) || []
+      end
+
       def setting(var)
         self.class.instance_variable_get("@#{var}")
       end

data/lib/rapido/version.rb

@@ -1,3 +1,3 @@
 module Rapido
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-rapido
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Jonathan Kirst
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-29 00:00:00.000000000 Z
+date: 2017-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari