redde 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac9b199ec5263c756a8b8c18911e9c6fd6f46fca
-  data.tar.gz: 457f1b1a5761524a33c272d2fb726eb2718afb93
+  metadata.gz: fbde0641c49836754b4070b0113f4298222340cb
+  data.tar.gz: 5b2da2600e17118d0515351e7c105598f953c486
 SHA512:
-  metadata.gz: 7749d1303c8d9d99a94fec6e4a4a3e42b098ba2f88ac5367a27bf40572a50e55ed413baa5b690f4be93d81d62b21f55cf38a34ad12d65e1aeaf2d88bdd7a5db6
-  data.tar.gz: cfd98c5ecfaff7f34ebff5add7fb3db32687f349009bf2508aadc886aa3d065738da479122753da3550b3be85832c1325bd881aaaae98b2d49258b5595f92866
+  metadata.gz: 9b3af10712fe15ee2e2871a3ea20534af14d7c8d296e3d4a9ba62b34c19b0e43b1b6ab15618b91073efcd88cc6b9552a4c4dabad7d454c0a3aedc2753c7a6148
+  data.tar.gz: 6767bae525444c8e97fc53c81d416bfee50ebd673184ee154ef085dde15fcd6c0493a0e82b67124f5fff4d3e0cf327ac0fe7d97a9c70ac6bebc0bc56f08aad94

data/lib/generators/redde/layout/layout_generator.rb

@@ -3,54 +3,36 @@ require 'rails/generators'
 module Redde
   module Generators
     class LayoutGenerator < ::Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
-      desc "Standart redde admin generator"
+      source_root File.expand_path('../templates', __FILE__)
+      desc 'Standart redde admin generator'
 
       attr_reader :app_name
 
       def generate_layout
-
-        # copy layouts
-        %w{ admin login }.each do |layout|
+        %w(admin login).each do |layout|
           template "layouts/#{layout}#{ext}", "app/views/layouts/#{layout}#{ext}"
         end
-
-        # copy base
-        directory "base", "app/views/admin/base"
-
-        # copy js
-        %w{ admin.js }.each do |js|
+        directory 'base', 'app/views/admin/base'
+        %w(admin.js).each do |js|
           template "assets/javascripts/#{js}", "app/assets/javascripts/#{js}"
         end
-        directory "assets/javascripts/admin", "app/assets/javascripts/admin"
-
-        # copy css
-        directory "assets/stylesheets/admin", "app/assets/stylesheets/admin"
-
-        # copy redactor
-        directory "assets/redactor", "app/assets"
-
-        # copy helpers
-        template "helpers/admin_helper.rb", "app/helpers/admin_helper.rb"
-
-        # copy images
-        directory "assets/images/admin", "app/assets/images/admin"
-
-        # copy application controller
-        template "controllers/base_controller.rb", "app/controllers/admin/base_controller.rb"
-
+        directory 'assets/javascripts/admin', 'app/assets/javascripts/admin'
+        directory 'assets/stylesheets/admin', 'app/assets/stylesheets/admin'
+        directory 'assets/redactor', 'app/assets'
+        template 'helpers/admin_helper.rb', 'app/helpers/admin_helper.rb'
+        directory 'assets/images/admin', 'app/assets/images/admin'
+        template 'controllers/base_controller.rb', 'app/controllers/admin/base_controller.rb'
       end
 
       private
 
       def ext
-        ".html.haml"
+        '.html.haml'
       end
 
       def app_name
-        Rails.application.class.to_s.split("::").first
+        Rails.application.class.to_s.split('::').first
       end
     end
-
   end
 end

data/lib/generators/redde/layout/templates/base/_header.html.haml

@@ -1,12 +1,12 @@
 %header.header
   .header__init
-    = link_to admin_root_path || "/admin", class: 'header__logo' do
+    = link_to admin_root_path || '/admin', class: 'header__logo' do
       ReddeCMS
       %br
       %span custom system
     .header__links
       - if current_manager
         = mail_to current_manager.email
-        = link_to "Выход", destroy_manager_session_path, :method => :delete
+        = link_to 'Выход', destroy_manager_session_path, method: :delete
     .header__center
-      = link_to "AppName", root_path ||= '/', :target => :_blank
+      = link_to 'AppName', root_path ||= '/', target: :_blank

data/lib/generators/redde/layout/templates/base/_launchbar.html.haml

