scaffold_pico 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01ed0d0a8a59adbc57c39dbc8a8bf930e8e7171b
-  data.tar.gz: 2f0dd10cb828c05079a94a47060b3bde5958fade
+  metadata.gz: e19a7250e48783d7ecea85cdcaee1d7d909c4ef4
+  data.tar.gz: 33f1da79febd07343c6949c3ea7945818caef1fe
 SHA512:
-  metadata.gz: 616d2848206de87163b6ed3fca98d23bcfa0424958a337ea2f6bd5901c392ce27d621958cee9d7f64f139c2f98517d568bee1994b393ba379b334997afc87898
-  data.tar.gz: b6c379c22b317c8a5f06e0e68b1af018b4caf9bd80b86306c834e8e3db346f240fd3d412892dbe45bfd5c67d141c4936a7b4d40f80cb0f14a32977548839920e
+  metadata.gz: b6f67fe57933324dc8bb505dc68c645421087714348bf407d45fe7906c930ab2be07092124ef12bbda1d4830c9cd5db1a9e0391d4251696211ed468d66501da1
+  data.tar.gz: e168b3d924e1fe54ba0312983781371ddf37a0a819e9404497f17da879c6ad39b8ed022216aa88a219009fee88f3c555e03c1068ae1edc4b1d13cb64c6a48dd0

data/README.rdoc

@@ -2,20 +2,26 @@
 
 ruby -I lib bin/scaffold_pico.rb  --css_framework=zurb --template=slim -m user -n Admin -i :roles :company -j :roles :company --fields name:string
 
-scaffold_pico.rb -m Admin::User -n admin/gosho -i :roles :company -j :roles :company --fields name:string
 
-ruby -I ~/scaffold_pico/lib ~/scaffold_pico/bin/scaffold_pico.rb  -m Admin::Assistant -n administation/pencho --fields first_name:string last_name:string
+Used in production:
+scaffold_pico.rb -m Company -n super_admin --fields name:string website:string active:string subscription:string contact_person:string
 
+scaffold_pico.rb -m CompanyOwnerships -b AuthenticatedController -n admin \
+  --includes :user :company \
+  --css_framework=materialize \
+  --fields user_id: company_id: admin:boolean approved:boolean \
+  --index-fields user_id admin approved \
+  --search-fields admin approved
 
-ruby -I ~/scaffold_pico/lib ~/scaffold_pico/bin/scaffold_pico.rb  -m Company -n super_admin --fields name:string website:string active:string subscription:string contact_person:string
+scaffold_pico.rb -m Admin::Assistant -n administation/pencho --fields first_name:string last_name:string
 
-
-ruby -I ~/scaffold_pico/lib ~/scaffold_pico/bin/scaffold_pico.rb -d --css_framework=materialize \
+Example with options:
+scaffold_pico.rb -d --css_framework=materialize \
   -m Vector -n manage -b AdminController  \
   --fields name: featured:boolean aspect_ratio: portrait:boolean landscape:boolean imported:boolean trending:boolean width:integer height:integer transperant:boolean bw:boolean license:belongs_to group_id:integer tool:belongs_to user_id: category_id: category_display_order:integer group_display_order:integer svg:file ai:file png:file emf:file wmf:file  \
   --index-fields id name imported featured \
   --search-fields name aspect_ratio landscape portrait imported featured trending width height transperant bw license_id group_id tool_id user_id category_id
-
+  --services_folder=services
 
 == I18n
 
@@ -37,3 +43,24 @@ en.yml:
 Copyright (c) 2016 gudata. See LICENSE.txt for
 further details.
 
+
+
+2fix
+
+
+scaffold_pico.rb -m Admin::CompanyOwnerships -b AuthenticatedController -n admin \
+  --includes :user, :company \ <---
+  --css_framework=materialize \
+  --fields user_id: company_id: admin:boolean approved:boolean \
+  --index-fields user_id admin approved \
+  --search-fields admin approved <-- missing searchfields
+
+Started POST "/super_admin/company_ownerships" for 127.0.0.1 at 2016-05-18 21:36:21 +0300
+Processing by SuperAdmin::CompanyOwnershipsController#create as HTML
+  Parameters: {"utf8"=>"✓", "authenticity_token"=>"OBASAkBg11kfNd0omZ6Jd4AApmCIU1Q2f9uCq/665cwf/qJva74jkS620ELii96stkPcYfLfzes0yu0i/+nKAQ==", "company_ownership"=>{"user_id"=>"1", "company_id"=>"1", "admin"=>"0", "approved"=>"0"}, "commit"=>"Създай Членство"}
+  User Load (0.4ms)  SELECT  "users".* FROM "users" WHERE "users"."id" = ? ORDER BY "users"."id" ASC LIMIT ?  [["id", 4], ["LIMIT", 1]]
+Unpermitted parameters: user_id, company_id <---
+
+
+services/action folder param
+auction = auction.where(name: name) if self.name.present?

data/lib/scaffold/cli.rb

@@ -85,6 +85,13 @@ module Scaffold
           desc 'zurb'
         end
 
+        option :services_folder do
+          long '--services_folder=services'
+          validate  /\A(\w+(?:\/\w+)*)\z/
+          desc 'Where to put the search model. Example: --services=actions'
+        end
+
+
         separator ''
         separator 'Common options: '
 

data/lib/scaffold/models_generator.rb

@@ -20,7 +20,7 @@ module Scaffold
     end
 
     def create_searches_path
