redde 0.1.18 → 0.3.0

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

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'rails/generators'
 require 'rails/generators/generated_attribute'
 
@@ -21,6 +22,10 @@ module Redde
         generate_views
       end
 
+      def generate_translations
+        template 'ru.yml', "config/locales/#{resource_name}/ru.yml"
+      end
+
       protected
 
       def initialize_views_variables
@@ -65,15 +70,47 @@ module Redde
       end
 
       def columns
-        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] }
+        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) }
       end
 
+      def default_name_for(column)
+        case column.to_s
+        when 'title' then 'Заголовок'
+        when 'name' then 'Название'
+        when 'slug' then 'URL'
+        when 'position' then 'Позиция'
+        when 'visible' then 'Отображать на сайте'
+        when 'short_desc' then 'Аннотация'
+        when 'comment' then 'Комментарий'
+        when 'email' then 'E-mail'
+        when 'image', 'src' then 'Изображение'
+        when 'phone' then 'Телефон'
+        when 'text', 'body', 'desc' then 'Описание'
+        when 'parent_id' then 'Родительская категория'
+        when 'company_id' then 'Компания'
+        when 'city_id' then 'Город'
+        when 'url' then 'Ссылка'
+        when 'value' then 'Значение'
+        when 'articul' then 'Артикул'
+        when 'guid' then '1С'
+        when 'tag_list' then 'Тэги'
+        when 'category_id' then 'Категория'
+        when 'message' then 'Сообщение'
+        when 'product_id' then 'Товар'
+        when 'price' then 'Цена'
+        when 'stock', 'in_stock' then 'Наличие'
+        when 'color', 'color_id' then 'Цвет'
+        when 'size', 'size_id' then 'Размер'
+        when 'parameter_id' then 'Параметр'
+        else column.capitalize.to_s
+        end
+      end
+
       def excluded_column_names
         %w(id created_at updated_at)
       end
@@ -93,15 +130,15 @@ module Redde
       def extract_modules(name)
         modules = name.include?('/') ? name.split('/') : name.split('::')
         name    = modules.pop
-        path    = modules.map { |m| m.underscore }
+        path    = modules.map(&:underscore)
         file_path = (path + [name.underscore]).join('/')
-        nesting = modules.map { |m| m.camelize }.join('::')
+        nesting = modules.map(&:camelize).join('::')
         [name, path, file_path, nesting, modules.size]
       end
 
       def generate_views
         views = {
-          "index.html.#{ext}" => contr_path('index'),
+          # "index.html.#{ext}" => contr_path('index'),
           "edit.html.#{ext}" => contr_path('edit')
         }
         selected_views = views

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

@@ -1,45 +1,2 @@
-class Admin::<%= model_name.demodulize.pluralize -%>Controller < Admin::BaseController
-  def index
-    @<%= plural_resource_name %> = <%= model_name.demodulize -%>.all
-  end
-  <%- if column_names.include?('position') -%>
-  def sort
-    params[:pos].each_with_index do |id, idx|
-      p = <%= model_name.demodulize -%>.find(id)
-      p.update(position: idx)
-    end
-    render nothing: true
-  end
-  <%- end -%>
-
-  def new
-    @<%= resource_name %> = <%= model_name.demodulize -%>.new
-    render 'edit'
-  end
-
-  def edit
-    @<%= resource_name %> = <%= model_name.demodulize -%>.find(params[:id])
-  end
-
-  def create
-    @<%= resource_name %> = <%= model_name.demodulize -%>.new(<%= resource_name %>_params)
-    redirect_or_edit(@<%= resource_name %>, @<%= resource_name %>.save)
-  end
-
-  def update
-    @<%= resource_name %> = <%= model_name.demodulize -%>.find(params[:id])
-    redirect_or_edit(@<%= resource_name %>, @<%= resource_name %>.update(<%= resource_name %>_params))
-  end
-
-  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} удален."
-  end
-
-  private
-
-  def <%= resource_name %>_params
-    params.require(:<%= resource_name %>).permit!
-  end
-end
+class Admin::<%= model_name.demodulize.pluralize -%>Controller < Admin::BaseController
+end

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

@@ -7,18 +7,13 @@
   %p= link_to 'Назад', [:admin, :<%= plural_resource_name %>]
 
 = form_for [:admin, @<%= resource_name %>], builder: ReddeFormBuilder do |f|
-  = render 'validate', { f: f }
+  = f.error_messages
   %table
     <%- columns.each do |column| -%>
-    <%- if column.field_type.to_s == 'text_area' -%>
-    = f.inline_text_area :<%= column.name %>
-    <%- elsif column.field_type.to_s == "check_box" -%>
-    = f.inline_check_box :<%= column.name %>
-    <%- elsif column.name != 'position' -%>
-    = f.inline_text_field :<%= column.name %>
+    <%- if column.name != 'position' -%>
+    = f.redde_field :<%= column.name %>
     <%- end -%>
     <%- end -%>
   %div= render 'redditor/admin/page', { f: f } if @<%= resource_name %>.methods.include?(:page)
   = render 'admin/seos/block', { f: f } if @<%= resource_name %>.methods.include?(:seo)
-  = f.inline_submit
-
+  = f.redde_submits

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

@@ -3,7 +3,7 @@
   %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{ 'data-sortable' => true }" if column_names.include?('position') %>
     %colgroup
       <%- columns.each do |column| -%>
       %col<%= '.w1' if ['position', 'visible'].include? column.name %>
@@ -23,7 +23,7 @@
       <%- end -%>
         <%- columns.each do |column| -%>
         <%- if column.name == 'position' -%>
-        %td.handle= image_tag asset_path('admin/move_handler.png')
+        %td.handle= image_tag '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 -%>
@@ -31,7 +31,3 @@
         <%- end -%>
         <%- end -%>
         %td= link_to 'Удалить', [:admin, <%= resource_name %>], method: :delete, data: { confirm: 'Точно Удалить?' }, class: :del
-
-  <%- if column_names.include?('position') -%>
-  = sortable sort_admin_<%= plural_resource_name %>_path
-  <%- end -%>

data/lib/generators/redde/scaffold/templates/ru.yml

@@ -0,0 +1,14 @@
+<%# encoding: utf-8 %>
+ru:
+  activerecord:
+    models:
+      <%= resource_name %>:
+        acc: статью
+        many: Статьи
+        one: Статья
+        other: Статьи
+
+    attributes:
+      <%= resource_name %>:
+        <% model_name.constantize.column_names.select { |i| !%w{ id created_at updated_at ancestry }.include?(i) }.each do |column| %><%= column %>: <%= default_name_for(column).force_encoding('utf-8') %>
+        <% end %>

data/lib/redde/engine.rb

@@ -0,0 +1,16 @@
+module Redde
+  class Engine < ::Rails::Engine
+    config.generators do |g|
+      g.test_framework      :rspec,        fixture: false
+      g.fixture_replacement :factory_girl, dir: 'spec/factories'
+      g.assets false
+      g.helper false
+    end
+    config.to_prepare do
+      Rails.application.config.assets.precompile += %w(
+        admin/favicon.png
+        admin/move_handler.png
+      )
+    end
+  end
+end

data/lib/redde/version.rb

@@ -1,3 +1,3 @@
 module Redde
-  VERSION = '0.1.18'
+  VERSION = '0.3.0'.freeze
 end

data/lib/redde.rb

@@ -1,10 +1,26 @@
+Gem.loaded_specs['redde']
+  .dependencies
+  .select { |i| i.type == :runtime }
+  .each { |d| require d.name }
+
+require 'redde/engine'
 require 'redde/version'
-require 'redde/concerns/sluggable'
-require 'redde/concerns/with_photo'
-require 'redde/concerns/photoable'
+# require 'sluggable'
+# require 'with_photo'
+# require 'photoable'
+# require 'layout'
+require 'russian'
+require 'haml'
+require 'jquery-rails'
+require 'jquery-ui-rails'
+require 'coffee-rails'
+require 'devise'
+require 'rails'
+
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
 
 module Redde
   require 'generators/redde/layout/layout_generator'
   require 'generators/redde/scaffold/scaffold_generator'
-  require 'generators/redde/photo/photo_generator'
 end

data/lib/tasks/redde_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :redde do
+#   # Task goes here
+# end

data/redde.gemspec

@@ -1,29 +1,51 @@
 # coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'redde/version'
 
-require File.expand_path('../lib/redde/version', __FILE__)
+Gem::Specification.new do |spec|
+  spec.name          = "redde"
+  spec.version       = Redde::VERSION
+  spec.authors       = ['Oleg Bovykin', 'Konstantin Gorozhankin']
+  spec.email         = ['oleg.bovykin@gmail.com', 'konstantin.gorozhankin@gmail.com', 'info@redde.ru']
 
-Gem::Specification.new do |gem|
-  gem.authors       = ['Oleg Bovykin', 'Konstantin Gorozhankin']
-  gem.email         = ['oleg.bovykin@gmail.com', 'konstantin.gorozhankin@gmail.com', 'info@redde.ru']
-  gem.description   = %q{Admin scaffold generator for redde projects}
-  gem.summary       = %q{Admin scaffold generator for redde projects}
-  gem.homepage      = 'http://github.com/redde/redde'
+  spec.description   = %q{Admin scaffold generator for redde projects}
+  spec.summary       = %q{Admin scaffold generator for redde projects}
+  spec.homepage      = 'http://github.com/redde/redde'
+  spec.license       = "MIT"
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.name          = 'redde'
-  gem.require_paths = ['lib']
-  gem.version       = Redde::VERSION
-  gem.license       = 'MIT'
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
 
-  gem.add_runtime_dependency 'jquery-rails'
-  gem.add_runtime_dependency 'jquery-ui-rails'
+  spec.add_runtime_dependency 'jquery-rails'
+  spec.add_runtime_dependency 'jquery-ui-rails'
+  spec.add_runtime_dependency 'fileapi'
+  spec.add_runtime_dependency 'russian', '>= 0.6.0'
+  spec.add_runtime_dependency 'haml'
+  spec.add_runtime_dependency 'compass-rails', '>= 2.0.5'
+  spec.add_runtime_dependency 'autoprefixer-rails'
+  spec.add_runtime_dependency 'carrierwave'
+  spec.add_runtime_dependency 'mini_magick'
+  spec.add_runtime_dependency 'kaminari'
+  spec.add_runtime_dependency 'ancestry'
+  spec.add_dependency 'rails', '>= 3.1'
+  spec.add_dependency 'sass-rails'
 
-  gem.add_development_dependency 'rails', '>= 3.1'
-  gem.add_development_dependency 'rspec-rails', '>= 2.7'
-  gem.add_development_dependency 'factory_girl_rails', '>= 2.7'
-  gem.add_development_dependency 'guard-rspec'
-  gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'generator_spec'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec-rails', '>= 2.7'
+  spec.add_development_dependency 'factory_girl_rails', '>= 2.7'
+  spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'sqlite3'
+  spec.add_development_dependency 'generator_spec'
+  spec.add_development_dependency 'devise'
+  spec.add_development_dependency 'coffee-rails'
+  spec.add_development_dependency 'sprockets-rails'
+  spec.add_development_dependency 'quiet_assets'
+  spec.add_development_dependency 'capybara'
+  spec.add_development_dependency 'ffaker'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'launchy'
 end