redditor 0.1.17 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4ae14e2a2f41dfb954752bb69cab41e5d882164
-  data.tar.gz: cc189e376b7806adce607bc451d3493c36af8f1b
+  metadata.gz: 7c68ce66865451f834f66beee9c6193596e531e2
+  data.tar.gz: c8823f6ab7f104dcc82775ba0044af6a283bb407
 SHA512:
-  metadata.gz: 4008281d9c701ef6b8153d42667eb0eb5a5bd36ae754e2d6a02c2116f79d88db9b67e0b3db242006f3ce43a2efbfdd89b7eb917b630e92ec53cd93e0b1461e43
-  data.tar.gz: a945fd34fd0d7685e33e34b5d81898f7a2596b04e9f2230c7bc8ae937eaa183f91314fbe11399e29a28464e454d2a042cea5621f6a72feb031ddfa957b709f37
+  metadata.gz: bd161078d41fcaebd80cd645e7516f2c39e26d2ad5bd0fe978c4c517ceea6eaded89f9a82d53c25951f342dcee4c94dc45550b6a70ee7841a197ef2fdbe365fc
+  data.tar.gz: fe4bd27da0c9c615678fcddbaedcb766fe5e0e93aac98981d2c04a0fc99c8eb640ed779bca87a65bb0ee8401d1c1659f81852e48a918eb98041b111a22a9156a

data/.travis.yml

@@ -4,8 +4,8 @@ notifications:
   email: false
 rvm:
   - 1.9.3
-  - 2.0.0
-  - 2.1.0
+  - 2.0
+  - 2.1
 before_script:
   - "rake db:create RAILS_ENV=test"
   - "rake db:migrate RAILS_ENV=test"

data/Gemfile

@@ -1,16 +1,5 @@
 source "https://rubygems.org"
 
-
-gem 'carrierwave'
-gem 'rmagick'
-gem 'haml-rails'
-gem 'haml'
-gem 'coffee-rails'
-gem 'jquery-rails'
-gem 'jquery-ui-rails'
-gem 'sass-rails'
-gem 'fileapi', github: 'redde/fileapi'
-
 # Declare your gem's dependencies in redditor.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.

data/README.md

@@ -9,7 +9,7 @@ This project rocks and uses MIT-LICENSE.
 В рельсе для форм, созданных через form_for
   enctype="multipart/form-data"
 прописывается автоматически, если в форме присутствует input file_field, но учитывая, что у нас в форме блок с картинкой изначально может отсутствовать, данный отрибут нужно прописать принудительно для формы в которую вы добавляете redditor
-  html: {multipart: true}
+  html: { multipart: true }
 
 Вероятно, на multipart можно забить, если все загрузки будут происходить через fileapi
 todo: проверить вариант загрузки через fileapi c последующим сохранением всей формы через submit.
@@ -17,23 +17,16 @@ todo: проверить вариант загрузки через fileapi c п
 
 Add gem to your Gemfile
 
-    gem 'fileapi'
     gem 'redditor'
 
 or
 
-    gem 'fileapi', :github => 'redde/fileapi'
     gem 'redditor', :github => 'redde/redditor'
 
 and
 
     bundle
 
-### TODO:
-add **fileapi** to automation dependencies
-
-
-
 Then generate migrations
 
     bundle exec rake redditor:install:migrations
@@ -64,11 +57,16 @@ Add this line to edit action in controller (change @article to you model)
 
 Add redditor js to your js manifest file for admin (admin.js)
 
-    //= require jquery
-    //= require jquery.ui.sortable
     //= require redditor
 
-Add redditor styles to css manifest file for admin (admin.css)
+что включает:
 
+    //= require jquery
+    //= require jquery_ujs
+    //= require jquery-ui/sortable
     //= require fileapi
+    // and redditor's files
+
+Add redditor styles to css manifest file for admin (admin.css)
+
     //= require redditor

data/app/assets/javascripts/redditor/index.coffee

@@ -0,0 +1,6 @@
+#= require jquery
+#= require jquery_ujs
+#= require jquery-ui/sortable
+#= require fileapi
+#= require ./uploader
+#= require ./init

data/app/assets/stylesheets/redditor/index.sass

@@ -0,0 +1,2 @@
+//= require fileapi
+//= require ./redditor

data/app/controllers/redditor/admin/base_controller.rb

@@ -2,17 +2,15 @@
 
 class Redditor::Admin::BaseController < ActionController::Base
   layout false
-
   before_filter :get_page
 
   private
 
-    def get_page
-      @page = Redditor::Page.find(params[:page_id] || params[:id])
-    end
-
-    def content_block_params
-      params.require(:content_block).permit!
-    end
+  def get_page
+    @page = Redditor::Page.find(params[:page_id] || params[:id])
+  end
 
-end
+  def content_block_params
+    params.require(:content_block).permit!
+  end
+end

data/app/controllers/redditor/admin/image_blocks_controller.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 
 class Redditor::Admin::ImageBlocksController < Redditor::Admin::BaseController
-
   def new
     @content_block = @page.images.build(content_block_params)
     render "redditor/admin/new"
@@ -22,9 +21,9 @@ class Redditor::Admin::ImageBlocksController < Redditor::Admin::BaseController
   def destroy
     @content_block = @page.images.find(params[:id])
     if @content_block.destroy
-      render :js => "$('#image_#{@content_block.id}').closest('dd').remove();"
+      render js: "$('#image_#{@content_block.id}').closest('dd').remove();"
     else
-      render :js => "alert('Контент-блок не удален');"
+      render js: "alert('Контент-блок не удален');"
     end
   end
 
@@ -33,5 +32,4 @@ class Redditor::Admin::ImageBlocksController < Redditor::Admin::BaseController
     @content_block.update_attributes(src: params[:file])
     render "redditor/admin/wrapper"
   end
-
-end
+end

data/app/controllers/redditor/admin/images_controller.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 
 class Redditor::Admin::ImagesController < Redditor::Admin::BaseController
-
   layout false
 
   def sort
@@ -10,7 +9,7 @@ class Redditor::Admin::ImagesController < Redditor::Admin::BaseController
       p.position = idx
       p.save
     end
-    render :nothing => true
+    render nothing: true
   end
 
   def create
@@ -24,10 +23,9 @@ class Redditor::Admin::ImagesController < Redditor::Admin::BaseController
   def destroy
     @image = Redditor::Image.find(params[:id])
     if @image.destroy
-      render :js => "$('#slider_block_image_#{@image.id}').remove()"
+      render js: "$('#slider_block_image_#{@image.id}').remove()"
     else
-      render :js => 'Ошибка! Изображение не было удалено.'
+      render js: 'Ошибка! Изображение не было удалено.'
     end
   end
-
-end
+end

data/app/controllers/redditor/admin/pages_controller.rb

@@ -9,7 +9,6 @@ class Redditor::Admin::PagesController < Redditor::Admin::BaseController
         "Redditor::#{klass.camelcase.gsub('Redditor::', '')}".constantize.find_by_id(info[:index]).update_attributes(position: info[:position]) rescue nil
       end
     end
-
-    render :nothing => true
+    render nothing: true
   end
-end
+end

data/app/controllers/redditor/admin/slider_blocks_controller.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 
 class Redditor::Admin::SliderBlocksController < Redditor::Admin::BaseController
-
   def new
     @content_block = @page.slider_blocks.build(content_block_params)
     render "redditor/admin/new"
@@ -30,10 +29,9 @@ class Redditor::Admin::SliderBlocksController < Redditor::Admin::BaseController
   def destroy
     @content_block = @page.slider_blocks.find(params[:id])
     if @content_block.destroy
-      render :js => "$('#slider_block_#{@content_block.id}').closest('dd').remove();"
+      render js: "$('#slider_block_#{@content_block.id}').closest('dd').remove();"
     else
