redde 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbde0641c49836754b4070b0113f4298222340cb
-  data.tar.gz: 5b2da2600e17118d0515351e7c105598f953c486
+  metadata.gz: 415d13d5581f203913ddbe74ba59d6fed19125a8
+  data.tar.gz: 00b8a99f56c2ad97b1d91bb1684529e389237126
 SHA512:
-  metadata.gz: 9b3af10712fe15ee2e2871a3ea20534af14d7c8d296e3d4a9ba62b34c19b0e43b1b6ab15618b91073efcd88cc6b9552a4c4dabad7d454c0a3aedc2753c7a6148
-  data.tar.gz: 6767bae525444c8e97fc53c81d416bfee50ebd673184ee154ef085dde15fcd6c0493a0e82b67124f5fff4d3e0cf327ac0fe7d97a9c70ac6bebc0bc56f08aad94
+  metadata.gz: 11ad3b74c37115cd4af58828c23e65fd9c395aedb5e8b2eafaaf719e42193a3da26464dac95ce2d8660fe803eff53fe7d853d97b2da5cdbaeb2506da6984a9f4
+  data.tar.gz: 3555c40b264141d970ff35cdff80ec0e06ff095ff8891912f3ee23de7ad920bdca83769bdc60354af9d9d2354e365abb85ef60739b42b864ea21671687485a6f

data/README.md

@@ -37,13 +37,50 @@ To set admin login layout you need to modify application controller:
     end
 
 To generate admin views and controller for a model, enter:
-  
+
     rails g redde:scaffold ModelNames
 
 Add `admin.scss` and `admin.js` to assets precompilation in config/production.rb:
 
     config.assets.precompile += %w( admin.js admin.css )
-    
+
+## 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'
+
+## Sluggable
+
+`Sluggable` is used to include into model with permanent slugs (similar to permalink).
+
+Your ActiveRecord model should have `slug` field and title field.
+
+You can set title field by setting `TITLE_FIELD` to symbol of method. This method will be used to generate `slug`.
+If `TITLE_FIELD` constant is not set, `:title` symbol will be used insted.
+
+Usage example:
+
+Book should have title and slug fields.
+
+	class Book < ActiveRecord::Base
+	  TITLE_SYMBOL = :name
+	  include Redde::Sluggable
+	  validates :name, presence: true
+	end
+
+	b = Book.new(name: 'Тестовая книга')
+    b.save
+    b.slug
+    => 'testovaya-kniga'
+
+    b.to_param
+    => '1-testovaya-kniga'
+
 ## Добавление фотографий
 
 	rails g redde:photo
@@ -67,7 +104,7 @@ Add `admin.scss` and `admin.js` to assets precompilation in config/production.rb
 Не забудьте добавить полиморфную связь
 
     has_many :photos, dependent: :destroy, as: :imageable
-	
+
 создаст scaffold для модели Photo с полиморфной связью
 
 ## Gemset dependenсies
@@ -79,7 +116,7 @@ Somehow, some dependencies are not initialized inside rails apps. If you get err
     gem 'haml-rails'
     gem 'russian'
     gem 'devise'
-    
+
 Its highly possible, that you will not have any problems with gems
 
 ## Autoprefixer note for development mode
@@ -107,7 +144,7 @@ Its neccessary to have joined asset files, change assets debug to false in `conf
 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.

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

@@ -5,10 +5,12 @@ class CreatePhotos < ActiveRecord::Migration
       t.string :imageable_type
       t.integer :position
       t.string :src
+      t.string :token
 
       t.timestamps
     end
     add_index :photos, :imageable_id
     add_index :photos, :imageable_type
+    add_index :photos, :token
   end
 end

data/lib/redde/sluggable.rb

@@ -0,0 +1,28 @@
+require 'redde/url_generator'
+
+module Redde::Sluggable
+  extend ActiveSupport::Concern
+
+  included do
+    validates :slug, format: { with: /\A[A-z0-9_-]*\z/i, message: 'имеет неверный формат, разрешены английские символы, знак подчеркивания "_" и дефис "-"'}, presence: true
+    before_validation :set_slug
+  end
+
+  def set_slug
+    self.slug = Redde::UrlGenerator.new(self, title_field).formatted_name.downcase unless slug.present?
+  end
+
+  def title_field
+    send(title_symbol)
+  end
+
+  def title_symbol
+    self.class::TITLE_SYMBOL
+  rescue
+    :title
+  end
+
+  def to_param
+    "#{id}-#{slug.try(:downcase)}"
+  end
+end

data/lib/{url_generator.rb → redde/url_generator.rb}

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-class UrlGenerator
+class Redde::UrlGenerator
   attr_reader :id, :name
   def initialize(id, name = nil)
     @id = id
@@ -8,7 +6,8 @@ class UrlGenerator
   end
 
   def url
-    "#{id}#-{formatted_name}".downcase
+    return "#{id}-#{formatted_name}".downcase if formatted_name.present?
+    id.to_s
   end
 
   def translitted_name

data/lib/redde/version.rb

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

data/lib/redde/with_photo.rb

@@ -0,0 +1,13 @@
+module WithPhoto
+  extend ActiveSupport::Concern
+
+  included do
+    attr_accessor :tokens
+    has_many :photos, dependent: :destroy, as: :imageable
+    after_create :assign_photos
+  end
+
+  def assign_photos
+    Photo.where(token: tokens || []).update_all(imageable_id: self.id, imageable_type: self.class.name)
+  end
+end

data/lib/redde.rb

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

data/spec/models/sluggable_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+class DummyClass
+  include ActiveModel::Model
+  include ActiveModel::Validations
+  include ActiveRecord::Callbacks
+  include Redde::Sluggable
+
+  attr_accessor :id, :title, :slug
+
+  def id
+    3
+  end
+
+  def title
+    'hey ho'
+  end
+end
+
+
+class DummyClassWithTitle < DummyClass
+  include Redde::Sluggable
+  TITLE_SYMBOL = :name
+
+  def name
+    'super name'
+  end
+end
+
+describe Redde::Sluggable do
+  let(:title) { DummyClass.new }
+  let(:name) { DummyClassWithTitle.new }
+
+  it 'sets slug for model with title' do
+    title.valid?
+    expect(title.slug).to eq 'hey-ho'
+  end
+
+  it 'sets slug for model with name' do
+    name.valid?
+    expect(name.slug).to eq 'super-name'
+  end
+end

data/spec/models/url_generator_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Redde::UrlGenerator do
+  let(:url) { Redde::UrlGenerator.new(1, 'тестовый заголовок $%##@$@#$') }
+
+  it 'generates valid translitted name' do
+    expect(url.translitted_name).to eq 'testovyy-zagolovok'
+  end
+
+  it 'generates valid url if name not present' do
+    url = Redde::UrlGenerator.new(1)
+    expect(url.url).to eq '1'
+  end
+
+  it 'generates valid url' do
+    expect(url.url).to eq '1-testovyy-zagolovok'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -245,8 +245,10 @@ 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/url_generator.rb
 - lib/redde/version.rb
-- lib/url_generator.rb
+- lib/redde/with_photo.rb
 - redde.gemspec
 - spec/dummy/.rspec
 - spec/dummy/README.rdoc
@@ -295,6 +297,8 @@ files:
 - spec/generators/layout_generator_spec.rb
 - spec/generators/photo_generator_spec.rb
 - spec/generators/scaffold_generator_spec.rb
+- spec/models/sluggable_spec.rb
+- spec/models/url_generator_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/redde/redde
 licenses:
@@ -368,4 +372,6 @@ test_files:
 - spec/generators/layout_generator_spec.rb
 - spec/generators/photo_generator_spec.rb
 - spec/generators/scaffold_generator_spec.rb
+- spec/models/sluggable_spec.rb
+- spec/models/url_generator_spec.rb
 - spec/spec_helper.rb