atomic_cms 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 728586a5dfb314682f1e61766fa29c5922022335
-  data.tar.gz: 3ca845f9f74da4c203ba77c7cc4883d12a1c6b35
+  metadata.gz: 0d5ba8b247e0e2df3c7f9c4d6341a4de336c5891
+  data.tar.gz: e4a7d558023ea759f664a75448f130b125eba4e1
 SHA512:
-  metadata.gz: 8aec4890792f8fc849e0443f086dbbf99e2ef735abd0aa4c9b018ab6c8b5cef5297a43db377ef319dfe87b93134c4db09dc297ce5451c2b9c6b14d1d00203ec6
-  data.tar.gz: 043a15c92a21e2277c3095163716560d7c650dd05a3c75c54a18aff87d19d0062fdd2bf7035cc1222c613de3575bf9ffd73738b800a497b960147c178a4d270c
+  metadata.gz: 2e75064a5b2922819dfe93825c1665ffa71dcc24320e5797c8b2f8d392bc3ace447926b3393c981ad33da0ad6aca4e09bb21e29b703944b87bbae031153d85d1
+  data.tar.gz: 50d6551c23cf38999f55017abda4bbf28c429039102b1738e03a0d9ea5a75f9a91adf13ced235de9f93adb4cf9ed6bf18dbbbd460d324041afc4b4eba218a27d

data/.gitignore

@@ -1,4 +1,5 @@
 .bundle/
+Gemfile.lock
 log/*.log
 pkg/
 *.gem

data/.hound.yml

@@ -0,0 +1,2 @@
+ruby:
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -1,5 +1,33 @@
+AllCops:
+  TargetRubyVersion: 2.3
+
 Style/Documentation:
   Enabled: false
 
+Style/DotPosition:
+  EnforcedStyle: leading
+  SupportedStyles:
+    - leading
+    - trailing
+
+Style/FrozenStringLiteralComment:
+  EnforcedStyle: when_needed
+  SupportedStyles:
+    - when_needed
+    - always
+    - never
+
 Style/StringLiterals:
-  Enabled: false
+  EnforcedStyle: single_quotes
+  SupportedStyles:
+    - single_quotes
+    - double_quotes
+  ConsistentQuotesInMultiline: false
+
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: single_quotes
+  SupportedStyles:
+    - single_quotes
+    - double_quotes
+
+

data/Gemfile

@@ -1,2 +1,2 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 gemspec

data/app/assets/javascripts/atomic_cms.js

@@ -39,6 +39,13 @@
 
   page = angular.module('page', ['markdown', 'ngSanitize']);
 
+  page.config(function($sceDelegateProvider) {
+    $sceDelegateProvider.resourceUrlWhitelist([
+      'self', 
+      'http://s3.amazonaws.com/**'
+    ]);
+  });
+
   page.filter('vimeo_url', [
     '$sce', function($sce) {
       return function(id) {
@@ -141,6 +148,7 @@
           $editor.find(':file').each(function() {
             var $input = $(this);
             var $next = $($input.siblings('input'));
+            var $errors = $($input.siblings('div.errors'));
             $input.attr('name', null).val('');
 
             $input.on('change', function(event) {
@@ -159,6 +167,11 @@
                   var parsed = JSON.parse(data);
                   $next.val(parsed.url);
                   $next.change();
+                  $errors.empty();
+                },
+                error: function (response) {
+                  var data = JSON.parse(response.responseText);
+                  $errors.text(data.errors.file[0]);
                 }
               });
             });

data/app/controllers/atomic_cms/media_controller.rb

@@ -5,7 +5,8 @@ module AtomicCms
       if asset.save
         render json: { url: asset.url }.to_json, status: :created
       else
-        render json: {}.to_json, status: :unprocessable_entity
+        render json: { errors: asset.errors }.to_json,
+               status: :unprocessable_entity
       end
     end
 

data/app/controllers/concerns/media_scrubber.rb

@@ -1,5 +1,5 @@
 class MediaScrubber
-  attr_accessor :original, :filtered
+  attr_accessor :original, :filtered, :errors
 
   def initialize(args)
     @original = args.fetch(:file, nil)
@@ -8,12 +8,16 @@ class MediaScrubber
 
   def infer_media_type
     return nil unless original.respond_to?(:content_type)
-    AtomicCms::Image.new(file: original) if original.content_type.match(/image/)
+    params = { file: original }
+    return AtomicCms::Image.new(params) if original.content_type =~ /image/
+    AtomicCms::Video.new(params) if original.content_type =~ /video/
   end
 
   def valid?
     return false unless filtered
-    filtered.valid?
+    return true if filtered.valid?
+    @errors = filtered.errors
+    false
   end
 
   def save

data/app/models/atomic_cms/video.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+module AtomicCms
+  class Video < Media
+    validates_attachment :file, presence: true,
+                                content_type: { content_type: /\Avideo/ }
+  end
+end

data/app/views/components/_datepicker_field.html.slim

@@ -0,0 +1,3 @@
+span.li.string.input
+  label.label #{name.to_s.humanize}
+  input.cms-field.datepicker type="text" name="#{name}" value="#{value}" data-ng-model="preview.#{name}"

data/app/views/components/_file_field.slim

@@ -2,4 +2,5 @@ span.li.string.input
   label.label #{name.to_s.humanize}
   input.cms-field type="file"
   label.label.filler #{name.to_s.humanize}
+  .errors
   input.cms-field type="text" name="#{name}" data-ng-model="preview.#{name}" value="#{value}"

data/atomic_cms.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'atomic_cms'
-  s.version     = '0.2.5'
+  s.version     = '0.3.0'
   s.summary     = 'Atomic CMS'
   s.description = 'Live CMS powered by atomic assets.'
   s.authors     = ['Don Humphreys', 'Spartan']
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split(/\n/)
   s.test_files  = Dir['spec/**/*']
   s.homepage    = 'https://github.com/spartansystems/atomic_cms'
