simplec 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc12728b3f36924c9748feeaf9b913adf6f2f4c5
-  data.tar.gz: acf72f1d1f5116208a044018df7e50ca298f458e
+  metadata.gz: cd4562c8c0bbab684b813215b25a37647dbbd134
+  data.tar.gz: 924e595fdddaf414fcbd91a33b0a5008e7913864
 SHA512:
-  metadata.gz: d7bd9cd9bc1007492113fc583e5c3eca2023938f6ab50f326e2f2ea194c946d24ec6bc5fe06aee34c88722f13ba8da53751282c8e233fb9e8fa21ea0ed190634
-  data.tar.gz: 0fb75e9fa2898854726b89dca64b5c3c610059835c5eecbf2dad81c53fd6aa3cd1a7f8e9071536b7edf59f8aa805ed57eec1644ec75d79bfde4833ab85a35b7f
+  metadata.gz: 49b55b0d7c216b7e35a5cec8f8c2e99086077dfd43ad5f27d9da0e6de3446b62e51a06013b2fc707554a5888cfcb3b69cfa5947d51f73a9e7718775a18f9c8a5
+  data.tar.gz: 6ce855a1ca1486f9e302dab3bf1b8c69cc8137c85cefd84daf1e14794658f35bd5a41f4f427d3031820d49e205833ddeb84c0fe9335460ba202630fa5c7ca7f3

data/README.md

@@ -244,10 +244,11 @@ See this page for a good cheat sheet: http://markevans.github.io/dragonfly/image
 
 1. TODOS:
 
-    - Embedded image id (integer -> uuid)
-
     - Check doc view helpers
 
+    - Add config options for uuid vs integer ids, maybe check if page is using
+      uuid/id if table exists to determine going forward. Add note in README
+
     - Throw clear warning when creating a page without a type
 
     - Document `lib/simplec/controller_extensions.rb`
@@ -260,6 +261,8 @@ See this page for a good cheat sheet: http://markevans.github.io/dragonfly/image
 
     - rewrite beginning part of usage
 
+    - utilize thread local variable for found subdomain in #subdomain
+
     - simplec_path/simplec_url caching
 
 1. Installer `rails generater simplec:install`

data/app/assets/javascripts/simplec/summernote-config.js

@@ -52,6 +52,7 @@ window.simplec.initSummernote = function() {
           url: '/embedded-images',
           dataType: 'json',
           contentType: 'application/json',
+          headers: { 'X-Engine': 'simplec' },
           data: JSON.stringify({
             asset_url: reader.result,
             asset_name: file.name

data/app/constraints/simplec/subdomains.rb

@@ -1,23 +1,29 @@
 module Simplec
   class Subdomains
-		def self.matches?(request)
+    def self.matches?(request)
+      simplec = request.headers['HTTP_X_ENGINE'] == 'simplec'
       present = request.subdomain.present?
-		  not_admin = request.subdomain != 'admin'
-	    subdomain = Simplec::Subdomain.find_by(name: request.subdomain)
+      not_admin = request.subdomain != 'admin'
+      subdomain = Simplec::Subdomain.find_by(name: request.subdomain)
 
-			match = present && not_admin && subdomain
+      match = simplec || (present && not_admin && subdomain)
 
       if match
         Thread.current[:simplec_subdomain] = subdomain
+        Rails.logger.info <<-LOG
+Simplec request received.
+  ActionDispatch::Request#original_url: #{request.original_url}
+  Simplec Engine: #{not_admin}
+  LOG
       else
-        Rails.logger.info <<-LOG unless match
+        Rails.logger.info <<-LOG
 Simplec Subdomain '#{request.subdomain}' was not found.
   ActionDispatch::Request#original_url: #{request.original_url}
   'admin' subdomain bypass: #{!not_admin}
-LOG
+  LOG
       end
 
-			match
-		end
+      match
+    end
   end
 end

data/app/controllers/simplec/embedded_images_controller.rb

@@ -0,0 +1,7 @@
+require_dependency "simplec/application_controller"
+
+module Simplec
+  class EmbeddedImagesController < ApplicationController
+    include Simplec::EmbeddedImageActions
+  end
+end

data/app/models/simplec/embedded_image.rb

@@ -1,7 +1,8 @@
 module Simplec
   class EmbeddedImage < ApplicationRecord
     belongs_to :embeddable,
-      polymorphic: true
+      polymorphic: true,
+      optional: true
 
     dragonfly_accessor :asset
 
@@ -10,6 +11,7 @@ module Simplec
       return self.asset.url unless persisted?
       self.asset.url(ei: Base64.urlsafe_encode64(self.id.to_s))
     end
+    alias_method :asset_url, :url
 
   end
 end

data/config/routes.rb

@@ -1,6 +1,7 @@
 Simplec::Engine.routes.draw do
 
   scope constraints: Simplec::Subdomains do
+    resources :embedded_images, path: 'embedded-images', only: :create
     root 'pages#show'
     get '*path', to: 'pages#show'
   end

data/db/migrate/20170809210304_create_simplec_embedded_images.rb

@@ -2,7 +2,7 @@ class CreateSimplecEmbeddedImages < ActiveRecord::Migration[5.0]
   def change
     create_table :simplec_embedded_images, id: :uuid, default: 'gen_random_uuid()' do |t|
       t.string :embeddable_type
-      t.integer :embeddable_id
+      t.uuid :embeddable_id
       t.string :asset_uid
       t.string :asset_name
 

data/lib/simplec/embedded_image_actions.rb

@@ -4,28 +4,29 @@ module Simplec
 
     module InstanceMethods
 
-			def create
-				@embedded_image = EmbeddedImage.new(embedded_image_params)
-				if @embedded_image.save
-					respond_to do |format|
-						format.json {
-							render :show, status: 201, location: @embedded_image.url
-						}
-					end
-				else
-					respond_to do |format|
-						format.json {
-							render status: 422, json: @embedded_image.errors
-						}
-					end
-				end
-			end
+      def create
+        @embedded_image = EmbeddedImage.new(embedded_image_params)
+        if @embedded_image.save
+          respond_to do |format|
+            format.json {
+              render status: 201, location: @embedded_image.url,
+                json: @embedded_image.slice(:id, :asset_name, :asset_url)
+            }
+          end
+        else
+          respond_to do |format|
+            format.json {
+              render status: 422, json: @embedded_image.errors
+            }
+          end
+        end
+      end
 
-			private
+      private
 
-			def embedded_image_params
-				params.permit(:asset_url, :asset_name)
-			end
+      def embedded_image_params
+        params.permit(:asset_url, :asset_name)
+      end
 
     end
 

data/lib/simplec/version.rb

@@ -1,3 +1,3 @@
 module Simplec
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/simplec.rb

@@ -1,4 +1,5 @@
 require "simplec/engine"
+require "simplec/embedded_image_actions"
 
 module Simplec
   # TODO configuration options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplec
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Smith
@@ -115,6 +115,7 @@ files:
 - app/assets/stylesheets/simplec/summernote.scss
 - app/constraints/simplec/subdomains.rb
 - app/controllers/simplec/application_controller.rb
+- app/controllers/simplec/embedded_images_controller.rb
 - app/controllers/simplec/pages_controller.rb
 - app/helpers/simplec/application_helper.rb
 - app/jobs/simplec/application_job.rb