redde 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 415d13d5581f203913ddbe74ba59d6fed19125a8
-  data.tar.gz: 00b8a99f56c2ad97b1d91bb1684529e389237126
+  metadata.gz: 4e9c5fd3d5b0a6b212e42d958015be835b3ca326
+  data.tar.gz: 211e8ec998cd34478082efba8e8418bc7dad1859
 SHA512:
-  metadata.gz: 11ad3b74c37115cd4af58828c23e65fd9c395aedb5e8b2eafaaf719e42193a3da26464dac95ce2d8660fe803eff53fe7d853d97b2da5cdbaeb2506da6984a9f4
-  data.tar.gz: 3555c40b264141d970ff35cdff80ec0e06ff095ff8891912f3ee23de7ad920bdca83769bdc60354af9d9d2354e365abb85ef60739b42b864ea21671687485a6f
+  metadata.gz: 28c5c14c47501b64b6bc181f2e85e8f35ca249acc37e0abaf7cc64236d52eb55ff2b71444c4880cd247b00ef347d15029bb65aaeb5393210ed235a88a6ad86f2
+  data.tar.gz: aede49ea623edd9c5d1ea02425500cc238d9f15a6839a8b86335e3a86c53feb2e907e08752a155c33c894221b06edf13f5817bc476946728caac62b55cc05dd0

data/README.md

@@ -16,45 +16,66 @@ And then execute:
 
 ## Requirements
 
+### Gems
+
 Layout requires 'devise' gem with generated user model. If You use another auth solution, feel free to modify partial with user info and logout link.
 
+### Assets
+
+Add this line to assets precompilation in `config/production.rb`:
+
+    config.assets.precompile += %w( admin.js admin.css redactor/wym.css )
+
 ## Usage
 
+### Layout
+
 To generate admin layout type:
 
     rails g redde:layout
 
-To set admin login layout you need to modify application controller:
+To set admin login layout you need to include `Redde::Layout` concern:
+
+    class ApplicationController < ActionController::Base
+      include Redde::Layout
+      # Prevent CSRF attacks by raising an exception.
+      # For APIs, you may want to use :null_session instead.
+      protect_from_forgery with: :exception
+    end
+
+This concern adds layout switch with:
 
     layout :layout_by_resource
 
+with method `layout_by_resource`:
+
     def layout_by_resource
-      if devise_controller? && controller_name == "sessions"
+      if devise_controller? && controller_name == 'sessions'
         'login'
       else
-        "application"
+        'application'
       end
     end
 
-To generate admin views and controller for a model, enter:
+Feel free to change this methos as you need.
 
-    rails g redde:scaffold ModelNames
+### Scaffold
 
-Add `admin.scss` and `admin.js` to assets precompilation in config/production.rb:
+To generate admin views and controller for a model, enter:
 
-    config.assets.precompile += %w( admin.js admin.css )
+    rails g redde:scaffold ModelNames
 
-## UrlGenerator
+### UrlGenerator
 
 `Redde::UrlGenerator` - is a small lib to convert title and id to combine url, used in `to_param` method.
 
 Usage example:
 
-	generator = Redde::UrlGenerator.new(1, 'тестовый заголовок $%##@$@#$')
-	generator.url
-	=> '1-testovyy-zagolovok'
+    generator = Redde::UrlGenerator.new(1, 'тестовый заголовок $%##@$@#$')
+    generator.url
+    => '1-testovyy-zagolovok'
 
-## Sluggable
+### Sluggable
 
 `Sluggable` is used to include into model with permanent slugs (similar to permalink).
 
@@ -67,13 +88,13 @@ Usage example:
 
 Book should have title and slug fields.
 
-	class Book < ActiveRecord::Base
-	  TITLE_SYMBOL = :name
-	  include Redde::Sluggable
-	  validates :name, presence: true
-	end
+    class Book < ActiveRecord::Base
+      TITLE_SYMBOL = :name
+      include Redde::Sluggable
+      validates :name, presence: true
+    end
 
-	b = Book.new(name: 'Тестовая книга')
+    b = Book.new(name: 'Тестовая книга')
     b.save
     b.slug
     => 'testovaya-kniga'
@@ -83,13 +104,13 @@ Book should have title and slug fields.
 
 ## Добавление фотографий
 
-	rails g redde:photo
+    rails g redde:photo
 
 Добавьте в routes.rb единожды
 
     concern :imageable do
       resources :photos, only: [:show, :create, :destroy] do
-        post 'sort', :on => :collection
+        post 'sort', on: :collection
       end
     end
 
@@ -139,18 +160,12 @@ Its neccessary to have joined asset files, change assets debug to false in `conf
             name: Название
             descr: Описание
 
-## WYSIWYG editor note
-
-To use styles for the WYSIWYG editor, add its styles to precompile in `config/production.rb`:
-
-    config.assets.precompile += %w( redactor/wym.css )
-
 ## Sortable
 
 If you have field `position` of integer type in your model, generator will add special column as a hook for sort.
 You should add POST `sort` action to you routes:
 
-	resources :article_categories do
+    resources :article_categories do
       post 'sort', on: :collection
     end
 

data/lib/redde/concerns/layout.rb

@@ -0,0 +1,15 @@
+module Redde::Layout
+  extend ActiveSupport::Concern
+
+  included do
+    layout :layout_by_resource
+  end
+
+  def layout_by_resource
+    if devise_controller? && controller_name == 'sessions'
+      'login'
+    else
+      'application'
+    end
+  end
+end

data/lib/redde/version.rb

@@ -1,3 +1,3 @@
 module Redde
-  VERSION = '0.1.9'
+  VERSION = '0.1.10'
 end

data/lib/redde.rb

@@ -1,6 +1,7 @@
 require 'redde/version'
-require 'redde/sluggable'
-require 'redde/with_photo'
+require 'redde/concerns/sluggable'
+require 'redde/concerns/with_photo'
+
 module Redde
   require 'generators/redde/layout/layout_generator'
   require 'generators/redde/scaffold/scaffold_generator'

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,4 +1,5 @@
 class ApplicationController < ActionController::Base
+  include Redde::Layout
   # Prevent CSRF attacks by raising an exception.
   # For APIs, you may want to use :null_session instead.
   protect_from_forgery with: :exception

data/spec/dummy/app/controllers/articles_controller.rb

@@ -1,12 +1,8 @@
-# coding: utf-8
-
 class ArticlesController < ApplicationController
-
   def index
   end
 
   def show
     @article = Article.find(params[:id])
   end
-  
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -245,10 +245,11 @@ files:
 - lib/generators/redde/scaffold/templates/edit.html.haml
 - lib/generators/redde/scaffold/templates/index.html.haml
 - lib/redde.rb
-- lib/redde/sluggable.rb
+- lib/redde/concerns/layout.rb
+- lib/redde/concerns/sluggable.rb
+- lib/redde/concerns/with_photo.rb
 - lib/redde/url_generator.rb
 - lib/redde/version.rb
-- lib/redde/with_photo.rb
 - redde.gemspec
 - spec/dummy/.rspec
 - spec/dummy/README.rdoc