ultra_light_wizard 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80b4dd5230aa70e805ce0b3f516dc4e882ea0d38
-  data.tar.gz: f9db7ab36afbb0fe06db8ad9937a7b04f250bac8
+  metadata.gz: 2929282783a52ec498589168a0c2d4f9a293ba48
+  data.tar.gz: 1a659b6b9a05a82a7f7464e6fe335cadb3f0c73c
 SHA512:
-  metadata.gz: f366407e1b4216e618f9c4668eb6fd76a7d4a7c164ed039f152d4bdb4543cb01038a888d4a920206186a8beebb9488ace94af395bd454b367eab90e15cbf1e11
-  data.tar.gz: 396ad497eabb8ba6ad460295c20ce903a03e6e287fdd9cb8c7003b5b14788c5175780b8a3f9d692c7256ac5ec500e4592828821774508abd7f7779b00e20ffba
+  metadata.gz: 8ed1443f1dc071f13c03abfaa9956aa9dc852aab3657fc990f1b06b8ed47be1f46f790e63e4a7fbabad92d88a9067c988a24dbd85a300b62c914e5380f3e67eb
+  data.tar.gz: 49bd8560e293d95aa42ab7c0f183a35a7f8bb61d6a5ca86865c2f54d288affcee70c4ce46ac2c7251211f61b1eb8036dbb2008f9629a055f1e708cd80c922572

data/README.md

@@ -95,8 +95,9 @@ Features
   + [DONE] Helper (or Controller SuperModule trait) for ultra light wizard support
   + [DONE] Route helper methods
   + [DONE] Wizard kick-off helper/view
-  - Forms
+  + [DONE] Forms
   - Scaffolding of main model controller/views/migration
+  - Support for attributes
   - Support for nested resources
   - Modularize (perhaps extracting sub-generators)
   + [DONE] Customize name conventions

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/generators/templates/app/controllers/wizard_steps_controller.rb.erb

@@ -1,4 +1,5 @@
 class <%= class_name %><%= step_alias.pluralize.camelize %>Controller < ApplicationController
+  include <%= class_name %><%= step_alias.pluralize.camelize %>Helper
   before_action :load_<%= file_path %>
 
   <%= step_alias.pluralize.upcase %> = %w(<%= steps.to_a.join(' ') %>)
@@ -16,8 +17,8 @@ class <%= class_name %><%= step_alias.pluralize.camelize %>Controller < Applicat
   end
 
   def update
-    if <%= file_path %>_<%= step_alias %>_model.update_attributes(params[:<%= file_path %>])
-      if next_<%= step_alias %> && params[:commit].downcase.include?('continue')
+    if <%= file_path %>_<%= step_alias %>_model.update_attributes(<%= file_path %>_params || {})
+      if next_<%= step_alias %> && params[:commit].downcase.include?('next')
         redirect_to edit_<%= file_path %>_<%= file_path %>_<%= step_alias %>_path(<%= file_path %>_<%= step_alias %>_model, next_<%= step_alias %>)
       else
         redirect_to <%= file_path %>_path(@<%= file_path %>)
@@ -33,18 +34,8 @@ class <%= class_name %><%= step_alias.pluralize.camelize %>Controller < Applicat
     @<%= file_path %> = <%= file_path %>_<%= step_alias %>_model
   end
 
-  def <%= file_path %>_<%= step_alias %>_model
-    <%= file_path %>_class = "<%= class_name %>::#{<%= step_alias %>.camelcase}".constantize rescue <%= class_name %>
-    <%= file_path %>_class.find(params[:<%= file_path %>_id])
-  end
-
-  def <%= step_alias %>
-    <%= step_alias.pluralize.upcase %>.find {|a_<%= step_alias %>| a_<%= step_alias %> == params[:id].to_s.downcase}
-  end
-
-  def next_<%= step_alias %>
-    current_<%= step_alias %>_index = <%= step_alias.pluralize.upcase %>.index(<%= step_alias %>)
-    next_<%= step_alias %> = <%= step_alias.pluralize.upcase %>[current_<%= step_alias %>_index+1]
+  def <%= file_path %>_params
+    params.require(:<%= file_path %>).permit(<%= controller_attribute_names %>)
   end
 
 end

data/lib/generators/templates/app/helpers/wizard_steps_helper.rb.erb

@@ -3,12 +3,14 @@ module <%= class_name %><%= step_alias.pluralize.camelize %>Helper
 
   def <%= file_path %>_<%= step_alias %>_model
     <%= file_path %>_class = "<%= class_name %>::#{<%= step_alias %>.camelcase}".constantize rescue <%= class_name %>
-    <%= file_path %>_class.find(params[:<%= file_path %>_id])
+    @<%= file_path %> ||= <%= file_path %>_class.find(params[:<%= file_path %>_id])
   end
 
   def <%= step_alias %>
-    <%= step_alias.pluralize.upcase %>.find {|a_<%= step_alias %>| a_<%= step_alias %> == params[:id].to_s.downcase}
+    # Filter for security reasons
+    @<%= step_alias %> ||= <%= step_alias.pluralize.upcase %>.find {|a_<%= step_alias %>| a_<%= step_alias %> == params[:id].to_s.downcase}
   end
+  alias current_<%= step_alias %> <%= step_alias %>
 
   def previous_<%= step_alias %>
     current_<%= step_alias %>_index = <%= step_alias.pluralize.upcase %>.index(<%= step_alias %>)
@@ -22,24 +24,30 @@ module <%= class_name %><%= step_alias.pluralize.camelize %>Helper
   end
 
   <% %w(path url).each do |route_term| %>
-  def first_<%= step_alias %>_<%= route_term %>
-    <%= file_path %>_<%= step_alias %>_model_<%= route_term %>(<%= step_alias.pluralize.upcase %>.first)
+  <% ["edit_", ""].each do |action_prefix| %>
+  def <%= action_prefix %>first_<%= step_alias %>_<%= route_term %>
+    <%= action_prefix %><%= file_path %>_<%= step_alias %>_model_<%= route_term %>(<%= step_alias.pluralize.upcase %>.first)
   end
 
-  def previous_<%= step_alias %>_<%= route_term %>
-    <%= file_path %>_<%= step_alias %>_model_<%= route_term %>(previous_<%= step_alias %>)
+  def <%= action_prefix %>previous_<%= step_alias %>_<%= route_term %>
+    <%= action_prefix %><%= file_path %>_<%= step_alias %>_model_<%= route_term %>(previous_<%= step_alias %>)
   end
 
-  def next_<%= step_alias %>_<%= route_term %>
-    <%= file_path %>_<%= step_alias %>_model_<%= route_term %>(next_<%= step_alias %>)
+  def <%= action_prefix %>next_<%= step_alias %>_<%= route_term %>
+    <%= action_prefix %><%= file_path %>_<%= step_alias %>_model_<%= route_term %>(next_<%= step_alias %>)
   end
 
-  def last_<%= step_alias %>_<%= route_term %>
-    <%= file_path %>_<%= step_alias %>_model_<%= route_term %>(<%= step_alias.pluralize.upcase %>.last)
+  def <%= action_prefix %>last_<%= step_alias %>_<%= route_term %>
+    <%= action_prefix %><%= file_path %>_<%= step_alias %>_model_<%= route_term %>(<%= step_alias.pluralize.upcase %>.last)
   end
 
-  def <%= file_path %>_<%= step_alias %>_model_<%= route_term %>(<%= step_alias %>)
-    edit_<%= file_path %>_<%= file_path %>_<%= step_alias %>_<%= route_term %>(<%= file_path %>_<%= step_alias %>_model, <%= step_alias %>)
+  def <%= action_prefix %>current_<%= step_alias %>_<%= route_term %>
+    <%= action_prefix %><%= file_path %>_<%= step_alias %>_model_<%= route_term %>(<%= step_alias %>)
   end
+
+  def <%= action_prefix %><%= file_path %>_<%= step_alias %>_model_<%= route_term %>(<%= step_alias %>)
+    <%= action_prefix %><%= file_path %>_<%= file_path %>_<%= step_alias %>_<%= route_term %>(<%= file_path %>_<%= step_alias %>_model, <%= step_alias %>)
+  end
+  <% end %>
   <% end %>
 end

data/lib/generators/templates/app/views/wizard_step_navigation_view.html.erb

@@ -1,10 +1,6 @@
 <ul>
   <%% if <%= "previous_#{step_alias}" %>.present? %>
-    <li><%%= link_to "Previous <%= step_alias %>", edit_<%= file_path %>_<%= file_path %>_<%= step_alias %>_path(<%= file_path %>_<%= step_alias %>_model, previous_<%= step_alias %>) %></li>
-  <%% end %>
-  <%% if <%= "next_#{step_alias}" %>.present? %>
-    <li><%%= link_to "Next <%= step_alias %>", edit_<%= file_path %>_<%= file_path %>_<%= step_alias %>_path(<%= file_path %>_<%= step_alias %>_model, next_<%= step_alias %>) %></li>
-  <%% else %>
-    <li><%%= link_to "Finish <%= step_alias %>", <%= file_path %>_path(<%= file_path %>_<%= step_alias %>_model) %></li>
+    <li><%%= link_to "Previous <%= step_alias %>", edit_previous_<%= step_alias %>_path %></li>
   <%% end %>
+  <li><%%= f.submit <%= "next_#{step_alias}" %>.present? ? "next" : "finish" %></li>
 </ul>

data/lib/generators/templates/app/views/wizard_step_view.html.erb

@@ -1,3 +1,6 @@
 <h1><%= file_path.humanize %> wizard</h1>
 <h2><%= step_alias.titleize %>: <%= @wizard_step.humanize %></h2>
-<%%= render '<%= step_alias %>_navigation' %>
+<%%= form_for <%= file_path %>_<%= step_alias %>_model, :url => current_<%= step_alias %>_path, :as => :<%= file_path %> do |f| %>
+  <%%# Please insert the fields of this particular step %>
+  <%%= render '<%= step_alias %>_navigation', f: f %>
+<%% end %>

data/lib/generators/ultra_light_wizard/wizard_generator.rb

@@ -29,6 +29,10 @@ module UltraLightWizard
         file_path.pluralize
       end
 
+      def controller_attribute_names
+        [].join(',')
+      end
+
       def human_name
         file_path.humanize
       end

data/ultra_light_wizard.gemspec

@@ -1,17 +1,17 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: ultra_light_wizard 0.0.4 ruby lib
+# stub: ultra_light_wizard 0.0.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ultra_light_wizard"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Andy Maleh"]
-  s.date = "2016-01-29"
+  s.date = "2016-01-30"
   s.description = "Ultra light & maintainble wizards in Rails that honor REST, MVC, and OO with minimal writing of code involved and maximum flexibility"
   s.email = "andy.am@gmail.com"
   s.extra_rdoc_files = [
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/AndyObtiva/ultra_light_wizard"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5.1"
+  s.rubygems_version = "2.4.8"
   s.summary = "Ultra Light & Maintainable Wizards In Rails"
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ultra_light_wizard
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Andy Maleh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ultra Light & Maintainable Wizards In Rails