zadok 0.3.8 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee2852997500d436bc39ad2c57da54b712e7bb3fa36b7a496e219daa57aaae7e
-  data.tar.gz: f5223b80b0ef40ebf1135e4f812a0b82b6df79c7d4511cd8c67377ed159519b6
+  metadata.gz: 2b272d38a80b647ac6a7f50750c2f241e5b0d5b9f3769289b60b912fa148325f
+  data.tar.gz: 2cb52978224dc5b959d8a9793c5a225cd97bb24349a14835f50934a2fe597543
 SHA512:
-  metadata.gz: 91a452c274421b3d2f9b14bff113093ed8d0adfe81c9d2d32e7baa0c113463a25db6fb0f401c6696df68f40fd0afdc7f5cf66e1e74ddb2a151f527323a67dc52
-  data.tar.gz: 36805a89ef1a8eb12db2ae97b3d2321b640cec8edeed265b8674d857dc20675d7d39750f6b1de07bfde4de1fac505f7e35606ef165453e8b89ee4d23f4c820f1
+  metadata.gz: d063d73903c152a09f9b122dd9b1e6de9ccc8321763fcdee694fad5516fd0f2195c81fa3f14cffe96319aab873b4c2fac11d08b7e4d411e7f1c709ebc915f641
+  data.tar.gz: f3e6d0e42d380269896a6ddc848354770790e5cebdf0ece24d72fc51bdc71e65573ebe0913cd8986d2c64942425f2c972f14d54388455838791eef30b3f94bc2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zadok (0.3.8)
+    zadok (0.4.0)
       bootstrap (~> 4.0)
       bundler-audit (~> 0.6)
       cancancan (~> 2.1)
@@ -98,7 +98,7 @@ GEM
     dry-initializer (2.3.0)
     erubi (1.7.0)
     execjs (2.7.0)
-    ffi (1.9.21)
+    ffi (1.9.23)
     font-awesome-rails (4.7.0.3)
       railties (>= 3.2, < 5.2)
     globalid (0.4.1)
@@ -133,7 +133,7 @@ GEM
       mini_portile2 (~> 2.3.0)
     orm_adapter (0.5.0)
     parallel (1.12.1)
-    parser (2.5.0.0)
+    parser (2.5.0.2)
       ast (~> 2.4.0)
     pg (1.0.0)
     polyamorous (1.3.3)
@@ -161,7 +161,7 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    rails-i18n (5.1.0)
+    rails-i18n (5.1.1)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
     railties (5.1.5)

data/app/controllers/zadok_controller.rb

@@ -4,7 +4,9 @@ class ZadokController < ApplicationController
   helper_method :edit_attributes
   helper_method :index_attributes
   helper_method :new_attributes
+  helper_method :page_title
   helper_method :resource
+  helper_method :resource_class
   helper_method :resource_name
   helper_method :resources
   helper_method :show_attributes
@@ -15,7 +17,7 @@ class ZadokController < ApplicationController
   end
 
   def show
-    render [resources_name, "show"].join("/")
+    render [controller_name, "show"].join("/")
   end
 
   def new
@@ -24,9 +26,9 @@ class ZadokController < ApplicationController
 
   def create
     if resource.save
-      flash.now[:success] = t("#{resource_name.pluralize}.create_success")
+      flash.now[:success] = t("#{controller_name}.create_success")
       flash.keep(:success)
-      redirect_to url_for(controller: resource_name.pluralize, action: :index)
+      redirect_to url_for(controller: controller_name, action: :index)
     else
       flash.now[:danger] = resource.errors.full_messages.join("<br />")
       render "zadok/new"
@@ -39,7 +41,7 @@ class ZadokController < ApplicationController
 
   def update
     if resource.update(resource_params)
-      flash.now[:success] = t("#{resource_name.pluralize}.update_success")
+      flash.now[:success] = t("#{controller_name}.update_success")
     else
       flash.now[:danger] = resource.errors.full_messages.join("<br />")
     end
@@ -48,13 +50,13 @@ class ZadokController < ApplicationController
 
   def destroy
     if resource.destroy
-      flash.now[:success] = t("#{resource_name.pluralize}.destroy_success")
+      flash.now[:success] = t("#{controller_name}.destroy_success")
       flash.keep(:success)
     else
       flash.now[:danger] = resource.errors.full_messages.join("<br />")
       flash.keep(:danger)
     end
-    redirect_to url_for(controller: resource_name.pluralize, action: :index)
+    redirect_to url_for(controller: controller_name, action: :index)
   end
 
   protected
