lady_josephine 0.0.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08931081c421edff4ff267a29010ed27df43c500
-  data.tar.gz: fe6f745e500f34a055e86fa704e7b756aee19f12
+  metadata.gz: 60a6a3687ea48331847dc71805138f3b6538caff
+  data.tar.gz: cc3f703f2ee2a6e7fdddc163a22802aa372b0442
 SHA512:
-  metadata.gz: f58b27466ad81cdc654cbd00549a31f7bdd6413d7b928800d374e7955fbd6fea6b53159a279d1db6068e953af93e5a5a9347850b938265b2da9714966252d3a7
-  data.tar.gz: 1a8ff67c4f2516dbddc88067dcc2bc97f116bacc488b04f63f93a368605c66f596652eefefdb09f51bab20ce21f0879b2c4b20999ba62142e18bddbdedbf71bc
+  metadata.gz: 7a3ff2974e150f88c654102fbd83740f1d892044309be6f4afbf59f8d069e5384156233c273493a6eae6458167ab86af4f0e0e0d054c5c3d1c73ec1b71af395b
+  data.tar.gz: debb9ad919884f916f89537a27e5671ecbb4735f0f52eca743125d4943616d67559b754ca97498ab0f096932d8b8abd4878b093a6c6f87e10d4eab12097bd9e9

data/app/controllers/lady_josephine/editor_controller.rb

@@ -12,9 +12,10 @@ module LadyJosephine
           result[:ping][:state] = "CONFLICT"
         end
 
-        result[:ping][:ping_date] = @resource.ping_date
-        result[:ping][:user_id]   = @resource.ping_user.try :id
-        result[:ping][:user_name] = @resource.ping_user.try :name
+        result[:ping][:ping_date] = @resource.lady_josephine_ping_date
+        result[:ping][:user_id]   = @resource.lady_josephine_ping_user.try :id
+        result[:ping][:user_name] = @resource.lady_josephine_ping_user.try :name
+
         render json: result
       end
     end
@@ -28,7 +29,8 @@ module LadyJosephine
     private
 
     def find_resource
-      if (@resource = params[:resource].capitalize.constantize.where(server_uuid: params[:id]).first)
+      resource_class = whitelisted_class(params[:resource])
+      if (resource_class && @resource = resource_class.where(lady_josephine_server_uuid: params[:id]).first)
         @resource
       else
         render nothing: true, status: 404
@@ -36,5 +38,9 @@ module LadyJosephine
       end
     end
 
+    def whitelisted_class(resource)
+      resource.capitalize.constantize if LadyJosephine::Whitelist.instance.is_whitelisted?(resource)
+    end
+
   end
 end

data/app/controllers/lady_josephine/images_controller.rb

@@ -4,15 +4,18 @@ module LadyJosephine
     def create
       image = Image.from_params image_params
 
-      if image.save
+      if image && image.save
         response = {file: {url: image.file.url}}
         render json: response.as_json, status: 200
-      else
+      elsif image
         render json: image.file.errors,  status: 500
+      else
+        render json: { error: 'Could not save Image.'} ,  status: 500
       end
-
     end
 
+    private
+
     def image_params
       params.require(:attachment).permit([:name, :file])
       params.require("block-uuid")

data/app/helpers/lady_josephine/sir_trevor_helper.rb

@@ -3,23 +3,12 @@ require 'redcarpet'
 module LadyJosephine
   module SirTrevorHelper
 
-    def render_sir_trevor(json, without_notes = true, image_type = 'large')
-      if hash = parse_sir_trevor(json)
-        first_definition_block = true
-        hash.map { |object|
-          if object["data"]["note"] != "yes" || !without_notes
-            if object["type"] == "definition"
-              options = {first: first_definition_block}
-              first_definition_block = false
-              render_sir_trevor_block(object, image_type, options)
-            else
-              render_sir_trevor_block(object, image_type)
-            end
-          end
-        }.compact.join.html_safe
-      else
-        ''
-      end
+    def render_sir_trevor(json, without_notes = true)
+      parse_sir_trevor(json).map do |object|
+        if object["data"]["note"] != "yes" || !without_notes
+          render_sir_trevor_block(object)
+        end
+      end.compact.join.html_safe
     end
 
     def component_attributes_for(block, classes)