@@ -5,7 +5,7 @@
 
 .launchbar
   %nav.launchbar__menu
-    = link_to "Материалы", nil, class: ['launchbar__link', ('_active' if @active == :shop)]
-    = link_to "Обратная связь", nil, class: ['launchbar__link', ('_active' if @active == :materials)]
-    = link_to "Система", nil, class: ['launchbar__link', ('_active' if @active == :system)]
-    %span.launchbar__time= Russian.strftime(Time.now,"%d %b, %Y %H:%M ")
+    = link_to 'Материалы', nil, class: ['launchbar__link', ('_active' if @active == :shop)]
+    = link_to 'Обратная связь', nil, class: ['launchbar__link', ('_active' if @active == :materials)]
+    = link_to 'Система', nil, class: ['launchbar__link', ('_active' if @active == :system)]
+    %span.launchbar__time= Russian.strftime(Time.now, '%d %b, %Y %H:%M ')

data/lib/generators/redde/layout/templates/base/_sidebar.html.haml

@@ -1,13 +1,13 @@
--# add this condition to remove empty sidebar 
+-# add this condition to remove empty sidebar
 -# if @active
 %nav.sidebar
   - case @active
-  - when :shop then
-    = link_to "Товары", admin_products_path, class: 'sidebar__link'
-  - when :materials then
-    = link_to "Статьи", [:admin, :articles], class: 'sidebar__link'
+  - when :shop
+    = link_to 'Товары', admin_products_path, class: 'sidebar__link'
+  - when :materials
+    = link_to 'Статьи', [:admin, :articles], class: 'sidebar__link'
   - when :system
-    = link_to "Пользователи", admin_users_path, class: 'sidebar__link'
+    = link_to 'Пользователи', admin_users_path, class: 'sidebar__link'
   - else
     = link_to 'Демо active', nil, class: ['sidebar__link', '_active']
     = link_to nil, class: ['sidebar__link'] do

data/lib/generators/redde/layout/templates/controllers/base_controller.rb

@@ -7,5 +7,4 @@ class Admin::BaseController < ActionController::Base
 
   def welcome
   end
-  
-end
+end

data/lib/generators/redde/layout/templates/helpers/admin_helper.rb

@@ -31,16 +31,17 @@ module AdminHelper
         });
       </script>
     }.gsub(/[\n ]+/, ' ').strip.html_safe
-    return content_for(:js,html)
+    content_for(:js, html)
   end
 
   def show_tree(c)
     link = link_to c.name, [:edit, :admin, c]
-    edit = link_to "Удал",[:admin, c], data: { confirm: 'Точно удалить?' }, :method => :delete, class: "del"
+    edit = link_to 'Удал', [:admin, c], data: { confirm: 'Точно удалить?' },
+                                        method: :delete, class: 'del'
     html = content_tag(:div, link + content_tag(:p, edit))
     if c.children.any?
       html << content_tag(:ol) do
-        raw c.children.map{|ch| show_tree(ch)}.join()
+        raw c.children.map { |ch| show_tree(ch) }.join('')
       end
     end
     content_tag :li, raw(html), id: "list_#{c.id}"
@@ -79,16 +80,15 @@ module AdminHelper
     }.gsub(/[\n ]+/, ' ').strip.html_safe
   end
 
-  def tsingular model
+  def tsingular(model)
     model.model_name.human
   end
 
-  def taccusative model_name
+  def taccusative(model_name)
     t("activerecord.models.#{model_name}.acc")
   end
 
-  def tplural model
-    model.model_name.human(:count => 'other')
+  def tplural(model)
+    model.model_name.human(count: 'other')
   end
-
 end

data/lib/generators/redde/layout/templates/layouts/admin.html.haml

@@ -1,29 +1,29 @@
 !!!
-%html{lang: "en"}
+%html{ lang: 'en' }
   %head
-    %meta{:charset => "UTF-8"}/ 
-    %title= @page_title || "ReddeCMS"
+    %meta{ charset: 'UTF-8'}/
+    %title= @page_title || 'ReddeCMS'
     = favicon_link_tag 'admin/favicon.png'
-    = stylesheet_link_tag "admin"
-    = javascript_include_tag "admin"
+    = stylesheet_link_tag 'admin'
+    = javascript_include_tag 'admin'
     = yield :js
     = csrf_meta_tag
   %body
