rails_admin_json_editor 0.0.12 → 0.0.13

data/app/assets/javascripts/rails_admin_json_editor/rails_admin_json_editor.js

@@ -1,5 +1,6 @@
 //= require rails_admin_json_editor/vue.0.11.4
 //= require rails_admin_json_editor/lodash.2.4.1
+//= require rails_admin_json_editor/markdown
 
 var vm;
 
@@ -14,6 +15,10 @@ $(document).on('rails_admin.dom_ready', function() {
     jsonResult = { components: [] };
   }
 
+  Vue.filter('markdown', function(value) {
+    return markdown.toHTML(value);
+  });
+
   // Setup templates for models
   var components = {};
   _.each(jsonScheme.models, function(model) {
@@ -21,7 +26,8 @@ $(document).on('rails_admin.dom_ready', function() {
       template: '#template-fields-for-' + model.name,
       data: function() {
         return {
-          expanded: true
+          expanded: true,
+          showPreview: false
         };
       },
       computed: {
@@ -91,7 +97,7 @@ $(document).on('rails_admin.dom_ready', function() {
         },
 
         nestedModelIsAllowed: function(model, allowedModels) {
-          return _.contains(allowedModels, model.name)
+          return _.contains(allowedModels, model.name);
         }
       }
     };

data/app/assets/stylesheets/rails_admin_json_editor/rails_admin_json_editor.css.scss

@@ -4,11 +4,27 @@ body.rails_admin .form-horizontal.denser .json-editor {
     margin-bottom: 15px;
   }
 
-  .form-control {
+  .form-control:not([type="checkbox"]) {
     width: 90%;
   }
 
   .btn-toggle-json {
     margin-left: 15px;
   }
+
+  .markdown-field {
+    position: relative;
+    button {
+      position: absolute;
+      right: 0;
+      bottom: 0;
+    }
+  }
+
+  .markdown-preview {
+    margin-top: 5px;
+    background: #EEE;
+    padding: 10px;
+    border-radius:5px;
+  }
 }

data/app/views/rails_admin_json_editor/main/_form_json_editor.html.erb

@@ -35,7 +35,7 @@
           <%= content_tag :p, model.help, class: "help-block" unless model.help.nil? %>
 
           <% model.fields.each do |f| %>
-            <div class="control-group row">
+            <div class="control-group row <%= f.css_class %>">
               <label class="col-sm-2 control-label"><%= f.label %></label>
 
               <div class="controls col-sm-10">
@@ -47,10 +47,33 @@
                   <textarea v-model="component.properties.<%= f.name %>" class="form-control"></textarea>
                 <% end %>
 
+                <% if f.type == :markdown %>
+                  <div class="markdown-field">
+                    <textarea v-model="component.properties.<%= f.name %>" class="form-control" rows="10"></textarea>
+
+                    <button v-on="click: showPreview = !showPreview" type="button" class="btn btn-default">
+                      <i class="icon-eye-open"></i>
+                    </button>
+                  </div>
+
+                  <div class="markdown-preview" v-show="showPreview">
+                    <div v-html="component.properties.<%= f.name %> | markdown"></div>
+                  </div>
+                <% end %>
+
+                <% if f.type == :boolean %>
+                  <input type="checkbox" v-model="component.properties.<%= f.name %>" class="form-control">
+                <% end %>
+
                 <% if f.type == :picker %>
                   <select v-on="change: onChangePicker($event, '<%= f.name %>')" class="form-control record-picker">
                     <option value=""></option>
-                    <% f.picker_records.each do |record| %>
+                    <%
+                      records = Rails.cache.fetch("record-picker-#{f.picker_model_name}") {
+                        f.picker_model_name.constantize.send(:all)
+                      }
+                    %>
+                    <% records.each do |record| %>
                       <option
                         v-attr="selected: pickerOptionIsSelected('<%= f.name %>', '<%= f.picker_label %>', '<%= record.send(f.picker_label) %>')"
                         value="<%= record.send(f.picker_label) %>"
@@ -70,24 +93,24 @@
                   </div>
 
                   <!-- Add nested component -- one model allowed -->
-                  <% if f.allowed_nested_models.count == 1 %>
+                  <% if f.list_model_names.count == 1 %>
                     <a href="#"
                       class="btn btn-info"
                       v-repeat="model: $root.scheme.models"
-                      v-show="nestedModelIsAllowed(model, <%= f.allowed_nested_models.map { |nct| nct.to_s } %>)"
+                      v-show="nestedModelIsAllowed(model, <%= f.list_model_names %>)"
                       v-on="click: addComponent($event, '<%= f.name %>', model)">
                         Add {{ model.label | lowercase }}
                     </a>
                   <% end %>
 
                   <!-- Add nested component -- multiple models allowed -->
-                  <% if f.allowed_nested_models.count > 1 %>
+                  <% if f.list_model_names.count > 1 %>
                     <div class="dropdown">
                       <a class="dropdown-toggle btn btn-info" data-toggle="dropdown" href="#">Add component <b class="caret"></b></a>
                       <ul class="dropdown-menu">
                         <li v-repeat="model: $root.scheme.models">
                           <a href="#"
-                            v-if="nestedModelIsAllowed(model, <%= f.allowed_nested_models.map { |nct| nct.to_s } %>)"
+                            v-if="nestedModelIsAllowed(model, <%= f.list_model_names %>)"
                             v-on="click: addComponent($event, '<%= f.name %>', model)">
                               {{ model.label }}
                           </a>

data/lib/rails_admin_json_editor.rb

@@ -64,26 +64,22 @@ module RailsAdmin
           end
 
           class Field
-            attr_accessor :name, :type
-            attr_accessor :label, :help
-            attr_accessor :picker_label
-            attr_accessor :picker_records
-            attr_accessor :allowed_nested_models
+            attr_accessor :name,
+                          :type
+
+            attr_accessor :label,
+                          :help,
+                          :css_class
+
+            attr_accessor :picker_label,
+                          :picker_model_name
+
+            attr_accessor :list_model_names
 
             def initialize(name, type, options = {})
               @name = name
               @type = type
               @label = name.to_s.humanize
-
-              if type == :list
-                allowed = options[:models].nil? ? [options[:model]] : options[:models]
-
-                if allowed.nil?
-                  raise "At least one model should be set for JsonEditor::Field with type => :list"
-                end
-
-                @allowed_nested_models = allowed.map { |m| m.name.gsub("::","__") }
-              end
             end
 
             def label(s = nil)
@@ -94,9 +90,17 @@ module RailsAdmin
               if s.nil? then return @help else @help = s end
             end
 
-            def setup_picker(label, records)
-              @picker_label = label
-              @picker_records = records
+            def css_class(s = nil)
+              if s.nil? then return @css_class else @css_class = s end
+            end
+
+            def picker(options)
+              @picker_label = options[:label]
+              @picker_model_name = options[:model].name
+            end
+
+            def list(models)
+              @list_model_names = Array(models).map { |m| m.name.gsub("::","___") }
             end
           end
         end

data/lib/rails_admin_json_editor/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminJsonEditor
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_json_editor
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Jasper Haggenburg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-25 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,7 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/rails_admin_json_editor/lodash.2.4.1.js
+- app/assets/javascripts/rails_admin_json_editor/markdown.js
 - app/assets/javascripts/rails_admin_json_editor/rails_admin_json_editor.js
 - app/assets/javascripts/rails_admin_json_editor/vue.0.11.4.js
 - app/assets/stylesheets/rails_admin_json_editor/rails_admin_json_editor.css.scss