redde 0.3.12 → 0.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6223aa27718ba7b312a123c5857c21aa37230ce0
-  data.tar.gz: a3654c84d19fef5d7ba239d8641cc090726a7e79
+  metadata.gz: a94e4daeabb901bbc2eaa51d473e66615ec65e59
+  data.tar.gz: 45421c128878de33b368925a50c22e6271c0a79c
 SHA512:
-  metadata.gz: 5efd5966f8872605b7b316a244a737852c4538dbe4b731066dbf3143db711944e18a4b736982b6164f3864b462db1d5dbe6d8acf6d0c15e1d9e5ff43e0918389
-  data.tar.gz: bfd75da454ecdb75a8a1827e8cb337c994cafed91b33cd17b7225877960dbea0ee9cb10c8a5eed00bbf55314c7827d9a1dcb25af1d4bcdc0ce690ab4a250cec4
+  metadata.gz: 614708064fe53ac70ebab9c188a614868e2c64986977100ea371ee1c98a140d9932ae319d6b75fa09e9bbc760a7160889d342aa2adc74139a03a66b8d4c7aaa6
+  data.tar.gz: 904add8d59889760fc3bc06ad9630d0a724e0013f6faf8b55603631341f6048d303536620d18c2a18a932d65bc66fcc7a372cc927456dcbe6d2bc8c9b757e072

data/app/assets/stylesheets/redde/blocks/redde-form.sass

@@ -33,6 +33,9 @@
 
 // .redde-form__row
 
+.redde-form__img-preview
+  max-width: 100%
+
 .redde-form__cell
   padding-top: 10px
   vertical-align: baseline

data/app/form_builders/redde_form_builder.rb

@@ -1,5 +1,5 @@
 class ReddeFormBuilder < ActionView::Helpers::FormBuilder
-  delegate :render, :content_tag, :tag, :link_to, :concat, :capture, to: :@template
+  delegate :render, :content_tag, :tag, :link_to, :image_tag, :concat, :capture, to: :@template
   # delegate :debug, :render, :content_tag, :tag, :link_to, :concat, :capture, to: :@template
 
   def redde_field(name, *args)
@@ -10,7 +10,11 @@ class ReddeFormBuilder < ActionView::Helpers::FormBuilder
     when :time then redde_date_time(name, *args)
     when :datetime then redde_date_time(name, *args)
     else
-      redde_text_field(name, *args)
+      if object.send(name).class.superclass.name == 'CarrierWave::Uploader::Base'
+        redde_image_field(name, *args)
+      else
+        redde_text_field(name, *args)
+      end
     end
   end
 
@@ -39,6 +43,17 @@ class ReddeFormBuilder < ActionView::Helpers::FormBuilder
     wrap(name, text_field(name, options), options)
   end
 
+  def redde_image_field(name, *args)
+    concat empty_wrap(image_tag(object.send(name), class: 'redde-form__img-preview') + check_box(:remove_preview) + label(:remove_preview)) if object.send(name).present?
+    redde_file_field(name, *args)
+  end
+
+  def redde_file_field(name, *args)
+    options = args.extract_options!
+    # options[:class] = assign_class(['inp', 'redde-form__inp'], options[:class])
+    wrap(name, file_field(name, options), options)
+  end
+
   def redde_text_area(name, *args)
     options = args.extract_options!
     options[:class] = assign_class(['txtr', 'redde-form__txtr'], options[:class])
@@ -66,6 +81,12 @@ class ReddeFormBuilder < ActionView::Helpers::FormBuilder
     end
   end
 
+  def empty_wrap(*args, &block)
+    options = args.extract_options!
+    content = block_given? ? capture(&block) : args[0]
+    content_tag( :tr, tag( :td, class: ['redde-form__cell', options[:cell]].flatten.compact ) + content_tag( :td, content, class: ['redde-form__cell', options[:cell]] ), class: ['redde-form__row', options[:wrap]].flatten.compact )
+  end
+
   def wrap(name = nil, *args, &block)
     options = args.extract_options!
     content = block_given? ? capture(&block) : args[0]

data/app/helpers/redde/index_helper.rb

@@ -135,10 +135,13 @@ module Redde::IndexHelper
   end
 
   def render_item_column(item, column)
-    case item.send(column).class
-    when Time then l(item.send(column), format: '%d %b %Y, %H:%M')
+    value = item.send(column)
+    return 'Не задано' unless value.present?
+    case value.class.name
+    when 'Time' then l(item.send(column), format: '%d %b %Y, %H:%M')
+    when 'Date' then l(item.send(column), format: '%d %b %Y')
     else
-      item.send(column)
+      value
     end
   end
 end

data/lib/redde/version.rb

@@ -1,3 +1,3 @@
 module Redde
-  VERSION = '0.3.12'.freeze
+  VERSION = '0.3.13'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redde
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Oleg Bovykin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-12 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails
@@ -583,7 +583,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Admin scaffold generator for redde projects