social-url 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 382bc516fb895000ad278ae48561ff9d814a2118
-  data.tar.gz: 92dde830fec2519dd536d5719f710f30dcd921c3
+  metadata.gz: b53dbc1e3360fcc3106bb39f5fb0982f8b7f92d3
+  data.tar.gz: 1911e4958a6545999181821fc3f70e3dbf1e212c
 SHA512:
-  metadata.gz: 82be3aa78314a4b6d72fd686b410e355c402b9774e17e439049cd2d7534b8e3617fd6255a4637b3d33d7523eba81d8c162a8f4e2ad7eb0cac249e2425163bdcd
-  data.tar.gz: a1499e19fddcaef083ea5dd7599abe42d33acc337ee6ac5e7dc00ca564f44962d1d3b7c07f509e6a39b11a9b72670de179d471aae7294f530e2ddd7e852ce059
+  metadata.gz: 6374b509874ea4ec03d63d383de4ca34393ce22a1e67236105705aa453a4ef9f11210d4f4c1c455bd2147cc904b642d3f9bc5ccdc36e82d9eb1fc2c08b013523
+  data.tar.gz: 8007c1381a449eb81424b48a1f491e85e601ce102e9207cd5e84280aa2c3eadef1590b07cd365ddfc68b299ed1b1180e1638bc8afd26dde23a16dd31f31d083c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    social-url (0.3.0)
+    social-url (1.0.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -61,7 +61,6 @@ message.facebook_url #=> 'https://www.facebook.com/sharer/sharer.php?u=http%3A%2
 This gem is a work-in-progress. Planned features:
 
 - Raise on missing required network parameters
-- Merge keys for networks (e.g. url, u)
 - Ruby on Rails ActionView helpers
 
 ## Contributing

data/lib/social_url.rb

@@ -1,5 +1,8 @@
 require 'erb'
+
+require 'social_url/errors'
 require 'social_url/version'
+
 require 'social_url/message'
 require 'social_url/facebook'
 require 'social_url/google'
@@ -11,6 +14,12 @@ module SocialUrl
 
   class << self
     NETWORKS = [:facebook, :google, :pinterest, :twitter]
+    KEYS = {
+      u: :url,
+      url: :u,
+      description: :text,
+      text: :description
+    }
 
     def networks
       NETWORKS
@@ -26,6 +35,16 @@ module SocialUrl
         opts[key] = normalize_array(value) if value.is_a?(Array)
       end
 
+      normalize_keys(opts)
+    end
+
+    def normalize_keys(options)
+      opts = options.dup
+
+      options.each do |key, value|
+        opts[KEYS[key]] = opts[key] if KEYS[key]
+      end
+
       opts
     end
 
@@ -38,7 +57,11 @@ module SocialUrl
         ERB::Util.url_encode(value)
       end.join(',')
     end
-  end
 
-  class UnsupportedNetworkError < StandardError; end
+    def filtered_params(options, params)
+      params.collect do |param|
+        "#{param}=#{options[param]}"
+      end.join('&')
+    end
+  end
 end

data/lib/social_url/facebook.rb

@@ -1,13 +1,13 @@
 module SocialUrl
   class Facebook
+    PARAMS = [:u]
+
     def initialize(options)
-      @options = options
+      @params = SocialUrl.filtered_params(options, PARAMS)
     end
 
     def url
-      params = "u=#{@options[:url]}"
-
-      "https://www.facebook.com/sharer/sharer.php?#{params}"
+      "https://www.facebook.com/sharer/sharer.php?#{@params}"
     end
   end
 end

data/lib/social_url/google.rb

@@ -1,13 +1,13 @@
 module SocialUrl
   class Google
+    PARAMS = [:url]
+
     def initialize(options)
-      @options = options
+      @params = SocialUrl.filtered_params(options, PARAMS)
     end
 
     def url
-      params = "url=#{@options[:url]}"
-
-      "https://plus.google.com/share?#{params}"
+      "https://plus.google.com/share?#{@params}"
     end
   end
 end

data/lib/social_url/pinterest.rb

@@ -0,0 +1,13 @@
+module SocialUrl
+  class Pinterest
+    PARAMS = [:url, :media, :description]
+
+    def initialize(options)
+      @params = SocialUrl.filtered_params(options, PARAMS)
+    end
+
+    def url
+      "https://www.pinterest.com/pin/create/button/?#{@params}"
+    end
+  end
+end

data/lib/social_url/twitter.rb

@@ -1,15 +1,13 @@
 module SocialUrl
   class Twitter
+    PARAMS = [:text, :url, :hashtags, :via, :related]
+
     def initialize(options)
-      @options = options
+      @params = SocialUrl.filtered_params(options, PARAMS)
     end
 
     def url
-      params = @options.collect do |key, value|
-        "#{key}=#{value}"
-      end.join('&')
-
-      "https://twitter.com/intent/tweet/?#{params}"
+      "https://twitter.com/intent/tweet/?#{@params}"
     end
   end
 end

data/lib/social_url/version.rb

@@ -1,3 +1,3 @@
 module SocialUrl
-  VERSION = '0.3.0'
+  VERSION = '1.0.0'
 end

data/test/lib/social_url/message_test.rb

@@ -2,39 +2,43 @@ require 'test_helper'
 
 module SocialUrl
   class MessageTest < Minitest::Test
-    def test_exposes_network_methods
-      message = Message.new({})
+    def setup
+      @message = Message.new({})
+      @complete_message = Message.new({
+        text: 'Hello World',
+        url: 'http://example.com',
+        hashtags: %w(nature sunset),
+        via: 'twitterdev',
+        related: ['twitter:Twitter News', 'twitterapi:Twitter API News']
+      })
+    end
+
+    def teardown
+      @message.destroy
+      @complete_message.destroy
+    end
 
+    def test_exposes_network_methods
       SocialUrl.networks.each do |network|
         method = "#{network}_url".to_sym
-        assert_respond_to message, method
+        assert_respond_to @message, method
       end
     end
 
     def test_throws_on_invalid_network
-      message = Message.new({})
-
       assert_raises UnsupportedNetworkError do
-        message.derp_url
+        @message.derp_url
       end
     end
 
     def test_network_url
-      message = Message.new({
-        text: 'Hello World',
-        url: 'http://example.com',
-        hashtags: %w(nature sunset),
-        via: 'twitterdev',
-        related: ['twitter:Twitter News', 'twitterapi:Twitter API News']
-      })
-
       url = ['https://twitter.com/intent/tweet/?text=Hello%20World',
              '&url=http%3A%2F%2Fexample.com',
              '&hashtags=nature,sunset',
              '&via=twitterdev',
              '&related=twitter%3ATwitter%20News,twitterapi%3ATwitter%20API%20News'].join
 
-      assert_equal url, message.twitter_url
+      assert_equal url, @complete_message.twitter_url
     end
   end
 end

data/test/lib/social_url_test.rb

@@ -1,6 +1,26 @@
 require 'test_helper'
 
 class SocialUrlTest < Minitest::Test
+  def setup
+    @options = {
+      text: 'Hello World',
+      url: 'http://example.com/',
+      hashtags: %w(nature sunset),
+      via: 'twitterdev',
+      related: ['twitter:Twitter News', 'twitterapi:Twitter API News']
+    }
+
+    @normalized_options = {
+      text: 'Hello%20World',
+      description: 'Hello%20World',
+      u: 'http%3A%2F%2Fexample.com%2F',
+      url: 'http%3A%2F%2Fexample.com%2F',
+      hashtags: 'nature,sunset',
+      via: 'twitterdev',
+      related: 'twitter%3ATwitter%20News,twitterapi%3ATwitter%20API%20News'
+    }
+  end
+
   def test_exposes_available_networks
     assert_kind_of Array, SocialUrl.networks
     assert_includes SocialUrl.networks, :twitter
@@ -23,22 +43,13 @@ class SocialUrlTest < Minitest::Test
   end
 
   def test_normalization
-    options = {
-      text: 'Hello World',
-      url: 'http://example.com/',
-      hashtags: %w(nature sunset),
-      via: 'twitterdev',
-      related: ['twitter:Twitter News', 'twitterapi:Twitter API News']
-    }
+    assert_equal @normalized_options, SocialUrl.normalize(@options)
+  end
 
-    normalized_options = {
-      text: 'Hello%20World',
-      url: 'http%3A%2F%2Fexample.com%2F',
-      hashtags: 'nature,sunset',
-      via: 'twitterdev',
-      related: 'twitter%3ATwitter%20News,twitterapi%3ATwitter%20API%20News'
-    }
+  def test_filtered_params
+    filtered_params = 'text=Hello%20World&url=http%3A%2F%2Fexample.com%2F'
+    params = [:text, :url]
 
-    assert_equal normalized_options, SocialUrl.normalize(options)
+    assert_equal filtered_params, SocialUrl.filtered_params(@normalized_options, params)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social-url
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Richard Venneman
@@ -100,6 +100,7 @@ files:
 - lib/social_url/facebook.rb
 - lib/social_url/google.rb
 - lib/social_url/message.rb
+- lib/social_url/pinterest.rb
 - lib/social_url/twitter.rb
 - lib/social_url/version.rb
 - social-url.gemspec