redditor 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04ff6d5b84a9af7e952457bf4152e61e452cfd45
-  data.tar.gz: 14883d81bbe9394caf1dc7df81389e9d6951d1a3
+  metadata.gz: e399c8e0938274cca6da98a2c382d4b818bf9f4d
+  data.tar.gz: 200d213665eec8faea1909f83b82b8c31a26a564
 SHA512:
-  metadata.gz: 45c34e057d72a2ede65fc11562fdc55facaf642c371c6eb28aa62877cbf1bc3812429aef85c51a1530a327f46c1f9d9346fa7eed8dd037d0a2f4f83c1d300835
-  data.tar.gz: 996b6f0500b2900fdb13a16cb95f1242111fef407425ae5a960ac16baffa919cff86697310f61b38ab0c148acca0d7ce365582f5fd42b94db0f01126825d265c
+  metadata.gz: 9629b1b6dbc4701d51a966074e5a2e3a066c7c8a1555ee39ec306a930a2c520349fb61f16642316c596f5c8d9efbef6e9efabe5ad4ccae9e16787d88d4664766
+  data.tar.gz: 25a9e5ac05f6e212b2dd2c25e4a40be25741ce79b94cddcca9b7bcd4518e86a041faf58262cf6de692e4c29bae0c7b85d43ae53d6e7e9e982718db7792e1fddd

data/app/helpers/redditor/application_helper.rb

@@ -13,15 +13,13 @@ module Redditor
     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
+      f.object_name.sub!(/\[\d*\]/, "[#{f.object.object_id}]") if f.object.object_id.present?
       index = if f.object.object_id.present?
         f.object.object_id
       else
         f.index
       end
-      data = {'object-name' => f.object_name, 'object-id' => index}
+      data = { 'object-name' => f.object_name, 'object-id' => index }
       content_tag(:div, capture(&block), class: 'redditor__form', id: id, data: data)
     end
 

data/app/models/redditor/image.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 module Redditor
   class Image < ActiveRecord::Base
     self.table_name = "redditor_images"

data/app/models/redditor/page.rb

@@ -5,10 +5,11 @@ module Redditor
     self.table_name = "redditor_pages"
 
     belongs_to :pageable, polymorphic: true, touch: true
-    has_many :text_blocks, class_name: "Redditor::TextBlock"
-    has_many :video_blocks, class_name: "Redditor::VideoBlock"
-    has_many :images, as: :imageable, class_name: "Redditor::Image"
-    has_many :slider_blocks, class_name: "Redditor::SliderBlock"
+
+    has_many :text_blocks, class_name: "::Redditor::TextBlock"
+    has_many :video_blocks, class_name: "::Redditor::VideoBlock"
+    has_many :images, as: :imageable, class_name: "::Redditor::Image"
+    has_many :slider_blocks, class_name: "::Redditor::SliderBlock"
     
     accepts_nested_attributes_for :text_blocks, allow_destroy: true
     accepts_nested_attributes_for :video_blocks, allow_destroy: true
@@ -20,7 +21,7 @@ module Redditor
     end
 
     def content_blocks
-      (self.text_blocks + self.video_blocks + self.images + self.slider_blocks).sort {|x, y| x.position <=> y.position}
+      (text_blocks + video_blocks + images + slider_blocks).sort {|x, y| x.position <=> y.position}
     end
   end
 end

data/app/models/redditor/slider_block.rb

@@ -6,8 +6,8 @@ module Redditor
 
     attr_accessor :object_id, :kind
 
-    belongs_to :page, class_name: "Redditor::Page", touch: true
-    has_many :images, as: :imageable, dependent: :destroy
+    belongs_to :page, class_name: "::Redditor::Page", touch: true
+    has_many :images, as: :imageable, dependent: :destroy, class_name: "::Redditor::Image"
     accepts_nested_attributes_for :images
 
     def self.model_name

data/app/models/redditor/text_block.rb

@@ -6,7 +6,7 @@ module Redditor
 
     attr_accessor :object_id
 
-    belongs_to :page, class_name: "Redditor::Page", touch: true
+    belongs_to :page, class_name: "::Redditor::Page", touch: true
 
     default_scope -> { order(:position) }
 

data/app/models/redditor/video_block.rb

@@ -1,14 +1,3 @@
-#coding: utf-8
-
-class YoutubeValidator < ActiveModel::EachValidator
-  def validate_each(record, attribute, value)
-    if value =~ /[^A-z0-9_-]/
-      record.errors[attribute] << (options[:message] || "- используются недопустимые символы")
-    end
-  end
-end
-
-
 module Redditor
   class VideoBlock < ActiveRecord::Base
     self.table_name = "redditor_video_blocks"
