scaffold_pico 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbe82a25404eaa5ba1101c071eace6171b0aa8f7
-  data.tar.gz: bee81a61c5815444ed94356fd340578caa799c7f
+  metadata.gz: 48f0605737089876b9d08fe8d170d3f8ed56ef4c
+  data.tar.gz: 60c747832e40604a75f07b4cb791d4dcf3627086
 SHA512:
-  metadata.gz: 4cb8b31ccf772abb3d1295ecc20cb8cc686723c68f71c8e49a11a10d48c29fa94945dbb67e40399d1565b951d17be4bfffae7328b34257c4fadbf6e22b198050
-  data.tar.gz: 3e05c06f18416372d044771477a8c7547610f41ff6717e542b2cda87caefefa51394b92fd61f2ce40220784c5b9397dacaa23d891354e50e745433f23aaebfdb
+  metadata.gz: 08bdb16efdb857b1f63c8bb8b9a616cdfb3e0973233b04058423a469ff858ad9984d7fd27e3879d4b2722cf3774b254aff125fb8786704e51d3f468ebd66c810
+  data.tar.gz: e93ef4477245ea1974730aff4bc86cb0a8cd38e8816d6db9f59c7013ed34865ee79e12f0f39bb6f86c4a83a6227b226bca79bc56629e8d36ad2e3c7f410c72f5

data/lib/scaffold/params.rb

@@ -35,32 +35,49 @@ module Scaffold
       @namespaces_array = parse_namespaces_array(@namespace)  # [:admin, ...?... ]
 
       # controller
+      @resource_name = @model_name.tableize.singularize # user for use in @user or filenames
+      @collection_name = @model_name.tableize # users for use in @users
+
       if @namespaces_array.blank?
         @controller_class_name = "#{@model_name.pluralize}Controller"
-        @search_modulized_resource_class_name = "Search::#{@resource_class_name}Search"
+        @search_modulized_resource_class_name = "Search::#{@resource_class_name.pluralize}Search"
+
+        # paths without namespace
+        @new_resource_path = "[:new, :#{@resource_name}]"
+
+        @resource_path = "[#{@resource_name}]"
+        @edit_resource_path = "[:edit, #{@resource_name}]"
+
+        @instance_resource_path = "[@#{@resource_name}]"
+        @instance_edit_resource_path = "[:edit, @#{@resource_name}]"
+
+        @collection_path = [@collection_name.to_sym]
+
       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"
+
+        # paths with namespace
+        @path_segments = @namespaces_array.map{|segment| segment.to_sym }
+        @new_resource_path = "[:new, #{@path_segments.map{|item| ":#{item}"}.join(", ")}, :#{@resource_name}]"
+
+        @resource_path = "[#{@path_segments.map{|item| ":#{item}"}.join(", ")}, #{@resource_name}]"
+        @edit_resource_path = "[:edit, #{@path_segments.map{|item| ":#{item}"}.join(", ")}, #{@resource_name}]"
+
+        @instance_resource_path = "[#{@path_segments.map{|item| ":#{item}"}.join(", ")}, @#{@resource_name}]"
+        @instance_edit_resource_path = "[:edit, #{@path_segments.map{|item| ":#{item}"}.join(", ")}, @#{@resource_name}]"
+
+        @collection_path = @path_segments.dup << @collection_name.to_sym
+
       end
       @controller_file_name = "#{@resource_class_name.tableize}_controller.rb"
 
-      @resource_name = @model_name.tableize.singularize # user for use in @user or filenames
-      @collection_name = @model_name.tableize # users for use in @users
 
       # view
       @views_folder_name = @model_name.tableize # users
 
-      @path_segments = @namespaces_array.map{|segment| segment.to_sym }
-      @new_resource_path = "[:new, #{@path_segments.map{|item| ":#{item}"}.join(", ")}, :#{@resource_name}]"
-
-      @resource_path = "[#{@path_segments.map{|item| ":#{item}"}.join(", ")}, #{@resource_name}]"
-      @edit_resource_path = "[:edit, #{@path_segments.map{|item| ":#{item}"}.join(", ")}, #{@resource_name}]"
-
-      @instance_resource_path = "[#{@path_segments.map{|item| ":#{item}"}.join(", ")}, @#{@resource_name}]"
-      @instance_edit_resource_path = "[:edit, #{@path_segments.map{|item| ":#{item}"}.join(", ")}, @#{@resource_name}]"
 
-      @collection_path = @path_segments.dup << @collection_name.to_sym
 
       @services_folder = choice[:services_folder]
       debug_info if choice[:debug]

metadata

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