redde 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e9c5fd3d5b0a6b212e42d958015be835b3ca326
-  data.tar.gz: 211e8ec998cd34478082efba8e8418bc7dad1859
+  metadata.gz: e7db06e9218ae6343bcc14a2dd7f22680b620750
+  data.tar.gz: eef951c975ae0d16d8e0d83fd08499b06ead764e
 SHA512:
-  metadata.gz: 28c5c14c47501b64b6bc181f2e85e8f35ca249acc37e0abaf7cc64236d52eb55ff2b71444c4880cd247b00ef347d15029bb65aaeb5393210ed235a88a6ad86f2
-  data.tar.gz: aede49ea623edd9c5d1ea02425500cc238d9f15a6839a8b86335e3a86c53feb2e907e08752a155c33c894221b06edf13f5817bc476946728caac62b55cc05dd0
+  metadata.gz: 0cc6de724a9a269574ee2b76032544283f8ef49e159ddb82f71fc45d6cf0d497ef2d82d44d0f005f1a3f489926ee2f4f03397c4a4528ddc079e2f6fbc888b724
+  data.tar.gz: cbb28953633ae2aae37658fa38c510dbd5ada7026819642e2ee5ef84be3b8259198d36ecda581ab7c2068442e5b41f027cbb6a4aac780626b0d26baca0f65892

data/.gitignore

@@ -22,4 +22,4 @@ tmp
 /spec/dummy/public/uploads
 /spec/dummy/log
 /spec/dummy/log/test.log
-/spec/dummy/db/*sqlite3
+/spec/dummy/db/*sqlite3

data/.travis.yml

@@ -3,8 +3,7 @@ language: ruby
 notifications:
   email: false
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
 before_script:
-  - "cd spec/dummy; rake db:setup RAILS_ENV=test"
+  - 'cd spec/dummy; rake db:setup RAILS_ENV=test'

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

@@ -8,20 +8,41 @@ module Redde
 
       attr_reader :app_name
 
-      def generate_layout
+      def make_views
         %w(admin login).each do |layout|
           template "layouts/#{layout}#{ext}", "app/views/layouts/#{layout}#{ext}"
         end
         directory 'base', 'app/views/admin/base'
+      end
+
+      def make_js
         %w(admin.js).each do |js|
           template "assets/javascripts/#{js}", "app/assets/javascripts/#{js}"
         end
         directory 'assets/javascripts/admin', 'app/assets/javascripts/admin'
+      end
+
+      def make_css
         directory 'assets/stylesheets/admin', 'app/assets/stylesheets/admin'
         directory 'assets/redactor', 'app/assets'
+      end
+
+      def make_helpers
         template 'helpers/admin_helper.rb', 'app/helpers/admin_helper.rb'
+      end
+
+      def make_images
         directory 'assets/images/admin', 'app/assets/images/admin'
+      end
+
+      def make_controllers
         template 'controllers/base_controller.rb', 'app/controllers/admin/base_controller.rb'
+        template 'controllers/managers_controller.rb', 'app/controllers/admin/managers_controller.rb'
+        directory 'controllers/managers', 'app/controllers/managers'
+      end
+
+      def fix_routes
+        route("devise_for :managers, controllers: { registrations: 'managers/registrations' }")
       end
 
       private

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

@@ -9,4 +9,4 @@
         = mail_to current_manager.email
         = link_to 'Выход', destroy_manager_session_path, method: :delete
     .header__center
-      = link_to 'AppName', root_path ||= '/', target: :_blank
+      = link_to Rails.application.class.parent_name, root_path || '/', target: :_blank

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

@@ -1,11 +1,11 @@
 - case controller_name
   - when 'products' then @active = :shop
   - when 'articles' then @active = :materials
-  - when 'users' then @active = :system
+  - when 'users', 'managers' then @active = :system
 
 .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)]
+    = link_to 'Система', [:admin, :managers], 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,12 @@
--# add this condition to remove empty sidebar
--# if @active
 %nav.sidebar
   - case @active
   - when :shop
-    = link_to 'Товары', admin_products_path, class: 'sidebar__link'
+    = link_to 'Товары', [:admin, :products], 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, :managers], class: 'sidebar__link'
+    = link_to 'Пользователи', [:admin, :users], 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

@@ -1,5 +1,3 @@
-#coding: utf-8
-
 class Admin::BaseController < ActionController::Base
   layout 'admin'
   before_filter :authenticate_manager!
@@ -7,4 +5,23 @@ class Admin::BaseController < ActionController::Base
 
   def welcome
   end
+
+  private
+
+  def redirect_or_edit(obj, saved)
+    if saved
+      redirect_to url_for_obj(obj), notice: notice_for(obj)
+    else
+      render 'edit'
+    end
+  end
+
+  def notice_for(obj)
+    "#{obj.class.model_name.human} сохранен."
+  end
+
+  def url_for_obj(obj)
+    return [:edit, :admin, obj] if params[:commit] == 'Применить'
+    [:admin, obj.class.model_name.plural.to_sym]
+  end
 end

data/lib/generators/redde/layout/templates/controllers/managers/registrations_controller.rb

@@ -0,0 +1,21 @@
+class Managers::RegistrationsController < Devise::RegistrationsController
+  def new
+    redirect_to root_path, alert: 'Регистрация закрыта'
+  end
+
+  def create
+    redirect_to root_path, alert: 'Регистрация закрыта'
+  end
+
+  def edit
+    redirect_to root_path, alert: 'Регистрация закрыта'
+  end
+
+  def update
+    redirect_to root_path, alert: 'Регистрация закрыта'
+  end
+
+  def destroy
+    redirect_to root_path, alert: 'Регистрация закрыта'
+  end
+end

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

@@ -0,0 +1,30 @@
+class Admin::ManagersController < Admin::BaseController
+  def index
+    @managers = Manager.all
+  end
+
+  def new
+    @manager = Manager.new
+    render 'edit'
+  end
+
+  def create
+    @manager = Manager.new(manager_params)
+    redirect_or_edit(@manager, @manager.save)
+  end
+
+  def edit
+    @manager = Manager.find(params[:id])
+  end
+
+  def update
+    @manager = Manager.find(params[:id])
+    redirect_or_edit(@manager, @manager.update(manager_params))
+  end
+
+  def destroy
+    @manager = Manager.find(params[:id])
+    @manager.destroy if current_manager.id != @manager.id
+    redirect_to [:admin, :managers], alert: 'Администратор удален'
+  end
+end

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

@@ -1,7 +1,4 @@
 class Photo < ActiveRecord::Base
-  belongs_to :imageable, polymorphic: true
-
-  default_scope { order(:position) }
-
+  include Redde::Photoable
   mount_uploader :src, PhotoUploader
 end

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

@@ -1,7 +1,4 @@
-# encoding: utf-8
-
 class PhotoUploader < CarrierWave::Uploader::Base
-
   # Include RMagick or MiniMagick support:
   include CarrierWave::RMagick
   # include CarrierWave::MiniMagick
@@ -28,7 +25,6 @@ class PhotoUploader < CarrierWave::Uploader::Base
     ActionController::Base.helpers.asset_path "missing/#{model.class.to_s.tableize}/#{version_name}.png"
   end
 
-
   # Process files as they are uploaded:
   # process :scale => [200, 300]
   #

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

@@ -23,20 +23,12 @@ 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} добавлен."
-    else
-      render 'edit'
-    end
+    redirect_or_edit(@<%= resource_name %>, @<%= resource_name %>.save)
   end
 
   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} отредактирован."
-    else
-      render 'edit'
-    end
+    redirect_or_edit(@<%= resource_name %>, @<%= resource_name %>.update(<%= resource_name %>_params))
   end
 
   def destroy
@@ -46,8 +38,8 @@ class Admin::<%= model_name.demodulize.pluralize -%>Controller < Admin::BaseCont
   end
 
   private
-    def <%= resource_name %>_params
-      params.require(:<%= resource_name %>).permit(<%= column_names.select {|c| !(['id', 'updated_at', 'created_at'].include? c) }.map {|c| ":#{c}"}.join(', ') %>)
-    end
 
-end
+  def <%= resource_name %>_params
+    params.require(:<%= resource_name %>).permit(<%= column_names.select {|c| !(['id', 'updated_at', 'created_at'].include? c) }.map { |c| ":#{c}" }.join(', ') %>)
+  end
+end

data/lib/redde/concerns/photoable.rb

@@ -0,0 +1,17 @@
+module Redde::Photoable
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :imageable, polymorphic: true
+    default_scope { order(:position) }
+    before_save :set_token, unless: :persisted_link?
+  end
+
+  def set_token
+    token = SecureRandom.uuid unless token.present?
+  end
+
+  def persisted_link?
+    imageable_type.present? && imageable_id.present?
+  end
+end

data/lib/redde/concerns/with_photo.rb

@@ -1,13 +1,27 @@
-module WithPhoto
+module Redde::WithPhoto
   extend ActiveSupport::Concern
 
+  QUERY = 'imageable_id = :id AND imageable_type = :type OR token in (:tokens)'
+
   included do
-    attr_accessor :tokens
+    attr_accessor :photo_tokens
     has_many :photos, dependent: :destroy, as: :imageable
     after_create :assign_photos
   end
 
+  def all_photos
+    Photo.where(QUERY, id: self.id, type: self.class.name, tokens: tokens)
+  end
+
   def assign_photos
-    Photo.where(token: tokens || []).update_all(imageable_id: self.id, imageable_type: self.class.name)
+    Photo.where(token: tokens).update_all(imageable_attributes)
+  end
+
+  def imageable_attributes
+    { imageable_id: self.id, imageable_type: self.class.name, token: nil }
+  end
+
+  def tokens
+    photo_tokens || []
   end
 end

data/lib/redde/version.rb

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

data/lib/redde.rb

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

data/redde.gemspec

@@ -3,27 +3,27 @@
 require File.expand_path('../lib/redde/version', __FILE__)
 
 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.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"
+  gem.homepage      = 'http://github.com/redde/redde'
 
   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.name          = 'redde'
+  gem.require_paths = ['lib']
   gem.version       = Redde::VERSION
-  gem.license       = "MIT"
+  gem.license       = 'MIT'
 
-  gem.add_runtime_dependency "jquery-rails"
-  gem.add_runtime_dependency "jquery-ui-rails"
+  gem.add_runtime_dependency 'jquery-rails'
+  gem.add_runtime_dependency 'jquery-ui-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 'sqlite3'
   gem.add_development_dependency 'generator_spec'
 end

data/spec/dummy/app/models/article.rb

@@ -1,3 +1,4 @@
 class Article < ActiveRecord::Base
+  include Redde::WithPhoto
   validates :title, presence: true
 end

data/spec/dummy/app/models/photo.rb

@@ -0,0 +1,3 @@
+class Photo < ActiveRecord::Base
+  include Redde::Photoable
+end

data/spec/dummy/app/views/admin/photos/_photo.haml

@@ -0,0 +1,5 @@
+%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 'удалить', [:admin, photo.imageable, photo], method: :delete, data: { confirm: 'Точно удалить?'}, remote: true, title: 'Удалить', class: 'del'

data/spec/dummy/app/views/admin/photos/_photos.haml

@@ -0,0 +1,19 @@
+- unless parent.new_record?
+  = content_for(:page_sidebar) do
+    %h5
+      Фотографии
+      - if editable ||= false
+        = 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]) } }
+          .b-dropzone__bg
+          .b-dropzone__txt Перетащите файлы сюда
+      #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]) } }
+      = photo_sortable url_for([:sort, :admin, parent, :photos])

data/spec/dummy/app/views/admin/photos/create.js.erb

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

data/spec/dummy/app/views/admin/photos/destroy.js.erb

@@ -0,0 +1 @@
+$("li#photo_<%= @photo.id%>").remove();

data/spec/dummy/db/migrate/20140607122532_create_photos.rb

@@ -0,0 +1,16 @@
+class CreatePhotos < ActiveRecord::Migration
+  def change
+    create_table :photos do |t|
+      t.integer :imageable_id
+      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/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140128152208) do
+ActiveRecord::Schema.define(version: 20140607122532) do
 
   create_table "article_categories", force: true do |t|
     t.string   "title"
@@ -26,4 +26,73 @@ ActiveRecord::Schema.define(version: 20140128152208) do
     t.datetime "created_at"
     t.datetime "updated_at"
   end
+
+  create_table "photos", force: true do |t|
+    t.integer  "imageable_id"
+    t.string   "imageable_type"
+    t.integer  "position"
+    t.string   "src"
+    t.string   "token"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "photos", ["imageable_id"], name: "index_photos_on_imageable_id"
+  add_index "photos", ["imageable_type"], name: "index_photos_on_imageable_type"
+  add_index "photos", ["token"], name: "index_photos_on_token"
+
+  create_table "redditor_images", force: true do |t|
+    t.integer  "imageable_id"
+    t.string   "imageable_type"
+    t.integer  "position"
+    t.string   "src"
+    t.string   "description"
+    t.datetime "created_at",     null: false
+    t.datetime "updated_at",     null: false
+  end
+
+  add_index "redditor_images", ["imageable_id"], name: "index_redditor_images_on_imageable_id"
+  add_index "redditor_images", ["imageable_type"], name: "index_redditor_images_on_imageable_type"
+
+  create_table "redditor_pages", force: true do |t|
+    t.integer  "pageable_id"
+    t.string   "pageable_type"
+    t.datetime "created_at",    null: false
+    t.datetime "updated_at",    null: false
+  end
+
+  add_index "redditor_pages", ["pageable_id"], name: "index_redditor_pages_on_pageable_id"
+  add_index "redditor_pages", ["pageable_type"], name: "index_redditor_pages_on_pageable_type"
+
+  create_table "redditor_slider_blocks", force: true do |t|
+    t.integer  "page_id"
+    t.integer  "position"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "redditor_slider_blocks", ["page_id"], name: "index_redditor_slider_blocks_on_page_id"
+
+  create_table "redditor_text_blocks", force: true do |t|
+    t.integer  "page_id"
+    t.text     "body"
+    t.integer  "position"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "redditor_text_blocks", ["page_id"], name: "index_redditor_text_blocks_on_page_id"
+
+  create_table "redditor_video_blocks", force: true do |t|
+    t.integer  "page_id"
+    t.integer  "position"
+    t.integer  "width"
+    t.integer  "height"
+    t.string   "youtube"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
+  end
+
+  add_index "redditor_video_blocks", ["page_id"], name: "index_redditor_video_blocks_on_page_id"
+
 end

data/spec/generators/layout_generator_spec.rb

@@ -2,11 +2,12 @@ require 'spec_helper'
 
 describe Redde::Generators::LayoutGenerator do
   include GeneratorSpec::TestCase
-  destination File.expand_path("../../../tmp", __FILE__)
+  destination File.expand_path('../../../tmp', __FILE__)
   arguments %w(something)
 
   before(:all) do
     prepare_destination
+    `mkdir tmp/config; touch tmp/config/routes.rb; echo "Rails.application.routes.draw do\nend" > tmp/config/routes.rb`
     run_generator
   end
 
@@ -14,28 +15,25 @@ describe Redde::Generators::LayoutGenerator do
     FileUtils.rm_rf 'tmp'
   end
 
-  describe "layout" do
-
-    it "Generates admin and login layouts with js and css" do
+  describe 'layout' do
+    it 'Generates admin and login layouts with js and css' do
       # check layouts
-      assert_file "app/views/layouts/admin.html.haml"
-      assert_file "app/views/layouts/login.html.haml"
+      assert_file 'app/views/layouts/admin.html.haml'
+      assert_file 'app/views/layouts/login.html.haml'
 
       # check shared
-      assert_file "app/views/admin/base/_launchbar.html.haml"
-      assert_file "app/views/admin/base/_sidebar.html.haml"
-      assert_file "app/views/admin/base/_header.html.haml"
+      assert_file 'app/views/admin/base/_launchbar.html.haml'
+      assert_file 'app/views/admin/base/_sidebar.html.haml'
+      assert_file 'app/views/admin/base/_header.html.haml'
 
       # check js and css
-      assert_file "app/assets/javascripts/admin.js"
-      assert_file "app/assets/stylesheets/admin/index.scss"
+      assert_file 'app/assets/javascripts/admin.js'
+      assert_file 'app/assets/stylesheets/admin/index.scss'
 
-      #check images
-      assert_directory "app/assets/images/admin"
-      assert_directory "app/assets/javascripts/admin"
-      assert_directory "app/assets/stylesheets/admin"
+      # check images
+      assert_directory 'app/assets/images/admin'
+      assert_directory 'app/assets/javascripts/admin'
+      assert_directory 'app/assets/stylesheets/admin'
     end
-
   end
-
-end
+end

data/spec/generators/photo_generator_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Redde::Generators::PhotoGenerator do
   include GeneratorSpec::TestCase
-  destination File.expand_path("../../../tmp", __FILE__)
+  destination File.expand_path('../../../tmp', __FILE__)
 
   before(:all) do
     prepare_destination
@@ -13,21 +13,20 @@ describe Redde::Generators::PhotoGenerator do
     FileUtils.rm_rf 'tmp'
   end
 
-  it "Generates controller" do
-    assert_file "app/controllers/admin/photos_controller.rb"
+  it 'Generates controller' do
+    assert_file 'app/controllers/admin/photos_controller.rb'
   end
 
-  it "Generates views" do
-    assert_directory "app/views/admin/photos"
+  it 'Generates views' do
+    assert_directory 'app/views/admin/photos'
   end
 
-  it "Generates model" do
-    assert_file "app/models/photo.rb"
+  it 'Generates model' do
+    assert_file 'app/models/photo.rb'
   end
 
-  it "Generates migration" do
-    files = Dir["tmp/db/migrate/*.rb"]
-    expect(files.map(&:to_s).join(" ").index("create_photos")).to eq 30
+  it 'Generates migration' do
+    files = Dir['tmp/db/migrate/*.rb']
+    expect(files.map(&:to_s).join(' ').index('create_photos')).to eq 30
   end
-
-end
+end

data/spec/generators/scaffold_generator_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Redde::Generators::ScaffoldGenerator do
   include GeneratorSpec::TestCase
-  destination File.expand_path("../../../tmp", __FILE__)
+  destination File.expand_path('../../../tmp', __FILE__)
   arguments ['Articles']
 
   before(:all) do
@@ -14,46 +14,45 @@ describe Redde::Generators::ScaffoldGenerator do
     FileUtils.rm_rf 'tmp'
   end
 
-  let(:args) { ["ArticleCategory"] }
+  let(:args) { ['ArticleCategory'] }
   let(:generator) { Redde::Generators::ScaffoldGenerator.new(args) }
 
-  context "METHODS" do
-    it "gets controller_routing_path" do
-      expect(generator.send(:controller_routing_path)).to eq "article_category"
+  context 'METHODS' do
+    it 'gets controller_routing_path' do
+      expect(generator.send(:controller_routing_path)).to eq 'article_category'
     end
 
-    it "gets singular_controller_routing_path" do 
-      expect(generator.send(:singular_controller_routing_path)).to eq "article_category"
+    it 'gets singular_controller_routing_path' do
+      res = generator.send(:singular_controller_routing_path)
+      expect(res).to eq 'article_category'
     end
 
-    it "gets model_name" do
-      expect(generator.send(:model_name)).to eq "::ArticleCategory"
+    it 'gets model_name' do
+      expect(generator.send(:model_name)).to eq '::ArticleCategory'
     end
 
-    it "gets plural_model_name" do
-      expect(generator.send(:plural_model_name)).to eq "::ArticleCategories"
+    it 'gets plural_model_name' do
+      expect(generator.send(:plural_model_name)).to eq '::ArticleCategories'
     end
 
-    it "gets resource_name" do
-      expect(generator.send(:resource_name)).to eq "article_category"
+    it 'gets resource_name' do
+      expect(generator.send(:resource_name)).to eq 'article_category'
     end
 
-    it "gets plural_resource_name" do
-      expect(generator.send(:plural_resource_name)).to eq "article_categories"
+    it 'gets plural_resource_name' do
+      expect(generator.send(:plural_resource_name)).to eq 'article_categories'
     end
 
-    it "gets index header" do
-      expect(generator.send(:index_header)).to eq "Article categories"
+    it 'gets index header' do
+      expect(generator.send(:index_header)).to eq 'Article categories'
     end
-  end # end context "METHODS"
+  end # end context 'METHODS'
 
-  context "INTEGRATION" do
-
-    it "Generates admin views" do
-      assert_file "app/views/admin/articles/index.html.haml"
-      assert_file "app/views/admin/articles/edit.html.haml"
+  context 'INTEGRATION' do
+    it 'Generates admin views' do
+      assert_file 'app/views/admin/articles/index.html.haml'
+      assert_file 'app/views/admin/articles/edit.html.haml'
     end
 
-  end # end describe "VIEWS"
-
-end
+  end # end describe 'VIEWS'
+end

data/spec/models/sluggable_spec.rb

@@ -17,7 +17,6 @@ class DummyClass
   end
 end
 
-
 class DummyClassWithTitle < DummyClass
   include Redde::Sluggable
   TITLE_SYMBOL = :name

data/spec/models/with_photo_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe Redde::WithPhoto do
+  let(:photo1) { Photo.create(src: '/uploads/1.txt', token: rand(1000)) }
+  let(:photo2) { Photo.create(src: '/uploads/2.txt', token: rand(1000)) }
+  let(:tokens) { [photo1.token, photo2.token] }
+  let(:only_token) { { imageable_type: nil, imageable_id: nil, token: 123 } }
+  let(:article) { Article.new(title: 'Test Title', photo_tokens: tokens) }
+
+  it 'assigns photos to article' do
+    Photo.delete_all
+    article.save
+    expect(article.photos.count).to eq 2
+  end
+
+  it 'it gets all photos for article' do
+    Photo.delete_all
+    article.save
+    article.reload
+    article.photos.first.update(only_token)
+    article.photo_tokens = [123]
+    expect(article.all_photos.count).to eq 2
+    expect(article.photos.count).to eq 1
+  end
+end

data/spec/spec_helper.rb

@@ -1,29 +1,22 @@
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../dummy/config/environment", __FILE__)
-
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../dummy/config/environment', __FILE__)
 require 'bundler/setup'
 require 'rails/all'
 require 'active_record'
-
 require 'rspec/rails'
 require 'rspec/autorun'
-
 require 'factory_girl'
-
-
 require 'generator_spec/test_case'
 require 'redde'
-Dir[Pathname.new(File.expand_path('../', __FILE__)).join('support/**/*.rb')].each {|f| require f}
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
 
-
 RSpec.configure do |config|
   # ## Mock Framework
   #
@@ -34,9 +27,9 @@ RSpec.configure do |config|
   # config.mock_with :rr
 
   # config.after(:all) do
-  #   if Rails.env.test? 
-  #     FileUtils.rm_rf(Dir["#{Rails.root}/public/uploads"])
-  #   end 
+  #   if Rails.env.test?
+  #     FileUtils.rm_rf(Dir['#{Rails.root}/public/uploads'])
+  #   end
   # end
 
   config.include FactoryGirl::Syntax::Methods
@@ -55,5 +48,5 @@ RSpec.configure do |config|
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
   #     --seed 1234
-  config.order = "random"
+  config.order = 'random'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -228,6 +228,8 @@ files:
 - lib/generators/redde/layout/templates/base/_validate.haml
 - lib/generators/redde/layout/templates/base/welcome.haml
 - lib/generators/redde/layout/templates/controllers/base_controller.rb
+- lib/generators/redde/layout/templates/controllers/managers/registrations_controller.rb
+- lib/generators/redde/layout/templates/controllers/managers_controller.rb
 - lib/generators/redde/layout/templates/helpers/admin_helper.rb
 - lib/generators/redde/layout/templates/layouts/admin.html.haml
 - lib/generators/redde/layout/templates/layouts/login.html.haml
@@ -246,6 +248,7 @@ files:
 - lib/generators/redde/scaffold/templates/index.html.haml
 - lib/redde.rb
 - lib/redde/concerns/layout.rb
+- lib/redde/concerns/photoable.rb
 - lib/redde/concerns/sluggable.rb
 - lib/redde/concerns/with_photo.rb
 - lib/redde/url_generator.rb
@@ -262,6 +265,11 @@ files:
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/article.rb
 - spec/dummy/app/models/article_category.rb
+- spec/dummy/app/models/photo.rb
+- spec/dummy/app/views/admin/photos/_photo.haml
+- spec/dummy/app/views/admin/photos/_photos.haml
+- spec/dummy/app/views/admin/photos/create.js.erb
+- spec/dummy/app/views/admin/photos/destroy.js.erb
 - spec/dummy/app/views/articles/show.html.haml
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
@@ -284,11 +292,10 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20130908123351_create_articles.rb
 - spec/dummy/db/migrate/20140128152208_create_article_categories.rb
+- spec/dummy/db/migrate/20140607122532_create_photos.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
 - spec/dummy/public/404.html
@@ -300,6 +307,7 @@ files:
 - spec/generators/scaffold_generator_spec.rb
 - spec/models/sluggable_spec.rb
 - spec/models/url_generator_spec.rb
+- spec/models/with_photo_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/redde/redde
 licenses:
@@ -337,6 +345,11 @@ test_files:
 - spec/dummy/app/models/.keep
 - spec/dummy/app/models/article.rb
 - spec/dummy/app/models/article_category.rb
+- spec/dummy/app/models/photo.rb
+- spec/dummy/app/views/admin/photos/_photo.haml
+- spec/dummy/app/views/admin/photos/_photos.haml
+- spec/dummy/app/views/admin/photos/create.js.erb
+- spec/dummy/app/views/admin/photos/destroy.js.erb
 - spec/dummy/app/views/articles/show.html.haml
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
@@ -359,11 +372,10 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20130908123351_create_articles.rb
 - spec/dummy/db/migrate/20140128152208_create_article_categories.rb
+- spec/dummy/db/migrate/20140607122532_create_photos.rb
 - spec/dummy/db/schema.rb
-- spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.keep
 - spec/dummy/log/.keep
 - spec/dummy/public/404.html
@@ -375,4 +387,5 @@ test_files:
 - spec/generators/scaffold_generator_spec.rb
 - spec/models/sluggable_spec.rb
 - spec/models/url_generator_spec.rb
+- spec/models/with_photo_spec.rb
 - spec/spec_helper.rb