redditor 0.1.20 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c68ce66865451f834f66beee9c6193596e531e2
-  data.tar.gz: c8823f6ab7f104dcc82775ba0044af6a283bb407
+  metadata.gz: 47dda44b37609e7e7c8def17cbe1d8c86539b4ac
+  data.tar.gz: 6991a2f0af8af0d4683b524f155702331872a0fe
 SHA512:
-  metadata.gz: bd161078d41fcaebd80cd645e7516f2c39e26d2ad5bd0fe978c4c517ceea6eaded89f9a82d53c25951f342dcee4c94dc45550b6a70ee7841a197ef2fdbe365fc
-  data.tar.gz: fe4bd27da0c9c615678fcddbaedcb766fe5e0e93aac98981d2c04a0fc99c8eb640ed779bca87a65bb0ee8401d1c1659f81852e48a918eb98041b111a22a9156a
+  metadata.gz: cbaf37b436b925d9b35431d839a6d1bfa0bc9f1366f9918c95926ea8fe74a7ca129a4c0823d5a4b476a8b8327d2a57ee14a396c9ea7960e960df6ab7779d9beb
+  data.tar.gz: e9dec8932de03d8e50e8dc22adb325c3be5760650602e54563cc299c3155e339022d61402d03ddaf0afe08192ad8ef067fb5219e7483334b298f962ae4a87ae7

data/app/models/redditor/image.rb

@@ -1,18 +1,12 @@
 module Redditor
   class Image < ActiveRecord::Base
     self.table_name = "redditor_images"
-
-    after_initialize :set_default_values # чтобы файл загружался, пока через html5 не передаем позицию
-
     attr_accessor :object_id
-
-    mount_uploader :src, RedditorUploader
-
-    validates :src, presence: true
-
     belongs_to :imageable, polymorphic: true, touch: true
-
+    validates :src, presence: true
+    mount_uploader :src, RedditorUploader
     default_scope -> { order(:position) }
+    after_initialize :set_default_values # чтобы файл загружался, пока через html5 не передаем позицию
 
     def self.model_name
       ActiveModel::Name.new(self, nil, 'Image')
@@ -23,8 +17,9 @@ module Redditor
     end
 
     private
-      def set_default_values
-        self.position ||= 1000
-      end
+
+    def set_default_values
+      self.position ||= 1000
+    end
   end
-end
+end

data/lib/redditor/version.rb

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

data/redditor.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", "~> 4.1.6"
+  s.add_dependency "rails", "~> 4"
 
   s.add_runtime_dependency 'carrierwave'
   s.add_runtime_dependency 'mini_magick'
@@ -38,4 +38,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency 'generator_spec'
   s.add_development_dependency "factory_girl_rails"
+  s.add_development_dependency "launchy"
 end

data/spec/dummy/config/environments/production.rb

@@ -13,6 +13,7 @@ Dummy::Application.configure do
   # Full error reports are disabled and caching is turned on.
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
+  config.active_record.raise_in_transactional_callbacks = true
 
   # Enable Rack::Cache to put a simple HTTP cache in front of your application
   # Add `rack-cache` to your Gemfile before enabling this.
@@ -20,7 +21,7 @@ Dummy::Application.configure do
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  config.serve_static_files = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/spec/dummy/config/environments/test.rb

@@ -11,9 +11,10 @@ Dummy::Application.configure do
   # just for the purpose of running a single test. If you are using a tool that
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
+  config.active_record.raise_in_transactional_callbacks = true
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  config.serve_static_files  = true
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching.

data/spec/features/text_spec.rb

@@ -18,7 +18,6 @@ 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")
@@ -49,7 +48,6 @@ 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
     find("textarea").set("test text block")

data/spec/features/video_spec.rb

@@ -49,4 +49,4 @@ describe "Video block" do
     visit_article
     wait_until { expect(page.find("iframe").nil?).to eq false }
   end
-end
+end

data/spec/rails_helper.rb

@@ -18,7 +18,7 @@ Capybara.default_wait_time = ENV['CAPYBARA_WAIT_TIME'].present? ? ENV['CAPYBARA_
 Capybara.register_driver :poltergeist do |app|
   Capybara::Poltergeist::Driver.new(app, {
     debug: false,
-    phantomjs_options: ['--load-images=no', '--disk-cache=false'],
+    # phantomjs_options: ['--load-images=no', '--disk-cache=false'],
     js_errors: false
   })
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redditor
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.22
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -249,6 +249,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  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
 email:
 - oleg.bovykin@gmail.com
@@ -435,7 +449,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Page editor