ecm_pictures 1.0.2.pre → 1.0.3.pre

data/app/models/ecm/pictures/picture.rb

@@ -17,7 +17,7 @@ class Ecm::Pictures::Picture < ActiveRecord::Base
 
   # acts as markup
   acts_as_markup :language => :variable, :columns => [ :description, :description ]
-  
+
   # callbacks
   after_initialize :set_defaults
   before_validation :set_name_from_image_file_name, :if => Proc.new { |p| ( p.name.nil? || p.name.empty? ) }
@@ -40,14 +40,20 @@ class Ecm::Pictures::Picture < ActiveRecord::Base
                               :inclusion => Ecm::Pictures::Configuration.markup_languages
   validates :name, :presence => true
 
-  def display_code
-    "<%= render_picture '#{self.name}' %>"
+  def display_code(style)
+    case style
+    when :erb
+      "<%= render_picture '#{self.name}' %>"
+    when :textile
+      "!#{image.url}!".gsub(/\?[0-9]*/, '')
+    else
+    end
   end
 
   def to_s
     name
   end
-  
+
   private
 
   def set_defaults
@@ -55,7 +61,7 @@ class Ecm::Pictures::Picture < ActiveRecord::Base
       self.markup_language ||= Ecm::Pictures::Configuration.default_markup_language
     end
   end
-  
+
   def set_name_from_image_file_name
     self.name = File.basename(image_file_name, File.extname(image_file_name)) unless image_file_name.nil?
   end

data/lib/ecm/pictures/active_admin/ecm_pictures_pictures.rb

@@ -49,7 +49,7 @@ ActiveAdmin.register Ecm::Pictures::Picture do
 
     panel Ecm::Pictures::Picture.human_attribute_name(:display_code) do
       div do
-        ecm_pictures_picture.display_code
+        ecm_pictures_picture.display_code(:textile)
       end
     end
   end

data/lib/ecm/pictures/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Pictures
-    VERSION = "1.0.2.pre"
+    VERSION = "1.0.3.pre"
   end  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: ecm_pictures
 version: !ruby/object:Gem::Version 
-  hash: 961915996
+  hash: 961915992
   prerelease: 6
   segments: 
   - 1
   - 0
-  - 2
+  - 3
   - pre
-  version: 1.0.2.pre
+  version: 1.0.3.pre
 platform: ruby
 authors: 
 - Roberto Vasquez Angel
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-12 00:00:00 Z
+date: 2013-03-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails