tomify 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2d0a5f91a0962812c61a3b7f66a1fd034c8750b
-  data.tar.gz: 30dbe54efd78321b91cb16a41fe48fcf15b2692a
+  metadata.gz: af725db32ac310b47ea7eefedfaf879b7b927040
+  data.tar.gz: 80da5c622cdb34254d793df17e2919afcef6c98a
 SHA512:
-  metadata.gz: f57feac1ed194f776c2e0badc337ef50d7e7738b1611e22012ef6769161da150dd67ea244e37e2a00a6c44d7c6d92290cb7ca8b239131f9f74eb6f8725443a65
-  data.tar.gz: 3ab0aa47ba4bf03d0dcc7eab29f5931bd20cccf4babfa46268188f90bdb3907d1f9f9c3ba01316e02973e82576ef07946e4264b94b5e174e942f988aee0f5dd7
+  metadata.gz: 34a9285af9d4e3f98bc13e7173c7c0bf34ef3e932c0321bfa8bf651ad74dd06610ae64c8329675a8b0e72ff08a5cb4b6e2d6ac163f5fdb2e636b4bccd6dc37b4
+  data.tar.gz: edd76bd3edf8f8545c2895a1066187822f42e302a58176cf4374b6e88857d36a6e1e5d4f1ff87147a68802d7243d587767196f955eb21f8ac15bd725555d3771

data/app/assets/javascripts/tomify/dynamic/classes/field.coffee

@@ -16,10 +16,16 @@ class @Field
     field.setForm(options.form)
     field
   copy: (form) ->
-    Field.build $.extend({}, @options, { form: form })
+    Field.build Object.assign({}, @options, { form: form })
   constructor: (options) ->
     @options = options
   setForm: (form) ->
     @props.value = form.value.bind(form)
     @props.onChange = form.onChange.bind(form)
     @props.options = form.options.bind(form, @props) if @props.model
+  show: ->
+    record = @options.form.record.get()
+    changes = @options.form.changes.get()
+    return @options.if(record, changes) if @options.if
+    return !@options.unless(record, changes) if @options.unless
+    true

data/app/assets/javascripts/tomify/dynamic/classes/form.coffee

@@ -25,7 +25,7 @@ class @Form
       options.push { value: record.id, name: record.name }
     options
   add: (name, type, options = {}) ->
-    options = $.extend { type: type, name: name, form: @ }, options
+    options = Object.assign { type: type, name: name, form: @ }, options
     @fields.push Field.build(options)
     @models.push options.model if options.model
   setComponent: (component, store) ->
@@ -70,4 +70,4 @@ class @Form
         <FieldComponent {...field.props} />
       </div>
   render: ->
-    @renderField(field) for field in @fields
+    @renderField(field) for field in @fields when field.show()

data/app/assets/javascripts/tomify/dynamic/classes/request.coffee

@@ -9,7 +9,7 @@ class @Request
   @ajax: (options) ->
     options.url = options.url.assign(options.data)
     if options.type in ["POST", "PUT"]
-      $.extend options, {
+      Object.assign options, {
         data: @formData(new FormData(), options.data),
         cache: false,
         processData: false,

data/app/assets/javascripts/tomify/dynamic/classes/store.coffee

@@ -11,21 +11,22 @@ class @Store extends Observer
   merge: (data) ->
     throw "Store: Invalid Data Type" unless @isObject()
     @trigger "merge", data
-    @set($.extend({}, @get(), data))
+    @set Object.assign({}, @get(), data)
   push: (data) ->
     throw "Store: Invalid Data Type" unless @isArray()
     @trigger "push", data
-    @set(@get().concat([data]))
+    @set @get().concat([data])
   remove: (field) ->
     throw "Store: Invalid Data Type" unless @isObject()
     @trigger "remove", data
     data = @get()
     delete data[field]
-    @set(item for item in data when item?)
+    data = (item for item in data when item?) if @isArray()
+    @set data
   get: (field) ->
     throw "Store: Invalid Data Type" unless @isDefined()
     return @data if @isBoolean() || @isString()
-    data = $.extend(@data.constructor(), @data)
+    data = Object.assign @data.constructor(), @data
     if field then data[field] else data
   empty: ->
     return @data.length == 0 if @isArray()

data/app/assets/javascripts/tomify/dynamic/react/components/admin/pages.coffee.erb

@@ -12,7 +12,7 @@ model.columns = [
   }
 ]
 
-form = new Form("horizontal")
+form = new Form "horizontal"
 form.add "parent_id", "select", model: "Admin.Page", allowBlank: true
 form.add "sidebar_id", "select", model: "Admin.Sidebar", allowBlank: true
 form.add "active", "checkbox"

data/app/assets/javascripts/tomify/dynamic/react/components/admin/settings.coffee

@@ -6,7 +6,7 @@ model.columns = [
   { name: "value", value: (r) ->
     type = r.type.split("::").last
     return "#{r.value}" if type == "Boolean"
-    return "JSON (Don't Edit)" if type == "Json"
+    return "JSON" if type == "Json"
     r.value
   },
   { name: "updated_at", value: (r) -> r.updated_at.date() },
@@ -16,15 +16,20 @@ model.columns = [
 options = ["Boolean", "Json", "Text", "Uploader"]
 options = ({ name: option, value: "Tomify::Setting::#{option}" } for option in options)
 
-newForm = new Form("horizontal")
+newForm = new Form "horizontal"
 newForm.add "type", "select", options: options
 newForm.add "public", "checkbox"
 newForm.add "name", "text"
-newForm.add "value", "text"
+newForm.add "value", "checkbox", if: (record, changes) -> changes.type.split("::").last == "Boolean"
+newForm.add "value", "text", if: (record, changes) -> changes.type.split("::").last == "Text"
+newForm.add "json", "json", if: (record, changes) -> changes.type.split("::").last == "Json"
 
-editForm = new Form("horizontal")
+editForm = new Form "horizontal"
 editForm.add "public", "checkbox"
 editForm.add "name", "text"
-editForm.add "value", "text"
+editForm.add "value", "checkbox", if: (record) -> record.type.split("::").last == "Boolean"
+editForm.add "value", "text", if: (record) -> record.type.split("::").last == "Text"
+editForm.add "json", "json", if: (record) -> record.type.split("::").last == "Json"
+# editForm.add "value", "json", if: (record) -> record.type.split("::").last == "Uploader"
 
 Component.create "Admin.Settings.Index.Container", render: -> <Index.Container name="Admin.Setting" newForm={newForm} editForm={editForm} />

data/app/assets/javascripts/tomify/dynamic/react/components/admin/{sidebars.coffee → sidebars.coffee.erb}

@@ -7,9 +7,10 @@ model.columns = [
   { name: "actions", edit: true, destroy: true }
 ]
 
-form = new Form("horizontal")
+form = new Form "horizontal"
 form.add "active", "checkbox"
 form.add "name", "text"
+form.add "template", "select", options: <%= Tomify::Page.templates %>
 form.add "heading", "text"
 form.add "text", "markdown"
 

data/app/assets/javascripts/tomify/dynamic/react/components/admin/uploads.coffee

@@ -6,7 +6,7 @@ model.columns = [
   { name: "actions", edit: true, destroy: true }
 ]
 
-form = new Form("horizontal")
+form = new Form "horizontal"
 form.add "name", "text"
 form.add "file", "file"
 

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

@@ -11,7 +11,7 @@ model.columns = [
   { name: "actions", edit: true, destroy: true }
 ]
 
-form = new Form("horizontal")
+form = new Form "horizontal"
 form.add "admin", "checkbox"
 form.add "email", "text"
 form.add "first_name", "text"

data/app/assets/javascripts/tomify/dynamic/react/components/fields/json.coffee

@@ -0,0 +1,30 @@
+Component.create "Form.Field.Json",
+  onKeyChange: (key, e) ->
+    changes = Object.assign {}, @props.value(@props.name)
+    value = changes[key]
+    delete changes[key]
+    key = e.target.value
+    changes[key] = value if key
+    @props.onChange(@props.name, target: { value: changes })
+  onValueChange: (key, e) ->
+    changes = Object.assign {}, @props.value(@props.name)
+    changes[key] = e.target.value
+    @props.onChange(@props.name, target: { value: changes })
+  render: ->
+    changes = Object.assign {}, @props.value(@props.name)
+    changes[""] ?= ""
+    index = 0
+    <div>
+      {for key, value of changes
+        <div key={index++} className="form-group">
+          <div className="col-xs-6">
+            <input placeholder="Key" className="form-control" type="text" value={key} onChange={@onKeyChange.bind(null, key)} />
+          </div>
+          {if key
+            <div className="col-xs-6">
+              <input placeholder="Value" className="form-control" type="text" value={value} onChange={@onValueChange.bind(null, key)} />
+            </div>
+          }
+        </div>
+      }
+    </div>

data/app/assets/javascripts/tomify/dynamic/react/components/layout/analytics.coffee

@@ -6,8 +6,7 @@ Component.create "Layout.Analytics",
     return unless code = setting "google_analytics_code"
 
     window.GoogleAnalyticsObject = "ga"
-    window.ga = (args...) -> window[window.GoogleAnalyticsObject] args...
-    window?[window.GoogleAnalyticsObject] ?= (args...) ->
+    window[window.GoogleAnalyticsObject] ?= (args...) ->
       api = window[window.GoogleAnalyticsObject]
       (api.q or= []).push args
       return

data/app/assets/stylesheets/tomify/_page.scss

@@ -1,4 +1,4 @@
-.page {
+.page, .sidebar {
   h1 { color: $brand; }
   h2, h3 { font-style: italic; }
   h2 { font-size: 1.5em; }
@@ -29,3 +29,7 @@
     ul li:before { content: "\f055"; }
   }
 }
+
+.sidebar {
+  h1, h2, h3, h4, h5, h6 { margin-top: 0; }
+}

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

@@ -16,6 +16,8 @@ module Tomify::Concerns::Default::EnvHelper
     [
       { name: "App", path: "admin/settings" },
       { name: "Pages", path: "admin/pages" },
+      { name: "Sidebars", path: "admin/sidebars" },
+      { name: "Uploads", path: "admin/uploads" },
       { name: "Users", path: "admin/users" }
     ]
   end

data/app/controllers/tomify/public/pages_controller.rb

@@ -17,6 +17,6 @@ class Tomify::Public::PagesController < Tomify.controllers.public
     when "default"
     end
 
-    render "templates/#{template}", layout: true
+    render "templates/#{template}", layout: true, locals: { record: @page }
   end
 end

data/app/helpers/tomify/carrierwave_helper.rb

@@ -1,17 +1,23 @@
 module Tomify::CarrierwaveHelper
   def self.load_config
-    return unless defined? Carrierwave
+    return unless defined? CarrierWave
     return unless settings = Tomify.setting(:aws)
 
-    CarrierWave.configure do |config|
-      config.fog_provider = "fog/aws"
-      config.storage = :fog
-      config.fog_credentials = {
-        provider:              "AWS",
-        aws_access_key_id:     settings["access_key"],
-        aws_secret_access_key: settings["secret_key"]
-      }
-      config.fog_directory = settings["bucket"]
+    descendants = CarrierWave::Uploader::Base.descendants
+    descendants.push CarrierWave::Uploader::Base
+    descendants.push CarrierWave
+    descendants.each do |klass|
+      klass.configure do |config|
+        config.fog_provider = "fog/aws"
+        config.fog_credentials = {
+          provider:              "AWS",
+          aws_access_key_id:     settings["access_key"],
+          aws_secret_access_key: settings["secret_key"]
+        }
+        config.fog_directory = settings["bucket"]
+        config.fog_public = true
+        config.storage = :fog
+      end
     end
   end
 end

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

@@ -3,7 +3,8 @@ module Tomify::Concerns::Sidebar
 
   included do
     has_many :pages, class_name: Tomify.models.page.to_s
-    validates_presence_of :name
+
+    validates_presence_of :name, :template
 
     scope :active, -> { where(active: true) }
 
@@ -12,7 +13,7 @@ module Tomify::Concerns::Sidebar
 
   class_methods do
     def admin_params
-      [:active, :name, :heading, :text]
+      [:active, :name, :heading, :template, :text]
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Tomify::Concerns::Upload
   extend ActiveSupport::Concern
 
   included do
-    mount_uploader :file, Tomify::FileUploader
+    mount_uploader :file, Tomify.uploaders.file
 
     before_validation :set_model
     before_validation :validate_content_type, on: :update, if: :content_type_changed?

data/app/models/tomify/setting.rb

@@ -18,7 +18,7 @@ class Tomify::Setting < Tomify.models.base
   end
 
   def self.admin_params
-    [:type, :name, :public, :value, :json]
+    [:type, :name, :public, :value, json: {}]
   end
 
   def serializable_hash(options = nil)

data/app/views/templates/contact.haml

@@ -1,7 +1,7 @@
 .container-fluid
   .row.text-center
     .col-md-8.col-md-offset-2
-      .page= @page.text_to_html
+      .page= record.text_to_html
       - if contact_email = setting(:contact_email)
         %p
           = link_to "mailto:#{contact_email}", target: :_blank do

data/app/views/templates/default.haml

@@ -1,4 +1,4 @@
 .container-fluid
   .row.text-center
     .col-md-8.col-md-offset-2
-      .page= @page.text_to_html
+      .page= record.text_to_html

data/app/views/templates/sidebar.haml

@@ -0,0 +1,4 @@
+.panel.panel-success
+  - if record.try(:heading)
+    .panel-heading= record.heading
+  .panel-body= record.text_to_html

data/app/views/tomify/defaults/_container.haml

@@ -1,3 +1,8 @@
+- sidebar = @page.sidebar if @page&.sidebar&.active
 .container-fluid
   .row
-    .col-md-12= yield
+    - if sidebar
+      .col-md-8= yield
+      .col-md-4.sidebar= render template: "templates/#{sidebar.template}", locals: { record: sidebar }
+    - else
+      .col-md-12= yield

data/db/migrate/19900000000010_add_template_to_sidebars.rb

@@ -0,0 +1,5 @@
+class AddTemplateToSidebars < ActiveRecord::Migration[5.0]
+  def change
+    add_column :sidebars, :template, :string, null: false
+  end
+end

data/lib/tomify/version.rb

@@ -1,3 +1,3 @@
 module Tomify
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/tomify.rb

@@ -36,7 +36,11 @@ module Tomify
   )
 
   mattr_accessor :uploaders
-  self.uploaders = Constantly.new(base: "TomifyUploader")
+  self.uploaders = Constantly.new(
+    base: "TomifyUploader",
+    file: "Tomify::FileUploader",
+    setting: "Tomify::SettingUploader"
+  )
 
   def self.root
     Pathname.new Gem::Specification.find_by_name("tomify").gem_dir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomify
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Tom Prats
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-30 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -267,13 +267,14 @@ files:
 - app/assets/javascripts/tomify/dynamic/global.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/admin/pages.coffee.erb
 - app/assets/javascripts/tomify/dynamic/react/components/admin/settings.coffee
-- app/assets/javascripts/tomify/dynamic/react/components/admin/sidebars.coffee
+- app/assets/javascripts/tomify/dynamic/react/components/admin/sidebars.coffee.erb
 - app/assets/javascripts/tomify/dynamic/react/components/admin/uploads.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/admin/users.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/edit.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/fields/checkbox.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/fields/default.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/fields/file.coffee
+- app/assets/javascripts/tomify/dynamic/react/components/fields/json.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/fields/markdown.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/fields/select.coffee
 - app/assets/javascripts/tomify/dynamic/react/components/fields/textarea.coffee
@@ -368,6 +369,7 @@ files:
 - app/uploaders/tomify_uploader.rb
 - app/views/templates/contact.haml
 - app/views/templates/default.haml
+- app/views/templates/sidebar.haml
 - app/views/tomify/defaults/_body.haml
 - app/views/tomify/defaults/_container.haml
 - app/views/tomify/defaults/_env.haml
@@ -398,6 +400,7 @@ files:
 - db/migrate/19900000000007_add_verified_to_users.rb
 - db/migrate/19900000000008_add_name_to_tokens.rb
 - db/migrate/19900000000009_add_invited_to_users.rb
+- db/migrate/19900000000010_add_template_to_sidebars.rb
 - db/seeds.rb
 - lib/generators/tomify/bundle/bundle_generator.rb
 - lib/generators/tomify/bundle/templates/default.js