@@ -50,82 +39,74 @@ module LadyJosephine
       tag "img", options.merge(:src => src, :srcset => srcset, :sizes => sizes)
     end
 
-    def protocol_relative(path)
-      path.gsub(/\Ahttps?:/, '')
-    end
-
     def sir_trevor_video(block)
-
       if block["source"] == "youtube"
-
-        options = {
-          frameborder:   0,
-          wmode:         nil,
-          autoplay:      false,
-          hide_related:  true,
-          showinfo:      0,
-          color:         "white",
-          modestbranding: 1,
-          iv_load_policy: 3,
-          theme:          "light",
-          fullscreen:     block["note"] == "yes" ? 0 : 1
-        }
-
-        src    = "//www.youtube.com/embed/#{block['remote_id']}"
-
-        params = []
-        params << "wmode=#{options[:wmode]}" if options[:wmode]
-        params << "autoplay=1" if options[:autoplay]
-        params << "rel=0" if options[:hide_related]
-        params << "showinfo=#{options[:showinfo]}" if options[:showinfo]
-        params << "modestbranding=#{options[:modestbranding]}" if options[:modestbranding]
-        params << "color=#{options[:color]}" if options[:color]
-        params << "iv_load_policy=#{options[:iv_load_policy]}" if options[:iv_load_policy]
-        params << "theme=#{options[:theme]}" if options[:theme]
-        params << "fs=#{options[:fullscreen]}" if options[:fullscreen]
-
-        src += "?#{params.join '&'}" unless params.empty?
-
-        %{<div class="ratio-container youtube-block" data-youtube-url=#{src} data-video-id=#{block['remote_id']}></div>}
-
-
+        sir_trevor_video_youtube(block)
       elsif block["source"] == "vimeo"
+        sir_trevor_video_vimeo(block)
+      else
+        ""
+      end
+    end
 
-        options = {
-          show_title:     false,
-          show_byline:    false,
-          show_portrait:  false,
-          frameborder:    0
-        }
-
-
-        frameborder     = options[:frameborder] || 0
-        src    = "//player.vimeo.com/video/#{block['remote_id']}"
-
-        params = []
-
-        params << "title=0"    unless options[:show_title]
-        params << "byline=0" if     options[:autoplay]
-        params << "portrait=0" if options[:hide_related]
+    def image_display_width(metadata, height = 620)
+      (metadata["w2000"]["ratio"] * height).round
+    end
 
-        src += "?#{params.join '&'}" unless params.empty?
+    private
 
-        %{<div class="ratio-container vimeo-block" data-vimeo-url=#{src} data-video-id=#{block['remote_id']}></div>}
+    def sir_trevor_video_youtube(block)
+      params = {
+        frameborder:   0,
+        wmode:         nil,
+        autoplay:      1,
+        rel:           0,  # hide related
+        showinfo:      0,
+        color:         "white",
+        modestbranding: 1,
+        iv_load_policy: 3,
+        theme:          "light",
+        fs:             block["note"] == "yes" ? 0 : 1, # fullscreen
+        rel:            0
+      }
+
+      src    = join_url_with_params("//www.youtube.com/embed/#{block['remote_id']}", params)
+
+      content_tag "div", "", {
+        "class" => "ratio-container youtube-block",
+        "data-youtube-url" => src,
+        "data-video-id"    => block['remote_id']
+      }
+    end
 
-      else
+    def sir_trevor_video_vimeo(block)
+      params = {
+        title:    0,
+        byline:   0, # autoplay
+        portrait: 0, # hide related
+      }
 
-        ""
+      src    = join_url_with_params("//player.vimeo.com/video/#{block['remote_id']}", params)
 
-      end
+      content_tag "div", "", {
+        "class" => "ratio-container vimeo-block",
+        "data-vimeo-url" => src,
+        "data-video-id"    => block['remote_id']
+      }
+    end
 
+    def join_url_with_params(url, params)
+      "#{url}?#{params.map{|k,v| "#{k}=#{v}"}.join('&')}"
     end
 
-    private
+    def protocol_relative(path)
+      path.gsub(/\Ahttps?:/, '')
+    end
 
     def parse_sir_trevor(json)
       hash = JSON.parse(json)
 
-      return false unless hash.has_key?("data")
+      return [] unless hash.has_key?("data")
       digest hash["data"]
     end
 
@@ -157,21 +138,9 @@ module LadyJosephine
 
     end
 
-    def render_sir_trevor_block(object, image_type = 'large', options = {})
-      context = Class.new(ActionView::Base) do
-        include ActionView::RoutingUrlFor
-        include ApplicationHelper
-        include Rails.application.routes.url_helpers
-        include Rails.application.routes.mounted_helpers
-        include SirTrevorHelper
-
-        def default_url_options
-          {}
-        end
-      end
-
+    def render_sir_trevor_block(object, options = {})
       view_name = "lady_josephine/blocks/_#{object['type'].to_s.downcase}_block"
-      view = context.new(["#{Rails.root}/app/views", "#{__FILE__}/../../../views"], {})
+      view = LadyJosephine::SirTrevorView.new(["#{Rails.root}/app/views", "#{__FILE__}/../../../views"], {})
       view.render(template: view_name, locals: {
         :block => object['data'],
         :options => options

data/app/models/lady_josephine/concerns/model.rb

@@ -9,10 +9,12 @@ module LadyJosephine
         include ServerUuid
         include SirTrevorImages
 
+        belongs_to :lady_josephine_ping_user, class_name: LadyJosephine.user_class_name
+
         LadyJosephine::Whitelist.instance.whitelist(self)
 
         def content_data_hash
-          if self.content_data.present?
+          if self.content_data.present? && !(self.content_data == "{}")
             JSON.parse(self.content_data)
           else
             {"server_uuid" => nil}

data/app/models/lady_josephine/concerns/sir_trevor_images.rb

@@ -3,7 +3,7 @@ module LadyJosephine
     module SirTrevorImages
       extend ActiveSupport::Concern
 
-      included do |column|
+      included do
 
         def images
           files = []
@@ -13,26 +13,24 @@ module LadyJosephine
             files << block["data"]["file"]["medium"]
             files << block["data"]["file"]["small"]
           end
-          files.map { |f| f["url"] }
+          files.map { |f| f.try :[], "url" }.compact
         end
 
         private
 
         def image_blocks
-          self.sir_trevor_unwrap_column["data"].select do |block|
+          return [] if sir_trevor_unwrap_column["data"].nil?
+          sir_trevor_unwrap_column["data"].select do |block|
             block['type'] == 'extended_image'
           end
         end
 
-      end
-
-      class_methods do
-
         def sir_trevor_unwrap_column
           JSON.parse(self.content_data || "{}")
         end
 
       end
+
     end
   end
 end

data/app/models/lady_josephine/image.rb

@@ -9,8 +9,9 @@ module LadyJosephine
     before_save :update_file_metadata
 
     def self.from_params(params)
-      uploadable_type      = params["model-name"]
-      uploadable_type      = allowed_class_name uploadable_type
+      uploadable_type      = allowed_class_name params["model-name"]
+      return nil if uploadable_type.nil?
+
       uploadable_uuid      = params["article-uuid"]
       uploadable_attribute = params["column-name"]
       uploadable_id        = uploadable_type.constantize.find_by(lady_josephine_server_uuid: uploadable_uuid).try :id

data/config/routes.rb

@@ -1,9 +1,9 @@
 LadyJosephine::Engine.routes.draw do
   resources :images, only: [:create]
 
-  controller :editor do
-    get '/content/:resource/:id/version' => :version
-    post '/content/:resource/:id/ping' => :ping
-  end
+   controller :editor do
+     get 'content/:resource/:id/version' => :version
+     post 'content/:resource/:id/ping' => :ping, as: "ping"
+   end
 
 end

data/lib/lady_josephine/redcarpet/custom_markdown_formatter.rb

@@ -1,3 +1,6 @@
+require 'addressable/uri'
+require 'redcarpet'
+
 module LadyJosephine
   module Redcarpet
     class CustomMarkdownFormatter < ::Redcarpet::Render::SmartyHTML

data/lib/lady_josephine/sir_trevor_view.rb

@@ -0,0 +1,14 @@
+module LadyJosephine
+  class SirTrevorView < ActionView::Base
+    include ActionView::RoutingUrlFor
+    include ApplicationHelper
+    include Rails.application.routes.url_helpers
+    include Rails.application.routes.mounted_helpers
+    include SirTrevorHelper
+
+    def default_url_options
+      {}
+    end
+  end
+
+end

data/lib/lady_josephine/version.rb

@@ -1,3 +1,3 @@
 module LadyJosephine
-  VERSION = "0.0.4"
+  VERSION = "0.5.0"
 end

data/lib/lady_josephine.rb

@@ -12,7 +12,12 @@ module LadyJosephine
     autoload :CustomMarkdownFormatter, 'lady_josephine/redcarpet/custom_markdown_formatter'
   end
 
+  autoload :SirTrevorView, 'lady_josephine/sir_trevor_view'
+
   mattr_accessor :mount_path
   @@mount_path = "/josephine"
 
+  mattr_accessor :user_class_name
+  @@user_class_name = "User"
+
 end

data/spec/controllers/lady_josephine/editor_controller_spec.rb

@@ -1,58 +1,82 @@
+require 'spec_helper'
 
-  # #version
-
-  # describe '#ping' do
-  #   before do
-  #     sign_in current_user
-  #   end
-  #   let(:current_user) { author }
-
-  #   after do
-  #     Timecop.return
-  #   end
-
-  #   it 'returns 404 if article was not found' do
-  #     post :ping, id: "not-found"
-  #     expect(response.status).to eql 404
-  #   end
-
-  #   it 'updates the user if the time was okay' do
-  #     post :ping, id: article.server_uuid
-  #     json = JSON.parse(response.body)
-  #     expect(response.status).to eql 200
-  #     expect(json["ping"]["state"]).to eq "OK"
-  #     expect(json["ping"]["user_id"]).to eq current_user.id
-  #     expect(json["ping"]["user_name"]).to eq current_user.name
-  #   end
-
-  #   it 'updates the user if it was forced' do
-  #     Timecop.freeze(Time.local(2014, 10, 10, 1, 0, 15))
-  #     article.ping_date = Time.local(2014, 10, 10, 1, 0, 0)
-  #     article.ping_user = admin
-  #     article.save
-
-  #     post :ping, id: article.server_uuid, update: "force"
-
-  #     json = JSON.parse(response.body)
-  #     expect(response.status).to eql 200
-  #     expect(json["ping"]["state"]).to eq "OK"
-  #     expect(json["ping"]["user_id"]).to eq current_user.id
-  #     expect(json["ping"]["user_name"]).to eq current_user.name
-  #   end
-
-  #   it 'does not update the user if another one edits the content' do
-  #     Timecop.freeze(Time.local(2014, 10, 10, 1, 0, 15))
-  #     article.ping_date = Time.local(2014, 10, 10, 1, 0, 0)
-  #     article.ping_user = admin
-  #     article.save
-
-  #     post :ping, id: article.server_uuid
-
-  #     json = JSON.parse(response.body)
-  #     expect(response.status).to eql 200
-  #     expect(json["ping"]["state"]).to eq "CONFLICT"
-  #     expect(json["ping"]["user_id"]).to eq admin.id
-  #     expect(json["ping"]["user_name"]).to eq admin.name
-  #   end
-
-  # end
+describe LadyJosephine::EditorController, type: :controller do
+  include Devise::TestHelpers
+  routes { LadyJosephine::Engine.routes }
+
+  let(:article) { Article.create title: "Local man thinks wrestling is real", content_data_hash: { "uuid" => "uuid-uuid-uuid", "version" => "1.0" } }
+
+  describe '#version' do
+
+    it 'returns 404 if article was not found' do
+      get :version, id: "not-found", resource: 'article'
+      expect(response.status).to eql 404
+    end
+
+    it 'returns the version if article was found' do
+      get :version, id: article.lady_josephine_server_uuid, resource: 'article'
+      json = JSON.parse(response.body)
+
+      expect(response.status).to eql 200
+      expect(json["lady_josephine_server_version"]).to eq "1.0"
+    end
+  end
+
+  describe '#ping' do
+    let(:user)    { User.create first_name: "Homer", email: "homer@simpson.com", password: "springfield", password_confirmation: "springfield" }
+    let(:admin)   { User.create first_name: "Marge", email: "marge@simpson.com", password: "springfield", password_confirmation: "springfield" }
+
+    before do
+      sign_in :user, user
+    end
+
+    after do
+      Timecop.return
+    end
+
+    it 'returns 404 if article was not found' do
+      post :ping, id: "not-found", resource: 'article'
+      expect(response.status).to eql 404
+    end
+
+    it 'updates the user if the time was okay' do
+      post :ping, id: article.lady_josephine_server_uuid, resource: 'article'
+      json = JSON.parse(response.body)
+      expect(response.status).to eql 200
+      expect(json["ping"]["state"]).to eq "OK"
+      expect(json["ping"]["user_id"]).to eq user.id
+      expect(json["ping"]["user_name"]).to eq user.name
+    end
+
+    it 'updates the user if it was forced' do
+      Timecop.freeze(Time.local(2014, 10, 10, 1, 0, 15))
+      article.lady_josephine_ping_date = Time.local(2014, 10, 10, 1, 0, 0)
+      article.lady_josephine_ping_user = admin
+      article.save
+
+      post :ping, id: article.lady_josephine_server_uuid, update: "force", resource: 'article'
+
+      json = JSON.parse(response.body)
+      expect(response.status).to eql 200
+      expect(json["ping"]["state"]).to eq "OK"
+      expect(json["ping"]["user_id"]).to eq user.id
+      expect(json["ping"]["user_name"]).to eq user.name
+    end
+
+    it 'does not update the user if another one edits the content' do
+      Timecop.freeze(Time.local(2014, 10, 10, 1, 0, 15))
+      article.lady_josephine_ping_date = Time.local(2014, 10, 10, 1, 0, 0)
+      article.lady_josephine_ping_user = admin
+      article.save
+
+      post :ping, id: article.lady_josephine_server_uuid, resource: 'article'
+
+      json = JSON.parse(response.body)
+      expect(response.status).to eql 200
+      expect(json["ping"]["state"]).to eq "CONFLICT"
+      expect(json["ping"]["user_id"]).to eq admin.id
+      expect(json["ping"]["user_name"]).to eq admin.name
+    end
+
+  end
+end

data/spec/controllers/lady_josephine/images_controller_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe LadyJosephine::ImagesController, type: :controller do
+  include Devise::TestHelpers
+  routes { LadyJosephine::Engine.routes }
+
+  let(:article) { Article.create title: "Local man thinks wrestling is real", content_data_hash: { "uuid" => "uuid-uuid-uuid", "version" => "1.0" } }
+
+  describe '#create' do
+
+    let(:file) { fixture_file_upload('spec/dummy/app/assets/images/depressed-cat.jpg', 'image/jpeg') }
+
+    it 'should return an error if the object can´t be saved' do
+      expect {
+        post :create, attachment: { name: 'file.jpg', file: file}, "block-uuid" => "uuid-uuid-uuid", "article-uuid" => article.lady_josephine_server_uuid, "model-name" => "NotAllowed", "column-name" => "content-data"
+        expect(response.status).to eq 500
+      }.to change { LadyJosephine::Image.count }.by 0
+    end
+
+    it 'should save an image' do
+      expect {
+        post :create, attachment: { name: 'file.jpg', file: file}, "block-uuid" => "uuid-uuid-uuid", "article-uuid" => article.lady_josephine_server_uuid, "model-name" => "article", "column-name" => "content-data"
+        expect(response.status).to eq 200
+      }.to change { LadyJosephine::Image.count }.by 1
+      image = LadyJosephine::Image.last
+      expect(image.block_uuid).to     eq "uuid-uuid-uuid"
+      expect(image.file.file.basename).to  eq "depressed-cat"
+      expect(image.uploadable_type).to eq "Article"
+      expect(image.uploadable_id).to eq article.id
+      expect(image.uploadable_attribute).to eq "content-data"
+    end
+
+  end
+
+end

data/spec/dummy/app/models/article.rb

@@ -0,0 +1,3 @@
+class Article < ActiveRecord::Base
+  include LadyJosephine::Concerns::Model
+end

data/spec/dummy/app/models/user.rb

@@ -0,0 +1,11 @@
+class User < ActiveRecord::Base
+  # Include default devise modules. Others available are:
+  # :confirmable, :lockable, :timeoutable and :omniauthable
+  devise :database_authenticatable, :registerable,
+         :recoverable, :rememberable, :trackable, :validatable
+
+  def name
+    self.first_name
+  end
+
+end

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

@@ -30,6 +30,7 @@ Rails.application.configure do
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
+  config.action_mailer.default_url_options = { :host => 'http://0.0.0.0:3000' }
 
   # Randomize the order test cases are executed.
   config.active_support.test_order = :random