@@ -17,7 +6,7 @@ module Redditor
 
     validates :youtube, length: { is: 11 }, youtube: true
 
-    belongs_to :page, class_name: "Redditor::Page", touch: true
+    belongs_to :page, class_name: "::Redditor::Page", touch: true
 
     def self.model_name
       ActiveModel::Name.new(self, nil, 'VideoBlock')

data/app/validators/youtube_validator.rb

@@ -0,0 +1,5 @@
+class YoutubeValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    record.errors[attribute] << (options[:message] || "- используются недопустимые символы") if value =~ /[^A-z0-9_-]/
+  end
+end

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

@@ -1,8 +1,9 @@
 = f.fields_for :page, f.object.page do |p|
 
   - 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}, layout: 'redditor/admin/wrap'
+    %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 }, layout: 'redditor/admin/wrap'
+      = p.object.content_blocks.to_json
 
     %div.redditor__add-blocks
       %p

data/lib/redditor/version.rb

@@ -1,3 +1,3 @@
 module Redditor
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

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

@@ -2,6 +2,24 @@
 
 class Admin::ArticlesController < Admin::BaseController
 
+  def index
+    @articles = Article.all
+  end
+
+  def new
+    @article = Article.new
+    render "edit"
+  end
+
+  def create
+    @article = Article.new(article_params)
+    if @article.save
+      redirect_to [:edit, :admin, @article], notice: "Article created"
+    else
+      render "edit", alert: "Error"
+    end
+  end
+
   def edit
     @article = Article.find(params[:id])
     @article.build_page.save unless @article.page
@@ -14,6 +32,9 @@ class Admin::ArticlesController < Admin::BaseController
   end
 
   def destroy
+    @article = Article.find(params[:id])
+    @article.destroy
+    redirect_to [:admin, :articles]
   end
 
   private

data/spec/dummy/app/views/admin/articles/edit.html.haml

@@ -1,4 +1,5 @@
-%h1 Edit article
+%h1 Article editor
+%p= link_to "back", [:admin, :articles]
 
 = form_for [:admin, @article], html: {multipart: true} do |f|
   %ul.errors

data/spec/dummy/app/views/admin/articles/index.html.haml

@@ -0,0 +1,8 @@
+%h1 Articles
+%p= link_to 'add', [:new, :admin, :article]
+
+%ul
+  - @articles.all.each do |article|
+    %li
+      = link_to article.title, [:edit, :admin, article]
+      = link_to 'x', [:admin, article], method: :delete, data: { confirm: "Really delete?" }

data/spec/dummy/config/routes.rb

@@ -5,6 +5,6 @@ Rails.application.routes.draw do
   resources :articles, only: [:show]
 
   namespace :admin do
-    resources :articles, only: [:edit, :update]
+    resources :articles
   end
 end

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ require 'capybara/rails'
 require 'capybara/rspec'
 require 'capybara/poltergeist'
 
-Capybara.default_wait_time = ENV['CAPYBARA_WAIT_TIME'].present? ? ENV['CAPYBARA_WAIT_TIME'].to_i : 5
+Capybara.default_wait_time = ENV['CAPYBARA_WAIT_TIME'].present? ? ENV['CAPYBARA_WAIT_TIME'].to_i : 10
 
 Capybara.register_driver :poltergeist do |app|
   Capybara::Poltergeist::Driver.new(app, {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redditor
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-17 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -177,6 +177,7 @@ files:
 - app/models/redditor/text_block.rb
 - app/models/redditor/video_block.rb
 - app/uploaders/redditor_uploader.rb
+- app/validators/youtube_validator.rb
 - app/views/layouts/redditor/application.html.erb
 - app/views/redditor/admin/_content_block.haml
 - app/views/redditor/admin/_image.haml
@@ -245,6 +246,7 @@ files:
 - spec/dummy/app/models/article.rb
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/views/admin/articles/edit.html.haml
+- spec/dummy/app/views/admin/articles/index.html.haml
 - spec/dummy/app/views/articles/show.html.haml
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle
@@ -344,6 +346,7 @@ test_files:
 - spec/dummy/app/models/article.rb
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/views/admin/articles/edit.html.haml
+- spec/dummy/app/views/admin/articles/index.html.haml
 - spec/dummy/app/views/articles/show.html.haml
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/bin/bundle