activeadmin_json_editor 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9226eb046c2107188b6149e3fe33a16dd03e2e9
-  data.tar.gz: f1c088d26a59ed7897fb81ce299b323066eeba64
+  metadata.gz: bbef1ee8e097aad025b4a7febfc5f6e9fc4dcbf9
+  data.tar.gz: 4c8d99161fbd5dbddb8fd98619f9117e314b2b2b
 SHA512:
-  metadata.gz: aff6e2ba0879883c2dbea683f3af89a448e7c58a7110c29e30930e4ac0d9a4618e5410f6f5f6bdff85b923a3170cc55a955db403f4343dd4a43aa24c25e83ac5
-  data.tar.gz: 0c07ecb48da6f5c031618c59af87f18598b9a0bdee56cc5701918127bd61ed55aa24440e3d2c99d73e26f486908233d74a310bc4ef5e1f5e1363c0e9560e0568
+  metadata.gz: 52b5e34e12f30c0f5f24b380704f90a0db9bdf90085df6ecef6a78703382c61242b49d7a02b7aa18a96a40062aaab9b80c856339e1148ced5f5254ab471e1671
+  data.tar.gz: 311f2eadac714faff1f6b144fa400c0d777bc616297273e4b0941a10f6b452a3da481bb1a1f7d5d84761beef9e6c2996670d30b354db00115eb8a74fc86a1f06

data/Gemfile.lock

@@ -1,26 +1,28 @@
 PATH
   remote: .
   specs:
-    activeadmin_json_editor (0.0.5)
+    activeadmin_json_editor (0.0.6)
+      ace-rails-ap
       railties (>= 3.0, < 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.2.5.1)
-      actionview (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    ace-rails-ap (4.1.0)
+    actionpack (4.2.7)
+      actionview (= 4.2.7)
+      activesupport (= 4.2.7)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.5.1)
-      activesupport (= 4.2.5.1)
+    actionview (4.2.7)
+      activesupport (= 4.2.7)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activesupport (4.2.5.1)
+    activesupport (4.2.7)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -32,10 +34,12 @@ GEM
     json (1.8.3)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
+    mini_portile2 (2.1.0)
+    minitest (5.9.0)
+    nokogiri (1.6.8)
+      mini_portile2 (~> 2.1.0)
+      pkg-config (~> 1.1.7)
+    pkg-config (1.1.7)
     rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -47,12 +51,12 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.5.1)
-      actionpack (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
+    railties (4.2.7)
+      actionpack (= 4.2.7)
+      activesupport (= 4.2.7)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.5.0)
+    rake (11.2.2)
     thor (0.19.1)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
@@ -66,4 +70,4 @@ DEPENDENCIES
   bundler (~> 1.5)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/README.md

@@ -1,13 +1,15 @@
 # ActiveAdmin::JsonEditor
 
-"json_input" field type to active_admin that allow to edit Postgresql json values as json tree.
+[![Gem Version](https://badge.fury.io/rb/activeadmin_json_editor.svg)](https://badge.fury.io/rb/activeadmin_json_editor)
+
+"json_input" and "jsonb_input" field type to active_admin that allow to edit Postgresql json and jsonb values as json tree.
 Data shown by using jsoneditor.js from http://jsoneditoronline.org
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'activeadmin_json_editor', github: 'udacity/activeadmin_json_editor', branch: 'master'
+    gem 'activeadmin_json_editor', '~> 0.0.6'
 
 And then execute:
 
@@ -36,6 +38,7 @@ ActiveAdmin.register User do
 	form do |f|
     f.inputs do
       f.input :settings, as: :json
+      f.input :other_settings, as: :jsonb
     end
 
     f.actions
@@ -45,7 +48,7 @@ end
 
 ## Contributing
 
-1. Fork it ( http://github.com/wild-ex/activeadmin_json_editor/fork )
+1. Fork it ( http://github.com/udacity/activeadmin_json_editor/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/activeadmin_json_editor.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.version       = ActiveAdmin::JsonEditor::VERSION
   spec.authors       = ['allanbreyes']
   spec.email         = ['allan@udacity.com']
-  spec.summary       = 'add "json_input" field type to active_admin that allow to edit Postgresql json values'
+  spec.summary       = 'add "json_input" and "jsonb_input" field type to active_admin that allow to edit Postgresql json and jsonb values'
   spec.description   = '"json_input" field allow to edit json value as json array with using jsoneditor.js from http://jsoneditoronline.org'
   spec.homepage      = 'https://github.com/wild-r/activeadmin_json_editor'
   spec.license       = 'MIT'
@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'railties', '>= 3.0', '< 5.0'
   # spec.add_development_dependency "rake", "~> 0"
   # spec.add_dependency "active_admin", "~> 1.0.0"
+  spec.add_dependency 'ace-rails-ap'
 end

data/app/assets/javascripts/active_admin/json_editor.js

@@ -4,13 +4,25 @@
 ;(function(window, $) {
   $(function() {
     $('div.jsoneditor-wrap').each(function(i,wrap){
+      var fieldset = $(wrap).parents('li:eq(0)');
       var container = $(wrap)[0];
       var textarea = $($(wrap).find('textarea'));
       var editor;
       var options = {
+        modes: ['tree', 'text'],
         mode: 'tree',
         change: function(ev){
-          textarea.text(JSON.stringify(editor.get()));
+          try {
+            var text = JSON.stringify(editor.get());
+            textarea.text(text);
+            $(fieldset).toggleClass('error',false);
+            textarea.text(JSON.stringify(editor.get()));
+          } catch (e) {
+            editor.options.error(e);
+          }
+        },
+        error: function(e){
+          $(fieldset).toggleClass('error',true);
         }
       };
       editor = new JSONEditor(container, options,JSON.parse(textarea.val()));

data/app/assets/stylesheets/active_admin/json_editor.css

@@ -44,3 +44,21 @@
 .jsoneditor .search .frame {
   border-color: rgb(201, 208, 214);
 }
+
+
+/*
+ * Use text mode
+ */
+.jsoneditor-wrap textarea.text {
+    display: block;
+}
+.jsoneditor .menu button.separator {
+    color: black;
+    text-shadow: none;
+}
+.jsoneditor-contextmenu ul li button {
+    text-shadow: none;
+}
+form fieldset > ol > li.error .jsoneditor {
+    border: 1px solid #932419;
+}

data/app/inputs/jsonb_input.rb

@@ -0,0 +1,3 @@
+class JsonbInput < JsonInput
+
+end

data/lib/activeadmin/json_editor/version.rb

@@ -1,5 +1,5 @@
 module ActiveAdmin
   module JsonEditor
-    VERSION = '0.0.5'.freeze
+    VERSION = '0.0.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin_json_editor
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - allanbreyes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,6 +44,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: ace-rails-ap
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: '"json_input" field allow to edit json value as json array with using
   jsoneditor.js from http://jsoneditoronline.org'
 email:
@@ -61,6 +75,7 @@ files:
 - app/assets/javascripts/active_admin/json_editor.js
 - app/assets/stylesheets/active_admin/json_editor.css
 - app/inputs/json_input.rb
+- app/inputs/jsonb_input.rb
 - lib/activeadmin/json_editor.rb
 - lib/activeadmin/json_editor/version.rb
 - lib/activeadmin/resource_dsl.rb
@@ -104,6 +119,6 @@ rubyforge_project:
 rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: add "json_input" field type to active_admin that allow to edit Postgresql
-  json values
+summary: add "json_input" and "jsonb_input" field type to active_admin that allow
+  to edit Postgresql json and jsonb values
 test_files: []