-  s.license       = 'MIT'
+  s.license     = 'MIT'
 
   s.add_dependency 'rails', '~> 4.2'
   s.add_dependency 'activeadmin', '1.0.0.pre2'

data/spec/controllers/media_controller_spec.rb

@@ -1,4 +1,5 @@
-require "rails_helper"
+# frozen_string_literal: true
+require 'rails_helper'
 
 RSpec.describe AtomicCms::MediaController, type: :controller do
   # Previously the engines guide contained an incorrect example that
@@ -8,23 +9,24 @@ RSpec.describe AtomicCms::MediaController, type: :controller do
   # in the test case with `Foo::Engine.routes`.
   before { @routes = AtomicCms::Engine.routes }
 
-  it "accepts a post request and fails with bad data" do
-    scrubber = double("scrubber")
+  it 'accepts a post request and fails with bad data' do
+    scrubber = double('scrubber')
     allow(MediaScrubber).to receive(:new).and_return(scrubber)
     allow(scrubber).to receive(:save).and_return(false)
+    allow(scrubber).to receive(:errors)
 
-    post :create, file: double("file")
+    post :create, file: double('file')
 
     expect(response).to have_http_status(:unprocessable_entity)
   end
 
-  it "accepts a post with an image" do
-    scrubber = double("scrubber", save: true, url: "http://www.google.com")
+  it 'accepts a post with a file' do
+    scrubber = double('scrubber', save: true, url: 'http://www.google.com')
     expect(MediaScrubber).to receive(:new).and_return(scrubber)
 
-    post :create, file: double("file")
+    post :create, file: double('file')
 
     expect(response).to have_http_status(:created)
-    expect(response.body).to include("http://www.google.com")
+    expect(response.body).to include('http://www.google.com')
   end
 end

data/spec/controllers/media_scrubber_spec.rb

@@ -3,6 +3,7 @@ require 'rails_helper'
 RSpec.describe MediaScrubber do
   let(:path) { File.expand_path('../../uploads', __FILE__) }
   let(:image) { File.open("#{path}/cat.jpg") }
+  let(:video) { File.open("#{path}/small.mp4") }
 
   it 'takes a file as an argument' do
     something = double('some_document')
@@ -16,6 +17,12 @@ RSpec.describe MediaScrubber do
       expect(m.infer_media_type.class).to be(AtomicCms::Image)
     end
 
+    it 'returns a Video if the file type is a video' do
+      allow(video).to receive(:content_type).and_return('video/mp4')
+      m = MediaScrubber.new(file: video)
+      expect(m.infer_media_type.class).to be(AtomicCms::Video)
+    end
+
     it 'returns nil if not supported' do
       something_else = double('some_document', content_type: 'rando')
       m = MediaScrubber.new(file: something_else)
@@ -35,15 +42,23 @@ RSpec.describe MediaScrubber do
       expect(m.valid?).to be(false)
     end
 
