redditor 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 139b02b3e8c540a2cb91a7ef7a5aaef880eb7f81
-  data.tar.gz: c78cbabea39fcd0361f680b6712fc3fc53e759f4
+  metadata.gz: bba15b3e99f1e69bfa1ab7de2bb7a6865a2b942b
+  data.tar.gz: 97945de1614e7c854ff8d8d510dcd340bfa1601e
 SHA512:
-  metadata.gz: 1f9e0b332fbe9778f9ab172689d902f6ca8529b5d7a98dbe629addb70c668ff42ba1fe5694a687abeb30d6b07f41228d61f5c4465f0dd4095497568df6daf845
-  data.tar.gz: 1f3646c53074378ae8709972f0fc6dbc1705a8badbfc7d0703fa58f5ee157401f992fe42843876a2918a6a23a341f72f9b1af2695da02621f4adfff57d6ae5df
+  metadata.gz: 6701646c7c6fad6c0aa50244d81e87ee233681961d9c2a68be1f6aa5eb4ba97b4904127f52bb462009a3ce0c1124939e281fdaea916fd2f230250d134307b55f
+  data.tar.gz: ea79fa075d9d566e4770cdfdbd8cff8419d33a143b552cf660a9e803685105f6dc139bfaaa194105dd6404b4e6bbd4b19f54e606d20ff52b7f7ee893c4f5737f

data/.travis.yml

@@ -5,6 +5,7 @@ notifications:
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.0
 before_script:
   - "rake db:create RAILS_ENV=test"
   - "rake db:migrate RAILS_ENV=test"

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

@@ -141,9 +141,40 @@ $ ->
         url: this.href,
         data: params
 
+    .on "click", "a.redditor__change", (event) ->
+      event.preventDefault()
+      box = $(@).closest "dd"
+      params = $.redditor.parameterizationForm(box)
+      kind = params.content_block.kind
+      if kind == 'description'
+        params.content_block.kind = ''
+      else if kind == ''
+        params.content_block.kind = 'description'  
+      $.ajax
+        method: 'POST',
+        url: this.href,
+        data: params
+
     $("ul.slider-block-images").sortable $.redditor.sliderBlockImagesSortableParams
 
     $('div.redditor__add-blocks').on "ajax:beforeSend", "a.redditor__add", (event, xhr, status) ->
-      status.url += "?" + $.param(content_block: {temp_id: new Date().getTime()}) # generate uniq id
+      $this = $(@)
+      cssClass = if $this.hasClass 'redditor__add_txt'
+        'text_block'
+      else if $this.hasClass 'redditor__add_video'
+        'video_block'
+      else if $this.hasClass 'redditor__add_photo'
+        'image'
+      else if $this.hasClass 'redditor__add_slider'
+        'slider_block'
+
+      arrIds = $.map $('#redditor').find(".#{cssClass}"), (elem)->
+        $(elem).find('.redditor__form').data('object-id')
+      if arrIds.length
+        objectId = Math.max.apply(null, arrIds) + 1
+      else
+        objectId = 0
+      # generate uniq id
+      status.url += "?" + $.param(content_block: {object_id: objectId})
 
     $.redditor.afterFunc()

data/app/assets/stylesheets/redditor.scss

@@ -44,6 +44,7 @@ ul.slider-block-images {
 }
 
 .redditor__control {float: right;}
+.redditor__change,
 .redditor__delete,
 .redditor__update {
   text-decoration: none;
@@ -63,6 +64,13 @@ ul.slider-block-images {
   color: green;
   &:before {content: '✔'}
 }
+.redditor__change {
+  background-image: image-url('redditor/change_view.png');
+  background-repeat: no-repeat;
+  background-position: center;
+  background-size: 16px;
+  &:before {content: "\A0"}
+}
 
 .redditor__form {
   margin-top: 25px;
@@ -144,6 +152,41 @@ ul.slider-block-images {
   font-size: 11px; margin-right: 3px;
 }
 
+.redditor__sl-desc {
+  border-collapse: collapse;
+  width: 100%;
+  margin-top: 5px;
+}
+
+.redditor__sl-desc__cell-img,
+.redditor__sl-desc__cell-desc {
+  padding: 5px 0;
+  vertical-align: top;
+  border: 1px solid #ccc;
+  border-width: 1px 0;
+}
+
+.redditor__sl-desc__cell-img {
+  width: 1px;
+  padding-right: 5px;
+}
+
+.redditor__sl-desc__area {
+  width: 100%;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  resize: none;
+  margin: 0;
+}
+
+.redditor__sl-desc__img {
+  display: block;
+}
+
+.redditor__sl-desc__label {
+  font-weight: bold;
+}
+
 .redditor__add_txt {
   background:#f5f5f5 image-url('redditor/add_txt.png') 3px center no-repeat;
   background: image-url('redditor/add_txt.png') 3px center no-repeat, -webkit-linear-gradient(top, #fff 0%, #f5f5f5 49%, #ececec 50%, #eee 100%);
@@ -178,6 +221,9 @@ a.redactor_btn_divide {
 // }
 
 // dl.redditor div.redditor__form:before {
-//   content: "object-name: " attr(data-object-name) "\A id: " attr(id); display: block; padding: 2px; background: #ffc;
+//   content: "object-name: " attr(data-object-name) "\A id: " attr(id) "\A object-id: " attr(data-object-id);
+//   display: block;
+//   padding: 2px;
+//   background: #ffc;
 //   white-space: pre;
 // }

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

@@ -7,6 +7,13 @@ class Redditor::Admin::SliderBlocksController < Redditor::Admin::BaseController
     render "redditor/admin/new"
   end
 
+  def change_view
+    @content_block = @page.slider_blocks.find(params[:id])
+    # оставляем только :kind и :object_id параметры, чтобы при возвращении к старому виду описания к фотографиям не сохранялись
+    @content_block.update_attributes(params.require(:content_block).permit(:kind, :object_id))
+    render "redditor/admin/wrapper"
+  end
+
   def update
     @content_block = @page.slider_blocks.find(params[:id])
     @content_block.update_attributes(content_block_params)

data/app/helpers/redditor/application_helper.rb

@@ -1,3 +1,5 @@
+# после редактирования хелперов необходимо рестартить сервер
+
 module Redditor
   module ApplicationHelper
     def real_name content_block
@@ -7,5 +9,34 @@ module Redditor
     def redditor_validate f
       render "redditor/admin/validate", {f: f} 
     end
+
+    def redditor_form(f, &block)
+      id = "#{real_name(f.object)}_"
+      id += f.object.id.nil? ? "#{f.object.object_id}" : "#{f.object.id}"
+      if f.object.object_id.present?
+        f.object_name.sub!(/\[\d*\]/, "[#{f.object.object_id}]")
+      end
+      index = if f.object.object_id.present?
+        f.object.object_id
+      else
+        f.index
+      end
+      data = {'object-name' => f.object_name, 'object-id' => index}
+      content_tag(:div, capture(&block), class: 'redditor__form', id: id, data: data)
+    end
+
+    def redditor_slider_block_kind f, slider_block
+      if @content_block
+        kind = params.try(:[], 'content_block').try(:[], 'kind')
+      else
+        params_array = f.object_name.split(/(?:[\[\]]{1,2})/)
+        par = params
+        params_array.each do |p|
+          par = par.try(:[], p)
+        end
+        kind = par.try(:[], 'kind')
+      end
+      return kind == 'description'
+    end
   end
 end

data/app/models/redditor/image.rb

@@ -6,8 +6,8 @@ module Redditor
 
     after_initialize :default_values # чтобы файл загружался, пока через html5 не передаем позицию
 
-    # attr_accessible :descr, :imageable_id, :imageable_type, :position, :src, :temp_id
-    attr_accessor :temp_id
+    # attr_accessible :descr, :imageable_id, :imageable_type, :position, :src
+    attr_accessor :object_id
 
     mount_uploader :src, RedditorUploader
 

data/app/models/redditor/slider_block.rb

@@ -4,11 +4,12 @@ module Redditor
   class SliderBlock < ActiveRecord::Base
     self.table_name = "redditor_slider_blocks"
 
-    # attr_accessible :page_id, :position, :temp_id
-    attr_accessor :temp_id
+    # attr_accessible :page_id, :position
+    attr_accessor :object_id, :kind
 
     belongs_to :page, :class_name => "Redditor::Page"
     has_many :images, :as => :imageable, :dependent => :destroy
+    accepts_nested_attributes_for :images
 
     def self.model_name
       ActiveModel::Name.new(self, nil, 'SliderBlock')

data/app/models/redditor/text_block.rb

@@ -4,8 +4,8 @@ module Redditor
   class TextBlock < ActiveRecord::Base
     self.table_name = "redditor_text_blocks"
 
-    # attr_accessible :body, :page_id, :position, :temp_id, :translations_attributes
-    attr_accessor :temp_id
+    # attr_accessible :body, :page_id, :position, :translations_attributes
+    attr_accessor :object_id
 
     belongs_to :page, :class_name => "Redditor::Page"
 

data/app/models/redditor/video_block.rb

@@ -13,8 +13,8 @@ module Redditor
   class VideoBlock < ActiveRecord::Base
     self.table_name = "redditor_video_blocks"
 
-    # attr_accessible :height, :page_id, :position, :width, :youtube, :temp_id
-    attr_accessor :temp_id
+    # attr_accessible :height, :page_id, :position, :width, :youtube
+    attr_accessor :object_id
 
     validates :youtube, :length => { :is => 11 }, :youtube => true
 

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

@@ -1,35 +1,41 @@
-%dd{class: real_name(content_block)}
-  .redditor__handle
+.redditor__handle
 
-  .redditor__control
-    - if content_block.new_record?
-      = link_to "", 
-        "javascript:void(0);", 
-        class: "redditor__delete",
-        onclick: "if (confirm('#{t "redditor.remove?"}')) $(this).closest('dd').remove();"
-      
-      = link_to "", 
-        [redditor, :admin, p.object, content_block], 
-        class: "redditor__update",
-        data: {:disable_with => t("redditor.saving")}
+.redditor__control
+  - if content_block.new_record?
+    = link_to "", 
+      "javascript:void(0);", 
+      class: "redditor__delete",
+      onclick: "if (confirm('#{t "redditor.remove?"}')) $(this).closest('dd').remove();"
+    
+    = link_to "", 
+      [redditor, :admin, p.object, content_block], 
+      class: "redditor__update",
+      data: {:disable_with => t("redditor.saving")}
 
-    - else
-      = link_to "", 
-        [redditor, :admin, p.object, content_block], 
-        class: "redditor__delete",
-        :method => :delete, 
-        remote: true, 
-        data: {confirm: "Вы, действительно, хотите удалить контент-блок?", disable_with: t("redditor.deleting")}
-      
-      = link_to "", 
-        [redditor, :admin, p.object, content_block], 
-        class: "redditor__update", 
-        data: {disable_with: t("redditor.saving")}
+  - else
+    - if content_block.class == Redditor::SliderBlock
+      = link_to "",
+        [redditor, :change_view, :admin, p.object, content_block],
+        class: 'redditor__change',
+        title: t("redditor.change_view")
 
-  = p.fields_for real_name(content_block).pluralize.to_sym, content_block, :include_id => false do |f|
-    %div.redditor__form{data: {"object-name" => f.object.temp_id.present? ? f.object_name.sub!(/\[\d*\]/, "[#{f.object.temp_id}]") : f.object_name}, id: "#{real_name(content_block)}_#{content_block.id.nil? ? f.object.temp_id : content_block.id}"}
-      = f.hidden_field :position, class: 'redditor__position'
-      = render :partial => "redditor/admin/#{real_name(content_block)}", locals: {f: f}
-      - unless f.object.new_record?
-        = f.hidden_field :id
-      = f.hidden_field :temp_id
+    = link_to "", 
+      [redditor, :admin, p.object, content_block], 
+      class: "redditor__delete",
+      :method => :delete, 
+      remote: true, 
+      data: {confirm: "Вы, действительно, хотите удалить контент-блок?", disable_with: t("redditor.deleting")}
+    
+    = link_to "", 
+      [redditor, :admin, p.object, content_block], 
+      class: "redditor__update", 
+      data: {disable_with: t("redditor.saving")}
+
+
+= p.fields_for real_name(content_block).pluralize.to_sym, content_block, :include_id => false do |f|
+  = redditor_form f do
+    = f.hidden_field :position, class: 'redditor__position'
+    = render "redditor/admin/#{real_name(content_block)}", {f: f}
+    - unless content_block.new_record?
+      = f.hidden_field :id
+    = f.hidden_field :object_id, value: f.object.object_id || f.index

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

@@ -2,7 +2,7 @@
 
   - unless f.object.new_record?
     %dl#redditor.redditor{data: {"sort-url" => url_for(redditor.sort_admin_page_path(p.object))}}
-      = render partial: "redditor/admin/content_block", collection: p.object.content_blocks, locals: {p: p, page: p.object}
+      = render partial: "redditor/admin/content_block", collection: p.object.content_blocks, locals: {p: p, page: p.object}, layout: 'redditor/admin/wrap'
 
     %div.redditor__add-blocks
       %p

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

@@ -2,15 +2,20 @@
   = t 'redditor.title.slider'
 = redditor_validate f
 
-.redditor__sep
+= f.hidden_field :kind
 
-- unless f.object.new_record?
+- if redditor_slider_block_kind(f, @content_block)
+  %table.redditor__sl-desc
+    = f.fields_for :images do |img|
+      = render "redditor/admin/slider_block_desc", {img: img}
+- else
+  .redditor__sep
   %ul.slider-block-images{data: {"sortable-url" => redditor.sort_admin_page_slider_block_images_path(f.object.page_id, f.object.id)}}
     = render partial: "redditor/admin/slider_block_image", collection: f.object.images, :as => :i
 
-.redditor__sep
+  .redditor__sep
 
-- unless f.object.new_record?
-  .b-button.js-fileapi-wrapper
-    .b-button__text= t("redditor.add.upload_images")
-    = file_field_tag :src, :class => "b-button__input redditor__js-fileapi", name: nil, :multiple => true, data: {"upload-url" => redditor.admin_page_slider_block_images_path(f.object.page_id, f.object.id)}
+  - unless f.object.new_record?
+    .b-button.js-fileapi-wrapper
+      .b-button__text= t("redditor.add.upload_images")
+      = file_field_tag :src, :class => "b-button__input redditor__js-fileapi", name: nil, :multiple => true, data: {"upload-url" => redditor.admin_page_slider_block_images_path(f.object.page_id, f.object.id)}

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

@@ -0,0 +1,7 @@
+%tr{id: "slider_block_image_#{img.object.id}"}
+  %td.redditor__sl-desc__cell-img
+    = image_tag img.object.src.url(:admin), class: 'redditor__sl-desc__img'
+  %td.redditor__sl-desc__cell-desc
+    = img.label :description, class: 'redditor__sl-desc__label'
+    = img.hidden_field :id
+    = img.text_area :description, class: 'nowred redditor__sl-desc__area', size: '100x7'

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

@@ -0,0 +1,2 @@
+%dd{class: real_name(content_block)}
+  = yield

data/app/views/redditor/admin/new.js.erb

@@ -1,5 +1,5 @@
 $.redditor.$el
-.append('<%= j(render(partial: "redditor/admin/wrapper", locals: {content_block: @content_block})) %>')
+.append('<%= j(render(partial: "redditor/admin/wrapper", locals: {content_block: @content_block}, layout: "redditor/admin/wrap")) %>')
 .find("ul.slider-block-images").sortable($.redditor.sliderBlockImagesSortableParams)
 $.redditor.sortList()
 $.redditor.afterFunc()

data/app/views/redditor/admin/wrapper.js.coffee

@@ -1,5 +1,3 @@
-$("#<%= real_name(@content_block) %>_<%= @content_block.temp_id %>, #<%= real_name(@content_block) %>_<%= @content_block.id %>").closest("dd")
-.replaceWith('<%= j(render(partial: "redditor/admin/wrapper", locals: {content_block: @content_block, page: @page})) %>')
-.end()
-.find("ul.slider-block-images").sortable $.redditor.sliderBlockImagesSortableParams
+$("#<%= real_name(@content_block) %>_<%= @content_block.object_id %>, #<%= real_name(@content_block) %>_<%= @content_block.id %>").closest("dd")
+.html('<%= j(render("redditor/admin/wrapper", {content_block: @content_block, page: @page})) %>').find("ul.slider-block-images").sortable $.redditor.sliderBlockImagesSortableParams
 $.redditor.afterFunc()

data/config/locales/redditor.en.yml

@@ -13,6 +13,7 @@ en:
     remove?: "Really delete content block?"
     deleting: ' Deleting...'
     saving: ' Saving...'
+    change_view: Edit description
     title:
       image: Image
       video: Video

data/config/locales/redditor.ru.yml

@@ -13,6 +13,7 @@ ru:
     remove?: "Вы, действительно, хотите удалить контент-блок?"
     deleting: ' Удаление...'
     saving: ' Сохранение...'
+    change_view: Редактировать описание
     title:
       image: Изображение
       video: Видео

data/config/routes.rb

@@ -6,6 +6,7 @@ Redditor::Engine.routes.draw do
         post :update_post, :on => :member
       end
       resources :slider_blocks do
+        post 'change_view', :on => :member
         resources :images do
           get 'sort', :on => :collection
         end

data/lib/redditor/version.rb

@@ -1,3 +1,3 @@
 module Redditor
-  VERSION = "0.1.11"
+  VERSION = "0.1.12"
 end

data/redditor.gemspec

@@ -23,7 +23,6 @@ Gem::Specification.new do |s|
   
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'poltergeist'
-  s.add_development_dependency "haml-rails"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "rspec-rails"
   s.add_development_dependency "guard-rspec"

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

@@ -20,5 +20,5 @@
 //= require redactor/toolbars/default
 
 $.redditor.afterFunc = function(){
-  $.redditor.$el.find('textarea').redactor();
+  $.redditor.$el.find('textarea:not(.nowred)').redactor();
 };

data/spec/dummy/config/application.rb

@@ -19,6 +19,8 @@ module Dummy
       g.template_engine :haml
     end
 
+    # I18n.enforce_available_locales = true
+
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'

data/spec/features/text_spec.rb

@@ -11,16 +11,19 @@ describe "Text block" do
   end
 
   def visit_article() visit "/admin/articles/#{article.id}/edit"; end
-  def add_block() find_link(I18n.t("redditor.add.text_block")).click; end
+  def add_block() find_link(I18n.t("redditor.add.text_block")).click; sleep 1; end
+  def show_text_area() page.execute_script("$('.redditor__textarea').show()"); sleep 1; end
   def submit() find_button("Submit").click; end
   def save_block() find("a.redditor__update").click; end
   def delete_block() find("a.redditor__delete").click; end
 
   it "Saves text block to article", type: :feature, js: true do
     add_block
-    page.find("textarea").set("test text block")
+    show_text_area
+    find(".redditor__textarea").set("test text block")
     submit
-    expect(page).to have_content "test text block"
+    show_text_area
+    expect(page.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
@@ -32,7 +35,6 @@ describe "Text block" do
   it "Deletes text block", type: :feature, js: true do
     article.page.text_blocks.build(body: "123", position: 1).save
     visit_article
-    save_page
     delete_block
     visit_article
     text_value = begin
@@ -45,9 +47,11 @@ describe "Text block" do
 
   it "Saves text block to article on save button", type: :feature, js: true do
     add_block
+    show_text_area
     page.find("textarea").set("test text block")
     save_block
     visit_article
-    expect(page.find("textarea").value).to eq "test text block"
+    show_text_area
+    expect(page.find(".redditor__textarea").value).to have_content "test text block"
   end
 end

data/spec/spec_helper.rb

@@ -15,7 +15,7 @@ require 'capybara/rspec'
 require 'capybara/poltergeist'
 
 Capybara.javascript_driver = :poltergeist
-# Capybara.default_wait_time = 10
+Capybara.default_wait_time = 10
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redditor
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,20 +53,6 @@ dependencies:
     - - '>='
       - !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: :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
@@ -167,6 +153,7 @@ files:
 - app/assets/images/redditor/big/slider.png
 - app/assets/images/redditor/big/text.png
 - app/assets/images/redditor/big/video.png
+- app/assets/images/redditor/change_view.png
 - app/assets/images/redditor/destroy_block_text.png
 - app/assets/images/redditor/move_handler.png
 - app/assets/images/redditor/no_format_text.png
@@ -195,10 +182,12 @@ files:
 - app/views/redditor/admin/_image.haml
 - app/views/redditor/admin/_page.haml
 - app/views/redditor/admin/_slider_block.haml
+- app/views/redditor/admin/_slider_block_desc.haml
 - app/views/redditor/admin/_slider_block_image.haml
 - app/views/redditor/admin/_text_block.haml
 - app/views/redditor/admin/_validate.haml
 - app/views/redditor/admin/_video_block.haml
+- app/views/redditor/admin/_wrap.haml
 - app/views/redditor/admin/_wrapper.haml
 - app/views/redditor/admin/new.js.erb
 - app/views/redditor/admin/slider_block_image.js.coffee
@@ -319,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Page editor