r5 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f1fb2694e5a8ff8f54db38b5adafcea2461f9c3
-  data.tar.gz: 067a07403ccee9dd1461f3bea6dfc0de440deb27
+  metadata.gz: 9a1eaf3b57459810152098f4af02c91499677633
+  data.tar.gz: 420c8330dd7cddb7f8fb1187ae896c7697bb3e9e
 SHA512:
-  metadata.gz: 20661a67b4d48fc0591cf01a492ab13934a23e5dae925b0570d99e1ddb914f40510088fd2f6ddd7bb5e282331923d71e326695fa68da6fb7fcdb7f56cd067dd8
-  data.tar.gz: 9b23a5f4f1b22021bfb167c7013cac85cdd82cd9d7dfd1a0ca3bb3088c5f9f3edbf706ea74395899bfc6ecac9ed225a9de8e760a80834912a39512f9793efb4d
+  metadata.gz: 82dec5da99cc35906e5cc1f5f70db0df95e1a539c5654e34b2cd748d36145febda6b3ae91f992a3ee01d35200dfb1d8caa0126da3f92d8f4d80ae7e5da2c5a24
+  data.tar.gz: 79d2c6f06e50542d2a08d48bc77a6cc32f36f287e0d1e63c7682f0980f873a4a264dbedc5249454f2ffd5ac08c09d57739f35f23591876656c00f157b7066876

data/lib/r5/installations/default.rb

@@ -40,7 +40,7 @@ layout_file = "#{@project_path}/app/views/layouts/application.html.erb"
 remove 'app/views/layouts/application.html.erb'
 copy 'app/views/layouts/application.html.erb'
 apply 'recipes/mail_settings.rb'
-apply 'recipes/timepress_generators.rb'
+apply 'recipes/timepress_specifics.rb'
 gsub_file layout_file, 'PROJECT_NAME', @project_name
 apply 'recipes/gitignore.rb'
 run 'git init'

data/lib/r5/template/config/initializers/html_helpers.rb

@@ -86,7 +86,7 @@ module ApplicationHelper
   end
 
   def delete_button objekt, text
-    link_to 'Delete', objekt, method: :delete, data: { confirm: text }, class: 'btn btn-danger pull-right' if params[:action] == 'edit'
+    link_to 'Archive', objekt, method: :delete, data: { confirm: text }, class: 'btn btn-danger pull-right' if params[:action] == 'edit'
   end
 
   def session_debug

data/lib/r5/template/lib/templates/active_record/migration/create_table_migration.rb

@@ -0,0 +1,27 @@
+# this one should working just fine, but there is bug in Rails so I need to put template to lib/templates/migration/templates/create_table_migration.rb
+# https://github.com/rails/rails/pull/13972
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
+  def change
+    create_table :<%= table_name %><%= primary_key_type %> do |t|
+<% attributes.each do |attribute| -%>
+<% if attribute.password_digest? -%>
+      t.string :password_digest<%= attribute.inject_options %>
+<% elsif attribute.token? -%>
+t.string :<%= attribute.name %><%= attribute.inject_options %>
+<% else -%>
+      t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
+<% end -%>
+<% end -%>
+<% if options[:timestamps] %>
+t.timestamps
+<% end -%>
+t.datetime :archived_at
+    end
+<% attributes.select(&:token?).each do |attribute| -%>
+add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>, unique: true
+<% end -%>
+<% attributes_with_index.each do |attribute| -%>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+<% end -%>
+  end
+end

data/lib/r5/template/lib/templates/active_record/model/model.rb

@@ -0,0 +1,14 @@
+<% module_namespacing do -%>
+class <%= class_name %> < <%= parent_class_name.classify %>
+<% attributes.select(&:reference?).each do |attribute| -%>
+  belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %><%= ', required: true' if attribute.required? %>
+<% end -%>
+  scope :active, -> { where(archived_at: nil) }
+<% attributes.select(&:token?).each do |attribute| -%>
+  has_secure_token<% if attribute.name != "token" %> :<%= attribute.name %><% end %>
+<% end -%>
+<% if attributes.any?(&:password_digest?) -%>
+has_secure_password
+<% end -%>
+end
+<% end -%>

data/lib/r5/template/lib/templates/erb/scaffold/edit.html.erb

@@ -1,5 +1,5 @@
 <div class="page-header">
-  <%%= delete_button @<%= singular_table_name %>, 'Do you really want to delete <%= singular_table_name %>?' %>
+  <%%= delete_button @<%= singular_table_name %>, 'Do you really want to archive <%= singular_table_name %>?' %>
   <h1>Editing <%= singular_table_name %></h1>
 </div>
 

data/lib/r5/template/lib/templates/migration/templates/create_table_migration.rb

@@ -0,0 +1,25 @@
+class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
+  def change
+    create_table :<%= table_name %><%= primary_key_type %> do |t|
+<% attributes.each do |attribute| -%>
+<% if attribute.password_digest? -%>
+      t.string :password_digest<%= attribute.inject_options %>
+<% elsif attribute.token? -%>
+t.string :<%= attribute.name %><%= attribute.inject_options %>
+<% else -%>
+      t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
+<% end -%>
+<% end -%>
+<% if options[:timestamps] %>
+t.timestamps
+<% end -%>
+t.datetime :archived_at
+    end
+<% attributes.select(&:token?).each do |attribute| -%>
+add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>, unique: true
+<% end -%>
+<% attributes_with_index.each do |attribute| -%>
+    add_index :<%= table_name %>, :<%= attribute.index_name %><%= attribute.inject_index_options %>
+<% end -%>
+  end
+end

data/lib/r5/template/lib/templates/rails/scaffold_controller/controller.rb

@@ -6,7 +6,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
   # GET <%= route_url %>
   def index
-    @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
+    @<%= plural_table_name %> = <%= class_name %>.active
   end
   # GET <%= route_url %>/1
   def show
@@ -41,8 +41,8 @@ if @<%= orm_instance.save %>
   end
   # DELETE <%= route_url %>/1
 def destroy
-  @<%= orm_instance.destroy %>
-    redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully destroyed.'" %>
+  @<%= orm_instance.update("archived_at: Time.now") %>
+    redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully archived.'" %>
   end
   private
     # Use callbacks to share common setup or constraints between actions.

data/lib/r5/version.rb

@@ -1,3 +1,3 @@
 module R5
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r5
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - mousse
@@ -114,11 +114,14 @@ files:
 - lib/r5/template/config/locales/cs.yml
 - lib/r5/template/lib/tasks/bootstrap.rake
 - lib/r5/template/lib/tasks/upload.rake
+- lib/r5/template/lib/templates/active_record/migration/create_table_migration.rb
+- lib/r5/template/lib/templates/active_record/model/model.rb
 - lib/r5/template/lib/templates/erb/scaffold/_form.html.erb
 - lib/r5/template/lib/templates/erb/scaffold/edit.html.erb
 - lib/r5/template/lib/templates/erb/scaffold/index.html.erb
 - lib/r5/template/lib/templates/erb/scaffold/new.html.erb
 - lib/r5/template/lib/templates/erb/scaffold/show.html.erb
+- lib/r5/template/lib/templates/migration/templates/create_table_migration.rb
 - lib/r5/template/lib/templates/rails/scaffold_controller/controller.rb
 - lib/r5/version.rb
 - r5.gemspec