-      searches_path = File.join(Dir.pwd, 'app', 'services', 'search', @params.namespaces_array)
+      searches_path = File.join(Dir.pwd, 'app', @params.services_folder, 'search', @params.namespaces_array)
       FileUtils.mkpath(searches_path)
       searches_path
     end

data/lib/scaffold/params.rb

@@ -1,6 +1,6 @@
 module Scaffold
   class Params
-    attr_reader :resource_name, :namespaces_array, :controller_file_name, :template, :css_framework, :views_folder_name, :route_resource_name
+    attr_reader :resource_name, :namespaces_array, :controller_file_name, :template, :css_framework, :views_folder_name, :route_resource_name, :services_folder
 
     def expand_default_types hash
       hash.each_pair do |key, value|
@@ -35,12 +35,11 @@ module Scaffold
       @namespaces_array = parse_namespaces_array(@namespace)  # [:admin, ...?... ]
 
       # controller
-      @controller_namespaces = @namespace.camelize
-
       if @namespaces_array.blank?
         @controller_class_name = "#{@model_name.pluralize}Controller"
         @search_modulized_resource_class_name = "Search::#{@resource_class_name}Search"
       else
+        @controller_namespaces = @namespace.camelize
         @controller_class_name = "#{@controller_namespaces}::#{@model_name.pluralize}Controller"
         @search_modulized_resource_class_name =  "Search::#{@controller_namespaces}::#{@resource_class_name.pluralize}Search"
       end
@@ -63,6 +62,7 @@ module Scaffold
 
       @collection_path = @path_segments.dup << @collection_name.to_sym
 
+      @services_folder = choice[:services_folder]
       debug_info if choice[:debug]
     end
 
@@ -90,7 +90,7 @@ module Scaffold
     end
 
     def parse_namespaces_array namespace
-      namespace.split('/').collect{|name| name.underscore}
+      (namespace || "").split('/').collect{|name| name.underscore}
     end
 
     def hasherize_fields fields_array

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

@@ -10,11 +10,15 @@ class <%= @search_modulized_resource_class_name %>
 
   def results
     <%= @resource_name %> = <%= @modulized_resource_class_name %>
-    <% @search_fields.each do |field_name| %>
-    <%= @resource_name %> = <%= @resource_name %>.where(<%= field_name %>: <%= field_name %>) if self.<%= field_name %>.present?
+    <% @fields.select {|k,v| @search_fields.include?(k) }.each_pair do |field_name, field_type| %>
+    <%- if field_type == "string" %>
+      <%= @resource_name %> = <%= @resource_name %>.where("<%= field_name %> LIKE ?", "%#{<%= field_name %>}%") if self.<%= field_name %>.present?
+    <%- else  %>
+      <%= @resource_name %> = <%= @resource_name %>.where(<%= field_name %>: <%= field_name %>) if self.<%= field_name %>.present?
+    <%- end  %>
     <% end %>
 
     <%= @resource_name %>
   end
 
-end
+end

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

@@ -1,8 +1,8 @@
-h1 = t('scaffold.index.title', model: <%= @resource_class_name %>.model_name.human(count: 2))
+h1 = t('scaffold.index.title', model: <%= @modulized_resource_class_name %>.model_name.human(count: 2))
 
 = link_to <%= @new_resource_path %>, class: 'btn waves-effect waves-light' do
   i.material-icons.right add
-  = t('scaffold.actions.new', model: <%= @resource_class_name %>.model_name.human(count: 1).mb_chars.downcase)
+  = t('scaffold.actions.new', model: <%= @modulized_resource_class_name %>.model_name.human(count: 1).mb_chars.downcase)
 
 .row
   .col.s12.m9
@@ -12,7 +12,7 @@ h1 = t('scaffold.index.title', model: <%= @resource_class_name %>.model_name.hum
           thead
             tr
             <% @fields.select {|k,v| @index_fields.include?(k) }.keys.each do |field_name| %>
-              th = <%= @resource_class_name -%>.human_attribute_name(:<%= field_name -%>)
+              th = <%= @modulized_resource_class_name -%>.human_attribute_name(:<%= field_name -%>)
             <% end %>
               th colspan=3 = t('scaffold.index.actions')
 

data/lib/templates/pico/views/zurb/slim/index.html.slim.erb

@@ -1,6 +1,6 @@
-h1 = t('scaffold.index.title', model: <%= @resource_class_name %>.model_name.human(count: 2).mb_chars.downcase)
+h1 = t('scaffold.index.title', model: <%= @modulized_resource_class_name %>.model_name.human(count: 2).mb_chars.downcase)
 
-= link_to t('scaffold.actions.new', model: <%= @resource_class_name %>.model_name.human.mb_chars.downcase), <%= @new_resource_path %>, class: 'button small secondary'
+= link_to t('scaffold.actions.new', model: <%= @modulized_resource_class_name %>.model_name.human.mb_chars.downcase), <%= @new_resource_path %>, class: 'button small secondary'
 
 .row
   .small-12.medium-10.columns
@@ -8,7 +8,7 @@ h1 = t('scaffold.index.title', model: <%= @resource_class_name %>.model_name.hum
       thead
         tr
         <% @fields.select {|k,v| @index_fields.include?(k) }.keys.each do |field_name| %>
-          th = <%= @resource_class_name -%>.human_attribute_name(:<%= field_name -%>)
+          th = <%= @modulized_resource_class_name -%>.human_attribute_name(:<%= field_name -%>)
         <% end %>
           th colspan=3 = t('scaffold.index.actions')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scaffold_pico
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - gudata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport