Download as
Browse Code »

Commit 8732ba3390bbe8ae5f26b08f54f36eaf333b6b47

Authored by Braulio Bhavamitra
1 parent 8dc2e2b6
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

metadata: use environment data for required fields

Showing 4 changed files with 30 additions and 16 deletions   Show diff stats
plugins/metadata/lib/ext/article.rb
  Diff comments   View file @8732ba3
... ... @@ -12,10 +12,10 @@ class Article
12 12 end,
13 13 title: proc{ |a, plugin| "#{a.title} - #{a.profile.name}" },
14 14 image: proc do |a, plugin|
15   - result = a.body_images_paths
16   - result = "#{a.profile.environment.top_url}#{a.profile.image.public_filename}" if a.profile.image if result.blank?
17   - result ||= MetadataPlugin.config[:open_graph][:environment_logo] rescue nil if result.blank?
18   - result
  15 + img = a.body_images_paths
  16 + img = "#{a.profile.environment.top_url}#{a.profile.image.public_filename}" if a.profile.image if img.blank?
  17 + img ||= MetadataPlugin.config[:open_graph][:environment_logo] rescue nil if img.blank?
  18 + img
19 19 end,
20 20 see_also: [],
21 21 site_name: proc{ |a, c| a.profile.name },
... ...
plugins/metadata/lib/ext/enterprise.rb
  Diff comments   View file @8732ba3
... ... @@ -7,15 +7,21 @@ class Enterprise
7 7 type: proc{ |e, plugin| plugin.context.params[:og_type] || MetadataPlugin.og_types[:enterprise] || :enterprise },
8 8 }
9 9  
  10 + # required for businness
  11 + metadata_spec namespace: 'place:location', tags: {
  12 + latitude: proc{ |e, plugin| if e.lat.present? then e.lat else e.environment.lat end },
  13 + longitude: proc{ |e, plugin| if e.lng.present? then e.lng else e.environment.lng end },
  14 + }
  15 +
10 16 metadata_spec namespace: 'business:contact_data', tags: {
11   - email: proc{ |e, plugin| e.contact_email },
12   - phone_number: proc{ |e, plugin| e.contact_phone },
13   - street_address: proc{ |e, plugin| e.address },
14   - locality: proc{ |e, plugin| e.city },
15   - region: proc{ |e, plugin| e.state },
16   - postal_code: proc{ |e, plugin| e.zip_code },
17   - # required
18   - country_name: proc{ |e, plugin| e.country || e.environment.country_name || 'Unknown' },
  17 + # all required
  18 + email: proc{ |e, plugin| if e.contact_email.present? then e.contact_email else e.environment.contact_email end },
  19 + phone_number: proc{ |e, plugin| if e.contact_phone.present? then e.contact_phone else e.environment.contact_phone end },
  20 + street_address: proc{ |e, plugin| if e.address.present? then e.address else e.environment.address end },
  21 + locality: proc{ |e, plugin| if e.city.present? then e.city else e.environment.city end },
  22 + region: proc{ |e, plugin| if e.state.present? then e.state else e.environment.state end },
  23 + postal_code: proc{ |e, plugin| if e.zip_code.present? then e.zip_code else e.environment.postal_code end },
  24 + country_name: proc{ |e, plugin| if e.country.present? then e.country else e.environment.country_name end },
19 25 }
20 26  
21 27 end
... ...
plugins/metadata/lib/ext/product.rb
  Diff comments   View file @8732ba3
... ... @@ -4,7 +4,6 @@ class Product
4 4  
5 5 metadata_spec namespace: :og, tags: {
6 6 type: proc{ |p, plugin| plugin.context.params[:og_type] || MetadataPlugin.og_types[:product] || :product },
7   - url: proc{ |p, plugin| plugin.og_url_for p.url },
8 7 url: proc do |p, plugin|
9 8 url = p.url.merge! profile: p.profile.identifier, og_type: plugin.context.params[:og_type]
10 9 plugin.og_url_for url
... ... @@ -14,7 +13,12 @@ class Product
14 13 title: proc{ |p, plugin| "#{p.name} - #{p.profile.name}" if p },
15 14 description: proc{ |p, plugin| ActionView::Base.full_sanitizer.sanitize p.description },
16 15  
17   - image: proc{ |p, plugin| "#{p.environment.top_url}#{p.image.public_filename}" if p.image },
  16 + image: proc do |p, plugin|
  17 + img = "#{p.environment.top_url}#{p.image.public_filename}" if p.image
  18 + img = "#{p.environment.top_url}#{p.profile.image.public_filename}" if img.blank? and p.profile.image
  19 + img ||= MetadataPlugin.config[:open_graph][:environment_logo] rescue nil if img.blank?
  20 + img
  21 + end,
18 22 'image:type' => proc{ |p, plugin| p.image.content_type if p.image },
19 23 'image:height' => proc{ |p, plugin| p.image.height if p.image },
20 24 'image:width' => proc{ |p, plugin| p.image.width if p.image },
... ...
plugins/metadata/lib/ext/profile.rb
  Diff comments   View file @8732ba3
... ... @@ -4,8 +4,12 @@ class Profile
4 4  
5 5 metadata_spec namespace: :og, tags: {
6 6 type: proc{ |p, plugin| plugin.context.params[:og_type] || MetadataPlugin.og_types[:profile] || :profile },
7   - image: proc{ |p, plugin| "#{p.environment.top_url}#{p.image.public_filename}" if p.image },
8   - title: proc{ |p, plugin| if p.nickname.present? then p.nickname else p.name end },
  7 + image: proc do |p, plugin|
  8 + img = "#{p.environment.top_url}#{p.image.public_filename}" if p.image
  9 + img ||= MetadataPlugin.config[:open_graph][:environment_logo] rescue nil if img.blank?
  10 + img
  11 + end,
  12 + title: proc{ |p, plugin| if p.nickname.present? then p.nickname else p.name end },
9 13 url: proc{ |p, plugin| plugin.og_url_for plugin.og_profile_url(p) },
10 14 description: proc{ |p, plugin| p.description },
11 15 updated_time: proc{ |p, plugin| p.updated_at.iso8601 },
... ...