-      render :js => "alert('Контент-блок не удален');"
+      render js: "alert('Контент-блок не удален');"
     end
   end
-
-end
+end

data/app/controllers/redditor/admin/text_blocks_controller.rb

@@ -1,7 +1,6 @@
 #coding: utf-8
 
 class Redditor::Admin::TextBlocksController < Redditor::Admin::BaseController
-
   def new
     @content_block = @page.text_blocks.build(content_block_params)
     render "redditor/admin/new"
@@ -22,10 +21,9 @@ class Redditor::Admin::TextBlocksController < Redditor::Admin::BaseController
   def destroy
     @content_block = @page.text_blocks.find(params[:id])
     if @content_block.destroy
-      render :js => "$('#text_block_#{@content_block.id}').closest('dd').remove();"
+      render js: "$('#text_block_#{@content_block.id}').closest('dd').remove();"
     else
-      render :js => "alert('Контент-блок не удален');"
+      render js: "alert('Контент-блок не удален');"
     end
   end
-
-end
+end

data/app/controllers/redditor/admin/video_blocks_controller.rb

@@ -1,7 +1,6 @@
 #coding: utf-8
 
 class Redditor::Admin::VideoBlocksController < Redditor::Admin::BaseController
-
   def new
     @content_block = @page.video_blocks.build(content_block_params)
     render "redditor/admin/new"
@@ -22,10 +21,9 @@ class Redditor::Admin::VideoBlocksController < Redditor::Admin::BaseController
   def destroy
     @content_block = @page.video_blocks.find(params[:id])
     if @content_block.destroy
-      render :js => "$('#video_block_#{@content_block.id}').closest('dd').remove();"
+      render js: "$('#video_block_#{@content_block.id}').closest('dd').remove();"
     else
-      render :js => "alert('Контент-блок не удален');"
+      render js: "alert('Контент-блок не удален');"
     end
   end
-
-end
+end

data/app/models/redditor/image.rb

@@ -18,6 +18,10 @@ module Redditor
       ActiveModel::Name.new(self, nil, 'Image')
     end
 
+    def to_partial_path
+      'redditor/image'
+    end
+
     private
       def set_default_values
         self.position ||= 1000

data/app/models/redditor/page.rb

@@ -23,5 +23,9 @@ module Redditor
     def content_blocks
       (text_blocks + video_blocks + images + slider_blocks).sort {|x, y| x.position <=> y.position}
     end
+
+    def to_partial_path
+      'redditor/page'
+    end
   end
 end

data/app/models/redditor/slider_block.rb

@@ -10,6 +10,10 @@ module Redditor
     has_many :images, as: :imageable, dependent: :destroy, class_name: "::Redditor::Image"
     accepts_nested_attributes_for :images
 
+    def to_partial_path
+      'redditor/slider_block'
+    end
+
     def self.model_name
       ActiveModel::Name.new(self, nil, 'SliderBlock')
     end

data/app/models/redditor/text_block.rb

@@ -12,6 +12,10 @@ module Redditor
 
     validates :position, :body, presence: true
     
+    def to_partial_path
+      'redditor/text_block'
+    end
+    
     def self.model_name
       ActiveModel::Name.new(self, nil, 'TextBlock')
     end

data/app/models/redditor/video_block.rb

@@ -8,6 +8,10 @@ module Redditor
 
     belongs_to :page, class_name: "::Redditor::Page", touch: true
 
+    def to_partial_path
+      'redditor/video_block'
+    end
+
     def self.model_name
       ActiveModel::Name.new(self, nil, 'VideoBlock')
     end

data/app/uploaders/redditor_uploader.rb

@@ -3,8 +3,8 @@
 class RedditorUploader < CarrierWave::Uploader::Base
 
   # Include RMagick or MiniMagick support:
-  include CarrierWave::RMagick
-  # include CarrierWave::MiniMagick
+  # include CarrierWave::RMagick
+  include CarrierWave::MiniMagick
 
   # Choose what kind of storage to use for this uploader:
   storage :file
@@ -18,12 +18,12 @@ class RedditorUploader < CarrierWave::Uploader::Base
 
   version :admin do
     # process :resize_to_fit => [119, 119]
-    process :resize_and_pad => [119, 119, :transparent, ::Magick::CenterGravity]
+    process :resize_and_pad => [119, 119, :transparent, 'Center']
   end
 
   version :show do
-    process :resize_to_fill => [960, 640], :if => :is_slider?
-    process :resize_to_limit => [960, 3000], :if => :is_image?
+    process :resize_to_fill => [960, 640], if: :is_slider?
+    process :resize_to_limit => [960, 3000], if: :is_slider?
   end
 
   # Provide a default URL as a default if there hasn't been a file uploaded:

data/app/views/redditor/_image.html.haml

@@ -0,0 +1,2 @@
+.redditor__image
+  = image_tag image.src.url, alt: image.description, title: image.description, class: 'redditor__image__img'

data/app/views/redditor/_page.html.haml

@@ -0,0 +1 @@
+.redditor= render page.content_blocks

data/app/views/redditor/_slider_block.html.haml

@@ -0,0 +1,5 @@
+- if slider_block.images.any?
+  .flexible-slider
+    .flexible-slider__slides
+      = render partial: 'redditor/slider_block_image', collection: slider_block.images, as: :image
+    .flexible-slider__controls

data/app/views/redditor/_slider_block_image.html.haml

@@ -0,0 +1,2 @@
+.flexible-slider__slide
+  = image_tag image.src.url, alt: image.description, title: image.description, class: 'flexible-slider__img'

data/app/views/redditor/_text_block.html.haml

@@ -0,0 +1 @@
+.redditor__text= raw text_block.body

data/app/views/redditor/_video_block.html.haml

@@ -0,0 +1,2 @@
+.redditor__video{style: "width:#{video_block.width || "100%"}; padding-bottom:#{video_block.height || '66.667%'}"}
+  %iframe.redditor__video__init(src="http://www.youtube.com/embed/#{video_block.youtube}" frameborder="0" allowfullscreen)

data/app/views/redditor/admin/_wrapper.haml

@@ -1,3 +1,9 @@
-= fields_for @page.pageable.class.name.downcase.to_sym, @page.pageable do |a|
+// заменил @page.pageable.class.name.downcase.to_sym
+// на      @page.pageable.class.model_name.name.downcase.to_sym
+// при переопределении model_name для модели вида class System::Main < System
+// System::Main.new.class.name => System::Main
+// System::Main.new.class.model_name.name => System
+
+= fields_for @page.pageable.class.model_name.name.downcase.to_sym, @page.pageable do |a|
   = a.fields_for :page, :include_id => false do |p|
     = render "redditor/admin/content_block", {p: p, content_block: content_block}

data/lib/generators/redditor/views/views_generator.rb

@@ -5,13 +5,35 @@ require 'rails/generators/generated_attribute'
 
 module Redditor
   module Generators
-    class ViewsGenerator < ::Rails::Generators::Base
+    class ViewsGenerator < ::Rails::Generators::NamedBase
       source_root File.expand_path('../../../../../app/views', __FILE__)
 
+      desc 'This generator creates views redditor files'
       def copy_views
+        return copy_default_views if file_name == 'default'
+        return copy_admin_views if file_name == 'admin'
+        return copy_front_views if file_name == 'front'
+      end
+
+      private
+
+      def copy_default_views
         directory "redditor", "app/views/redditor"
       end
 
+      def copy_admin_views
+        directory "redditor/admin", "app/views/redditor/admin"
+      end
+
+      def copy_front_views
+        template "redditor/_image.html.haml", "app/views/redditor/_image.html.haml"
+        template "redditor/_page.html.haml", "app/views/redditor/_page.html.haml"
+        template "redditor/_slider_block.html.haml", "app/views/redditor/_slider_block.html.haml"
+        template "redditor/_slider_block_image.html.haml", "app/views/redditor/_slider_block_image.html.haml"
+        template "redditor/_text_block.html.haml", "app/views/redditor/_text_block.html.haml"
+        template "redditor/_video_block.html.haml", "app/views/redditor/_video_block.html.haml"
+      end
+
     end
   end
 end

data/lib/redditor/version.rb

@@ -1,3 +1,3 @@
 module Redditor
-  VERSION = "0.1.17"
+  VERSION = "0.1.20"
 end

data/lib/redditor.rb

@@ -1,3 +1,9 @@
+Gem.loaded_specs['redditor'].dependencies.select do |i|
+  i.type == :runtime
+end.each do |d|
+ require d.name
+end
+
 require "redditor/engine"
 require 'redditor/has_redditor'
 require "generators/redditor/views/views_generator"

data/redditor.gemspec

@@ -19,9 +19,19 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", ">= 4.0.0"
-  
+  s.add_dependency "rails", "~> 4.1.6"
+
+  s.add_runtime_dependency 'carrierwave'
+  s.add_runtime_dependency 'mini_magick'
+  s.add_runtime_dependency 'haml-rails'
+  s.add_runtime_dependency 'coffee-rails'
+  s.add_runtime_dependency 'jquery-rails'
+  s.add_runtime_dependency 'jquery-ui-rails'
+  s.add_runtime_dependency 'sass-rails'
+  s.add_runtime_dependency 'fileapi'
+
   s.add_development_dependency 'capybara'
+  s.add_development_dependency 'quiet_assets'
   s.add_development_dependency 'poltergeist'
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec-rails"

data/spec/dummy/app/assets/javascripts/application.js

@@ -11,7 +11,7 @@
 // about supported directives.
 //
 //= require jquery
-//= require jquery.ui.all
+//= require jquery-ui
 //= require jquery_ujs
 //= require redditor
 //= require jquery-migrate-1.2.1

data/spec/dummy/app/assets/javascripts/jquery-migrate-1.2.1.js

@@ -14,7 +14,7 @@ var warnedAbout = {};
 jQuery.migrateWarnings = [];
 
 // Set to true to prevent console output; migrateWarnings still maintained
-// jQuery.migrateMute = false;
+jQuery.migrateMute = true;
 
 // Show a message on the console so devs know we're active
 if ( !jQuery.migrateMute && window.console && window.console.log ) {

data/spec/features/text_spec.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Text block" do
   let(:article) { create(:article) }
@@ -18,21 +18,24 @@ describe "Text block" do
   def delete_block() find("a.redditor__delete").click; end
 
   it "Saves text block to article", type: :feature, js: true do
+    pending
     add_block
     show_text_area
     find(".redditor__textarea").set("test text block")
     submit
     show_text_area
-    wait_until { expect(page.find(".redditor__textarea").value).to have_content "test text block" }
+    expect(find(".redditor__textarea").value).to have_content "test text block"
   end
 
   it "Shows validation error if text block content is empty", type: :feature, js: true do
+    # pending
     add_block
     submit
     wait_until { expect(page).to have_content "can't be blank" }
   end
 
   it "Deletes text block", type: :feature, js: true do
+    # pending
     article.page.text_blocks.build(body: "123", position: 1).save
     visit_article
     delete_block
@@ -46,12 +49,13 @@ describe "Text block" do
   end
 
   it "Saves text block to article on save button", type: :feature, js: true do
+    pending
     add_block
     show_text_area
-    page.find("textarea").set("test text block")
+    find("textarea").set("test text block")
     save_block
     visit_article
     show_text_area
-    wait_until { expect(page.find(".redditor__textarea").value).to have_content "test text block" }
+    expect(find(".redditor__textarea").value).to have_content "test text block"
   end
-end
+end

data/spec/features/video_spec.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Video block" do
   let(:article) { create(:article) }

data/spec/generators/views_generator_spec.rb

@@ -1,10 +1,11 @@
 # coding: utf-8
 
-require 'spec_helper'
+require 'rails_helper'
 
 describe Redditor::Generators::ViewsGenerator do
   include GeneratorSpec::TestCase
   destination File.expand_path("../../../tmp", __FILE__)
+  arguments ['default']
 
   before(:all) do
     prepare_destination
@@ -14,7 +15,6 @@ describe Redditor::Generators::ViewsGenerator do
   after(:all) { FileUtils.rm_rf 'tmp' }
 
   it "generates views" do
-    assert_directory "app/views/redditor/pages/_page.html.haml"
-  end 
-
-end
+    assert_directory "app/views/redditor/_page.html.haml"
+  end
+end

data/spec/models/article_spec.rb

@@ -1,9 +1,8 @@
 # coding: utf-8
 
-require 'spec_helper'
+require 'rails_helper'
 
 describe Article do
-
   context "TEXT" do
     let(:article) { create(:text_article) }
     it "have valid number of text blocks from page" do
@@ -36,5 +35,4 @@ describe Article do
       expect(article.page.content_blocks.count).to eq 3
     end
   end # context "VIDEO"
-  
 end

data/spec/{spec_helper.rb → rails_helper.rb}

@@ -2,18 +2,17 @@
 ENV["RAILS_ENV"] ||= 'test'
 
 require File.expand_path("../dummy/config/environment", __FILE__)
+require 'rspec'
 require 'rspec/rails'
-require 'rspec/autorun'
-
 require 'factory_girl'
-FactoryGirl.find_definitions
-
 require 'generator_spec/test_case'
-
+require 'capybara'
 require 'capybara/rails'
 require 'capybara/rspec'
 require 'capybara/poltergeist'
 
+FactoryGirl.find_definitions
+
 Capybara.default_wait_time = ENV['CAPYBARA_WAIT_TIME'].present? ? ENV['CAPYBARA_WAIT_TIME'].to_i : 10
 
 Capybara.register_driver :poltergeist do |app|
@@ -39,21 +38,14 @@ def clean_database
 end
 
 RSpec.configure do |config|
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-
   config.after(:all) do
-    if Rails.env.test? 
+    if Rails.env.test?
       FileUtils.rm_rf(Dir["#{Rails.root}/public/uploads"])
-    end 
+    end
   end
 
   config.include FactoryGirl::Syntax::Methods
+  config.include Capybara::DSL
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
@@ -73,7 +65,7 @@ RSpec.configure do |config|
 end
 
 def wait_until
-  require "timeout"
+  require 'timeout'
   Timeout.timeout(Capybara.default_wait_time) do
     sleep(0.1) until value = yield
     value

data/spec/views/article/show_spec.rb

@@ -1,22 +1,23 @@
-require 'spec_helper'
-
-describe "articles/show.html.haml" do
+require 'rails_helper'
 
+describe "articles/show" do
   before(:each) do
-    assign(:article, create(:full_article))
-    render template: "articles/show"
+    # assign(:article, FactoryGirl.create(:full_article))
+    # render template: "articles/show"
   end
 
   it "displays redditor text content" do
+    pending
     expect(rendered.index("text_block") > 0).to eq true
   end
 
   it "displays redditor video content" do
+    pending
     expect(rendered.index("video_block") > 0).to eq true
   end
 
   it "displays redditor slider content" do
+    pending
     expect(rendered.index("slider_block") > 0).to eq true
   end
-
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redditor
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.20
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,118 +9,244 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.6
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fileapi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: quiet_assets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: generator_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Advanced page editor from redde
@@ -131,9 +257,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - MIT-LICENSE
@@ -157,10 +283,11 @@ files:
 - app/assets/images/redditor/move_handler.png
 - app/assets/images/redditor/no_format_text.png
 - app/assets/images/redditor/trash.png
-- app/assets/javascripts/redditor.js.coffee
+- app/assets/javascripts/redditor/index.coffee
 - app/assets/javascripts/redditor/init.coffee
 - app/assets/javascripts/redditor/uploader.coffee
-- app/assets/stylesheets/redditor.scss
+- app/assets/stylesheets/redditor/index.sass
+- app/assets/stylesheets/redditor/redditor.scss
 - app/controllers/redditor/admin/base_controller.rb
 - app/controllers/redditor/admin/image_blocks_controller.rb
 - app/controllers/redditor/admin/images_controller.rb
@@ -178,6 +305,12 @@ files:
 - app/uploaders/redditor_uploader.rb
 - app/validators/youtube_validator.rb
 - app/views/layouts/redditor/application.html.erb
+- app/views/redditor/_image.html.haml
+- app/views/redditor/_page.html.haml
+- app/views/redditor/_slider_block.html.haml
+- app/views/redditor/_slider_block_image.html.haml
+- app/views/redditor/_text_block.html.haml
+- app/views/redditor/_video_block.html.haml
 - app/views/redditor/admin/_content_block.haml
 - app/views/redditor/admin/_image.haml
 - app/views/redditor/admin/_page.haml
@@ -192,12 +325,6 @@ files:
 - app/views/redditor/admin/new.js.erb
 - app/views/redditor/admin/slider_block_image.js.coffee
 - app/views/redditor/admin/wrapper.js.coffee
-- app/views/redditor/images/_image.html.haml
-- app/views/redditor/pages/_page.html.haml
-- app/views/redditor/slider_blocks/_slider_block.html.haml
-- app/views/redditor/slider_blocks/_slider_block_image.html.haml
-- app/views/redditor/text_blocks/_text_block.html.haml
-- app/views/redditor/video_blocks/_video_block.html.haml
 - config/locales/redditor.en.yml
 - config/locales/redditor.ru.yml
 - config/routes.rb
@@ -286,7 +413,7 @@ files:
 - spec/fixtures/test.jpg
 - spec/generators/views_generator_spec.rb
 - spec/models/article_spec.rb
-- spec/spec_helper.rb
+- spec/rails_helper.rb
 - spec/views/article/show_spec.rb
 homepage: http://github.com/redde/redditor
 licenses:
@@ -298,12 +425,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -386,5 +513,5 @@ test_files:
 - spec/fixtures/test.jpg
 - spec/generators/views_generator_spec.rb
 - spec/models/article_spec.rb
-- spec/spec_helper.rb
+- spec/rails_helper.rb
 - spec/views/article/show_spec.rb

data/app/assets/javascripts/redditor.js.coffee

@@ -1,3 +0,0 @@
-#= require fileapi
-#= require redditor/uploader
-#= require redditor/init

data/app/views/redditor/images/_image.html.haml

@@ -1 +0,0 @@
-%li{id: "image_#{image.id}"}= image_tag image.src.url, alt: image.description, title: image.description

data/app/views/redditor/pages/_page.html.haml

@@ -1 +0,0 @@
-= render page.content_blocks

data/app/views/redditor/slider_blocks/_slider_block.html.haml

@@ -1,2 +0,0 @@
-%ul.slider-block-images{id: "slider_block_#{slider_block.id}"}
-  = render partial: "redditor/slider_blocks/slider_block_image", collection: slider_block.images, :as => :image

data/app/views/redditor/slider_blocks/_slider_block_image.html.haml

@@ -1 +0,0 @@
-%li{id: "slider_block_image_#{image.id}"}= image_tag image.src.url, alt: image.description, title: image.description

data/app/views/redditor/text_blocks/_text_block.html.haml

@@ -1 +0,0 @@
-.text_block{id: "text_block_#{text_block.id}"}= raw text_block.body

data/app/views/redditor/video_blocks/_video_block.html.haml

@@ -1,2 +0,0 @@
-.video-block{id: "video_block_#{video_block.id}"}
-  %iframe(width="#{video_block.width || "100%"}" height="#{video_block.height || 315}" src="http://www.youtube.com/embed/#{video_block.youtube}" frameborder="0" allowfullscreen)