@@ -64,7 +66,7 @@ class ZadokController < ApplicationController
   end
 
   def filters_namespace
-    "filters/#{search_model}".classify.pluralize.constantize
+    "zadok/filters/#{controller_name}".classify.constantize
   end
 
   def filtered_resources
@@ -75,10 +77,6 @@ class ZadokController < ApplicationController
     permitted_params.fetch(:q) { {} }
   end
 
-  def search_model
-    raise "search_model method not implemented"
-  end
-
   def current_search
     search_model.ransack(search_params)
   end
@@ -104,11 +102,26 @@ class ZadokController < ApplicationController
   end
 
   def resource_params
-    raise "resource_params method not implemented"
+    send("#{controller_name}_params")
+  end
+
+  def resource_class
+    controller_name.singularize.camelize.constantize
+  end
+  alias search_model resource_class
+
+  def resource_name(variant = :one)
+    if variant == :zero
+      resource_class.model_name.human(count: 0)
+    elsif variant == :one
+      resource_class.model_name.human(count: 1)
+    elsif variant == :other
+      resource_class.model_name.human(count: 9)
+    end
   end
 
-  def resource_name
-    raise "resource_name method not implemented"
+  def page_title
+    t("#{controller_name}.#{action_name}")
   end
 
   def resources

data/app/helpers/zadok_helper.rb

@@ -2,7 +2,7 @@
 
 module ZadokHelper
   def resource_url_for(action)
-    url_for(controller: resource_name.pluralize, action: action)
+    url_for(controller: controller_name, action: action)
   end
 
   def sort_table_header(attr, model)

data/app/views/zadok/edit.html.slim

@@ -1,9 +1,9 @@
-.container.resource-edit[id="#{resource_name.pluralize}-edit"]
+.container.resource-edit[id="#{controller_name}-edit"]
   .card
     .card-body
       h2.card-title
-        = t("#{resource_name.pluralize}.edit")
-        = link_to(t("activerecord.models.#{resource_name}.other"),
+        = page_title
+        = link_to(resource_name(:other),
                   resource_url_for(:index),
                   class: "btn btn-primary text-white float-right")
 
@@ -23,8 +23,8 @@
 
     - if can?(:destroy, resource)
       .card-footer
-        = link_to(t("#{resource_name.pluralize}.destroy"),
+        = link_to(t("#{controller_name}.destroy"),
                   resource_url_for(:destroy),
-                  data: { confirm: t("#{resource_name.pluralize}.destroy_confirm") },
+                  data: { confirm: t("#{controller_name}.destroy_confirm") },
                   method: :delete,
                   class: "btn btn-danger pull-right")

data/app/views/zadok/index.html.slim

@@ -1,10 +1,10 @@
-.container.resource-index[id="#{resource_name.pluralize}-index"]
+.container.resource-index[id="#{controller_name}-index"]
   .card
     .card-body
       h2.card-title
-        = resources.model_name.human(count: 10)
+        = resource_name(:other)
         - if can?(:create, resources.klass)
-          = link_to(t("#{resource_name.pluralize}.new"),
+          = link_to(t("#{controller_name}.new"),
                     resource_url_for(:new),
                     class: "btn btn-primary text-white float-right")
 
@@ -20,7 +20,7 @@
             td.text-right[colspan=index_attributes.count]
               = page_entries_info(resources)
         tbody
-          = render(partial: "#{resource_name.pluralize}/index_row",
+          = render(partial: "#{controller_name}/index_row",
                    collection: resources,
                    as: :resource)
 

data/app/views/zadok/new.html.slim

@@ -1,9 +1,9 @@
-.container.resource-new[id="#{resource_name.pluralize}-new"]
+.container.resource-new[id="#{controller_name}-new"]
   .card
     .card-body
       h2.card-title
-        = t("#{resource_name.pluralize}.new")
-        = link_to(resources.model_name.human(count: 10),
+        = page_title
+        = link_to(resource_name(:other),
                   resource_url_for(:index),
                   class: "btn btn-primary text-white float-right")
 
@@ -16,4 +16,4 @@
                    options: options)
 
         .form-group
-          = form.submit(class: "btn btn-primary text-white")
+          = form.submit(class: "btn btn-primary text-white")

data/lib/zadok/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Zadok
-  VERSION = "0.3.8"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zadok
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.0
 platform: ruby
 authors:
 - Leon Hooijer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap
@@ -426,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A data management gem.