-    = render "launchbar"
-    = render "header"
+    = render 'launchbar'
+    = render 'header'
     .wrapper
-      = render "sidebar"
+      = render 'sidebar'
       .main
         .page-header
           = yield(:page_header)
         - if notice
           .notice= notice
         - if alert
-          .alert= alert          
-        .page{class: "#{yield(:page_sidebar).empty? ? '_full' : '_sidebar'}"}
+          .alert= alert
+        .page{ class: "#{yield(:page_sidebar).empty? ? '_full' : '_sidebar'}" }
           #filter
             = yield(:filter)
           .page-sidebar
             = yield(:page_sidebar)
           .content
-            = yield
+            = yield

data/lib/generators/redde/layout/templates/layouts/login.html.haml

@@ -1,7 +1,7 @@
 !!!
-%html.login{:xmlns => "http://www.w3.org/1999/xhtml", "xml:lang" => "en"}
+%html.login{ 'xmlns' => 'http://www.w3.org/1999/xhtml', 'xml:lang' => 'en' }
   %head
-    %meta{"http-equiv" => "Content-Type", :content => "text/html;charset=UTF-8"}
+    %meta{ 'http-equiv' => 'Content-Type', 'content' => 'text/html;charset=UTF-8' }
     %title Вход на сайт | Административная панель
     = stylesheet_link_tag 'admin'
     = javascript_include_tag "admin"
@@ -15,18 +15,18 @@
               %h1 Административная панель
             .page
               .content
-                = form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+                = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
                   .login__fields
-                    = f.label :email, "E-mail"
+                    = f.label :email, 'E-mail'
                     %br
                     = f.text_field :email, class: 'login__inp'
                   .login__fields
-                    = f.label :password, "Пароль"
+                    = f.label :password, 'Пароль'
                     %br
-                    = f.password_field :password, :size => 35, class: 'login__inp'
+                    = f.password_field :password, size: 35, class: 'login__inp'
                   - if devise_mapping.rememberable?
                     .login__fields
                       = f.check_box :remember_me
-                      = f.label :remember_me, "Оставаться в системе"
+                      = f.label :remember_me, 'Оставаться в системе'
                   .login__actions
-                    = f.submit "Войти"
+                    = f.submit 'Войти'

data/lib/generators/redde/photo/photo_generator.rb

@@ -7,28 +7,28 @@ module Redde
       include Rails::Generators::Migration
       source_root File.expand_path('../templates', __FILE__)
 
-      def self.next_migration_number(path)
-        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      def self.next_migration_number(_path)
+        Time.now.utc.strftime('%Y%m%d%H%M%S')
       end
-      
+
       def copy_controller
-        template "controller.rb", "app/controllers/admin/photos_controller.rb"
+        template 'controller.rb', 'app/controllers/admin/photos_controller.rb'
       end
 
       def copy_views
-        directory "photos", "app/views/admin/photos"
+        directory 'photos', 'app/views/admin/photos'
       end
 
       def copy_model
-        template "photo.rb", "app/models/photo.rb"
+        template 'photo.rb', 'app/models/photo.rb'
       end
 
       def copy_uploader
-        template "uploader.rb", "app/uploaders/photo_uploader.rb"
+        template 'uploader.rb', 'app/uploaders/photo_uploader.rb'
       end
 
       def copy_migration
-        migration_template "create_photos.rb", "db/migrate/create_photos.rb"
+        migration_template 'create_photos.rb', 'db/migrate/create_photos.rb'
       end
     end
   end

data/lib/generators/redde/photo/templates/controller.rb

@@ -1,29 +1,20 @@
 class Admin::PhotosController < ActionController::Base
-
   def sort
     params[:photo].each_with_index do |id, idx|
       p = Photo.find(id)
-      p.position = idx
-      p.save
+      p.update(position: idx)
     end
-    render :nothing => true
+    render nothing: true
   end
 
   def create
-    if params[:product_id].present?
-      parent = Product.find(params[:product_id])
-    end       
+    parent = Product.find(params[:product_id]) if params[:product_id].present?
     @photo = parent.photos.build(src: params[:file])
-    unless @photo.save
-      render js: 'alert("Ошибка! Фото не загружено")'
-    end
+    render js: 'alert("Ошибка! Фото не загружено")' unless @photo.save
   end
 
   def destroy
     @photo = Photo.find(params[:id])
