share_buttons 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48ddf4aed372d084e4fa5e3178c0a81654ab68d7
-  data.tar.gz: f647c4f310618ddda0a25d980bcdb1f36d17b006
+  metadata.gz: 11db4faf869ab88325e89a36c95f02ea1ca5c992
+  data.tar.gz: 100e03d7d849b65a48a102ef87ab74d837eb04be
 SHA512:
-  metadata.gz: 197612915bf4fedfb6bdd2fbe9cef27aebc33872d8a96e8b4750bedfc56f23f6ff4d49b4c55bd7b3e49bb6f2407e3278c839a403903b8766a44cda1d1e1d5847
-  data.tar.gz: cd365c831279ea569ce960c23ae8e6b3679990446207a76b424b575ddbc8a857d43de316ebc165db1e08fba4eacdefed607b8d3693388b910e5e4c54037e2c20
+  metadata.gz: 96f58a3e94fe3aacaaeb41d80920e96ada34429acdd8ccc9752ff56fb3a9a38bf9844eaca77eb3a78557685af77253dda23ea8a42f4efc7c6cf8af4cd368edbe
+  data.tar.gz: 1000db3730f7eae0f4152d4c44f5ca6a90aa5cff7648ba837c84ed5fc5c19643c402b6bfc46505b5ea3c58e8a51c9b5ccc2407f7ec0669ab85253b0a5f795b75

data/README.md

@@ -31,13 +31,13 @@ At last, include the javascript file in your `application.js` with :
 
 ## Configuration
 
-For Facebook sharing, you need to add you Facebook APP_ID to the generated
-initializer configuration file in `config/initializers/share_buttons.rb` :
+For Facebook sharing, you need to set the `FACEBOOK_APP_ID` environment variable
+or add your Facebook App Id to the generated initializer configuration file at
+`config/initializers/share_buttons.rb` :
 
 ```ruby
 ShareButtons.configure do |config|
-  # Configure your facebook App ID for sharing
-  config.facebook.app_id = ENV['FACEBOOK_KEY']
+  config.facebook.app_id = 'YOUR_APP_ID'
 end
 ```
 
@@ -46,16 +46,19 @@ end
 In your views, use any of the included helpers :
 
 ```erb
-<%= facebook_share_button(resource_path(resource), title: resource.title) %>
-<%= twitter_share_button(resource_path(resource), title: resource.title) %>
-<%= google_plus_share_button(resource_path(resource), title: resource.title) %>
-<%= pinterest_share_button(resource_path(resource), title: resource.title, image_url: resource.image.url) %>
-<%= email_share_button(resource_path(resource), title: resource.title) %>
-<%= link_share_button(resource_path(resource), title: resource.title) %>
+<%= facebook_share_button(resource_url(resource), title: resource.title) %>
+<%= twitter_share_button(resource_url(resource), title: resource.title) %>
+<%= google_plus_share_button(resource_url(resource), title: resource.title) %>
+<%= pinterest_share_button(resource_url(resource), title: resource.title, image_url: resource.image.url) %>
+<%= email_share_button(resource_url(resource), title: resource.title) %>
+<%= link_share_button(resource_url(resource), title: resource.title) %>
 ```
 
 And customize the generated views to your needs in `app/views/share_buttons/_<provider>.html.haml`
 
+> **Note** : Do not forget to use **URL** helpers and not Path helpers since the
+final URL is to be shared on other websites.
+
 ### Facebook
 
 Facebook's `redirect_uri` parameter will be set to `request.original_url` by

data/app/assets/javascripts/share_buttons.coffee

@@ -9,8 +9,8 @@
   # Custom page ready handler allowing to automatically handle apps with or
   # without Turbolinks
   onPageReady: (callback) ->
-    $(document).ready(-> callback() unless window.Turbolinks)
-    $(document).on('page:change', callback);
+    $(document).ready(-> callback() unless window.Turbolinks?.supported)
+    $(document).on('page:change turbolinks:load', callback)
 
   register: (type, plugin) ->
     ShareButtons._plugins[type] = plugin

data/app/helpers/share_buttons/view_helper.rb

@@ -22,7 +22,8 @@ module ShareButtons
           options = {}
         end
       end
+
       [url, options]
     end
   end
-end
+end

data/app/views/share_buttons/_email.html.haml

@@ -1,3 +1,3 @@
-= mail_to nil, body: button.url, subject: button.title, class: 'btn btn-default', data: { share: 'email' } do
+= mail_to nil, body: button.url, subject: button.title, class: button.button_class, data: { share: 'email' } do
   %i.fa.fa-envelope
   = button.label

data/app/views/share_buttons/_facebook.html.haml

@@ -1,3 +1,3 @@
-= link_to button.href, class: 'btn btn-default', data: { share: 'popup' } do
+= link_to button.href, class: button.button_class, data: { share: 'popup' } do
   %i.fa.fa-facebook
   = button.label

data/app/views/share_buttons/_google_plus.html.haml

@@ -1,3 +1,3 @@
-= link_to button.href, class: 'btn btn-default', data: { share: 'popup' } do
+= link_to button.href, class: button.button_class, data: { share: 'popup' } do
   %i.fa.fa-google-plus
   = button.label

data/app/views/share_buttons/_link.html.haml

@@ -1,4 +1,4 @@
-%button.btn.btn-default{ type: 'button', data: { share: 'copy', target: "##{ button.dom_id }", :"clipboard-text" => button.url, :title => button.label } }
+%button{ class: button.button_class, type: 'button', data: { share: 'copy', target: "##{ button.dom_id }", :"clipboard-text" => button.url, :title => button.label } }
   %i.fa.fa-link
   = button.label
 

data/app/views/share_buttons/_pinterest.html.haml

@@ -1,3 +1,3 @@
-= link_to button.href, class: 'btn btn-default', data: { share: 'popup', :'pin-do' => 'buttonBookmark' } do
+= link_to button.href, class: button.button_class, data: { share: 'popup', :'pin-do' => 'buttonBookmark' } do
   %i.fa.fa-pinterest
   = button.label

data/app/views/share_buttons/_twitter.html.haml

@@ -1,3 +1,3 @@
-= link_to button.href, class: 'btn btn-default', data: { share: 'popup' } do
+= link_to button.href, class: button.button_class, data: { share: 'popup' } do
   %i.fa.fa-twitter
   = button.label

data/lib/generators/share_buttons/install/templates/initializer.rb

@@ -1,4 +1,6 @@
 ShareButtons.configure do |config|
   # Configure your facebook App ID for sharing
+  # Note that it defaults to the `FACEBOOK_APP_ID` environment variable.
+  #
   # config.facebook.app_id = ENV['FACEBOOK_APP_ID']
 end

data/lib/share_buttons/base.rb

@@ -16,6 +16,10 @@ module ShareButtons
       options.fetch(:label, "Partager sur #{ medium_name }")
     end
 
+    def button_class
+      options.fetch(:button_class, 'btn btn-default')
+    end
+
     def medium_name
       self.class.name.demodulize.underscore.humanize
     end

data/lib/share_buttons/facebook.rb

@@ -1,6 +1,6 @@
 module ShareButtons
   class Facebook < ShareButtons::Base
-    cattr_accessor :app_id
+    class_attribute :app_id
 
     private
 
@@ -11,7 +11,7 @@ module ShareButtons
     def url_options
       {
         display: 'popup', redirect_uri: redirect_uri,
-        app_id: config.app_id, href: url
+        app_id: app_id, href: url
       }
     end
 
@@ -19,5 +19,8 @@ module ShareButtons
       options[:redirect_uri] || request.original_url
     end
 
+    def app_id
+      @app_id ||= ENV['FACEBOOK_APP_ID'] || config.app_id
+    end
   end
 end

data/lib/share_buttons/version.rb

@@ -1,3 +1,3 @@
 module ShareButtons
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: share_buttons
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Valentin Ballestrino