tomify 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4f081a00b7ab4f2e5f62d855ddfd8b0bf1bd316
-  data.tar.gz: 27c8deb82e11ae1be2f8c0dca2c1ad49a2744de8
+  metadata.gz: ac53de7c87e8d2e4b64ca429b225deea891a650a
+  data.tar.gz: b871e83c8c4af470f0cad696d70ee83935f8a69f
 SHA512:
-  metadata.gz: bdbc0f49f4ca2787ec6b6075207824210c668d9ac6d7955fc8ce42f0b1728514f12c95696e24a4f509e65abf6409e752014ed8e2d463fc59ee731194afe2ac18
-  data.tar.gz: 3a876a2fa0d1c0d23325b10a0a1aef032561b74d07cc365300d3b8e50741b6c5f2f76fb59677e68fbad6a8df8f77f263817c8b6ddb2a6d56327a2a06e782c70e
+  metadata.gz: 5bfbfdf6d25a6cd4738f1239699268dbeabc24b8e190e63016496c2c6cc9d7eede3d82a5b2402aae33ac597b28152ebe328fb295e5b14bc96c053644e3de894c
+  data.tar.gz: 14244aa1726f72017698854f29868554be1100aa4542bf0c752a14f8fe8f70f5ff0777f916db085c185b4a6ad7c47601158b39a724cfa2e18209dce17a81871b

data/app/assets/javascripts/tomify/dynamic/react/components/public/users/edit.coffee

@@ -1,7 +1,7 @@
 form = new Form
-form.add "email", "email"
 form.add "first_name", "text"
 form.add "last_name", "text"
+form.add "email", "email"
 form.add "password", "password"
 form.add "password_confirmation", "password"
 
@@ -18,7 +18,7 @@ Component.create "Public.Users.Edit",
     @form.setDefaultValues()
   modelUpdate: (response) ->
     message type: response.type, text: response.message
-    Store.find("User").merge @form.changes.get() if response.type == "success"
+    Store.find("User").merge response.data if response.type == "success"
   submit: (e) ->
     e.preventDefault()
     if @form.changes.empty()
@@ -32,7 +32,7 @@ Component.create "Public.Users.Edit",
   destroy: (e) ->
     e.preventDefault()
     Model.find("Public.User").destroy().then (response) ->
-      return redirect response.redirect if response.type == "success"
+      return redirect response.redirect if response.message == "Profile Deleted"
       message type: response.type, text: response.message
     false
   render: ->

data/app/assets/javascripts/tomify/dynamic/react/components/public/users/new.coffee

@@ -1,9 +1,9 @@
 Model.create "Public.User", path: "user"
 
 form = new Form
-form.add "email", "email"
 form.add "first_name", "text"
 form.add "last_name", "text"
+form.add "email", "email"
 form.add "password", "password"
 form.add "password_confirmation", "password"
 

data/app/controllers/tomify/api/public/users_controller.rb

@@ -1,38 +1,48 @@
 class Tomify::Api::Public::UsersController < Tomify.controllers.public_api
   before_action :require_user!, only: [:show, :update]
-  before_action :set_record, only: [:show, :update, :destroy]
   before_action :not_found, only: :create, unless: "setting(:allow_signup)"
 
   def create
     session[:current_user_id] = Tomify.models.user.create!(record_params).id
-    current_user.activities.create(action: action_name, controller: controller_name)
+    create_activity
     render json: { type: :success }, success: "Welcome #{current_user.name}!"
   rescue ActiveRecord::RecordInvalid => e
     render json: { type: :warning, message: e.record.errors.full_messages.join(", ") }
   end
 
-  def update
-    current_user.update!(record_params)
-    current_user.activities.create(action: action_name, controller: controller_name)
-    render json: { type: :success, message: "Profile Updated" }
-  rescue ActiveRecord::RecordInvalid => e
-    render json: { type: :warning, message: e.record.errors.full_messages.join(", ") }
+  private
+  def create_activity
+    record.activities.create(action: action_name, controller: controller_name)
   end
 
-  def destroy
+  def destroy_record
     flash[:danger] = "Goodbye #{current_user.name}"
-    current_user.activities.create(action: action_name, controller: controller_name)
-    find_record
-    destroy_record
-    render json: { type: :success }
+    create_activity
+    super
+  end
+
+  def find_record
+    @record = current_user
+  end
+
+  def model_name
+    @model_name ||= "Profile"
+  end
+
+  def model_param
+    @model_param ||= "user"
   end
 
-  private
   def permitted_attributes
     [:email, :first_name, :last_name, :password, :password_confirmation]
   end
 
-  def set_record
-    @record = current_user
+  def serializable_options
+    User.env_serializable_options
+  end
+
+  def update_record
+    super
+    create_activity
   end
 end

data/app/controllers/tomify/concerns/api/helpers.rb

@@ -28,16 +28,20 @@ module Tomify::Concerns::Api::Helpers
   end
 
   def model
-    @model ||= model_name.constantize rescue nil
-    @model ||= "Tomify::#{model_name}".constantize
+    @model ||= model_class.constantize rescue nil
+    @model ||= "Tomify::#{model_class}".constantize
+  end
+
+  def model_class
+    @model_class ||= controller_name.classify
   end
 
   def model_name
-    @model_name ||= controller_name.chomp("s").titleize
+    @model_name ||= model_class.split("::").first.titleize
   end
 
   def model_param
-    @model_param ||= controller_name.chomp("s")
+    @model_param ||= model_name.underscore
   end
 
   def record

data/app/controllers/tomify/concerns/default/env_helper.rb

@@ -6,7 +6,7 @@ module Tomify::Concerns::Default::EnvHelper
       page: page.for_env,
       pages: Tomify.models.page.for_env,
       settings: Tomify.models.setting.for_env,
-      user: current_user
+      user: current_user.try(:for_env)
     }
   end
 end

data/app/models/tomify/concerns/page.rb

@@ -69,6 +69,10 @@ module Tomify::Concerns::Page
     as_json(self.class.env_serializable_options)
   end
 
+  def markdown_options
+    { replace: as_json(methods: [:cover_image_url, :share_image_url]) }
+  end
+
   private
   def parent_valid?
     errors.add(:parent_id) if parent && parent.id == id

data/app/models/tomify/concerns/user.rb

@@ -21,6 +21,20 @@ module Tomify::Concerns::User
     scope :admin, -> { where(admin: true) }
   end
 
+  class_methods do
+    def env_serializable_options
+      { methods: [:name] }
+    end
+
+    def for_env
+      all.as_json(env_serializable_options)
+    end
+  end
+
+  def for_env
+    as_json(self.class.env_serializable_options)
+  end
+
   def name
     "#{first_name} #{last_name}"
   end

data/app/models/tomify_record.rb

@@ -5,7 +5,9 @@ class TomifyRecord < ActiveRecord::Base
     attrs.each do |attr|
       define_method("#{attr}_to_html") do
         Rails.cache.fetch("#{self.class.name.downcase}-#{id}-#{attr}") do
-          markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML, autolink: true, tables: true)
+          options = { autolink: true, tables: true }
+          options.merge!(self.markdown_options) if self.try(:markdown_options)
+          markdown = Redcarpet::Markdown.new(Tomify::Markdown::HTML, options)
           markdown.render(self[attr] || "").html_safe
         end
       end

data/lib/tomify.rb

@@ -1,5 +1,6 @@
 require "tomify/constantly"
 require "tomify/engine"
+require "tomify/markdown"
 require "tomify/version"
 
 module Tomify

data/lib/tomify/markdown.rb

@@ -0,0 +1,14 @@
+module Tomify
+  module Markdown
+    class HTML < Redcarpet::Render::HTML
+      def preprocess(text)
+        text = find_and_replace(text) if @options[:replace]
+        text
+      end
+
+      def find_and_replace(text)
+        text.gsub!(/!!\w+!!/) { |t| @options[:replace][t[2...-2]] }
+      end
+    end
+  end
+end

data/lib/tomify/version.rb

@@ -1,3 +1,3 @@
 module Tomify
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomify
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Tom Prats
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-08 00:00:00.000000000 Z
+date: 2017-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -435,6 +435,7 @@ files:
 - lib/tomify.rb
 - lib/tomify/constantly.rb
 - lib/tomify/engine.rb
+- lib/tomify/markdown.rb
 - lib/tomify/version.rb
 - vendor/tomify/development/react.js
 - vendor/tomify/production/react.js