ecm_pictures2 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56efd2330fe8b7f52f39c203f30416e2b9f450da
-  data.tar.gz: b9c8d765cbd1402387f324d1f84cd797145f5f67
+  metadata.gz: 5ebb37d682a26e5debd7b4e20d7d0571f2600ed3
+  data.tar.gz: 76a5edd7c413d0a9328f426b6f2927747df8f5aa
 SHA512:
-  metadata.gz: 0b9944e3cb14f066dfbc42e8a83311182972ee9c2f4800ca8d50d09d9634ff50234048ef5379c500754949a6ac6f7420dd1dd10841ae6d8cf6d54f95c4d53f9e
-  data.tar.gz: 8857b732b77defee31aeacaa277046aa1c703d0012cac146ceba7add2b5588501086149798f2adff133a3305f1a4432e9f75b94ebb5cccc9b1869c33d6adac5f
+  metadata.gz: c152100dce2d3741bdf07aceac6cda5f8fef753dd5cbcb4f8fa8013d09fcdcfb4cb6a2dafdb224da2f28bcfedd3326fcfdd3e3685447f3f9a2e5d866c62c556b
+  data.tar.gz: 766523c638f92f3f2e326e2fda97b8a82f232af7d49df78c528787e0241a621d58ccf3dda3d7580d0d4cbca812ccd3e704aa9f0901a66becccb8636ff3e75816

data/README.rdoc

@@ -51,6 +51,13 @@ Migrate:
 
   > rake db:migrate
 
+Add the helper to your application controller:
+
+    # app/controllers/application_controller.rb
+    class ApplicationController < ActionController::Base
+      helper Ecm::PicturesHelper
+      ...
+    end
 
 == Optional: Generate locale files
 

data/app/helpers/ecm/pictures_helper.rb

@@ -46,7 +46,6 @@ module Ecm::PicturesHelper
     return link_options
   end
 
-  # TODO: Implement this.
   def render_picture(name, options = {})
     begin
       options = {:preview_style => :thumb}.merge(options)
@@ -59,9 +58,7 @@ module Ecm::PicturesHelper
           content_tag(:p, I18n.t('ecm.pictures.picture.warnings.missing', :name => name.to_s))
         end
       else
-        content_tag(:div, :class => 'row') do
-          render picture
-        end
+        render picture
       end
 
     rescue Exception => e

data/app/views/ecm/pictures/picture_galleries/_picture_gallery.html.erb

@@ -1,7 +1,9 @@
+<%= Ecm::Pictures::Configuration.prevent_textile_rendering_in_html ? '<notextile>'.html_safe : '' %>
 <div class="picture-gallery-description">
   <%= mu picture_gallery, :description %>
 </div>
 
 <div class="picture-gallery-pictures row" data-target="#modal-gallery" data-toggle="modal-gallery">
   <%= render picture_gallery.pictures %>
-</div>
+</div>
+<%= Ecm::Pictures::Configuration.prevent_textile_rendering_in_html ? '</notextile>'.html_safe : '' %>

data/app/views/ecm/pictures/pictures/_picture.html.erb

@@ -1,5 +1,7 @@
+<%= Ecm::Pictures::Configuration.prevent_textile_rendering_in_html ? '<notextile>'.html_safe : '' %>
 <div class="col-xs-6 col-md-3">
   <%= link_to("#{picture.image.url}#{File.extname(picture.image_file_name).downcase}", :'data-gallery' => "gallery", :class => 'thumbnail') do %>
     <%= image_tag(picture.image.url(:default_thumb)) %>
   <% end %>
-</div>
+</div>
+<%= Ecm::Pictures::Configuration.prevent_textile_rendering_in_html ? '</notextile>'.html_safe : '' %>

data/lib/ecm/pictures/configuration.rb

@@ -25,6 +25,10 @@ module Ecm
         'ApplicationController'
       end
 
+      mattr_accessor :prevent_textile_rendering_in_html do
+        true
+      end
+
       # def paperclip_options=(paperclip_options)
       #   @@paperclip_options = picture_image_styles.with_indifferent_access
       # end

data/lib/ecm/pictures/version.rb

@@ -1,6 +1,6 @@
 module Ecm
   module Pictures
-    VERSION = "1.0.4"
+    VERSION = "1.1.0"
   end
 end
 

data/lib/generators/ecm/pictures/install/templates/ecm_pictures.rb

@@ -31,5 +31,11 @@ Ecm::Pictures.configure do |config|
   # Default: config.base_controller = 'ApplicationController'
   #
   config.base_controller = 'ApplicationController'
+
+  # Adds <notextile> tags around the to fix html output.
+  #
+  # Default: config.prevent_textile_rendering_in_html = true
+  #
+  config.prevent_textile_rendering_in_html = true
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_pictures2
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-28 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails