shareable 0.0.3 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 19c19e220407ca941b623e9fa1193f404741adbc
+  data.tar.gz: 214c19f7a01b047c536a5b26bf32676161e0988e
+SHA512:
+  metadata.gz: 91f23d8a1f33e77d7421c9bbbe91c617bce9361bbc07918cdb5c49e04bf8f0cd5f6ff06607a17ed7e9c773bb67286837f5968b6e0cce7eb5de3e1267acb2d938
+  data.tar.gz: 01b71ab520dcb4575d26f567013eb370060bf8ec6e99fe4f89ae98724da890d834f7b61339b82158478a131a2f9ac76829c35cdc4be34f63a44505426df49bbd

data/app/views/shareable/_facebook.html.erb

@@ -1,20 +1,16 @@
-<%= output_once :facebook do %>
-<div id="fb-root"></div>
-<script>(function(d, s, id) {
-  var js, fjs = d.getElementsByTagName(s)[0];
-  if (d.getElementById(id)) return;
-  js = d.createElement(s); js.id = id;
-  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1<%= raw('&appId=' + options[:app_id]) unless options[:app_id].empty? %>";
-  fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));</script>
-<% end %>
-
-<fb:like href='<%= options[:url] %>'
-         send='<%= options[:send] %>'
-         layout='<%= options[:layout] %>'
-         show_faces='<%= options[:show_faces] %>'
-         width='<%= options[:width] %>'
-         action='<%= options[:action] %>'
-         font='<%= options[:font] %>'
-         colorscheme='<%= options[:colorscheme] %>'
-         ref='<%= options[:ref] %>' ></fb:like>
+<% if options[:static_link] %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+    <%= render "shareable/partials/link", :options => options.merge(:url=>"https://www.facebook.com/sharer.php?u=#{options[:url]}") %>
+  <% end %>
+<% else %>
+  <% unless options[:button_only] %>
+    <%= output_once :facebook do %>
+      <%= render "shareable/partials/scripts/facebook", :app_id => options[:app_id] %> 
+    <% end %>
+  <% end %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+<div class="fb-like"
+  <%= html_attributes(options.slice(:url, :send, :layout, :show_faces, :width, :action, :font, :colorscheme, :ref, :share, :kid_directed_site), :data => true) %>
+></div>
+  <% end %>
+<% end %>

data/app/views/shareable/_google_plus.html.erb

@@ -1,21 +1,16 @@
-<div class='g-plusone gplusshare'
-     data-href='<%= options[:url] %>'
-     data-size='<%= options[:size] %>'
-     data-annotation='<%= options[:annotation] %>'
-     data-width='<%= options[:width] %>'
-     data-align='<%= options[:align] %>'
-     data-expandTo='<%= options[:expand_to] %>'
-     data-callback='<%= options[:callback] %>'
-     data-onstartinteraction='<%= options[:onstartinteraction] %>'
-     data-onendinteraction='<%= options[:onendinteraction] %>'
-     data-recommendations='<%= options[:recommendations] %>'
+<% if options[:static_link] %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+    <%= render "shareable/partials/link", :options => options.merge(:url=>"https://plus.google.com/share?url=#{options[:url]}") %>
+  <% end %>
+<% else %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+<div class="g-plusone gplusshare"
+  <%= html_attributes(options.slice(:url, :size, :annotation, :width, :align, :expand_to, :callback, :onstartinteraction, :onendinteraction, :recommendations), :data => true) %>
 ></div>
-<%= output_once :google_plus do %>
-<script type="text/javascript">
-  (function() {
-    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-    po.src = 'https://apis.google.com/js/plusone.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-  })();
-</script>
+  <% end %>
+  <% unless options[:button_only] %>
+    <%= output_once :google_plus do %>
+      <%= render "shareable/partials/scripts/google_plus" %>
+    <% end %>
+  <% end %>
 <% end %>

data/app/views/shareable/_linkedin.html.erb

@@ -1,8 +1,14 @@
-<script src="//platform.linkedin.com/in.js" type="text/javascript"></script>
+<% if options[:static_link] %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+    <%= render "shareable/partials/link", :options => options.merge(:url=>"http://www.linkedin.com/shareArticle?url=#{options[:url]}&title=#{options[:title]}&summary=#{options[:description]}") %>
+  <% end %>
+<% else %>
+  <% unless options[:button_only] %>
+    <%= render "shareable/partials/scripts/linkedin" %> 
+  <% end %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
 <script type="IN/Share"
-        data-url='<%= options[:url] %>'
-        data-counter='<%= options[:counter] %>'
-        data-onerror='<%= options[:onerror]%>'
-        data-onsuccess='<%= options[:onsuccess]%>'
-        data-showzero='<%= options[:showzero] %>'
-></script>
+  <%= html_attributes(options.slice(:url, :counter, :onerror, :onsuccess, :showzero), :data => true) %>
+></script>
+  <% end %>
+<% end %>

data/app/views/shareable/_pinterest.html.erb

@@ -1,24 +1,17 @@
-<a data-pin-config='<%= options[:pin_config] %>'
+<% if options[:static_link] %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+    <%= render "shareable/partials/link", :options => options.merge(:url=>"http://pinterest.com/pin/create/button/?url=#{options[:url]}&description=#{options[:description]}&media=#{options[:media]}") %>
+  <% end %>
+<% else %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+<a data-pin-config="<%= options[:pin_config] %>"
    href="//pinterest.com/pin/create/button/?url=<%= options[:url] %><%= raw('&media=' + options[:media]) unless options[:media].blank? %><%= raw('&description=' + options[:description]) unless options[:description].blank? %>"
-   data-pin-do='<%= options[:pin_do] %>' >
-  <img src="//assets.pinterest.com/images/pidgets/pin_it_button.png" title='<%= options[:title]%>' alt='<%= options[:alt] %>' /></a>
-
-<%= output_once :pinterest do %>
-<script type="text/javascript">
-  (function (d, buildThese) {
-    var homeScript, newScript, n = buildThese.length, i;
-    for (i = 0; i < n; i = i + 1) {
-      newScript = d.createElement('SCRIPT');
-      newScript.type = 'text/javascript';
-      newScript.async = true;
-      newScript.src = buildThese[i];
-      homeScript = d.getElementsByTagName('SCRIPT')[0];
-      homeScript.parentNode.insertBefore(newScript, homeScript);
-    }
-  }(document, [
-    '//assets.pinterest.com/js/pinit.js'
-    /* load more third-party JavaScript here */
-  ])
-  );
-</script>
+   data-pin-do="<%= options[:pin_do] %>" >
+  <img src="//assets.pinterest.com/images/pidgets/pin_it_button.png" title="<%= options[:title]%>" alt="<%= options[:alt] %>" /></a>
+  <% end %>
+  <% unless options[:button_only] %>
+    <%= output_once :pinterest do %>
+      <%= render "shareable/partials/scripts/pinterest" %> 
+    <% end %>
+  <% end %>
 <% end %>

data/app/views/shareable/_reddit.html.erb

@@ -1,3 +1,7 @@
+<%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+  <% if options[:static_link] %>
+  <%= render "shareable/partials/link", :options => options.merge(:url=>"http://www.reddit.com/submit?url=#{options[:url]}&title=#{options[:title]}") %>
+  <% else %>
 <script type="text/javascript">
     reddit_url='<%= options[:url] %>';
     reddit_target='<%= options[:target]%>';
@@ -6,6 +10,10 @@
     reddit_bordercolor='<%= options[:bordercolor] %>';
     reddit_newwindow='<%= options[:newwindow] %>';
 </script>
+    <% unless options[:button_only] %>
 <script type="text/javascript"
-src="<%= raw((options[:btnsrc].blank? ? ('http://www.reddit.com/static/button/button' + options[:type] + '.js?i=' + options[:points]) : options[:btnsrc]) + '&styled=' + options[:styled]) %>">
-</script>
+src="<%= raw((options[:btnsrc].blank? ? ('//www.reddit.com/static/button/button' + options[:type] + '.js?i=' + options[:points]) : options[:btnsrc]) + '&styled=' + options[:styled]) %>">
+</script>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/shareable/_social_buttons.html.erb

@@ -1,7 +1,7 @@
-<nav class="share">
-  <%= social_buttons.render do -%>
-      <% each_button do |button| -%>
-          <%= eval button + '_tag' %>
-      <% end -%>
-  <% end -%>
-</nav>
+<%= render :layout =>'shareable/partials/parent_wrapper' do %>
+  <%= social_buttons.render do %>
+    <% each_button do |button| %>
+      <%= eval button + '_tag' %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/shareable/_stumble_upon.html.erb

@@ -0,0 +1,14 @@
+<% if options[:static_link] %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+    <%= render "shareable/partials/link", :options => options.merge(:url=>"https://www.stumbleupon.com/submit?url=#{options[:url]}&title=#{options[:title]}") %>
+  <% end %>
+<% else %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+<su:badge layout="<%= options[:badge_layout]%>" location="<%= options[:url] %>"></su:badge>
+  <% end %>
+  <% unless options[:button_only] %>
+    <%= output_once :stumble_upon do %>
+      <%= render "shareable/partials/scripts/stumble_upon" %> 
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/shareable/_tumblr.html.erb

@@ -0,0 +1,15 @@
+<% if options[:static_link] %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+    <%= render "shareable/partials/link", :options => options.merge(:url=>"https://www.tumblr.com/share/link?url=#{options[:url]}&name=#{options[:title]}&description=#{options[:description]}") %>
+  <% end %>
+<% else %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+<a href="http://www.tumblr.com/share/link?url=<%= options[:url] %>&name=<%= options[:title] %>&description=<%= options[:description] %>" title="Share on Tumblr" 
+style="display:inline-block; text-indent:-9999px; overflow:hidden; width:<%= options[:width] %>px; height:20px; background:url('http://platform.tumblr.com/v1/<%= options[:background] %>') top left no-repeat transparent;">Share on Tumblr</a>
+  <% end %>
+  <% unless options[:button_only] %>
+    <%= output_once :tumblr do %>
+      <%= render "shareable/partials/scripts/tumblr" %>
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/shareable/_twitter.html.erb

@@ -1,27 +1,21 @@
-<!--script src='http://platform.twitter.com/widgets.js' type='text/javascript'></script> -->
-<%- if defined?(Turbolinks) %>
-  <%= output_once :twitter do %>
-    <script src="//platform.twitter.com/widgets.js"></script>
+<% if options[:static_link] %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+    <%= render "shareable/partials/link", :options => options.merge(:url=>"https://twitter.com/intent/tweet?url=#{options[:url]}&text=#{options[:text]}&hashtags=#{options[:hashtags]}") %>
   <% end %>
-<% else -%>
-  <script>!function(d,s,id){
-    var js,fjs=d.getElementsByTagName(s)[0];
-    if(!d.getElementById(id)){
-        js=d.createElement(s);
-        js.id=id;js.src="//platform.twitter.com/widgets.js";
-        fjs.parentNode.insertBefore(js,fjs);}} (document,"script","twitter-wjs");
-  </script>
-<% end -%>
-
-<a href='http://twitter.com/share'
-   class='twitter-share-button'
-   data-url='<%= options[:url] %>'
-   data-via='<%= options[:via] %>'
-   data-text='<%= options[:text] %>'
-   data-related='<%= options[:related] %>'
-   data-count='<%= options[:count] %>'
-   data-lang='<%= options[:lang] %>'
-   data-counturl='<%= options[:counturl] %>'
-   data-hashtags='<%= options[:hashtags] %>'
-   data-size='<%= options[:size] %>'
-   data-dnt='<%= options[:dnt] %>'>Tweet</a>
+<% else %>
+  <% if tl = (defined?(Turbolinks) && !(options[:button_only])) %>
+    <%= output_once :twitter do %>
+<script src="//platform.twitter.com/widgets.js"></script>
+    <% end %>
+  <% end %>
+  <%= render :layout => "shareable/partials/button_wrapper", locals: {:options => options} do %>
+<a href="http://twitter.com/share" class="twitter-share-button"
+  <%= html_attributes(options.slice(:url, :via, :text, :related, :count, :lang, :counturl, :hashtags, :size, :dnt), :data => true) %>
+>Tweet</a>
+  <% end %>
+  <% unless tl %>
+    <%= output_once :twitter do %>
+      <%= render "shareable/partials/scripts/twitter" %> 
+    <% end %>
+  <% end %>
+<% end %>

data/app/views/shareable/partials/_button_wrapper.html.erb

@@ -0,0 +1 @@
+<%= yield %>

data/app/views/shareable/partials/_link.html.erb

@@ -0,0 +1 @@
+<a target="_blank" href="<%= options[:url] %>"><%= options[:button_caption] %></a>

data/app/views/shareable/partials/_parent_wrapper.html.erb

@@ -0,0 +1,3 @@
+<nav class="share">
+ <%= yield %>
+</nav>

data/app/views/shareable/partials/scripts/_facebook.html.erb

@@ -0,0 +1,9 @@
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+  var js, fjs = d.getElementsByTagName(s)[0];
+  if (d.getElementById(id)) return;
+  js = d.createElement(s); js.id = id;
+  js.src = "//connect.facebook.net/en_US/all.js#xfbml=1<%= raw('&appId=' + app_id) unless app_id.empty? %>";
+  fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));
+</script>