-    it 'passes the valid call onto the underlying Object if filtered' do
+    it 'returns true if underlying Object is filtered' do
       m = MediaScrubber.new(file: image)
       m.filtered = spy('underlying_asset')
-      allow(m.filtered).to receive(:valid?).and_return(:true)
+      allow(m.filtered).to receive(:valid?).and_return(true)
 
-      m.valid?
+      expect(m.valid?).to be(true)
 
       expect(m.filtered).to have_received(:valid?)
     end
+
+    it 'returns false if underlying Object is not filtered' do
+      m = MediaScrubber.new(file: image)
+      m.filtered = spy('underlying_asset')
+      allow(m.filtered).to receive(:valid?).and_return(false)
+
+      expect(m.valid?).to be(false)
+    end
   end
 
   context '#save' do

data/spec/models/video_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+require 'rails_helper'
+
+describe AtomicCms::Video do
+  it_behaves_like 'media upload'
+
+  context 'file validations' do
+    it { should validate_attachment_presence(:file) }
+    it 'validates the content types' do
+      should validate_attachment_content_type(:file)
+        .allowing('video/mp4', 'video/x-msvideo', 'video/x-ms-wmv')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: atomic_cms
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Don Humphreys
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -235,12 +235,12 @@ extra_rdoc_files: []
 files:
 - ".eslintrc"
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-version"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - app/assets/images/icon_add_component.png
@@ -254,7 +254,9 @@ files:
 - app/helpers/component_helper.rb
 - app/models/atomic_cms/image.rb
 - app/models/atomic_cms/media.rb
+- app/models/atomic_cms/video.rb
 - app/views/components/_children_field.html.slim
+- app/views/components/_datepicker_field.html.slim
 - app/views/components/_edit.html.slim
 - app/views/components/_file_field.slim
 - app/views/components/_markdown_field.slim
@@ -309,10 +311,8 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -320,11 +320,13 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/models/image_spec.rb
 - spec/models/media_spec.rb
+- spec/models/video_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/media_upload_shared_examples.rb
 - spec/uploads/cat.jpg
 - spec/uploads/pdf.pdf
+- spec/uploads/small.mp4
 - vendor/assets/javascripts/angular-markdown.js
 - vendor/assets/javascripts/showdown.min.js
 homepage: https://github.com/spartansystems/atomic_cms
@@ -347,7 +349,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Atomic CMS
@@ -382,10 +384,8 @@ test_files:
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -395,8 +395,10 @@ test_files:
 - spec/dummy/README.rdoc
 - spec/models/image_spec.rb
 - spec/models/media_spec.rb
+- spec/models/video_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
 - spec/support/media_upload_shared_examples.rb
 - spec/uploads/cat.jpg
 - spec/uploads/pdf.pdf
+- spec/uploads/small.mp4

data/Gemfile.lock

@@ -1,241 +0,0 @@
-PATH
-  remote: .
-  specs:
-    atomic_cms (0.2.2)
-      activeadmin (= 1.0.0.pre2)
-      atomic_assets (~> 0.1.0)
-      jquery-rails (~> 4.0, >= 4.0.3)
-      paperclip (~> 4.3)
-      rails (~> 4.2)
-      redcarpet (~> 3.3)
-      slim-rails (~> 3.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.4)
-      actionview (= 4.2.4)
-      activesupport (= 4.2.4)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.4)
-      activesupport (= 4.2.4)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activeadmin (1.0.0.pre2)
-      arbre (~> 1.0, >= 1.0.2)
-      bourbon
-      coffee-rails
-      formtastic (~> 3.1)
-      formtastic_i18n
-      inherited_resources (~> 1.6)
-      jquery-rails
-      jquery-ui-rails
-      kaminari (~> 0.15)
-      rails (>= 3.2, < 5.0)
-      ransack (~> 1.3)
-      sass-rails
-    activejob (4.2.4)
-      activesupport (= 4.2.4)
-      globalid (>= 0.3.0)
-    activemodel (4.2.4)
-      activesupport (= 4.2.4)
-      builder (~> 3.1)
-    activerecord (4.2.4)
-      activemodel (= 4.2.4)
-      activesupport (= 4.2.4)
-      arel (~> 6.0)
-    activesupport (4.2.4)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    arbre (1.0.3)
-      activesupport (>= 3.0.0)
-    arel (6.0.3)
-    atomic_assets (0.1.0)
-      draper (~> 2.1)
-    bourbon (4.2.6)
-      sass (~> 3.4)
-      thor (~> 0.19)
-    builder (3.2.2)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
-    cocaine (0.5.7)
-      climate_control (>= 0.0.3, < 1.0)
-    coffee-rails (4.1.0)
-      coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.9.1.1)
-    diff-lcs (1.2.5)
-    draper (2.1.0)
-      actionpack (>= 3.0)
-      activemodel (>= 3.0)
-      activesupport (>= 3.0)
-      request_store (~> 1.0)
-    erubis (2.7.0)
-    execjs (2.6.0)
-    factory_girl (4.5.0)
-      activesupport (>= 3.0.0)
-    factory_girl_rails (4.5.0)
-      factory_girl (~> 4.5.0)
-      railties (>= 3.0.0)
-    formtastic (3.1.3)
-      actionpack (>= 3.2.13)
-    formtastic_i18n (0.4.1)
-    globalid (0.3.6)
-      activesupport (>= 4.1.0)
-    has_scope (0.6.0)
-      actionpack (>= 3.2, < 5)
-      activesupport (>= 3.2, < 5)
-    i18n (0.7.0)
-    inherited_resources (1.6.0)
-      actionpack (>= 3.2, < 5)
-      has_scope (~> 0.6.0.rc)
-      railties (>= 3.2, < 5)
-      responders
-    jquery-rails (4.0.5)
-      rails-dom-testing (~> 1.0)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.5)
-      railties (>= 3.2.16)
-    json (1.8.3)
-    kaminari (0.16.3)
-      actionpack (>= 3.0.0)
-      activesupport (>= 3.0.0)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.2)
-    mimemagic (0.3.0)
-    mini_portile (0.6.2)
-    minitest (5.8.1)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    paperclip (4.3.1)
-      activemodel (>= 3.2.0)
-      activesupport (>= 3.2.0)
-      cocaine (~> 0.5.5)
-      mime-types
-      mimemagic (= 0.3.0)
-    polyamorous (1.2.0)
-      activerecord (>= 3.0)
-    rack (1.6.4)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.4)
-      actionmailer (= 4.2.4)
-      actionpack (= 4.2.4)
-      actionview (= 4.2.4)
-      activejob (= 4.2.4)
-      activemodel (= 4.2.4)
-      activerecord (= 4.2.4)
-      activesupport (= 4.2.4)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.4)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.2)
-      loofah (~> 2.0)
-    railties (4.2.4)
-      actionpack (= 4.2.4)
-      activesupport (= 4.2.4)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    ransack (1.7.0)
-      actionpack (>= 3.0)
-      activerecord (>= 3.0)
-      activesupport (>= 3.0)
-      i18n
-      polyamorous (~> 1.2)
-    redcarpet (3.3.3)
-    request_store (1.2.0)
-    responders (2.1.0)
-      railties (>= 4.2.0, < 5)
-    rspec-core (3.3.2)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-rails (3.3.3)
-      actionpack (>= 3.0, < 4.3)
-      activesupport (>= 3.0, < 4.3)
-      railties (>= 3.0, < 4.3)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    sass (3.4.19)
-    sass-rails (5.0.4)
-      railties (>= 4.0.0, < 5.0)
-      sass (~> 3.1)
-      sprockets (>= 2.8, < 4.0)
-      sprockets-rails (>= 2.0, < 4.0)
-      tilt (>= 1.1, < 3)
-    shoulda-matchers (3.0.0)
-      activesupport (>= 4.0.0)
-    slim (3.0.6)
-      temple (~> 0.7.3)
-      tilt (>= 1.3.3, < 2.1)
-    slim-rails (3.0.1)
-      actionmailer (>= 3.1, < 5.0)
-      actionpack (>= 3.1, < 5.0)
-      activesupport (>= 3.1, < 5.0)
-      railties (>= 3.1, < 5.0)
-      slim (~> 3.0)
-    sprockets (3.4.0)
-      rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.11)
-    temple (0.7.6)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tilt (2.0.1)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  atomic_cms!
-  factory_girl_rails
-  rspec-core (~> 3.3)
-  rspec-expectations (~> 3.3)
-  rspec-mocks (~> 3.3)
-  rspec-rails
-  rspec-support (~> 3.3)
-  shoulda-matchers
-  sqlite3
-
-BUNDLED WITH
-   1.10.6