-    if @photo.destroy
-      render 'admin/photos/destroy'
-    end
+    render 'admin/photos/destroy' if @photo.destroy
   end
-
-end
+end

data/lib/generators/redde/photo/templates/create_photos.rb

@@ -9,5 +9,6 @@ class CreatePhotos < ActiveRecord::Migration
       t.timestamps
     end
     add_index :photos, :imageable_id
+    add_index :photos, :imageable_type
   end
-end
+end

data/lib/generators/redde/photo/templates/photo.rb

@@ -4,4 +4,4 @@ class Photo < ActiveRecord::Base
   default_scope { order(:position) }
 
   mount_uploader :src, PhotoUploader
-end
+end

data/lib/generators/redde/photo/templates/photos/_photo.haml

@@ -1,5 +1,5 @@
-%li{class: "handle", :id => "photo_#{photo.id}"}
+%li{ class: 'handle', id: "photo_#{photo.id}" }
   = link_to photo.src.url do
     = image_tag photo.src.admin
-    %em= photo.src.to_s.gsub(/.*\/(.*)\z/,'\1')
-  = link_to "удалить", url_for([:admin, photo.imageable, photo]), :method => :delete, :confirm => "Точно удалить?", :remote => true, :title => "Удалить", :class => "del"
+    %em= photo.src.to_s.gsub(/.*\/(.*)\z/, '\1')
+  = link_to 'удалить', [:admin, photo.imageable, photo], method: :delete, data: { confirm: 'Точно удалить?'}, remote: true, title: 'Удалить', class: 'del'

data/lib/generators/redde/photo/templates/photos/_photos.haml

@@ -1,22 +1,19 @@
 - unless parent.new_record?
   = content_for(:page_sidebar) do
-    %h5 
+    %h5
       Фотографии
       - if editable ||= false
-        = link_to "ред.", [:admin, parent]
+        = link_to 'ред.', [:admin, parent]
     .product-photos
       %ul.photos#photo-list
         = render parent.photos
-
       #preview
-      #drag-n-drop{:style => "display: none; margin-top: 5px;"}
-        #drop-zone.b-dropzone{style: 'height: 100px;', data: {"upload-url" => url_for([:admin, parent, :photos])}}
+      #drag-n-drop{ style: 'display: none; margin-top: 5px;' }
+        #drop-zone.b-dropzone{ style: 'height: 100px;', data: { 'upload-url' => url_for([:admin, parent, :photos]) } }
           .b-dropzone__bg
           .b-dropzone__txt Перетащите файлы сюда
-      
-      
-      #buttons-panel{style: 'margin-bottom: 10px;'}
+      #buttons-panel{ style: 'margin-bottom: 10px;' }
         .b-button.js-fileapi-wrapper
           .b-button__text Загрузить файлы
-          %input.b-button__input.js-fileapi{:name => "files", :type => "file",  :multiple => true, data: {"upload-url" => url_for([:admin, parent, :photos])}}
+          %input.b-button__input.js-fileapi{ name: 'files', type: 'file',  multiple: true, data: { "upload-url" => url_for([:admin, parent, :photos]) } }
       = photo_sortable url_for([:sort, :admin, parent, :photos])

data/lib/generators/redde/photo/templates/photos/create.js.erb

@@ -1 +1 @@
-$("ul.photos").append('<%= escape_javascript(render "admin/photos/photo", { :photo => @photo, :parent => @parent }) %>');
+$('ul.photos').append('<%= escape_javascript(render "admin/photos/photo", { photo: @photo, parent: @parent }) %>');

data/lib/generators/redde/photo/templates/uploader.rb

@@ -48,7 +48,7 @@ class PhotoUploader < CarrierWave::Uploader::Base
   # end
 
   version :admin do
-    process :resize_and_pad => [119, 119, :transparent, ::Magick::CenterGravity]    
+    process resize_and_pad: [119, 119, :transparent, ::Magick::CenterGravity]
   end
 
   # Override the filename of the uploaded files:
@@ -56,5 +56,4 @@ class PhotoUploader < CarrierWave::Uploader::Base
   # def filename
   #   "something.jpg" if original_filename
   # end
-
-end
+end

data/lib/generators/redde/scaffold/scaffold_generator.rb

@@ -5,9 +5,13 @@ module Redde
   module Generators
     class ScaffoldGenerator < ::Rails::Generators::Base
       source_root File.expand_path('../templates', __FILE__)
-      argument :controller_path,    :type => :string
-      argument :model_name,         :type => :string, :required => false
-  
+      argument :controller_path, type: :string
+      argument :model_name, type: :string, required: false
+
+      attr_accessor :model_name, :controller_routing_path, :base_name,
+                    :controller_class_path, :controller_file_path,
+                    :controller_class_nesting, :controller_class_nesting_depth
+
       def initialize(args, *options)
         super(args, *options)
         initialize_views_variables
@@ -26,24 +30,16 @@ module Redde
         @model_name = @model_name.camelize
       end
 
-      def controller_routing_path
-        @controller_routing_path
-      end
-
       def singular_controller_routing_path
-        @controller_routing_path.singularize
-      end
-
-      def model_name
-        @model_name
+        controller_routing_path.singularize
       end
 
       def plural_model_name
-        @model_name.pluralize
+        model_name.pluralize
       end
 
       def resource_name
-        @model_name.demodulize.underscore
+        model_name.demodulize.underscore
       end
 
       def plural_resource_name
@@ -55,28 +51,41 @@ module Redde
       end
 
       def index_header
-        model_name.constantize.model_name.human(:count => 'other')
+        model_name.constantize.model_name.human(count: 'other')
       end
 
       def sort_priority(column_name)
         case column_name
-        when "position" then 1
-        when "visible" then 2
-        when "name" then 3
-        when "title" then 3
+        when 'position' then 1
+        when 'visible' then 2
+        when 'name' then 3
+        when 'title' then 3
         else 5
         end
       end
 
       def columns
-        begin
-          excluded_column_names = %w[id created_at updated_at]
-          @model_name.constantize.columns.reject{|c| excluded_column_names.include?(c.name) || c.name.index("_id") }.sort{|a, b| sort_priority(a.name) <=> sort_priority(b.name)}.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type)}
-        rescue NoMethodError
-          @model_name.constantize.fields.collect{|c| c[1]}.reject{|c| excluded_column_names.include?(c.name) || c.name.index("_id") }.collect{|c| ::Rails::Generators::GeneratedAttribute.new(c.name, c.type.to_s)}
-        end
+        model_name.constantize.columns.reject { |c| exclude_column?(c.name) }
+          .sort { |a, b| sort_priority(a.name) <=> sort_priority(b.name) }
+          .map { |c| convert_column(c) }
+      rescue NoMethodError
+        model_name.constantize.fields.map { |c| c[1] }
+          .reject { |c| exclude_column?(c.name) }
+          .map { |c| convert_column(c) }
+      end
+
+      def excluded_column_names
+        %w(id created_at updated_at)
       end
-      
+
+      def convert_column(column)
+        ::Rails::Generators::GeneratedAttribute.new(column.name, column.type.to_s)
+      end
+
+      def exclude_column?(name)
+        excluded_column_names.include?(name) || name.index('_id')
+      end
+
       def column_names
         @model_name.constantize.column_names
       end
@@ -92,13 +101,16 @@ module Redde
 
       def generate_views
         views = {
-          "index.html.#{ext}"                 => "app/views/admin/#{@controller_file_path}/index.html.#{ext}",
-          "edit.html.#{ext}"                  => "app/views/admin/#{@controller_file_path}/edit.html.#{ext}"
+          "index.html.#{ext}" => contr_path('index'),
+          "edit.html.#{ext}" => contr_path('edit')
         }
         selected_views = views
         options.engine == generate_erb(selected_views)
       end
-     
+
+      def contr_path(action)
+        "app/views/admin/#{controller_file_path}/#{action}.html.#{ext}"
+      end
 
       def generate_erb(views)
         views.each do |template_name, output_path|
@@ -112,9 +124,8 @@ module Redde
       end
 
       def generate_controller
-        template "controllers/controller.rb", "app/controllers/admin/#{plural_resource_name}_controller.rb"
+        template 'controllers/controller.rb', "app/controllers/admin/#{plural_resource_name}_controller.rb"
       end
-
     end
   end
 end

data/lib/generators/redde/scaffold/templates/controllers/controller.rb

@@ -1,19 +1,17 @@
-# coding: utf-8
 class Admin::<%= model_name.demodulize.pluralize -%>Controller < Admin::BaseController
-
   def index
     @<%= plural_resource_name %> = <%= model_name.demodulize -%>.all
   end
-  <%- if column_names.include?("position") -%>
+  <%- if column_names.include?('position') -%>
   def sort
     params[:pos].each_with_index do |id, idx|
       p = <%= model_name.demodulize -%>.find(id)
-      p.position = idx
-      p.save
+      p.update(position: idx)
     end
-    render :nothing => true
+    render nothing: true
   end
   <%- end -%>
+
   def new
     @<%= resource_name %> = <%= model_name.demodulize -%>.new
     render 'edit'
@@ -26,7 +24,7 @@ class Admin::<%= model_name.demodulize.pluralize -%>Controller < Admin::BaseCont
   def create
     @<%= resource_name %> = <%= model_name.demodulize -%>.new(<%= resource_name %>_params)
     if @<%= resource_name %>.save
-      redirect_to params[:commit] == "Применить" ? [:edit, :admin, @<%= resource_name %>] : [:admin, :<%= plural_resource_name %>], :notice => "#{<%= model_name.demodulize -%>.model_name.human} добавлен."
+      redirect_to params[:commit] == 'Применить' ? [:edit, :admin, @<%= resource_name %>] : [:admin, :<%= plural_resource_name %>], notice: "#{<%= model_name.demodulize -%>.model_name.human} добавлен."
     else
       render 'edit'
     end
@@ -35,7 +33,7 @@ class Admin::<%= model_name.demodulize.pluralize -%>Controller < Admin::BaseCont
   def update
     @<%= resource_name %> = <%= model_name.demodulize -%>.find(params[:id])
     if @<%= resource_name %>.update_attributes(<%= resource_name %>_params)
-      redirect_to params[:commit] == "Применить" ? [:edit, :admin, @<%= resource_name %>] : [:admin, :<%= plural_resource_name %>], :notice => "#{<%= model_name.demodulize -%>.model_name.human} отредактирован."
+      redirect_to params[:commit] == 'Применить' ? [:edit, :admin, @<%= resource_name %>] : [:admin, :<%= plural_resource_name %>], notice: "#{<%= model_name.demodulize -%>.model_name.human} отредактирован."
     else
       render 'edit'
     end
@@ -44,7 +42,7 @@ class Admin::<%= model_name.demodulize.pluralize -%>Controller < Admin::BaseCont
   def destroy
     @<%= resource_name %> = <%= model_name.demodulize -%>.find(params[:id])
     @<%= resource_name %>.destroy
-    redirect_to admin_<%= plural_resource_name %>_path, :notice => "#{<%= model_name.demodulize -%>.model_name.human} удален."
+    redirect_to admin_<%= plural_resource_name %>_path, notice: "#{<%= model_name.demodulize -%>.model_name.human} удален."
   end
 
   private

data/lib/generators/redde/scaffold/templates/edit.html.haml

@@ -4,13 +4,13 @@
       Добавить #{taccusative(:<%= resource_name %>)}
     - else
       Редактировать #{taccusative(:<%= resource_name %>)}
-  %p= link_to "Назад", [:admin, :<%= plural_resource_name %>]
+  %p= link_to 'Назад', [:admin, :<%= plural_resource_name %>]
 
 = form_for [:admin, @<%= resource_name %>] do |f|
-  = render 'validate', {f: f}
+  = render 'validate', { f: f }
   %table
     <%- columns.each do |column| -%>
-    <%- if column.field_type.to_s == "text_area" -%>
+    <%- if column.field_type.to_s == 'text_area' -%>
     %tr
       %td{colspan: 2}
         = f.label :<%= column.name %>
@@ -21,12 +21,12 @@
       %th{colspan: 2}
         = f.<%= column.field_type -%> :<%= column.name %>
         = f.label :<%= column.name %>
-    <%- elsif column.name != "position" -%>
+    <%- elsif column.name != 'position' -%>
     %tr
       %th= f.label :<%= column.name %>
       %td= f.<%= column.field_type -%> :<%= column.name %>
     <%- end -%>
     <%- end -%>
   .actions
-    = f.submit "Сохранить"
-    = f.submit "Применить"
+    = f.submit 'Сохранить'
+    = f.submit 'Применить'

data/lib/generators/redde/scaffold/templates/index.html.haml

@@ -3,35 +3,35 @@
   %p= link_to "Добавить #{taccusative('<%= resource_name %>')}", [:new, :admin, :<%= resource_name %>]
   
 - unless @<%= plural_resource_name %>.empty?