data/app/views/shareable/partials/scripts/_google_plus.html.erb

@@ -0,0 +1,7 @@
+<script type="text/javascript">
+  (function() {
+    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
+    po.src = 'https://apis.google.com/js/plusone.js';
+    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
+  })();
+  </script>

data/app/views/shareable/partials/scripts/_linkedin.html.erb

@@ -0,0 +1 @@
+<script src="//platform.linkedin.com/in.js" type="text/javascript"></script>

data/app/views/shareable/partials/scripts/_pinterest.html.erb

@@ -0,0 +1,17 @@
+<script type="text/javascript">
+  (function (d, buildThese) {
+    var homeScript, newScript, n = buildThese.length, i;
+    for (i = 0; i < n; i = i + 1) {
+      newScript = d.createElement('SCRIPT');
+      newScript.type = 'text/javascript';
+      newScript.async = true;
+      newScript.src = buildThese[i];
+      homeScript = d.getElementsByTagName('SCRIPT')[0];
+      homeScript.parentNode.insertBefore(newScript, homeScript);
+    }
+  }(document, [
+    '//assets.pinterest.com/js/pinit.js'
+    /* load more third-party JavaScript here */
+  ])
+  );
+</script>

data/app/views/shareable/partials/scripts/_stumble_upon.html.erb

@@ -0,0 +1,7 @@
+<script type="text/javascript">
+  (function() {
+    var li = document.createElement("script"); li.type = "text/javascript"; li.async = true;
+    li.src = ("https:" == document.location.protocol ? "https:" : "http:") + "//platform.stumbleupon.com/1/widgets.js";
+    var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(li, s);
+  })();
+</script>

data/app/views/shareable/partials/scripts/_tumblr.html.erb

@@ -0,0 +1 @@
+<script src="http://platform.tumblr.com/v1/share.js"></script>

data/app/views/shareable/partials/scripts/_twitter.html.erb

@@ -0,0 +1,7 @@
+<script>!function(d,s,id){
+  var js,fjs=d.getElementsByTagName(s)[0];
+  if(!d.getElementById(id)){
+    js=d.createElement(s);
+    js.id=id;js.src="//platform.twitter.com/widgets.js";
+    fjs.parentNode.insertBefore(js,fjs);}} (document,"script","twitter-wjs");
+</script>

data/lib/generators/shareable/templates/shareable_config.rb

@@ -1,5 +1,11 @@
 Shareable.configure do |config|
-  #config.names = %w[ twitter facebook linkedin pinterest google_plus reddit ]
+
+  # valid names are:
+  # twitter facebook pinterest reddit google_plus linkedin tumblr stumble_upon
+  #config.names = %w[ twitter facebook linkedin pinterest google_plus reddit tumblr stumble_upon ]
+
+  #config.button_only=false # omit initializing javacript. Only button code is rendered.
+  #config.static_link=false # renders non-javascript html links.
 
   ##############
   #facebook
@@ -8,11 +14,12 @@ Shareable.configure do |config|
   #config.send= 'false'
   #config.layout=''
   #config.show_faces=''
-  #config.width='80'
   #config.action=''
   #config.font=''
   #config.colorscheme=''
   #config.ref=''
+  #config.share=''
+  #config.kid_directed_site=''
 
   ##############
   #google_plus
@@ -38,10 +45,8 @@ Shareable.configure do |config|
   ##############
   #config.pin_config = 'none'
   #config.pin_do = 'buttonPin'
-  #config.title= '' # title for content, also used by reddit button
   #config.alt='' # alternate text for image tag
   #config.media=''
-  #config.description='Pin This'
 
   ##############
   #reddit
@@ -67,4 +72,22 @@ Shareable.configure do |config|
   #config.hashtags=''
   #config.size='medium'
   #config.dnt=''
+
+  ##############
+  #stumble_upon
+  ##############
+  #config.badge_layout='1'
+
+  ##############
+  #tumblr
+  ##############
+  #config.background='share_1.png'
+
+  ##############
+  #shared configuration options
+  ##############
+  #config.width='80' # used by facebook and tumblr
+  #config.title= '' # used by linkedin, pinterest, reddit, stumbleupon and tumblr
+  #config.description='' # used by linkedin and tumblr
+
 end

data/lib/shareable/config.rb

@@ -19,12 +19,16 @@ module Shareable
                     :onstartinteraction, :onendinteraction, :pin_config, :pin_do, :media, :color,
                     :bordercolor, :btnsrc, :via, :text, :related, :count, :lang, :counturl, :hashtags, :size, :dnt,
                     :type, :styled, :newwindow, :description, :counter, :onsuccess, :onerror, :showzero,
-                    :recommendations, :points
+                    :recommendations, :points, :badge_layout, :background, :share, :kid_directed_site,
+                    :button_only, :static_link
   end
 
   configure do |config|
     config.names = %w[ twitter facebook linkedin pinterest google_plus reddit ]
 
+    config.button_only=false # omit initializing javacript. Only button code is rendered.
+    config.static_link=false # renders non-javascript html links.
+
     ##############
     #facebook
     ##############
@@ -32,11 +36,12 @@ module Shareable
     config.send= 'false'
     config.layout='button_count'
     config.show_faces=''
-    config.width='80'
     config.action=''
     config.font=''
     config.colorscheme=''
     config.ref=''
+    config.share=''
+    config.kid_directed_site=''
 
     ##############
     #google_plus
@@ -62,10 +67,8 @@ module Shareable
     ##############
     config.pin_config = 'beside'
     config.pin_do = 'buttonPin'
-    config.title= '' # title for content, also used by reddit button
     config.alt='' # alternate text for image tag
     config.media=''
-    config.description='Pin This'
 
     ##############
     #reddit 
@@ -91,5 +94,22 @@ module Shareable
     config.hashtags=''
     config.size='medium'
     config.dnt=''
+
+    ##############
+    #stumble_upon
+    ##############
+    config.badge_layout='1'
+
+    ##############
+    #tumblr
+    ##############
+    config.background='share_1.png'
+
+    ##############
+    #shared configuration options
+    ##############
+    config.width='80' # used by facebook and tumblr
+    config.title= '' # used by linkedin, pinterest, reddit, stumbleupon and tumblr
+    config.description='' # used by linkedin and tumblr
   end
 end

data/lib/shareable/helpers/action_view_extension.rb

@@ -3,6 +3,19 @@ require 'shareable/helpers/social_buttons'
 module Shareable
   # = Helpers
   module ActionViewExtension
+    def html_attributes(attributes, opts={})
+      opts = {
+        :data => false
+      }.merge(opts)
+
+      prefix = opts[:data] ? 'data-' : ''
+      attributes.map { |(k, v)|
+        if v.present?
+          %{#{prefix}#{k.to_s.camelize(:lower)}="#{html_escape( v )}"}.html_safe
+        end
+      }.compact.join( " " ).html_safe
+    end
+
     # A helper that renders social links
     #   <%= render_shareable [options] %>
     def render_shareable(options = {}, &block)
@@ -32,6 +45,9 @@ module Shareable
     def refine_options(options={},button=nil)
       options[:options] ||= {}
       options[:options].merge! options.except(:options)
+      if options.has_key?(:buttons) then
+        options[:buttons].map!(&:to_s)
+      end
       if options[:url].blank? then
         options[:options][:url] = request.url
       end

data/lib/shareable/helpers/social_buttons.rb

@@ -9,16 +9,17 @@ module Shareable
     class SocialButtons < Tag
       include ::ActionView::Context
       cattr_accessor :buttons
-      self.buttons = %w[ twitter facebook pinterest reddit google_plus linkedin ]
+      self.buttons = %w[ twitter facebook pinterest reddit google_plus linkedin tumblr stumble_upon ]
 
-      #not very DRY. Refactor.
       cattr_accessor :config_options
       self.config_options = {
-      :facebook => [ :app_id, :send, :layout, :show_faces, :width, :action, :font, :colorscheme, :ref ],
+      :facebook => [ :app_id, :send, :layout, :show_faces, :width, :action, :font, :colorscheme, :ref, :share, :kid_directed_site ],
       :google_plus => [ :annotation, :recommendations, :align, :expand_to, :callback, :onstartinteraction, :onendinteraction, :size, :width ],
-      :linkedin => [ :counter, :onsuccess, :onerror, :showzero ],
+      :linkedin => [ :counter, :onsuccess, :onerror, :showzero, :title, :description ],
       :pinterest => [ :pin_config, :pin_do, :title, :alt, :media, :description ],
       :reddit => [ :title, :target, :color, :bordercolor, :type, :styled, :newwindow, :btnsrc, :points ],
+      :stumble_upon => [ :badge_layout, :title ],
+      :tumblr => [ :title, :description, :width, :background ],
       :twitter => [ :via, :text, :related, :count, :lang, :counturl, :hashtags, :size, :dnt ]}
 
       def initialize(template, options) #:nodoc:
@@ -49,22 +50,32 @@ module Shareable
       def to_s #:nodoc:
         #from Kamanari for handling log subscriber:
         subscriber = ActionView::LogSubscriber.log_subscribers.detect {|ls| ls.is_a? ActionView::LogSubscriber}
-        return super @options.merge :social_buttons => self unless subscriber
 
-        # dirty hack to suppress logging render_partial
-        class << subscriber
-          alias_method :render_partial_with_logging, :render_partial
-          # do nothing
-          def render_partial(event); end
-        end
+        # There is a logging subscriber
+        # and we don't want it to log render_partial
+        # It is threadsafe, but might not repress logging
+        # consistently in a high-load environment
+        if subscriber
+          unless defined? subscriber.render_partial_with_logging
+            class << subscriber
+              alias_method :render_partial_with_logging, :render_partial
+              attr_accessor :render_without_logging
+              # ugly hack to make a renderer where
+              # we can turn logging on or off
+              def render_partial(event)
+                render_partial_with_logging(event) unless render_without_logging
+              end
+            end
+          end
 
-        ret = super @options.merge :social_buttons => self
+          subscriber.render_without_logging = true
+          ret = super @options.merge :social_buttons => self
+          subscriber.render_without_logging = false
 
-        class << subscriber
-          alias_method :render_partial, :render_partial_with_logging
-          undef :render_partial_with_logging
+          ret
+        else
+          super @options.merge :social_buttons => self
         end
-        ret
       end
 
       def each_relevant_button #:nodoc:

data/lib/shareable/helpers/tags.rb

@@ -1,5 +1,6 @@
 module Shareable
   module Helpers
+
     class Tag
       def initialize(template, options = {}) #:nodoc:
         @template, @options = template, options.dup
@@ -11,9 +12,10 @@ module Shareable
     end
 
     class Socialize < Tag
-      def to_s(locals={}) #:nodoc:
+      def to_s(locals={}, caption="") #:nodoc:
         locals[:options] ||= {}
-        social_site = self.class.name.demodulize.downcase.to_sym
+        social_site=(locals[:options][:button_name]=self.class.name.demodulize.underscore.downcase).to_sym
+        locals[:options][:button_caption] = caption
         if @options[:options]
           @options[:filtered] ||= @options[:options].reject {|opt| locals[:options].include?(opt)}
           locals[:options].merge!(@options[:filtered])
@@ -26,36 +28,135 @@ module Shareable
     end
 
     class Facebook < Socialize
+      def to_s(locals={}) #:nodoc:
+        if (@options[:options][:static_link] && !(@options[:facebook] && @options[:facebook][:static_link]==false)) || (@options[:facebook] && @options[:facebook][:static_link])
+          locals[:options] ||= {}
+          p_opts = {:url => CGI::escape(@options[:options][:url])}
+          locals[:options].merge!(@options[:options].merge(p_opts))
+          if @options[:facebook]
+            @options[:facebook][:url] = CGI::escape(@options[:facebook][:url]) if @options[:facebook][:url]
+          end
+        end
+        super locals, "Facebook"
+      end
     end
 
     class GooglePlus < Socialize
+      def to_s(locals={}) #:nodoc:
+        if (@options[:options][:static_link] && !(@options[:google_plus] && @options[:google_plus][:static_link]==false)) || (@options[:google_plus] && @options[:google_plus][:static_link])
+          locals[:options] ||= {}
+          p_opts = {:url => CGI::escape(@options[:options][:url])}
+          locals[:options].merge!(@options[:options].merge(p_opts))
+          if @options[:google_plus]
+            @options[:google_plus][:url] = CGI::escape(@options[:google_plus][:url]) if @options[:google_plus][:url]
+          end
+        end
+        super locals, "Google+"
+      end
     end
 
     class Linkedin < Socialize
+      def to_s(locals={}) #:nodoc:
+        if (@options[:options][:static_link] && !(@options[:linkedin] && @options[:linkedin][:static_link]==false)) || (@options[:linkedin] && @options[:linkedin][:static_link])
+          locals[:options] ||= {}
+          p_opts = {:description => CGI::escape(@options[:options][:description]),
+                    :title => CGI::escape(@options[:options][:title]),
+                    :url => CGI::escape(@options[:options][:url])}
+          locals[:options].merge!(@options[:options].merge(p_opts))
+          if @options[:linkedin]
+            @options[:linkedin][:description] = CGI::escape(@options[:linkedin][:description]) if @options[:linkedin][:description]
+            @options[:linkedin][:title] = CGI::escape(@options[:linkedin][:title]) if @options[:linkedin][:title]
+            @options[:linkedin][:url] = CGI::escape(@options[:linkedin][:url]) if @options[:linkedin][:url]
+          end
+        end
+        super locals, "LinkedIn"
+      end
     end
 
     class Pinterest < Socialize
       def to_s(locals={}) #:nodoc:
         locals[:options] ||= {}
-        unless @options[:options].blank?
-          p_opts = {:description => CGI::escape(@options[:options][:description] ? @options[:options][:description] : '' ),
-                    :url => CGI::escape(@options[:options][:url] ? @options[:options][:url] : ''),
-                    :media => CGI::escape(@options[:options][:media] ? @options[:options][:media] : '')}
+        p_opts = {:description => CGI::escape(@options[:options][:description]),
+                  :url => CGI::escape(@options[:options][:url]),
+                  :media => CGI::escape(@options[:options][:media])}
+        locals[:options].merge!(@options[:options].merge(p_opts))
+        if @options[:pinterest]
+          @options[:pinterest][:description] = CGI::escape(@options[:pinterest][:description]) if @options[:pinterest][:description]
+          @options[:pinterest][:url] = CGI::escape(@options[:pinterest][:url]) if @options[:pinterest][:url]
+          @options[:pinterest][:media] = CGI::escape(@options[:pinterest][:media]) if @options[:pinterest][:media]
+        end
+        super locals, "Pinterest"
+      end
+    end
+
+    class Reddit < Socialize
+      def to_s(locals={}) #:nodoc:
+        if (@options[:options][:static_link] && !(@options[:reddit] && @options[:reddit][:static_link]==false)) || (@options[:reddit] && @options[:reddit][:static_link])
+          locals[:options] ||= {}
+          p_opts = {:title => CGI::escape(@options[:options][:title]),
+                    :url => CGI::escape(@options[:options][:url])}
           locals[:options].merge!(@options[:options].merge(p_opts))
-          if @options[:pinterest]
-            @options[:pinterest][:description] = CGI::escape(@options[:pinterest][:description]) if @options[:pinterest][:description]
-            @options[:pinterest][:url] = CGI::escape(@options[:pinterest][:url]) if @options[:pinterest][:url]
-            @options[:pinterest][:media] = CGI::escape(@options[:pinterest][:media]) if @options[:pinterest][:media]
+          if @options[:reddit]
+            @options[:reddit][:title] = CGI::escape(@options[:reddit][:title]) if @options[:reddit][:title]
+            @options[:reddit][:url] = CGI::escape(@options[:reddit][:url]) if @options[:reddit][:url]
           end
         end
-        super locals
+        super locals, "Reddit"
       end
     end
 
-    class Reddit < Socialize
+    class StumbleUpon < Socialize
+      def to_s(locals={}) #:nodoc:
+        if (@options[:options][:static_link] && !(@options[:stumble_upon] && @options[:stumble_upon][:static_link]==false)) || (@options[:stumble_upon] && @options[:stumble_upon][:static_link])
+          locals[:options] ||= {}
+          p_opts = {:title => CGI::escape(@options[:options][:title]),
+                    :url => CGI::escape(@options[:options][:url])}
+          locals[:options].merge!(@options[:options].merge(p_opts))
+          if @options[:stumble_upon]
+            @options[:stumble_upon][:title] = CGI::escape(@options[:stumble_upon][:title]) if @options[:stumble_upon][:title]
+            @options[:stumble_upon][:url] = CGI::escape(@options[:stumble_upon][:url]) if @options[:stumble_upon][:url]
+          end
+        end
+        super locals, "StumbleUpon"
+      end
+    end
+
+    class Tumblr < Socialize
+      def to_s(locals={}) #:nodoc:
+        locals[:options] ||= {}
+        p_opts = {:description => CGI::escape(@options[:options][:description]),
+                  :url => CGI::escape(@options[:options][:url]),
+                  :title => CGI::escape(@options[:options][:title])}
+        locals[:options].merge!(@options[:options].merge(p_opts))
+        if @options[:tumblr]
+          @options[:tumblr][:description] = CGI::escape(@options[:tumblr][:description]) if @options[:tumblr][:description]
+          @options[:tumblr][:url] = CGI::escape(@options[:tumblr][:url]) if @options[:tumblr][:url]
+          @options[:tumblr][:title] = CGI::escape(@options[:tumblr][:title]) if @options[:tumblr][:title]
+        end
+        super locals, "Tumblr"
+      end
     end
 
     class Twitter <  Socialize
+      def to_s(locals={}) #:nodoc:
+        locals[:options] ||= {}
+        if locals[:options][:text].blank? && @options[:options][:text].blank? && (@options[:twitter] ? @options[:twitter][:text].blank? : true) && @options[:options][:title]
+          locals[:options][:text] = @options[:options][:title]
+        end
+        if (@options[:options][:static_link] && !(@options[:twitter] && @options[:twitter][:static_link]==false)) || (@options[:twitter] && @options[:twitter][:static_link])
+          p_opts = {:text => CGI::escape(locals[:options][:text] ? locals[:options][:text] : (@options[:options][:text] ? @options[:options][:text] : '')),
+                    :url => CGI::escape(@options[:options][:url]),
+                    :hashtags => @options[:options][:hashtags].blank? ? '' : @options[:options][:hashtags].split(',').map{|tag| CGI::escape(tag)}.join(',')}
+          locals[:options].merge!(@options[:options].merge(p_opts))
+          if @options[:twitter]
+            @options[:twitter][:text] = CGI::escape(@options[:twitter][:text]) if @options[:twitter][:text]
+            @options[:twitter][:url] = CGI::escape(@options[:twitter][:url]) if @options[:twitter][:url]
+            @options[:twitter][:hashtags] = @options[:twitter][:hashtags].split(',').map{|tag| CGI::escape(tag)}.join(',') if @options[:twitter][:hashtags]
+          end
+        end
+        super locals, "Twitter"
+      end
     end
+
   end
 end

data/lib/shareable/version.rb

@@ -1,3 +1,3 @@
 module Shareable
-  VERSION = "0.0.3"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,126 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: shareable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Hermango
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Add social sharing links to a view in your Rails app with one method
@@ -131,6 +116,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .DS_Store
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -141,7 +127,19 @@ files:
 - app/views/shareable/_pinterest.html.erb
 - app/views/shareable/_reddit.html.erb
 - app/views/shareable/_social_buttons.html.erb
+- app/views/shareable/_stumble_upon.html.erb
+- app/views/shareable/_tumblr.html.erb
 - app/views/shareable/_twitter.html.erb
+- app/views/shareable/partials/_button_wrapper.html.erb
+- app/views/shareable/partials/_link.html.erb
+- app/views/shareable/partials/_parent_wrapper.html.erb
+- app/views/shareable/partials/scripts/_facebook.html.erb
+- app/views/shareable/partials/scripts/_google_plus.html.erb
+- app/views/shareable/partials/scripts/_linkedin.html.erb
+- app/views/shareable/partials/scripts/_pinterest.html.erb
+- app/views/shareable/partials/scripts/_stumble_upon.html.erb
+- app/views/shareable/partials/scripts/_tumblr.html.erb
+- app/views/shareable/partials/scripts/_twitter.html.erb
 - lib/generators/shareable/config_generator.rb
 - lib/generators/shareable/templates/shareable_config.rb
 - lib/shareable.rb
@@ -157,26 +155,25 @@ files:
 homepage: http://github.com/hermango/shareable
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple and unobtrusive gem for adding social links to your Rails app.
 test_files: []