phrasing_plus 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ef6672d71bf447029bc06207fb7134d3c073572
-  data.tar.gz: fe6bfad3ec7cc62bf8d61a71f73f65a505a2fcdc
+  metadata.gz: e6de77ba808b78aee18151f2fa76a1fc741f33c0
+  data.tar.gz: 25281dc73a5ad8751e1a565fb90b4e8f2e7872fb
 SHA512:
-  metadata.gz: 9aa73a631a395513a7ac1279f6692bbfde7c33c34642f65750c531ab012613a06d7cf4c6e9f8743626116c5be77adaee96cb7cf312493d306a91f82cb2f3a393
-  data.tar.gz: ecf093f80cda4594073cda1e9f7791c90eceae2ef12e0f5b33f15ab8f5a8e9e9193e5e10bf93824eb8d5d7cedb4446a90f32334df62e5fde0f795b6b5cdccd07
+  metadata.gz: 5f8c1500d91e35d5a4cd945d9981072f572f2fb667b1ee8820e2bb682fbfb0cc639b7b17ba41ed9c6dd5fa0bfd46fde107d7491bf3a1e99a8a204b7f7ab4f5e7
+  data.tar.gz: ad1dd303591c27aa249fdcc1e3966f814f89478ce066cdcecaea6839ef14b446e8ec1841c94e4ebf52ef51a7ffa0fc0426f5416373eb6f76ae693cf7592e1edd

data/app/uploaders/phrasing_image_uploader.rb

@@ -4,4 +4,8 @@ class PhrasingImageUploader < CarrierWave::Uploader::Base
   def extension_white_list
     %w(jpg jpeg gif png)
   end
+
+  def store_dir
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+  end
 end

data/app/widgets/phrasing_background_image_widget.rb

@@ -11,6 +11,7 @@ class PhrasingBackgroundImageWidget < SimpleDelegator
     @view_context = view_context
     @wrapped_html = wrapped_html
     @options = options
+    @default_image = @options.delete(:default_image)
     @options[:style] = "background-image: url(#{image_url})"
     @tag = @options.delete(:tag)
 
@@ -26,7 +27,7 @@ class PhrasingBackgroundImageWidget < SimpleDelegator
   private
 
   def image_url
-    image.url || PhrasingPlus::DummyImage.new(options).url
+    image.url || default_image && view_context.asset_url(default_image) || PhrasingPlus::DummyImage.new(options).url
   end
 
   def add_phrasable_image_class

data/app/widgets/phrasing_image_widget.rb

@@ -5,12 +5,13 @@ class PhrasingImageWidget < SimpleDelegator
   HTML_CLASS = 'phrasable-image'
   WRAPPER_HTML_CLASS = 'phrasable-image-wrapper'
 
-  attr_accessor :options, :wrapper_options
+  attr_accessor :options, :wrapper_options, :default_image
 
   def initialize(phrasing_image, view_context, options = {})
     super(phrasing_image)
     @view_context = view_context
     @options = options
+    @default_image = @options.delete(:default_image)
     @wrapper_options = @options.delete(:wrapper_html) || {}
 
     return unless view_context.can_edit_phrases?
@@ -20,7 +21,7 @@ class PhrasingImageWidget < SimpleDelegator
   end
 
   def image_url
-    image.url || PhrasingPlus::DummyImage.new(options).url
+    image.url || default_image && view_context.asset_url(default_image) || PhrasingPlus::DummyImage.new(options).url
   end
 
   private

data/lib/phrasing_plus/version.rb

@@ -1,3 +1,3 @@
 module PhrasingPlus
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phrasing_plus
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Damir Svrtan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-23 00:00:00.000000000 Z
+date: 2015-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails