redditor 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bba15b3e99f1e69bfa1ab7de2bb7a6865a2b942b
-  data.tar.gz: 97945de1614e7c854ff8d8d510dcd340bfa1601e
+  metadata.gz: 04ff6d5b84a9af7e952457bf4152e61e452cfd45
+  data.tar.gz: 14883d81bbe9394caf1dc7df81389e9d6951d1a3
 SHA512:
-  metadata.gz: 6701646c7c6fad6c0aa50244d81e87ee233681961d9c2a68be1f6aa5eb4ba97b4904127f52bb462009a3ce0c1124939e281fdaea916fd2f230250d134307b55f
-  data.tar.gz: ea79fa075d9d566e4770cdfdbd8cff8419d33a143b552cf660a9e803685105f6dc139bfaaa194105dd6404b4e6bbd4b19f54e606d20ff52b7f7ee893c4f5737f
+  metadata.gz: 45c34e057d72a2ede65fc11562fdc55facaf642c371c6eb28aa62877cbf1bc3812429aef85c51a1530a327f46c1f9d9346fa7eed8dd037d0a2f4f83c1d300835
+  data.tar.gz: 996b6f0500b2900fdb13a16cb95f1242111fef407425ae5a960ac16baffa919cff86697310f61b38ab0c148acca0d7ce365582f5fd42b94db0f01126825d265c

data/.travis.yml

@@ -1,4 +1,4 @@
-script: bundle exec rspec
+script: CAPYBARA_WAIT_TIME=60 bundle exec rspec
 language: ruby
 notifications:
   email: false

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

@@ -15,8 +15,8 @@ class Redditor::Admin::ImagesController < Redditor::Admin::BaseController
 
   def create
     @slider_block = @page.slider_blocks.find(params[:slider_block_id])
-    @image = @slider_block.images.build(src: params[:file])
-    if @image.save
+    @image = @slider_block.images.build
+    if @image.update_attributes(src: params[:file])
       render "redditor/admin/slider_block_image"
     end
   end

data/app/models/redditor/image.rb

@@ -4,16 +4,15 @@ module Redditor
   class Image < ActiveRecord::Base
     self.table_name = "redditor_images"
 
-    after_initialize :default_values # чтобы файл загружался, пока через html5 не передаем позицию
+    after_initialize :set_default_values # чтобы файл загружался, пока через html5 не передаем позицию
 
-    # attr_accessible :descr, :imageable_id, :imageable_type, :position, :src
     attr_accessor :object_id
 
     mount_uploader :src, RedditorUploader
 
-    validates :src, :presence => true
+    validates :src, presence: true
 
-    belongs_to :imageable, :polymorphic => true
+    belongs_to :imageable, polymorphic: true, touch: true
 
     default_scope -> { order(:position) }
 
@@ -22,7 +21,7 @@ module Redditor
     end
 
     private
-      def default_values
+      def set_default_values
         self.position ||= 1000
       end
   end

data/app/models/redditor/page.rb

@@ -4,9 +4,7 @@ module Redditor
   class Page < ActiveRecord::Base
     self.table_name = "redditor_pages"
 
-    # attr_accessible :pageable_id, :pageable_type, :metakey, :metadesc, :text_blocks_attributes, :video_blocks_attributes, :images_attributes, :slider_blocks_attributes
-
-    belongs_to :pageable, polymorphic: true
+    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"

data/app/models/redditor/slider_block.rb

@@ -4,11 +4,10 @@ module Redditor
   class SliderBlock < ActiveRecord::Base
     self.table_name = "redditor_slider_blocks"
 
-    # attr_accessible :page_id, :position
     attr_accessor :object_id, :kind
 
-    belongs_to :page, :class_name => "Redditor::Page"
-    has_many :images, :as => :imageable, :dependent => :destroy
+    belongs_to :page, class_name: "Redditor::Page", touch: true
+    has_many :images, as: :imageable, dependent: :destroy
     accepts_nested_attributes_for :images
 
     def self.model_name

data/app/models/redditor/text_block.rb

@@ -4,14 +4,13 @@ module Redditor
   class TextBlock < ActiveRecord::Base
     self.table_name = "redditor_text_blocks"
 
-    # attr_accessible :body, :page_id, :position, :translations_attributes
     attr_accessor :object_id
 
-    belongs_to :page, :class_name => "Redditor::Page"
+    belongs_to :page, class_name: "Redditor::Page", touch: true
 
     default_scope -> { order(:position) }
 
-    validates :position, :body, :presence => true
+    validates :position, :body, presence: true
     
     def self.model_name
       ActiveModel::Name.new(self, nil, 'TextBlock')

data/app/models/redditor/video_block.rb

@@ -13,12 +13,11 @@ module Redditor
   class VideoBlock < ActiveRecord::Base
     self.table_name = "redditor_video_blocks"
 
-    # attr_accessible :height, :page_id, :position, :width, :youtube
     attr_accessor :object_id
 
-    validates :youtube, :length => { :is => 11 }, :youtube => true
+    validates :youtube, length: { is: 11 }, youtube: true
 
-    belongs_to :page, :class_name => "Redditor::Page"
+    belongs_to :page, class_name: "Redditor::Page", touch: true
 
     def self.model_name
       ActiveModel::Name.new(self, nil, 'VideoBlock')

data/app/uploaders/redditor_uploader.rb

@@ -22,7 +22,8 @@ class RedditorUploader < CarrierWave::Uploader::Base
   end
 
   version :show do
-    process :resize_to_fill => [600, 400]
+    process :resize_to_fill => [960, 640], :if => :is_slider?
+    process :resize_to_limit => [960, 3000], :if => :is_image?
   end
 
   # Provide a default URL as a default if there hasn't been a file uploaded:
@@ -42,6 +43,17 @@ class RedditorUploader < CarrierWave::Uploader::Base
   #   process :scale => [50, 50]
   # end
 
+
+  # Для того чтобы можно было использовать эти методы ввиде условий необходимо,
+  # чтобы изображение сохранялось через update_attributes вместо save
+  def is_slider? picture
+    model.imageable_type == "Redditor::SliderBlock"
+  end
+
+  def is_image? picture
+    model.imageable_type == "Redditor::Page"
+  end
+
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
   # def extension_white_list

data/lib/redditor/version.rb

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

data/spec/dummy/config/application.rb

@@ -19,6 +19,8 @@ module Dummy
       g.template_engine :haml
     end
 
+    I18n.enforce_available_locales = false
+
     # I18n.enforce_available_locales = true
 
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.

data/spec/features/text_spec.rb

@@ -23,13 +23,13 @@ describe "Text block" do
     find(".redditor__textarea").set("test text block")
     submit
     show_text_area
-    expect(page.find(".redditor__textarea").value).to have_content "test text block"
+    wait_until { 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
     add_block
     submit
-    expect(page).to have_content "can't be blank"
+    wait_until { expect(page).to have_content "can't be blank" }
   end
 
   it "Deletes text block", type: :feature, js: true do
@@ -42,7 +42,7 @@ describe "Text block" do
     rescue
       nil
     end
-    expect(text_value).to eq nil
+    wait_until { expect(text_value).to eq nil }
   end
 
   it "Saves text block to article on save button", type: :feature, js: true do
@@ -52,6 +52,6 @@ describe "Text block" do
     save_block
     visit_article
     show_text_area
-    expect(page.find(".redditor__textarea").value).to have_content "test text block"
+    wait_until { expect(page.find(".redditor__textarea").value).to have_content "test text block" }
   end
 end

data/spec/features/video_spec.rb

@@ -20,13 +20,13 @@ describe "Video block" do
     add_block
     page.find(".video-block-input").set("1"*11)
     submit
-    expect(page.find("iframe").nil?).to eq false
+    wait_until { expect(page.find("iframe").nil?).to eq false }
   end
 
   it "Shows validation error if youtube block url is empty or invalid", type: :feature, js: true do
     add_block
     submit
-    expect(page.find(".errors")).to have_content "is the wrong length"
+    expect(page).to have_content "is the wrong length"
   end
 
   it "Deletes video block", type: :feature, js: true do
@@ -39,7 +39,7 @@ describe "Video block" do
     rescue
       nil
     end
-    expect(video_frame).to eq nil
+    wait_until { expect(video_frame).to eq nil }
   end
 
   it "Saves video block to article on save button", type: :feature, js: true do
@@ -47,6 +47,6 @@ describe "Video block" do
     page.find(".video-block-input").set("1"*11)
     save_block
     visit_article
-    expect(page.find("iframe").nil?).to eq false
+    wait_until { expect(page.find("iframe").nil?).to eq false }
   end
 end

data/spec/spec_helper.rb

@@ -14,8 +14,17 @@ 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.register_driver :poltergeist do |app|
+  Capybara::Poltergeist::Driver.new(app, {
+    debug: false,
+    phantomjs_options: ['--load-images=no', '--disk-cache=false'],
+    js_errors: false
+  })
+end
+
 Capybara.javascript_driver = :poltergeist
-Capybara.default_wait_time = 10
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -46,9 +55,6 @@ RSpec.configure do |config|
 
   config.include FactoryGirl::Syntax::Methods
 
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
   # 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
   # instead of true.
@@ -65,3 +71,11 @@ RSpec.configure do |config|
   #     --seed 1234
   config.order = "random"
 end
+
+def wait_until
+  require "timeout"
+  Timeout.timeout(Capybara.default_wait_time) do
+    sleep(0.1) until value = yield
+    value
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redditor
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -308,7 +308,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Page editor