scaffold_pico 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e40cb927580081fb976d84220cc33e0e636345df
-  data.tar.gz: 5fca21fc95f40f2df1ae2add3af2807cb6ffce97
+  metadata.gz: 9e93bb313cafc6d56845d6aa323617b9e0fe9a51
+  data.tar.gz: 4a6395bb956e5882affbb856eb53f95df157934f
 SHA512:
-  metadata.gz: 661bfda0de1d8e558e008a05f4c23da19a5e5478342a71af3c52eb596ffaf3c6fbe7d4424b0e7bc324ed44e628f1390382e987122fa4d9c1f7582f69c532e836
-  data.tar.gz: 1df187a0f3e592fd2d01c6416eea13fa2441c1634a26ef67000620b1dc11a33bc647ef0b4f26b0ce663ab9d9cd9905a4cf27c77e3fc0c93cb3a5a8cb43c36f60
+  metadata.gz: 3036554128dced8f6e0ee0b7b15a2ad15d85233551a98e2490903fd3eb4bf2d1e777360c1bdcb92ecee236ecf0e23c267b4ebf7ecc54232aedf24ff8ce2cdf94
+  data.tar.gz: 61b72b5e8fadfe481793e45e6e271dceb46ba84edc8bfc2c52be8728e51428494a9f842b163727d58e7e1baa40c7faeb857f17d0f21bb619ed459cb88c42ac30

data/lib/scaffold/params.rb

@@ -10,18 +10,15 @@ module Scaffold
      :route_resource_name,
      :services_folder
 
-    def expand_default_types hash
-      hash.each_pair do |key, value|
-        hash[key] = 'string' if value.blank?
-      end
-    end
-
-    def initialize choice
+     def initialize choice
       (@modules, @model_name) = parse_model(choice[:model]) # what came from the params (it contain namespaces)
 
       @fields = expand_default_types(hasherize_fields(choice[:fields]))
       @index_fields = choice[:index_fields].blank? ? @fields.keys : choice[:index_fields]
       @search_fields = choice[:search_fields].blank? ? @fields.keys : choice[:search_fields]
+      # permitted params
+      @fields_permitted = associations_to_ids(@fields)
+      @search_fields_permitted = search_fields_permitted(@search_fields, @fields)
 
       @joins = choice[:joins]
       @includes = choice[:includes]
@@ -127,5 +124,33 @@ module Scaffold
       fields
     end
 
+
+    def expand_default_types hash
+      hash.each_pair do |key, value|
+        hash[key] = 'string' if value.blank?
+      end
+    end
+
+    # convert company => company_id
+    def associations_to_ids hash
+      to_ids = {}
+      hash.each_pair do |key, type|
+        key_name = ['references', 'belongs_to'].include?(type.downcase) ? "#{key}_id" : key
+        to_ids[key_name] = type
+      end
+      to_ids
+    end
+
+    # convert company => company_id
+    def search_fields_permitted search_fields, fields
+      to_ids = []
+      search_fields.each do |key|
+        next unless fields.keys.include?(key)
+        type = fields[key]
+        to_ids << (['references', 'belongs_to'].include?(type.downcase) ? "#{key}_id" : key)
+      end
+      to_ids
+    end
+
   end
 end

data/lib/templates/pico/controller.rb.erb

@@ -61,12 +61,12 @@ class <%= @controller_class_name %> < <%= @base_controller %>
 
   private
   def <%= @collection_name %>_params
-    params[:<%= @resource_name %>].permit(<%= @fields.keys.collect{|field| ":#{field}"}.join(', ') %>)
+    params[:<%= @resource_name %>].permit(<%= @fields_permitted.keys.map{|field| ":#{field}"}.join(', ') %>)
   end
 
   def search_<%= @collection_name %>_params
     return {} if params[:<%= @collection_name %>_search].blank?
-    params[:<%= @collection_name %>_search].permit(<%= @fields.keys.collect{|field| ":#{field}"}.join(', ') %>)
+    params[:<%= @collection_name %>_search].permit(<%= @search_fields_permitted.collect{|field| ":#{field}"}.join(', ') %>)
   end
 
 end

data/lib/templates/pico/fabricators/fabrication.rb.erb

@@ -1,7 +1,7 @@
 <% if @modules.empty? %>
-Fabricator(:company) do
+Fabricator(:<%= @resource_name %>) do
 <% else %>
-Fabricator(:company, class_name: '<%= @modulized_resource_class_name -%>') do
+Fabricator(:<%= @resource_name %>, class_name: '<%= @modulized_resource_class_name -%>') do
 <% end -%>
 <%   @fields.each_pair do |field_name, kind| -%>
 <%   if kind == 'belongs_to' -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scaffold_pico
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - gudata