-  %table.list<%= ".sortable" if column_names.include?("position") %>
+  %table.list<%= ".sortable" if column_names.include?('position') %>
     %colgroup 
       <%- columns.each do |column| -%>
-      %col<%= ".w1" if ["position", "visible"].include? column.name %>
+      %col<%= '.w1' if ['position', 'visible'].include? column.name %>
       <%- end -%>
       %col.w1
     %thead
       %tr
         <%- columns.each do |column| -%>
-        %th<%- unless ["position", "visible"].include? column.name %>= <%= model_name.demodulize %>.human_attribute_name("<%= column.name %>")<% end %>
+        %th<%- unless ['position', 'visible'].include? column.name %>= <%= model_name.demodulize %>.human_attribute_name('<%= column.name %>')<% end %>
         <%- end -%>
         %th
     - @<%= plural_resource_name %>.each do |<%= resource_name %>|
-      <%- if column_names.include?("position") -%>
-      %tr{id: "pos_#{<%= resource_name %>.id}"}
+      <%- if column_names.include?('position') -%>
+      %tr{ id: "pos_#{<%= resource_name %>.id}" }
       <%- else -%>
       %tr
       <%- end -%>
         <%- columns.each do |column| -%>
-        <%- if column.name == "position" -%>
-        %td.handle= image_tag asset_path("admin/move_handler.png")
-        <%- elsif column.name == "visible" -%>
-        %td.show= link_to "", admin_<%= singular_controller_routing_path %>_path(<%= resource_name %>, <%= resource_name %>: {visible: !<%= resource_name %>.visible}), :class => <%= resource_name %>.visible ? nil : "not-show", data: {method: 'put'}
+        <%- if column.name == 'position' -%>
+        %td.handle= image_tag asset_path('admin/move_handler.png')
+        <%- elsif column.name == 'visible' -%>
+        %td.show= link_to '', admin_<%= singular_controller_routing_path %>_path(<%= resource_name %>, <%= resource_name %>: { visible: !<%= resource_name %>.visible} ), class: <%= resource_name %>.visible ? nil : 'not-show', data: { method: 'put' }
         <%- else -%>
         %td= link_to <%= resource_name %>.<%= column.name %>, [:edit, :admin, <%= resource_name %>]
         <%- end -%>
         <%- end -%>
-        %td= link_to "Удалить", [:admin, <%= resource_name %>], method: :delete, data: { confirm: "Точно Удалить?" }, class: :del
+        %td= link_to 'Удалить', [:admin, <%= resource_name %>], method: :delete, data: { confirm: 'Точно Удалить?'' }, class: :del
         
-  <%- if column_names.include?("position") -%>
+  <%- if column_names.include?('position') -%>
   = sortable sort_admin_<%= plural_resource_name %>_path
   <%- end -%>

data/lib/redde/version.rb

@@ -1,3 +1,3 @@
 module Redde
-  VERSION = "0.1.7"
+  VERSION = '0.1.8'
 end

data/lib/redde.rb

@@ -1,7 +1,6 @@
-require "redde/version"
+require 'redde/version'
 module Redde
   require 'generators/redde/layout/layout_generator'
   require 'generators/redde/scaffold/scaffold_generator'
   require 'generators/redde/photo/photo_generator'
-  # Your code goes here...
 end

data/lib/url_generator.rb

@@ -1,21 +1,23 @@
 # coding: utf-8
 
 class UrlGenerator
-
-  def initialize id, name = nil
+  attr_reader :id, :name
+  def initialize(id, name = nil)
     @id = id
     @name = name
   end
 
   def url
-    "#{@id}#-{formatted_name}".downcase
+    "#{id}#-{formatted_name}".downcase
   end
 
   def translitted_name
-    Russian.translit(@name).gsub(' ','-').gsub(/[^\x00-\x7F]+/, '').gsub(/[^\w_ \-]+/i, '').gsub(/[ \-]+/i, '-').gsub(/^\-|\-$/i, '')
+    Russian.translit(name).gsub(' ', '-')
+      .gsub(/[^\x00-\x7F]+/, '').gsub(/[^\w_ \-]+/i, '')
+      .gsub(/[ \-]+/i, '-').gsub(/^\-|\-$/i, '')
   end
 
   def formatted_name
-    @name.nil? ? '' : translitted_name
+    name.nil? ? '' : translitted_name
   end
-end
+end

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails