flakey 0.0.7 → 0.1.0

data/lib/flakey/twitter.rb

@@ -58,28 +58,19 @@ module Flakey
     def tweet_button(options = {})
       url = options[:url] || request.url
       text = options[:text]
-      hashtags = options[:hashtags] ||
-        Flakey.configuration.tweet_hashtags
-      label = options[:label] ||
-        Flakey.configuration.tweet_label
-      via = options[:via] ||
-        Flakey.configuration.tweet_via
-      related = options[:related] ||
-        Flakey.configuration.tweet_related
-      size = options[:size] || 
-        Flakey.configuration.tweet_button_size
-      class_list = options[:class] ||
-        Flakey.configuration.tweet_button_class
+      hashtags = options[:hashtags] || Flakey.configuration.tweet_hashtags
+      label = options[:label] || Flakey.configuration.tweet_label
+      via = options[:via] || Flakey.configuration.tweet_via
+      related = options[:related] || Flakey.configuration.tweet_related
+      size = options[:size] || Flakey.configuration.tweet_button_size
+      class_list = options[:class] || Flakey.configuration.tweet_button_class
 
-      data_attr = {
-        :via => via,
-        :related => related,
-        :hashtags => hashtags,
-        :url => url
-      }
+      data_attr = { via: via, related: related, hashtags: hashtags }
       # Twitter will take the page title if we just leave it out.
       data_attr.merge!(text: text) unless text.nil?
       data_attr.merge!(size: size) unless size.nil?
+      data_attr.merge!(url: url) unless url.nil?
+
       class_list = class_list ? 
         class_list.concat(' ' + TWEET_BUTTON_CLASS) : TWEET_BUTTON_CLASS
 

data/lib/flakey/version.rb

@@ -1,3 +1,3 @@
 module Flakey
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

data/vendor/assets/javascripts/flakey/facebook.js.erb

@@ -1,7 +1,9 @@
-(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_GB/all.js#xfbml=1&appId=<%= Flakey.configuration.facebook_app_id %>";
-  fjs.parentNode.insertBefore(js, fjs);
-}(document, 'script', 'facebook-jssdk'));
+<% if defined?(Rails) && !Rails.env.test? %>
+  (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_GB/all.js#xfbml=1&appId=<%= Flakey.configuration.facebook_app_id %>";
+    fjs.parentNode.insertBefore(js, fjs);
+  }(document, 'script', 'facebook-jssdk'));
+<% end %>

data/vendor/assets/javascripts/flakey/google_plus.js.erb

@@ -1,9 +1,11 @@
-<% if Flakey.configuration.plus_one_button_language %>
-  window.___gcfg = {lang: '<%= Flakey.configuration.plus_one_button_language %>'};
-<% end %>
+<% if defined?(Rails) && !Rails.env.test? %>
+  <% if Flakey.configuration.plus_one_button_language %>
+    window.___gcfg = {lang: '<%= Flakey.configuration.plus_one_button_language %>'};
+  <% end %>
 
-(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);
-})();
+  (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);
+  })();
+<% end %>

data/vendor/assets/javascripts/flakey/twitter.js.erb

@@ -0,0 +1,3 @@
+<% if defined?(Rails) && !Rails.env.test? %>
+  !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");
+<% end %>

metadata

@@ -1,48 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: flakey
 version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  version: 0.0.7
 platform: ruby
 authors:
 - David Tuite
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  prerelease: false
+- !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Social helpers for Rails apps.
 email:
 - dtuite@gmail.com
@@ -70,7 +70,7 @@ files:
 - spec/spec_helper.rb
 - vendor/assets/javascripts/flakey/facebook.js.erb
 - vendor/assets/javascripts/flakey/google_plus.js.erb
-- vendor/assets/javascripts/flakey/twitter.js
+- vendor/assets/javascripts/flakey/twitter.js.erb
 homepage: ''
 licenses: []
 post_install_message: 
@@ -78,26 +78,26 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -1397062392363678178
-  none: false
+      hash: -4057276441558711601
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -1397062392363678178
-  none: false
+      hash: -4057276441558711601
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Makes a bunch of helper methods available for including in your Rails views.

data/vendor/assets/javascripts/flakey/twitter.js

@@ -1 +0,0 @@
-!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");