enjoy_cms 0.3.7 → 0.3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1498d8db8ce0758077a4c20c2cec3ea63c0c228
-  data.tar.gz: cb2ef030d270a5be3c8d80c5562cd0573a4fddff
+  metadata.gz: edb1ca4cc4a6285dc5cec5cdf79c7616d24c9f62
+  data.tar.gz: 3fccd7d654da9a4f4673cb3ea69b48a9e9827c10
 SHA512:
-  metadata.gz: 5c48c1f6b9eacfd8d2b06dcd842250d1278480cb55cb144dc0db6216dfc9365270147214950189f6a85a12bbdf05b8af81ce50dd59c7768f3ecf582e7170f5ba
-  data.tar.gz: d06dcaae72d76c9f9ceed2b0a984249be281891bbddf7d809ee10219ad7afed42c1e87a21aefe2093efd7c37dcaf31ed0d21761360ec10db66c907006358df91
+  metadata.gz: 43484a9b08f3bd5135d1961eca438da61f00957b09793d16084d624b88d123a86c5ca26660574843249813c371b8771a7f4b9d9559721a194315a89b16b6ee02
+  data.tar.gz: 0bcf54b781a1a2c4914ad6a725c0806197063977ea4e1cefa86e4a641e9ff3543c15ef522733e831c6a27bbfbed712a66de6c604d2e3cad158b18177e702566d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enjoy_cms (0.3.7)
+    enjoy_cms (0.3.7.1)
       ack_rails_admin_jcrop
       addressable
       ckeditor

data/app/models/concerns/enjoy/hash_field.rb

@@ -4,32 +4,99 @@ if Enjoy.mongoid?
 
     module ClassMethods
       def enjoy_cms_hash_field(name, opts = {})
+        opts.merge!({type: Hash, default: {}})
         field "#{name}_hash", opts
 
-        class_eval <<-EVAL
-          def #{name}_str=(val)
-            begin
-              self.#{name}_hash = JSON.parse(val)
-            rescue
-              self[:#{name}_str] = val
-            end
-          end
-          def #{name}_str
-            self[:#{name}_str] ||= self.#{name}.to_json
-          end
-          def #{name}
-            self.#{name}_hash
-          end
+        meth = name
+        meth_str = "#{name}_str"
+        meth_hsh = "#{name}_hash"
+        meth_json = "#{name}_json"
+        if opts[:localize]
+          meth_str_t = "#{name}_str_translations"
+          meth_hsh_t = "#{name}_hash_translations"
+          class_eval <<-EVAL
+            def #{meth_str_t}=(val)
+              return self.#{meth_hsh_t} = {} if val.blank?
+              _hash = {}
+              self[:#{meth_str_t}] ||= {}
+              I18n.available_locales.each do |l|
+                begin
+                  _hash[l] = JSON.parse(val[l])
+                  self[:#{meth_str_t}][l]= val[l]
+                rescue
+                  self[:#{meth_str_t}][l]= val[l]
+                end
+              end
+              self.#{meth_hsh_t} = _hash
+            end
+            def #{meth_str_t}
+              self[:#{meth_str_t}] ||= self.#{meth} if self.#{meth}
+            end
+            def #{meth_str}
+              self.#{meth_str_t}[I18n.locale] if self.#{meth_str_t}
+            end
+            def #{meth}
+              self.#{meth_hsh}
+            end
+            def #{meth_json}
+              self.#{meth_hsh}.to_json if self.#{meth_hsh}
+            end
+
+            validate do
+              unless self.#{meth_hsh_t}.nil?
+                _has_errors = false
+                I18n.available_locales.each do |l|
+                  I18n.with_locale(l) do
+                    puts self.#{meth_hsh_t}[l]
+                    puts self.#{meth_str}
+                    puts "_"
+                    if self.#{meth_hsh_t}[l].nil? and !self[:#{meth_str_t}][l].blank?
+                      _has_errors ||= true
+                      _meth = "#{meth_hsh_t}_\#{l}".to_s
+                      self.errors.add(_meth, "Неверный формат данных")
+                    else
+                      self[:#{meth_str_t}].delete(l) if self[:#{meth_str_t}]
+                    end
+                  end
+                end
+                self.remove_attribute :#{meth_str_t} unless _has_errors
+              end
+              true
+            end
+          EVAL
 
-          validate do
-            if self.#{name}_str != self.#{name}.to_json
-              self.errors.add(:#{name}, "Неверный формат данных")
-            else
-              self.remove_attribute :#{name}_str
-            end
-            true
-          end
-        EVAL
+        else
+          class_eval <<-EVAL
+            def #{meth_str}=(val)
+              return self.#{meth_hsh} = {} if val.blank?
+              begin
+                self.#{meth_hsh} = JSON.parse(val)
+              rescue
+                self[:#{meth_str}] = val
+              end
+            end
+            def #{meth_str}
+              self[:#{meth_str}] ||= self.#{meth}.to_json if self.#{meth}
+            end
+            def #{meth}
+              self.#{meth_hsh}
+            end
+            def #{meth_json}
+              self.#{meth_hsh}.to_json if self.#{meth_hsh}
+            end
+
+            validate do
+              unless self.#{meth}.nil?
+                if self.#{meth_str} != self.#{meth}.to_json
+                  self.errors.add(:#{meth}, "Неверный формат данных")
+                else
+                  self.remove_attribute :#{meth_str}
+                end
+                true
+              end
+            end
+          EVAL
+        end
       end
     end
   end

data/app/models/concerns/enjoy/html_field.rb

@@ -8,7 +8,7 @@ if Enjoy.mongoid?
         clear_by_default = false unless clear_by_default == true
 
         field "#{name}_html", opts
-        field "#{name}_clear", type: Boolean, default: clear_by_default
+        field "#{name}_clear", type: Boolean, default: clear_by_default, localize: opts[:localize]
 
         class_eval <<-EVAL
           def #{name}

data/app/models/concerns/enjoy/mappable.rb

@@ -6,7 +6,7 @@ module Enjoy::Mappable
     if Enjoy.mongoid?
       include ::Geocoder::Model::Mongoid
       field :coordinates, type: Array
-      field :address, type: String
+      field :address, type: String, localize: Enjoy.configuration.localize
 
       field :map_address, type: String
       field :map_hint, type: String

data/app/views/rails_admin/main/_enjoy_hash.html.slim

@@ -5,4 +5,5 @@ ruby:
   _opts[:class] = 'form-control'
   _opts[:value] = field.formatted_value
   _opts[:style] = "font-family: monospace"
+  
 = form.text_area field.string_method, _opts

data/app/views/rails_admin/main/_enjoy_hash_ml.html.slim

@@ -0,0 +1,10 @@
+ruby:
+  _opts = {}
+  _opts[:rows] = 10
+  _opts[:cols] = 80
+  _opts[:class] = 'form-control'
+  #_opts[:value] = field.formatted_value
+  _opts[:style] = "font-family: monospace"
+/ = form.text_area field.string_method, _opts
+
+= render 'form', form: form, field: field, field_type: :text_area, html_attributes: _opts

data/app/views/rails_admin/main/_enjoy_html.html.slim

@@ -10,6 +10,7 @@ ruby:
 = form.text_area field.html_method, _html_attributes
 
 label{style='display: block;'}
-  - _html_attributes = field.html_attributes.reverse_merge({ value: field.form_value[:clear], checked: field.form_value[:clear].in?([true, '1']), required: false, class: "form-control"})
+  - _hash = { value: field.form_value[:clear], checked: field.form_value[:clear].in?([true, '1']), required: false, class: "form-control"}
+  - _html_attributes = field.html_attributes.reverse_merge(_hash)
   span{style='float: left'}= form.send field.boolean_view_helper, field.clear_method, _html_attributes
   div{style='margin-left: 35px; line-height: 40px;'} Убирать теги

data/app/views/rails_admin/main/_enjoy_html_ml.html.slim

@@ -0,0 +1,53 @@
+ul.nav.nav-tabs
+  - uuid = "#{field.name}_#{field.object_id}_unique_id"
+  - I18n.available_locales.each do |locale|
+    li(class="#{'active' if locale == I18n.locale}")
+      a(href="##{locale}_#{uuid}" data-toggle="tab" class="#{uuid}")= locale
+.tab-content
+  / = form.fields_for field.translations_field do |localized_field|
+  - I18n.available_locales.each do |locale|
+        - _class = "#{[( 'active' if locale == I18n.locale ), uuid].join(" ")}"
+        .fields.tab-pane(style='padding:5px; margin: 0;' id="#{locale}_#{uuid}" class="#{_class}")
+          = form.fields_for field.html_translations_field do |html_localized_field|
+            ruby:
+              js_data = {
+                jspath: field.location ? field.location : field.base_location + "ckeditor.js",
+                base_location: field.base_location,
+                options: {
+                  customConfig: field.config_js ? field.config_js : field.base_location + "config.js"
+                }
+              }
+              _html_attributes = field.html_attributes.reverse_merge(data: { 
+                richtext: 'ckeditor', 
+                options: js_data.to_json
+              })
+              _html_attributes[:value] = field.form_value[:html] ? field.form_value[:html][locale] : ""
+            = html_localized_field.send :text_area, locale , _html_attributes
+            
+          = form.fields_for field.clear_translations_field do |clear_localized_field|
+            label{style='display: block;'}
+              ruby:
+                _value = field.form_value[:clear] ? field.form_value[:clear][locale] : true
+                _hash = { 
+                  value: _value, 
+                  checked: _value.in?([true, '1']),
+                  required: false, 
+                  class: "form-control"
+                }
+                _html_attributes = field.html_attributes.reverse_merge(_hash)
+              span{style='float: left'}= clear_localized_field.send field.boolean_view_helper, locale , _html_attributes
+              div{style='margin-left: 35px; line-height: 40px;'} Убирать теги
+          
+          
+          
+
+javascript:
+  var #{field.name}#{field.object_id} = (new Date().getTime()) + Math.floor(Math.random()*100000);
+  $("ul.nav.nav-tabs a.#{uuid}").each(function(e){
+    this.href = $(this).attr('href').replace('_unique_id', #{field.name}#{field.object_id});
+    $(this).removeClass('#{uuid}');
+  });
+  $(".tab-content .#{uuid}").each(function(e){
+    this.id = this.id.replace('_unique_id', #{field.name}#{field.object_id});
+    $(this).removeClass('#{uuid}');
+  });

data/lib/enjoy/rails_admin_ext/enjoy_hash.rb

@@ -14,24 +14,70 @@ module RailsAdmin
             "#{name}_str"
           end
 
-          register_instance_option :allowed_methods do
-            [string_method]
+          register_instance_option :hash_method do
+            "#{name}_hash"
           end
 
-          register_instance_option :partial do
-            :enjoy_hash
+          register_instance_option :value do
+            formatted_value
+          end
+
+          register_instance_option :tabbed do
+            true
+          end
+
+
+          ############ localize ######################
+          register_instance_option :translations_field do
+            (string_method.to_s + '_translations').to_sym
+          end
+
+          register_instance_option :localized? do
+            @abstract_model.model_name.constantize.public_instance_methods.include?(translations_field)
+          end
+
+          register_instance_option :pretty_value do
+            if localized?
+              I18n.available_locales.map { |l|
+                ret = nil
+                I18n.with_locale(l) do
+                  _hash = bindings[:object].send(hash_method) || {}
+                  ret = ("#{l}:<pre>" + JSON.pretty_generate(_hash) + "</pre>")
+                end
+                ret
+              }.join.html_safe
+            else
+              _hash = bindings[:object].send(hash_method) || {}
+              ("<pre>" + JSON.pretty_generate(_hash) + "</pre>").html_safe
+            end
           end
 
           register_instance_option :formatted_value do
-            begin
-              JSON.pretty_generate(JSON.parse(bindings[:object].send string_method))
-            rescue
-              bindings[:object].send string_method
+            if localized?
+              puts bindings[:object].send((hash_method.to_s + '_translations').to_sym)
+              puts '__'
+              _val = bindings[:object].send((hash_method.to_s + '_translations').to_sym)
+              _val.each_pair { |l, _hash|
+                begin
+                  _val[l] = JSON.pretty_generate(_hash)
+                rescue
+                end
+              }
+            else
+              begin
+                JSON.pretty_generate(bindings[:object].send hash_method)
+              rescue
+                bindings[:object].send hash_method
+              end
             end
           end
 
-          register_instance_option :pretty_value do
-            ("<pre>" + JSON.pretty_generate(value) + "</pre>").html_safe
+          register_instance_option :allowed_methods do
+            localized? ? [string_method, translations_field] : [string_method]
+          end
+
+          register_instance_option :partial do
+            localized? ? :enjoy_hash_ml : :enjoy_hash
           end
         end
       end

data/lib/enjoy/rails_admin_ext/enjoy_html.rb

@@ -10,25 +10,17 @@ module RailsAdmin
           include RailsAdmin::Engine.routes.url_helpers
 
           register_instance_option :html_method do
-            "#{name}_html"
+            "#{name}_html".to_sym
           end
 
           register_instance_option :clear_method do
-            "#{name}_clear"
+            "#{name}_clear".to_sym
           end
 
           register_instance_option :pretty_value do
             bindings[:object].send(html_method)
           end
 
-          register_instance_option :form_value do
-            {
-              html: bindings[:object].send(html_method),
-              clear: bindings[:object].send(clear_method)
-            }
-          end
-
-
           register_instance_option :formatted_value do
             pretty_value
           end
@@ -37,17 +29,48 @@ module RailsAdmin
             pretty_value
           end
 
-
           register_instance_option :boolean_view_helper do
             :check_box
           end
 
+          register_instance_option :tabbed do
+            true
+          end
+
+
+          ############ localize ######################
+          register_instance_option :html_translations_field do
+            (html_method.to_s + '_translations').to_sym
+          end
+          register_instance_option :clear_translations_field do
+            (clear_method.to_s + '_translations').to_sym
+          end
+
+          register_instance_option :form_value do
+            if localized?
+              {
+                html: bindings[:object].send(html_translations_field),
+                clear: bindings[:object].send(clear_translations_field)
+              }
+            else
+              {
+                html: bindings[:object].send(html_method),
+                clear: bindings[:object].send(clear_method)
+              }
+            end
+          end
+
+          register_instance_option :localized? do
+            @abstract_model.model_name.constantize.public_instance_methods.include?(html_translations_field) and
+              @abstract_model.model_name.constantize.public_instance_methods.include?(clear_translations_field)
+          end
+
           register_instance_option :allowed_methods do
-            [html_method, clear_method]
+            localized? ? [html_method, clear_method, html_translations_field, clear_translations_field] : [html_method, clear_method]
           end
 
           register_instance_option :partial do
-            :enjoy_html
+            localized? ? :enjoy_html_ml : :enjoy_html
           end
         end
       end

data/lib/enjoy/version.rb

@@ -1,3 +1,3 @@
 module Enjoy
-  VERSION = "0.3.7"
+  VERSION = "0.3.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enjoy_cms
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.7.1
 platform: ruby
 authors:
 - Alexander Kiseliev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -498,7 +498,9 @@ files:
 - app/views/rails_admin/main/_check_boxes.html.slim
 - app/views/rails_admin/main/_enjoy_connectable.html.slim
 - app/views/rails_admin/main/_enjoy_hash.html.slim
+- app/views/rails_admin/main/_enjoy_hash_ml.html.slim
 - app/views/rails_admin/main/_enjoy_html.html.slim
+- app/views/rails_admin/main/_enjoy_html_ml.html.slim
 - app/views/rails_admin/main/_enum_check_boxes.html.slim
 - app/views/rails_admin/main/_enum_radio_buttons.html.slim
 - app/views/rails_admin/main/_form_raw.html.slim