scaffold_pico 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05cb9ae933761d5c005549a9b394100a715856d5
-  data.tar.gz: 55c7e30fb9c60eda9a0d36678e7141f6c291390b
+  metadata.gz: 14cf2648944a7e5f17fefee16207c780e92cb932
+  data.tar.gz: b42eaf583b52b2b40f507f5833f563a95e7612db
 SHA512:
-  metadata.gz: 83426759ac134ba0e6d7bb1289de61b250ec3ed22bb9b0e0d9e67380027d93f03efb726a3d6fe193bd3df93bc39142fdfa25e4e7296015840c1b878241d28af5
-  data.tar.gz: 3c28e4b8d4238e4b6ab72255c71c3fb71b371922bd85201222e23832c30509bbf98a0414763946f1c492d67ba1ea0a023758e9768f713eb3d2e2fd3dffa9c9a5
+  metadata.gz: 5f4addb50eaa34fb870635bc0ecaf30b5b9db09994aa33472daf565301257c3442a4847d933bbc2c14807f4ccb0555855ebd696b9983e4a8b0471565c1bd144b
+  data.tar.gz: 78b7b56bf9f28549a31ce8388a92f28b54075a3386bca329d23510933516472cb9aa669a625d4896f806e044353e0aa08345f067587bce088d9d8fb3a637d3fd

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

@@ -2,20 +2,22 @@ class <%= @rails.resource.search_class_name %>
   include ActiveModel::Model
 
   attr_accessor(
-<% @rails.resource.fields.select {|k,v| @rails.controller.search_fields.include?(k) }.each_pair do |field_name, field_type| %>
-  <% if field_type == 'belongs_to' -%>
-    :<%= field_name %>_id,
-  <% else %>
-    :<%= field_name %>,
+    <% @rails.controller.search_fields.map do |field_name| %>
+      <%=
+      if @rails.resource.fields[field_name] == 'belongs_to'
+        ":#{field_name}_id,"
+      else
+        ":#{field_name},"
+      end
+      -%>
     <% end %>
-<% end %>
   )
 
-<% @rails.resource.fields.select {|k,v| @rails.controller.search_fields.include?(k) }.each_pair do |field_name, field_type| %>
-  <%- if field_type == "integer" %>
-  validates :<%= field_name -%>, numericality: { only_integer: true }, allow_blank: true
-  <%- end  %>
-<%- end  %>
+  <% @rails.controller.search_fields.select { |search_filed| @rails.resource.fields[search_filed] == 'integer' }.each do |search_filed| %>
+    <%=
+    "validates :#{field_name}, numericality: { only_integer: true }, allow_blank: true"
+    -%>
+  <% end %>
 
   def initialize *args
     @relation = <%= @rails.resource.class_name_with_modules %>
@@ -23,25 +25,32 @@ class <%= @rails.resource.search_class_name %>
   end
 
   def results
-    <%= @rails.resource.name %> = @relation
-
-    <%= @rails.resource.name %> = @relation.order("updated_at") if <%= @rails.resource.class_name_with_modules %>.column_names.include?('updated_at')
+    <% resource_name = @rails.resource.name.pluralize %>
+    <%= resource_name -%> = @relation
 
     if valid?
-<% @rails.resource.fields.select {|k,v| @rails.controller.search_fields.include?(k) }.each_pair do |field_name, field_type| %>
-  <% if ['string', 'text'].include?(field_type) -%>
-    <%= @rails.resource.name %> = <%= @rails.resource.name %>.where("<%= field_name %> LIKE ?", "%#{<%= field_name %>}%") if self.<%= field_name %>.present?
-  <% elsif field_type == "boolean" -%>
-    <%= @rails.resource.name %> = <%= @rails.resource.name %>.where(<%= field_name -%>: <%= field_name -%>=='1') if self.<%= field_name %>.present?
-  <% elsif field_type == 'belongs_to' -%>
-    <%= @rails.resource.name %> = <%= @rails.resource.name %>.where(<%= field_name %>_id: <%= field_name %>_id) if self.<%= field_name %>_id.present?
-  <% else  -%>
-    <%= @rails.resource.name %> = <%= @rails.resource.name %>.where(<%= field_name %>: <%= field_name %>) if self.<%= field_name %>.present?
-  <% end  -%>
-<% end -%>
-  end
+    <% @rails.controller.search_fields.each do |field_name| %>
+      <%=
+      case @rails.resource.fields[field_name]
+      when 'string', 'text'
+        "#{resource_name} = #{resource_name}.where(\"#{field_name} LIKE ?\", \"%\#{#{field_name}}%\") if #{field_name}.present?"
+      when 'boolean'
+        "#{resource_name} = #{resource_name}.where(#{field_name}: true) if #{field_name} == '1'"
+      when 'belongs_to'
+        "#{resource_name} = #{resource_name}.where(#{field_name}_id: #{field_name}_id) if #{field_name}_id.present?"
+      when 'int', 'integer'
+        "#{resource_name} = #{resource_name}.where(#{field_name}: #{field_name}.to_i) if #{field_name}.present?"
+      else
+        "#{resource_name} = #{resource_name}.where(#{field_name}: #{field_name}) if #{field_name}.present?"
+      end
+      -%>
+    <% end %>
 
-    <%= @rails.resource.name %>
+      if <%= @rails.resource.class_name_with_modules -%>.attribute_names.include?('updated_at')
+        <%= resource_name %>.order(updated_at: :desc)
+      else
+        <%= resource_name %>
+      end
+    end
   end
-
 end

data/lib/templates/pico/views/materialize/slim/_form.html.slim.erb

@@ -1,15 +1,21 @@
 = form.error_notification
 .form-inputs
-<%   @rails.resource.fields.each_pair do |field_name, kind| -%>
-<%   if kind == 'file' -%>
-    = form.input :<%= field_name -%>, as: :file
-<%   elsif kind == 'belongs_to' -%>
-    = form.association :<%= field_name %>
-<%   elsif kind == 'text' -%>
-    = form.input :<%= field_name -%>, as: :text
-<%   elsif ['date', 'datetime'].include?(kind)  -%>
-    = form.input :<%= field_name -%>, as: :date, html5: true
-<%   else -%>
-    = form.input :<%= field_name %>
-<%   end -%>
-<%   end -%>
+<% @rails.resource.fields.each_pair do |field_name, kind| %>
+  <%- next if field_name == 'id' -%>
+  <%=
+    case kind
+    when 'file'
+      "= form.input :#{field_name}, as: :file"
+    when 'belongs_to'
+      "= form.association :#{field_name}"
+    when 'text'
+      "= form.input :#{field_name}, as: :text"
+    when 'date', 'datetime'
+      "= form.input :#{field_name}, as: :date, html5: true"
+    when 'boolean'
+      "= form.input :#{field_name}, as: :boolean"
+    else
+      "= form.input :#{field_name}"
+    end
+  -%>
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scaffold_pico
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors:
 - gudata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport