sharing_tags 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ef0e18afe7c32b95c438851bb49b4450afcea75
-  data.tar.gz: 2eae2d428c5c57c1200d912674c89c7d880cb25b
+  metadata.gz: 4600530fcd767146095f9f85445425d33149df32
+  data.tar.gz: f40753ce534e15ab6efa1881ea45f414b5187bd6
 SHA512:
-  metadata.gz: 9b014bbed77579d540542fc3354074cd4a03fc8ad064e997447698ad7b3b755a211bb9853e51152c32c0d0d9eafa6a28954a03f0a71f63250f756337d10f93cc
-  data.tar.gz: f88b7a4ec35bb903d1f34be56fc232c2f1a888d8114c283b2b2c17f9c0a63ba393e091e3d47aa515095085fd48946880f024989dbf844f55e06aaa5c0be78745
+  metadata.gz: d2f1289cf0fe412c372cec5869597b89588cc89cbd337b0394b295f17ca4faa2528efaa83b87094b2b3050ff036c7e0321016bb71e97f4c98639bae02e89eb92
+  data.tar.gz: e9232d62c2b0b870d2b4da6197419eb9d5bef8735a081ae806531bd651c50ab8d925f9dd89a3a69591f923c47fed49262f2bc3da5a0773e5561c77577ef38350

data/README.md

@@ -36,7 +36,7 @@ For the simplest way of using this gem, add this helper method to head in your v
 ```
 
 
-### Example configuration
+### Usage example
 ```ruby 
 # initializers/sharings_tags.rb
 SharingTags.configure do
@@ -108,18 +108,27 @@ You can subscribe to javascript events
 jQuery("body").on "sharing_tags.click_action", ({network, context, target})->
   # your code
 
-# after successful sharing
-jQuery("body").on "sharing_tags.shared", ({network, context, target})->
+# on start sharing
+jQuery(window).on "sharing_tags.before_share", ({network, context, target})->
+  # your code
+
+# on successful sharing
+jQuery(window).on "sharing_tags.success_share", ({network, context, target, response})->
+  # your code
+
+# on cancel sharing
+jQuery(window).on "sharing_tags.cancel_share", ({network, context, target, response})->
   # your code
-```
 
-### Wave-animations
-''' sass
-@import 'sharing_tags/wave_animation'
+# on success or cancel sharing
+jQuery(window).on "sharing_tags.after_share", ({network, context, target, response})->
+  # your code
 
-+create_wave_animation_on_sharing_buttons(4)
-'''
+# on open sharing popup
+jQuery(window).on "sharing_tags.open_popup", ({network, context, url, popup_window})->
+  # your code
 
+```
 
 ## Recommendations
 Facebook sharing images 1200x630 and add mimetype and size

data/Todo.md

@@ -13,4 +13,5 @@
 * Update facebook info for fetching urls
 * Add twitter card settings
 * Add sharing through Vk js SDK
-* Generate sass styles only for choiced icons
+* Generate sass styles only for choiced icons
+* if return nil in proc try get variable from parent settings

data/app/assets/images/sharing_tags/icons/google.svg

@@ -1 +1 @@
-<svg viewBox="0 -1 35 36" xmlns="http://www.w3.org/2000/svg"><path class="gl-sharing-tags-icon-fill sharing-tags-icon-fill" d="M17.63 34.085c9.394 0 17.008-7.615 17.008-17.008C34.638 7.684 27.024.07 17.63.07 8.237.07.622 7.684.622 17.077S8.237 34.085 17.63 34.085"/><path class="gl-sharing-tags-icon-in sharing-tags-icon-in" d="M25.825 15.835h-2.05v-2.05h-1.65v2.05h-2.05v1.65h2.05v2.05h1.65v-2.05h2.05v-1.65zM18.16 18.32c-.475-.338-1.385-1.158-1.385-1.64 0-.565.162-.842 1.01-1.506.872-.682 1.49-1.64 1.49-2.75 0-1.326-.59-2.617-1.7-3.044h1.67l1.18-.85h-5.268c-2.36 0-4.583 1.788-4.583 3.86 0 2.117 1.61 3.827 4.012 3.827.167 0 .33-.004.488-.015-.156.298-.268.635-.268.983 0 .59.317 1.066.717 1.456-.302 0-.595.01-.912.01-2.923 0-5.175 1.863-5.175 3.795 0 1.902 2.468 3.092 5.393 3.092 3.334 0 5.176-1.89 5.176-3.794 0-1.526-.45-2.44-1.842-3.423zm-2.812-2.64c-1.357-.04-2.647-1.52-2.88-3.3-.236-1.783.675-3.146 2.032-3.106 1.356.04 2.646 1.47 2.88 3.252.234 1.782-.675 3.194-2.032 3.153zm-.532 9.015c-2.022 0-3.482-1.28-3.482-2.817 0-1.507 1.812-2.76 3.833-2.74.472.006.912.082 1.31.21 1.098.765 1.885 1.195 2.107 2.065.042.177.065.358.065.543 0 1.538-.99 2.74-3.835 2.74z"/></svg>
+<svg viewBox="-1 -1 36 36" xmlns="http://www.w3.org/2000/svg"><path class="gl-sharing-tags-icon-fill sharing-tags-icon-fill" d="M17.63 34.085c9.394 0 17.008-7.615 17.008-17.008C34.638 7.684 27.024.07 17.63.07 8.237.07.622 7.684.622 17.077S8.237 34.085 17.63 34.085"/><path class="gl-sharing-tags-icon-in sharing-tags-icon-in" d="M25.825 15.835h-2.05v-2.05h-1.65v2.05h-2.05v1.65h2.05v2.05h1.65v-2.05h2.05v-1.65zM18.16 18.32c-.475-.338-1.385-1.158-1.385-1.64 0-.565.162-.842 1.01-1.506.872-.682 1.49-1.64 1.49-2.75 0-1.326-.59-2.617-1.7-3.044h1.67l1.18-.85h-5.268c-2.36 0-4.583 1.788-4.583 3.86 0 2.117 1.61 3.827 4.012 3.827.167 0 .33-.004.488-.015-.156.298-.268.635-.268.983 0 .59.317 1.066.717 1.456-.302 0-.595.01-.912.01-2.923 0-5.175 1.863-5.175 3.795 0 1.902 2.468 3.092 5.393 3.092 3.334 0 5.176-1.89 5.176-3.794 0-1.526-.45-2.44-1.842-3.423zm-2.812-2.64c-1.357-.04-2.647-1.52-2.88-3.3-.236-1.783.675-3.146 2.032-3.106 1.356.04 2.646 1.47 2.88 3.252.234 1.782-.675 3.194-2.032 3.153zm-.532 9.015c-2.022 0-3.482-1.28-3.482-2.817 0-1.507 1.812-2.76 3.833-2.74.472.006.912.082 1.31.21 1.098.765 1.885 1.195 2.107 2.065.042.177.065.358.065.543 0 1.538-.99 2.74-3.835 2.74z"/></svg>

data/app/assets/javascripts/sharing_tags/share/callback.js.coffee

@@ -3,14 +3,30 @@ class @SharingTags.Share.Callback
     @network = @share.network
     @context = @share.context
 
-  before_sharing: (provider)=>
-    @trigger("start_share", url: @share.url, provider: provider, network: @network, context: @context)
+  before_share: (provider)=>
+    @trigger("before_share", provider: provider)
 
-  after_sharing: (response)->
-    @trigger("shared", response: response, network: @network, context: @context)
+  success_share: (response)->
+    @trigger("success_share", response: response)
 
-  before_open_popup: (open_url, popup_window)=>
+  cancel_share: (response)->
+    @trigger("cancel_share", response: response)
+
+  after_share: (response)->
+    @trigger("after_share", response: response)
+
+  open_popup: (open_url, popup_window)=>
     @trigger("open_popup", url: open_url, popup_window: popup_window)
 
   trigger: (trigger_name, params...)->
-    jQuery?(window).trigger("sharing_tags.#{trigger_name}", params)
+    trigger_params = @_share_params(params)
+    jQuery?(window).trigger("sharing_tags.#{trigger_name}", [trigger_params])
+
+  _share_params: (params)->
+    properties = {
+      url: @share.url
+      network: @network
+      context: @context
+    }
+    params[key] = val for key, val of properties
+    params

data/app/assets/javascripts/sharing_tags/share/facebook.js.coffee

@@ -18,29 +18,31 @@ class @SharingTags.FacebookShare extends @SharingTags.Share
   # facebook locales support (https://www.facebook.com/translations/FacebookLocales.xml)
   #
   @init: (locale="en_US")->
-
-    # todo: for debug mode load debug sdk
-    # js.src = "//connect.facebook.net/en_US/sdk/debug.js";
-    if not FB?
-      sdk_url = locale + (if @debug then "/sdk/debug.js" else "/all.js")
-      jQuery.ajax(
-        url: "//connect.facebook.net/#{sdk_url}"
-        dataType: "script"
-        cache: true
-      )
-#      `(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 = "http://connect.facebook.net/" + sdk_url;
-#      fjs.parentNode.insertBefore(js, fjs);
-#      }(document, 'script', 'facebook-jssdk'));`
+    return if FB?
+    sdk_url = locale + (if @debug then "/sdk/debug.js" else "/all.js")
+    jQuery.ajax(
+      url: "//connect.facebook.net/#{sdk_url}"
+      dataType: "script"
+      cache: true
+    )
 
   share: (provider = @provider)->
-    @callback.before_sharing(provider)
+    @callback.before_share(provider)
     @["_#{provider}"]()
     @
 
+  detect_provider: ->
+    provider =
+      if @_user_agent().match('CriOS')
+        "sharer"
+      else if @app_id
+        if @return_url then "dialog"
+        else "fb_ui_feed"
+      else
+        "sharer"
+    @constructor._debug("Facebook#detect_provider", provider)
+    provider
+
   _sharer: ->
     @_assert_vars "url"
     @open_popup("http://www.facebook.com/sharer.php", u: @url)
@@ -48,15 +50,10 @@ class @SharingTags.FacebookShare extends @SharingTags.Share
   #   https://developers.facebook.com/docs/javascript/reference/FB.ui
   _fb_ui: =>
     @_assert_vars "url", "app_id"
-    FB?.ui(
+    FB.ui(
       method: 'share',
       href: @url,
-      (response)=>
-        @callback.after_sharing(response)
-        # if response && !response.error_code
-        #  @_after_callback(response)
-        # else
-        #  # another callback
+      @_fb_ui_callback
     )
 
   _dialog: (display = 'page')->
@@ -70,8 +67,7 @@ class @SharingTags.FacebookShare extends @SharingTags.Share
     FB.ui(
       method: 'stream.share',
       u:       @url
-      (response) ->
-        @callback.after_sharing(response)
+      @_fb_ui_callback
     )
 
   # @note: iphone facebook browser - doesn't redirect to page after sharing
@@ -83,24 +79,17 @@ class @SharingTags.FacebookShare extends @SharingTags.Share
       @_prepare_params(
         method:      'feed'
         link:         @url
-        name:         @caption   # The name of the link attachment.
-        caption:      @title
-        description:  @description
+        name:         @title       # The name of the link attachment.
+        caption:      @caption     # The caption of the link (appears beneath the link name). If not specified, this field is automatically populated with the URL of the link.
+        description:  @description # The description of the link (appears beneath the link caption). If not specified, this field is automatically populated by information scraped from the link, typically the title of the page.
         picture:      @image
         redirect_uri: @return_url
-      ),
-      (response)=>
-        @callback.after_sharing(response)
+      ), @_fb_ui_callback
     )
 
-  detect_provider: ->
-    provider =
-      if @_user_agent().match('CriOS')
-        "sharer"
-      else if @app_id
-        if @return_url then "dialog"
-        else "fb_ui_feed"
-      else
-        "sharer"
-    @constructor._debug("Facebook#detect_provider", provider)
-    provider
+  _fb_ui_callback: (response)=>
+    @callback.after_share(response)
+    if response && !response.error_code
+      @callback.success_share(response)
+    else
+      @callback.cancel_share(response)

data/app/assets/javascripts/sharing_tags/share.js.coffee

@@ -4,7 +4,8 @@ class @SharingTags
 
   @debug: false
 
-  @share: (network, attributes)->
+  @share: (network, attributes = {})->
+    attributes.network = network
     SharingTags.Share[network]?(attributes)
 
   class @Error extends Error
@@ -12,66 +13,78 @@ class @SharingTags
 
   class @Share
 
-    @line: ({title, url}) ->
+    @line: ({title, url, context, network}) ->
       message = "#{title} #{url}"
       @share_popup(
-        network: "line",
-        url: url,
+        url: url
         popup_url: "http://line.me/R/msg/text/?#{encodeURIComponent(message)}"
         popup_params: null
+        network: network
+        context: context
       )
 
-    @facebook: ({url, app_id, caption, title, description, image, return_url, provider}) ->
+    @facebook: ({url, app_id, caption, title, description, image, return_url, provider, network}) ->
       @_debug("Facebook sharing", arguments[0])
       (new SharingTags.FacebookShare(arguments[0])).share()
 
-    @twitter: ({url, title}) ->
+    @twitter: ({url, title, context, network}) ->
       @share_popup(
-        network: "twitter"
         url: url
         popup_url: "http://twitter.com/intent/tweet"
         popup_params:
           text: title
           url: url
+        network: network
+        context: context
       )
 
-    @vkontakte: ({title, url, description, image}) ->
+    @vkontakte: ({title, url, description, image, context, network}) ->
       @share_popup(
-        network: 'vkontakte'
-        url: url,
-        popup_url: "http://vk.com/share.php",
+        url: url
+        popup_url: "http://vk.com/share.php"
         popup_params:
-          url: url,
-          title: title,
-          description: description,
+          url: url
+          title: title
+          description: description
           image: image
+        network: network
+        context: context
       )
 
-    @google: ({url}) ->
-      @share_popup(network: 'google', url: url, popup_url: "https://plus.google.com/share", popup_params: {url: url})
+    @google: ({url, context, network}) ->
+      @share_popup(
+        url: url
+        popup_url: "https://plus.google.com/share"
+        popup_params: {url: url}
+        network: network
+        context: context
+      )
 
-    @odnoklassniki: ({url, description}) ->
+    @odnoklassniki: ({url, description, context, network}) ->
       @share_popup(
-        network: 'odnoklassniki'
-        url: url,
-        popup_url: "http://www.odnoklassniki.ru/dk",
+        url: url
+        popup_url: "http://www.odnoklassniki.ru/dk"
         popup_params: {'st._surl': url, 'st.comments': description, 'st.cmd': 'addShare', 'st.s': 1}
+        network: network
+        context: context
       )
 
-    @mailru: ({url, title, image, description}) ->
+    @mailru: ({url, title, image, description, context, network}) ->
       @share_popup(
-        network: 'mailru'
-        url: url,
-        popup_url: 'http://connect.mail.ru/share',
+        url: url
+        popup_url: 'http://connect.mail.ru/share'
         popup_params: {url: url, title: title, description: description, imageurl: image}
+        network: network
+        context: context
       )
 
-    @linkedin: ({url, title, description}) ->
+    @linkedin: ({url, title, description, context, network}) ->
       @share_popup(
-        network: 'linkedin'
-        url: url,
-        popup_url: 'http://www.linkedin.com/shareArticle',
+        url: url
+        popup_url: 'http://www.linkedin.com/shareArticle'
         popup_params: {mini: true, url: url, title: title, summary: description}
+        network: network
+        context: context
       )
 
     @share_popup: ({network, url, popup_url, popup_params})->
@@ -85,10 +98,8 @@ class @SharingTags
     constructor: ({@network, @context, @url, @title, @description, @image})->
       @_assert_vars 'url'
       @callback = new SharingTags.Share.Callback(@)
-
       @constructor._debug("Init sharing #{@network}", {@url, @title, @description})
 
-
     open_popup: (api_url, params, popup_attrs = 'width=550,height=420,toolbar=no')->
       share_url = if params then "#{api_url}?#{$.param(params)}" else api_url
 
@@ -100,7 +111,7 @@ class @SharingTags
 #          when "vkontakte" then "width=550,height=420,toolbar=no"
 
       share_window = window.open share_url, 'Sharing', popup_attrs
-      @callback.before_open_popup(share_url, share_window)
+      @callback.open_popup(share_url, share_window)
 
       clearInterval(@interval)
       iteration = 0
@@ -108,12 +119,13 @@ class @SharingTags
         iteration++
         if @_open_popup_check(share_url, share_window, iteration)
           clearInterval @interval
-          @callback.after_sharing()
+          @callback.success_share()
+          @callback.after_share()
       ), 500)
 
     _open_popup_check: (share_url, share_window, iteration)=>
       # console.log("check desktop sharing", share_url, share_window, iteration)
-      share_window?.closed || iteration >= 5
+      share_window?.closed || iteration >= 10
 
     _assert_vars: (vars...)->
       for var_name in vars

data/app/assets/stylesheets/sharing_tags/icons.css.sass

@@ -20,13 +20,11 @@
 .sharing-tags-icon-in
   fill-rule: evenodd
   fill-opacity: 1
-  fill-rule: evenodd
 
 .sharing-tags-icon-fill
   stroke-linecap: butt
   stroke-linejoin: miter
   stroke-miterlimit: 2
-  stroke-width: 2
   stroke-opacity: 1
 
 // white
@@ -62,18 +60,22 @@
 
 
 
-
-.fb-sharing-tags-icon-in
 .fb-sharing-tags-icon-fill
+  stroke-width: 2
+.fb-sharing-tags-icon-in
 
 .od-sharing-tags-icon-fill
+  stroke-width: 2
 .od-sharing-tags-icon-in
 
 .vk-sharing-tags-icon-fill
+  stroke-width: 2
 .vk-sharing-tags-icon-in
 
 .tw-sharing-tags-icon-in
+
 .tw-sharing-tags-icon-fill
+  stroke-width: 2
 
 .li-sharing-tags-icon-fill
   stroke-width: 1

data/app/assets/stylesheets/sharing_tags/themes.css.sass

@@ -1,3 +1,23 @@
+
+%sharing_tags-white-theme
+  .sharing_tags-buttons__icon
+    .sharing-tags-icon-in
+      fill: #ffffff
+      stroke: none
+
+    .sharing-tags-icon-fill
+      fill: none
+      stroke: #ffffff
+
+  .sharing_tags-buttons__icon:hover
+    .sharing-tags-icon-in
+      fill: #4A4A4A
+
+    .sharing-tags-icon-fill
+      fill: #ffffff
+      stroke: none
+
+
 %sharing_tags-squared-theme
   .sharing_tags-buttons__item
     border: 1px solid
@@ -23,6 +43,7 @@
       .sharing-tags-icon-in
         fill: #FFFFFF
 
+
   //.sharing_tags-buttons__item:hover
     background-color: #FFFFFF
     border: 1px solid

data/app/assets/stylesheets/sharing_tags.css.sass

@@ -24,7 +24,7 @@
   display: inline-block
   width: 36px
   height: 36px
-  @media screen and (max-width: 600px) and (min-width: 360px)
-    width: 50px
-    height: 50px
+  //@media screen and (max-width: 600px) and (min-width: 360px)
+  //  width: 50px
+  //  height: 50px
 

data/app/views/sharing_tags/buttons.html.slim

@@ -1,3 +1,3 @@
-ul.sharing_tags-buttons class="sharing_tags-buttons__#{context.name} #{options[:class]}"
+ul.sharing_tags-buttons class="sharing_tags-buttons__#{context.name} #{options[:class]}" role="sharing_tags_share_#{context.name}"
   - networks.each do |network|
     li.sharing_tags-buttons__item class="sharing_tags-#{network}_buttons__item"= render "sharing_tags/button/#{network}"

data/lib/sharing_tags/version.rb

@@ -1,3 +1,3 @@
 module SharingTags
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/spec/javascripts/fixtures/vkontakte.json

@@ -3,6 +3,7 @@
     "url":         "http://full.url",
     "title":       "Title full",
     "description": "Description",
-    "image":       "http://image.url"
+    "image":       "http://image.url",
+    "network":     "vkontakte"
   }
 }

data/spec/javascripts/sharing_tags/share/callback_spec.coffee

@@ -11,11 +11,67 @@ describe "SharingTags.Share.Callback", ->
   beforeEach ->
     @fb_fixture = fixture.load("facebook.json")[0]
     @fb = @fb_fixture.fb_ui
+    @fb.context = "callback context"
     @share =  new SharingTags.Share @fb
     @callback = new subject(@share)
 
-
   it "expect get network and context attr from share", ->
     expect( @callback.network ).toBe "facebook"
 
-  # todo: check all callbacks
+  it "expect get context and context attr from share", ->
+    expect( @callback.context ).toBe "callback context"
+
+  describe "callbacks", ->
+    beforeEach ->
+      spyOn(@callback, "trigger")
+      @response = jasmine.createSpy('response')
+
+    it "#before_share", ->
+      @callback.before_share("auto")
+      expect(@callback.trigger).toHaveBeenCalledWith(
+        "before_share", jasmine.objectContaining(provider: "auto")
+      )
+
+    it "#success_share", ->
+      @callback.success_share(@response)
+      expect(@callback.trigger).toHaveBeenCalledWith(
+        "success_share", jasmine.objectContaining(response: @response)
+      )
+
+    it "#cancel_share", ->
+      @callback.cancel_share(@response)
+      expect(@callback.trigger).toHaveBeenCalledWith(
+        "cancel_share", jasmine.objectContaining(response: @response)
+      )
+
+    it "#after_share", ->
+      @callback.after_share(@response)
+      expect(@callback.trigger).toHaveBeenCalledWith(
+        "after_share", jasmine.objectContaining(response: @response)
+      )
+
+    it "open_popup", ->
+      window_obj = jasmine.createSpy('window')
+      @callback.open_popup("url", window_obj)
+      expect(@callback.trigger).toHaveBeenCalledWith(
+        "open_popup", jasmine.objectContaining(
+          url: "url", popup_window: window_obj
+        )
+      )
+
+  describe "#trigger", ->
+    beforeEach ->
+      @original_jquery = window.jQuery
+#      spyOn(jQuery(window), "trigger")
+      window.jQuery = jasmine.createSpyObj('jQuery', ['trigger'])
+
+    afterEach ->
+      window.jQuery = @original_jquery
+
+    xit "expect valid trigger params", ->
+      @callback.trigger("callback_name", {param1: "val1", param2: "val2"})
+      expect(jQuery(window).trigger).toHaveBeenCalledWith(
+        "sharing_tags.callback_name", jasmine.objectContaining(
+          param1: "val1", param2: "val2"
+        )
+      )

data/spec/javascripts/sharing_tags/share/facebook_spec.coffee

@@ -84,8 +84,8 @@ describe "SharingTags.FacebookShare", ->
         @fb = @fb_fixture.full
         @share = new subject(@fb)
         spyOn(@share, "_open_popup_check").andCallThrough()
-        spyOn(@share.callback, "after_sharing").andCallThrough()
-        spyOn(@share.callback, "before_sharing").andCallThrough()
+        spyOn(@share.callback, "after_share").andCallThrough()
+        spyOn(@share.callback, "before_share").andCallThrough()
         spyOn(@share.callback, "trigger")
         jasmine.Clock.useMock()
         window.FB = jasmine.createSpyObj('FB', ['ui', 'init'])
@@ -93,36 +93,36 @@ describe "SharingTags.FacebookShare", ->
       afterEach ->
         delete window.FB
 
-      it "expect called before_sharing on start sharing", ->
+      it "expect called before_share on start sharing", ->
         @share.share('fb_ui')
-        expect(@share.callback.before_sharing).toHaveBeenCalled()
+        expect(@share.callback.before_share).toHaveBeenCalled()
         expect(@share.callback.trigger).toHaveBeenCalled()
-        expect(@share.callback.trigger).toHaveBeenCalledWith("start_share", url: @fb.url, provider: "fb_ui")
+        expect(@share.callback.trigger).toHaveBeenCalledWith("before_share", provider: "fb_ui")
 
       it "expect calling callback for fb_ui", ->
         FB.ui.andCallFake (params, callback)-> callback()
 
         @share.share("fb_ui")
-        expect(@share.callback.after_sharing).toHaveBeenCalled()
-        expect(@share.callback.trigger).toHaveBeenCalledWith("start_share", url: @fb.url, provider: "fb_ui")
+        expect(@share.callback.after_share).toHaveBeenCalled()
+        expect(@share.callback.trigger).toHaveBeenCalledWith("before_share", provider: "fb_ui")
 
       it "expect calling callback for sharer", ->
         @share.share('sharer')
         jasmine.Clock.tick(700)
         expect(@share._open_popup_check).toHaveBeenCalled()
         expect(@share.callback.trigger).toHaveBeenCalledWith("open_popup", url: jasmine.any(String), popup_window: jasmine.any(Object))
-        expect(@share.callback.after_sharing).not.toHaveBeenCalled()
+        expect(@share.callback.after_share).not.toHaveBeenCalled()
 
-        jasmine.Clock.tick(500 * 5)
-        expect(@share.callback.after_sharing).toHaveBeenCalled()
+        jasmine.Clock.tick(500 * 10)
+        expect(@share.callback.after_share).toHaveBeenCalled()
 
-      it "expect calling callback for dialog 2.5sec", ->
+      it "expect calling callback for dialog 5sec", ->
         @share.share('dialog')
-        expect(@share.callback.after_sharing).not.toHaveBeenCalled()
-        expect(@share.callback.trigger).toHaveBeenCalledWith("start_share", url: @fb.url, provider: "dialog")
+        expect(@share.callback.after_share).not.toHaveBeenCalled()
+        expect(@share.callback.trigger).toHaveBeenCalledWith("before_share", provider: "dialog")
 
-        jasmine.Clock.tick(500 * 5)
-        expect(@share.callback.after_sharing).toHaveBeenCalled()
+        jasmine.Clock.tick(500 * 10)
+        expect(@share.callback.after_share).toHaveBeenCalled()
         expect(@share.callback.trigger).toHaveBeenCalledWith("open_popup", url: jasmine.any(String), popup_window: jasmine.any(Object))
 
   describe "#_sharer", ->
@@ -213,8 +213,8 @@ describe "SharingTags.FacebookShare", ->
       expect(FB.ui).toHaveBeenCalled()
       expect(FB.ui).toHaveBeenCalledWith(
         jasmine.objectContaining(
-          link: @fb.url, method: 'feed', caption: @fb.title,
-          description: @fb.description, name: @fb.caption,
+          link: @fb.url, method: 'feed', caption: @fb.caption,
+          description: @fb.description, name: @fb.title,
           picture: @fb.image, redirect_uri: @fb.return_url
         ),
         jasmine.any(Function)
@@ -227,8 +227,8 @@ describe "SharingTags.FacebookShare", ->
       expect(FB.ui).toHaveBeenCalled()
       expect(FB.ui).toHaveBeenCalledWith(
         jasmine.objectContaining(
-          link: @fb.url, method: 'feed', caption: @fb.title,
-          name: @fb.caption, picture: @fb.image
+          link: @fb.url, method: 'feed', caption: @fb.caption,
+          name: @fb.title, picture: @fb.image
         ),
         jasmine.any(Function)
       )

data/spec/javascripts/sharing_tags/share_spec.coffee

@@ -81,7 +81,7 @@ describe "SharingTags.Share", ->
       )
 
     it "expect init new class with params", ->
-      expect(@share.network).toBe("twitter")
+#      expect(@share.network).toBe("twitter")
       expect(@share.url).toBe(@f.url)
 #      expect(@share.title).toBe(@f.title)
 
@@ -100,7 +100,7 @@ describe "SharingTags.Share", ->
       )
 
     it "expect init new class with params", ->
-      expect(@share.network).toBe("google")
+#      expect(@share.network).toBe("google")
       expect(@share.url).toBe(@f.url)
 
   describe "odnoklassniki", ->
@@ -122,7 +122,7 @@ describe "SharingTags.Share", ->
       )
 
     it "expect init new class with params", ->
-      expect(@share.network).toBe("odnoklassniki")
+#      expect(@share.network).toBe("odnoklassniki")
       expect(@share.url).toBe(@f.url)
 
   describe "mailru", ->
@@ -144,7 +144,7 @@ describe "SharingTags.Share", ->
       )
 
     it "expect init new class with params", ->
-      expect(@share.network).toBe("mailru")
+#      expect(@share.network).toBe("mailru")
       expect(@share.url).toBe(@f.url)
 
   describe "linkedin", ->
@@ -166,7 +166,7 @@ describe "SharingTags.Share", ->
       )
 
     it "expect init new class with params", ->
-      expect(@share.network).toBe("linkedin")
+#      expect(@share.network).toBe("linkedin")
       expect(@share.url).toBe(@f.url)
 
   describe "line", ->
@@ -185,7 +185,7 @@ describe "SharingTags.Share", ->
       )
 
     it "expect init new class with params", ->
-      expect(@share.network).toBe("line")
+#      expect(@share.network).toBe("line")
       expect(@share.url).toBe(@f.url)
 
 

data/spec/javascripts/sharing_tags/sharing_tags_spec.coffee

@@ -21,7 +21,48 @@ describe "SharingTags.share", ->
       beforeEach ->
         spyOn(SharingTags.Share, "vkontakte")
 
-      it "expect desktop version", ->
+      it "expect calling", ->
         SharingTags.share('vkontakte')
         expect(SharingTags.Share.vkontakte).toHaveBeenCalled()
 
+    describe "twitter", ->
+      beforeEach ->
+        spyOn(SharingTags.Share, "twitter")
+
+      it "expect calling", ->
+        SharingTags.share('twitter')
+        expect(SharingTags.Share.twitter).toHaveBeenCalled()
+
+    describe "line", ->
+      beforeEach ->
+        spyOn(SharingTags.Share, "line")
+
+      it "expect calling", ->
+        SharingTags.share('line')
+        expect(SharingTags.Share.line).toHaveBeenCalled()
+
+    describe "google", ->
+      beforeEach ->
+        spyOn(SharingTags.Share, "google")
+
+      it "expect calling", ->
+        SharingTags.share('google')
+        expect(SharingTags.Share.google).toHaveBeenCalled()
+
+    describe "odnoklassniki", ->
+      beforeEach ->
+        spyOn(SharingTags.Share, "odnoklassniki")
+
+      it "expect calling", ->
+        SharingTags.share('odnoklassniki')
+        expect(SharingTags.Share.odnoklassniki).toHaveBeenCalled()
+
+
+    describe "linkedin", ->
+      beforeEach ->
+        spyOn(SharingTags.Share, "linkedin")
+
+      it "expect calling", ->
+        SharingTags.share('linkedin')
+        expect(SharingTags.Share.linkedin).toHaveBeenCalled()
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sharing_tags
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Anatoliy Kovalchuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails