invisible_controller 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da3fccf529bfb396a0869dd0d2a2dbb8363fdacb
-  data.tar.gz: 3687b1b6c7260ce2721a1402360382fda31446ff
+  metadata.gz: 94051ab670e25620fd2a2ca240eb7f9a9f0e7ea9
+  data.tar.gz: 30c18a94ac2f8747e6862a25fec44461e3065e89
 SHA512:
-  metadata.gz: 75f1c4776e997f00b615fa285edfffe54e8cd306291344b07d685558adda3c3f2c9445724e5b68baa957959cb4c41873f623c70656751e4e1427a62ce5cb88f6
-  data.tar.gz: 087cdc8c1bbf11fd397b36150a073dab0edbc282adc2711227e97f1a67fae381fce0ca954e528c1240ffb0d7261e27513aafda836a1484a00a34215b2abb82d3
+  metadata.gz: 1d245741469f9b6073eb8b8f34e59b15da63fd0dd6285dea6120c40736f2ae4b99864c1482b01ad27e512c16d0858e20c781d14fb16cbd90da410f1b554283ab
+  data.tar.gz: 6a202b8eda9a86603caa47153e4a0cb4db7ba8aa5baff67ef1aef3b1930d7ebd7eb86881217eea80fa52b83556b32fffce0bd7ae5ab418caba62c1df3a1dc3cc

data/app/controllers/invisible_controller/base.rb

@@ -72,10 +72,20 @@ module InvisibleController
       #belongs_to Functionality
     def nested?()                   parent_name.split('.')[0].singularize != resource_name.singularize end
     def parent_name()               request.path.split('/')[1].singularize end
+    def has_one?
+      return false unless parent_resource
+      parent_resource.class.reflect_on_association(resource_name.singularize).present?
+    end
 
-    def parent_resource()           @parent_resource ||= parent_name.classify.constantize.find(parent_id) end
+    def parent_resource()           @parent_resource ||= parent_id.present? ? parent_name.classify.constantize.find(parent_id) : nil end
     def parent_id()                 params["#{parent_name}_id"] end
-    def active_class()              nested? ? parent_resource.send(nested_name || resource_name.pluralize) : klass end
+    def active_class()
+      if nested?
+        return has_one? ? parent_resource : parent_resource.send(nested_name || resource_name.pluralize)
+      else
+        return klass
+      end
+    end
     def scoped()                    ((params.keys || []) & (self.class.instance_variable_get("@scopes") || []))[0] end
     def current_scope()             scoped || :all end
     def scope_args()                params[current_scope] end
@@ -88,7 +98,9 @@ module InvisibleController
       return active_class.new(processed_params)           if new? || create?
       define_singleton_resource
     end
-    def define_singleton_resource() active_class.find(params[:id]) end
+    def define_singleton_resource()
+      has_one? ? active_class.send(resource_name) : active_class.find(params[:id])
+    end
     def klass()            resource_name.classify.constantize rescue Class end
     def permitted_params() params.permit( resource_name.to_sym => (@resource || klass).whitelisted ) end
     def processed_params() permitted_params[resource_name] end

data/lib/invisible_controller/version.rb

@@ -1,3 +1,3 @@
 module InvisibleController
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: invisible_controller
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chris Moody
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2016-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails