adhoc-generators 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 754919abd00031ded4698235eff5f7cf5d323deb
-  data.tar.gz: 42a455e5fad7083b936b91328fe539d3cc853f8e
+  metadata.gz: 41d1e43da9f97728b0ef6e08245f40e87c48a698
+  data.tar.gz: 40aef30c65246e320c1985158a1db25e54032c56
 SHA512:
-  metadata.gz: ff077bf96bde8106723f0f9dfc601de959b7cd26da5d6ddceb019003f08d23cf8fbbf05d819c81eb8a9b2bafd1f9c5e0b759f784b3f8dc44368ad93dfdca8a4b
-  data.tar.gz: bad0b54aef752a882012e7e8a5935f7000df73cabddf9e09fe3a969073e7f07d98e2877f745975e850431eda3aa37e8b5733bc2db4d84addb3565f2ee4865c26
+  metadata.gz: 6bac520a3f939f6c10b5cd92d9115479d13067ad3cceea220c062b7124f10eb825df58c36be15e2b0fc3bdd71b778b80374bbe6df8aaf75f3f79c8cad1f06ad6
+  data.tar.gz: 1dc847e47a9776123fcb5b9ac74a3ad58fa0bf770581760a49e65dda782fbf6f071424bcbd9d55b4b96cf9f4f54cb3a16d8c1020cebd578cccbdcc0fe644b7a1

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    adhoc-generators (0.0.2)
+    adhoc-generators (0.0.4)
+      paperclip (~> 3.5.1)
       rails (~> 4.0.0)
 
 GEM
@@ -35,6 +36,10 @@ GEM
     atomic (1.1.13)
     bcrypt-ruby (3.1.2)
     builder (3.1.4)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.1)
+      climate_control (>= 0.0.3, < 1.0)
     cucumber (1.3.6)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
@@ -57,6 +62,11 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.7.9)
     multi_test (0.0.2)
+    paperclip (3.5.1)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.0)
+      mime-types
     polyglot (0.3.3)
     rack (1.5.2)
     rack-test (0.6.2)

data/lib/generators/adhoc/portfolio/portfolio_generator.rb

@@ -10,14 +10,9 @@ module Adhoc
 
       argument :name, type: :string, default: 'Portfolio', banner: 'PortfolioBanner'
 
-      class_option :namespace_model,
-                    desc: 'If the resource is namespaced, include the model in the namespace.',
-                    type: :boolean
-
       def initialize(*args, &block)
         super
         print_usage unless name.underscore =~ /^[a-z][a-z0-9_\/]+$/
-        @namespace_model = options.namespace_model?
         
         @attributes = []
 
@@ -27,22 +22,19 @@ module Adhoc
 
       end
 
-
       def create_model
         template 'model.rb', "app/models/#{file_name}.rb"
       end
 
-
       def create_migration
-        migration_template 'migration.rb', "db/migrate/create_#{plural_name.gsub('/', '_')}.rb"
+        migration_template 'migration.rb', "db/migrate/create_#{table_name}.rb"
       end
 
-
       def create_controller
         template 'controller.rb', "app/controllers/#{plural_name}_controller.rb"
         template 'helper.rb', "app/helpers/#{plural_name}_helper.rb"
 
-        %w[index show new edit].each do |action|
+        controller_views.each do |action|
           template "views/#{action}.html.erb", "app/views/#{plural_name}/#{action}.html.erb"
         end
 
@@ -57,50 +49,49 @@ module Adhoc
         }
       end
 
-
       private
 
-      def file_name
+      def file_name # potfolio
         name.underscore
       end
 
-      def constant_name
-        file_name.upcase
+      def plural_name # portfolios
+        name.underscore.pluralize
       end
 
-      def model_name
-        file_name.capitalize
+      def model_name # Portfolio
+        name.underscore.capitalize
       end
 
-      def plural_class_name
+      def plural_model_name # Portfolios
         plural_name.camelize
       end
 
-      def plural_name
-        file_name.pluralize
-      end
-
-      def table_name
-        if name.include?('::') && @namespace_model
+      def table_name # portfolios
+        if name.include?('::')
           plural_name.gsub('/', '_')
         end
       end
 
       def instance_name
-        file_name.gsub('/','_')
+        name.underscore.gsub('/','_')
       end
 
       def instances_name
         instance_name.pluralize
       end
 
+      def controller_views
+        %w[index show new edit]
+      end
+
       def controller_actions
         %w[index show new edit create update destroy]
       end
 
-      def controller_methods(dir_name)
+      def controller_methods
         controller_actions.map do |action|
-          read_template("#{dir_name}/#{action}.rb")
+          read_template("actions/#{action}.rb")
         end.join("\n").strip
       end
 
@@ -116,54 +107,54 @@ module Adhoc
         names.all? { |name| action? name }
       end
 
-def singular_name
-  name.underscore
-end
+      def singular_name
+        name.underscore
+      end
 
- def item_resource
-    name.underscore.gsub('/','_')
-  end
+      def item_resource
+        name.underscore.gsub('/','_')
+      end
 
-  def items_path
-    if action? :index
-      "#{item_resource.pluralize}_path"
-    else
-      "root_path"
-    end
-  end
+      def items_path
+        if action? :index
+          "#{item_resource.pluralize}_path"
+        else
+          "root_path"
+        end
+      end
 
-  def item_path(options = {})
-    name = options[:instance_variable] ? "@#{instance_name}" : instance_name
-    suffix = options[:full_url] ? "url" : "path"
-    if options[:action].to_s == "new"
-      "new_#{item_resource}_#{suffix}"
-    elsif options[:action].to_s == "edit"
-      "edit_#{item_resource}_#{suffix}(#{name})"
-    else
-      if name.include?('::')
-        namespace = singular_name.split('/')[0..-2]
-        "[:#{namespace.join(', :')}, #{name}]"
-      else
-        name
+      def item_path(options = {})
+        name = options[:instance_variable] ? "@#{instance_name}" : instance_name
+        suffix = options[:full_url] ? "url" : "path"
+        if options[:action].to_s == "new"
+          "new_#{item_resource}_#{suffix}"
+        elsif options[:action].to_s == "edit"
+          "edit_#{item_resource}_#{suffix}(#{name})"
+        else
+          if name.include?('::')
+            namespace = singular_name.split('/')[0..-2]
+            "[:#{namespace.join(', :')}, #{name}]"
+          else
+            name
+          end
+        end
       end
-    end
-  end
 
-  def item_url
-    if action? :show
-      item_path(:full_url => true, :instance_variable => true)
-    else
-      items_url
-    end
-  end
+      def item_url
+        if action? :show
+          item_path(:full_url => true, :instance_variable => true)
+        else
+          items_url
+        end
+      end
 
-  def items_url
-    if action? :index
-      item_resource.pluralize + '_url'
-    else
-      "root_url"
-    end
-  end
+      def items_url
+        if action? :index
+          item_resource.pluralize + '_url'
+        else
+          "root_url"
+        end
+      end
 
       def form_partial?
         actions? :new, :edit

data/lib/generators/adhoc/portfolio/templates/actions/create.rb

@@ -1,7 +1,7 @@
   def create
-    @<%= instance_name %> = <%= model_name %>.new(params[:<%= instance_name %>])
+    @<%= instance_name %> = <%= model_name %>.new(<%= instance_name %>_params)
     if @<%= instance_name %>.save
-      redirect_to <%= item_url %>, :notice => "Successfully created <%= model_name.underscore.humanize.downcase %>."
+      redirect_to <%= item_url %>, notice: "Successfully created <%= model_name.underscore.humanize.downcase %>."
     else
       render :new
     end

data/lib/generators/adhoc/portfolio/templates/actions/destroy.rb

@@ -1,5 +1,4 @@
   def destroy
-    @<%= instance_name %> = <%= model_name %>.find(params[:id])
     @<%= instance_name %>.destroy
-    redirect_to <%= items_url %>, :notice => "Successfully destroyed <%= model_name.underscore.humanize.downcase %>."
+    redirect_to <%= items_url %>, notice: "Successfully destroyed <%= model_name.underscore.humanize.downcase %>."
   end

data/lib/generators/adhoc/portfolio/templates/actions/edit.rb

@@ -1,3 +1,2 @@
   def edit
-    @<%= instance_name %> = <%= model_name %>.find(params[:id])
   end

data/lib/generators/adhoc/portfolio/templates/actions/show.rb

@@ -1,3 +1,2 @@
   def show
-    @<%= instance_name %> = <%= model_name %>.find(params[:id])
   end

data/lib/generators/adhoc/portfolio/templates/actions/update.rb

@@ -1,8 +1,7 @@
   def update
-    @<%= instance_name %> = <%= model_name %>.find(params[:id])
-    if @<%= instance_name %>.update_attributes(params[:<%= instance_name %>])
-      redirect_to <%= item_url %>, :notice  => "Successfully updated <%= model_name.underscore.humanize.downcase %>."
+    if @<%= instance_name %>.update_attributes(<%= instance_name %>_params)
+      redirect_to <%= item_url %>, notice: "Successfully updated <%= model_name.underscore.humanize.downcase %>."
     else
       render :edit
     end
-  end
+  end

data/lib/generators/adhoc/portfolio/templates/controller.rb

@@ -1,3 +1,15 @@
-class <%= plural_class_name %>Controller < ApplicationController
-  <%= controller_methods :actions %>
+class <%= plural_model_name %>Controller < ApplicationController
+  before_action :set_<%= instance_name %>, only: [:show, :edit, :update, :destroy]
+
+  <%= controller_methods %>
+
+  private
+
+    def set_<%= instance_name %>
+      @<%= instance_name %> = <%= model_name %>.where(id: params[:id]).first
+    end
+
+    def <%= instance_name %>_params
+      params.require(:<%= instance_name %>).permit(<%= attributes.map { |a| ":#{a.name}" }.join(", ") %>)
+    end
 end

data/lib/generators/adhoc/portfolio/templates/helper.rb

@@ -1,2 +1,2 @@
-module <%= plural_class_name %>Helper
+module <%= plural_model_name %>Helper
 end

data/lib/generators/adhoc/portfolio/templates/migration.rb

@@ -1,9 +1,10 @@
-class Create<%= model_name.pluralize.delete('::') %> < ActiveRecord::Migration
+class Create<%= plural_model_name.delete('::') %> < ActiveRecord::Migration
   def self.up
-    create_table :<%= table_name || plural_name.split('/').last %> do |t|
+    create_table :<%= plural_name.split('/').last %> do |t|
     <%- for attribute in attributes -%>
       t.<%= attribute.type %> :<%= attribute.name %>
     <%- end -%>
+      t.attachment :picture
     <%- unless options[:skip_timestamps] -%>
       t.timestamps
     <%- end -%>
@@ -11,6 +12,6 @@ class Create<%= model_name.pluralize.delete('::') %> < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :<%= table_name || plural_name.split('/').last %>
+    drop_table :<%= plural_name.split('/').last %>
   end
 end

data/lib/generators/adhoc/portfolio/templates/model.rb

@@ -1,3 +1,5 @@
 class <%= model_name %> < ActiveRecord::Base
 
+
+
 end

data/lib/generators/adhoc/portfolio/templates/views/show.html.erb

@@ -1,6 +1,6 @@
 <%% title "<%= singular_name.titleize %>" %>
 
-<%- for attribute in attributes -%>
+<%- attributes.each do |attribute| -%>
 <p>
   <strong><%= attribute.human_name.titleize %>:</strong>
   <%%= @<%= instance_name %>.<%= attribute.name %> %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhoc-generators
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - folklore
@@ -24,6 +24,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: paperclip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement