sharing_tags 0.0.9 → 0.0.10

data/lib/sharing_tags/action_view/meta_helper.rb

@@ -1,10 +1,13 @@
-module SharingTags::ActionView::MetaHelper
+module SharingTags
+  module ActionView
+    module MetaHelper
+      def sharing_tags
+        SharingTags.config.within_context_params(self)
+      end
 
-  def sharing_tags
-    SharingTags.config.within_context_params(self)
-  end
-
-  def render_sharing_tags
-    render template: "sharing_tags/meta_tags.html.slim"
-  end
+      def render_sharing_tags
+        render template: "sharing_tags/meta_tags.html.slim"
+      end      
+    end  
+  end    
 end

data/lib/sharing_tags/config.rb

@@ -2,10 +2,9 @@ require "hashie/mash"
 
 module SharingTags
   class Config < ::Hashie::Mash
+    # TODO: initialize default param as Config.new
 
-    # todo: initialize default param as Config.new
-
-    # note: temporary code for working construction sharing_tags.switch_context_to
+    # NOTE: temporary code for working construction sharing_tags.switch_context_to
     def switch_context_to(name, *attrs)
       Rails.logger.debug "SharingTags: switch context from #{SharingTags.config.current_context.name} to #{name}"
       SharingTags.config.switch_context(name, *attrs)
@@ -17,7 +16,7 @@ module SharingTags
       lists.each do |divide_key|
         second_part[divide_key] =
             if self.key?(divide_key)
-              self.delete(divide_key)
+              delete(divide_key)
             else
               self.class.new
             end

data/lib/sharing_tags/configuration.rb

@@ -1,32 +1,36 @@
 module SharingTags
   class Configuration
-
-    NETWORKS = %i{ google facebook twitter }
+    NETWORKS = %i( google facebook twitter )
 
     attr_accessor :running_context
+    attr_reader :default_context
 
     def initialize
       clear!
     end
 
     def context(name, &block)
-      raise "please define context block params" unless block_given?
+      fail "please define context block params" unless block_given?
       (@contexts[name] ||= Context.new(name, self)).instance_exec(&block)
     end
 
-    def switch_context(name = nil, *args)
+    def switch_context(name = nil, *args, &block)
       clean_params!
+      prev_context = current_context
+      prev_context_params = @current_context_params
+
       @current_context_params = args
-      @prev_context = current_context
-
-      @current_context =
-        if name
-           @contexts[name]
-        else
-          default_context
-        end
+      @current_context = name && @contexts[name] || default_context
+      return unless block_given?
+
+      result = block.call
+
+      @current_context = prev_context
+      @current_context_params = prev_context_params
+
+      result
     end
-    alias switch_context_to switch_context
+    alias_method :switch_context_to, :switch_context
 
     def clear!
       @contexts = {}
@@ -69,10 +73,5 @@ module SharingTags
     def method_missing(method_name, *arguments, &block)
       current_context.send(method_name, *arguments, &block)
     end
-
-    def default_context
-      @default_context
-    end
-
   end
 end

data/lib/sharing_tags/context.rb

@@ -1,6 +1,5 @@
 module  SharingTags
   class Context
-
     attr_reader :name
     attr_reader :configuraton
 
@@ -9,8 +8,8 @@ module  SharingTags
       @networks = {}
       @configuraton = configuraton
 
-      Network.lists.each do |name|
-        self.send(name)
+      Network.lists.each do |network_name|
+        send(network_name)
       end
     end
 
@@ -19,43 +18,43 @@ module  SharingTags
     end
 
     def twitter(&block)
-      (@networks[:twitter] ||=  Network.new(:twitter, self)).tap do |twitter|
+      (@networks[:twitter] ||= Network.new(:twitter, self)).tap do |twitter|
         twitter.instance_exec(&block) if block_given?
       end
     end
 
     def facebook(&block)
-      (@networks[:facebook] ||=  Network::Facebook.new(:facebook, self)).tap do |facebook|
+      (@networks[:facebook] ||= Network::Facebook.new(:facebook, self)).tap do |facebook|
         facebook.instance_exec(&block) if block_given?
       end
     end
 
     def google(&block)
-      (@networks[:google] ||=  Network.new(:google, self)).tap do |google|
+      (@networks[:google] ||= Network.new(:google, self)).tap do |google|
         google.instance_exec(&block) if block_given?
       end
     end
 
     def vkontakte(&block)
-      (@networks[:vkontakte] ||=  Network.new(:vkontakte, self)).tap do |vkontakte|
+      (@networks[:vkontakte] ||= Network.new(:vkontakte, self)).tap do |vkontakte|
         vkontakte.instance_exec(&block) if block_given?
       end
     end
 
     def line(&block)
-      (@networks[:line] ||=  Network.new(:line, self)).tap do |line|
+      (@networks[:line] ||= Network.new(:line, self)).tap do |line|
         line.instance_exec(&block) if block_given?
       end
     end
 
     def odnoklassniki(&block)
-      (@networks[:odnoklassniki] ||=  Network.new(:odnoklassniki, self)).tap do |odnoklassniki|
+      (@networks[:odnoklassniki] ||= Network.new(:odnoklassniki, self)).tap do |odnoklassniki|
         odnoklassniki.instance_exec(&block) if block_given?
       end
     end
 
     def linkedin(&block)
-      (@networks[:linkedin] ||=  Network.new(:linkedin, self)).tap do |vkontakte|
+      (@networks[:linkedin] ||= Network.new(:linkedin, self)).tap do |vkontakte|
         vkontakte.instance_exec(&block) if block_given?
       end
     end
@@ -73,14 +72,13 @@ module  SharingTags
     def fetch_params(context_args = nil, default_config_params = Config.new)
       default_context_params = fetch_default_context_params(context_args, default_config_params || Config.new)
 
-      @networks.inject(Config.new) do |result, (name, network)|
+      @networks.each_with_object(Config.new) do |(name, network), result|
         param = (result[name] ||= Config.new)
 
         default_network_params = default_context_params[name]
         param.deep_update network.attributes_for(context_args, default_network_params)
 
         result[name] = param
-        result
       end
     end
 
@@ -99,10 +97,9 @@ module  SharingTags
 
     def method_missing(method_name, *arguments, &block)
       unless default_network.class.available_attributes.include?(method_name.to_sym)
-        raise Network::Error.new("Error didn't find #{method_name} attribute in network")
+        fail Network::Error, "Error didn't find #{method_name} attribute in network"
       end
       default_network.send(method_name, *arguments, &block)
     end
-
   end
 end

data/lib/sharing_tags/engine.rb

@@ -2,5 +2,16 @@ module SharingTags
   class Engine < ::Rails::Engine
     isolate_namespace SharingTags
 
+    if Rails.env.development?
+      config.to_prepare do
+        require_dependency Rails.root.join('config', 'initializers', 'sharing_tags.rb').to_s
+      end
+
+      config.after_initialize do
+        # optional, without it will call `to_prepend` only when a file changes,
+        # not on every request
+        Rails.application.config.reload_classes_only_on_change = false
+      end
+    end
   end
 end

data/lib/sharing_tags/network.rb

@@ -1,15 +1,38 @@
+require 'uri'
+
 module SharingTags
   class Network
-
-    # todo: add default values
+    # TODO: add default values
 
     class Error < StandardError
     end
 
+    class NetworkRunningContext
+      def initialize(network, context)
+        @network_name = network.name
+        @context = context
+        @context_name = @context.name
+      end
+
+      def network
+        @network_name
+      end
+
+      def context
+        @context_name
+      end
+
+      def method_missing(method_name, *arguments, &block)
+        return unless @context && @context.configuraton
+        @context.configuraton.running_context.send(method_name, *arguments, &block)
+      end
+    end
+
     NETWORKS = %i( facebook google twitter vkontakte odnoklassniki line linkedin )
 
-    ATTRIBUTES = %i( share_url title description  page_url share_url_params link_params
-                      image_url image digested_image digested_image_url )
+    ATTRIBUTES = 
+      %i( share_url title description  page_url share_url_params link_params
+          image_url image digested_image digested_image_url )
 
     attr_reader :name, :attributes
 
@@ -22,12 +45,12 @@ module SharingTags
     def initialize(name, context = nil)
       @name = name
       @context = context
+      @running_context = NetworkRunningContext.new(self, context)
       clear!
     end
 
     def clear!
       @attributes = {}
-      @share_url_params = nil
     end
 
     def self.available_attributes
@@ -46,16 +69,16 @@ module SharingTags
       attributes[:description] = store_value(value, &block)
     end
 
-    # def image_url(new_image = nil, size = nil, content_type = nil, options, &block)
+    # TODO: activate rubycop Metrics
+    # rubocop:disable Metrics/AbcSize
+    # image_url(new_image = nil, size = nil, content_type = nil, options, &block)
     def image_url(*arguments, &block)
       options = arguments.extract_options!
       new_image, size, content_type = arguments
 
-      if options[:digested] == false && !block_given?
-        block = proc { without_digest_asset_url(new_image) }
-      end
+      block = proc { without_digest_asset_url(new_image) } if options[:digested] == false && block_given? == false
 
-      # todo: add another class for storing image
+      # TODO: add another class for storing image
       attributes[:image] = store_value(new_image, &block)
 
       # add size and content type for block value
@@ -64,41 +87,42 @@ module SharingTags
       attributes[:image_size] = store_value(size.split("x").map(&:to_i)) if size
       attributes[:image_content_type] = store_value(content_type) if content_type
     end
-    alias :image :image_url
+    alias_method :image, :image_url
+    # rubocop:enable Metrics/AbcSize  
 
-    # todo: add image_size
-    # todo: add_image_type
+    # TODO: add image_size
+    # TODO: add_image_type
 
     def digested_image_url(*arguments, &block)
       options = arguments.extract_options!
-      options.merge!(:digested => false)
+      options.merge!(digested: false)
 
       wrap_block = proc { |*args| without_digest_asset_url(block.call(*args)) } if block_given?
       image_url(*arguments, options, &wrap_block)
     end
-    alias :digested_image :digested_image_url
+    alias_method :digested_image, :digested_image_url
 
     def page_url(new_url = nil, &block)
       attributes[:page_url] = store_value(new_url, &block)
     end
 
     def share_url_params(params = nil, &block)
-      @share_url_params = store_value(params, &block)
+      attributes[:share_url_params] = store_value(params, &block)
     end
-    alias :link_params :share_url_params
+    alias_method :link_params, :share_url_params
 
     def attributes_for(context_params = nil, default_params = Config.new)
-      # todo: merge default params after get all values of attributes
-      @attributes.inject(default_params.dup) do |result, (name, value)|
-        result[name] = get_value(value, context_params)
-        result
-      end.tap do |attrs|
-        #todo: fix assign share_url from page_url
-        attrs[:share_url] = attrs[:page_url].dup if !attrs[:share_url] && attrs[:page_url]
-        attrs[:share_url] = ("#{attrs[:share_url]}?" + @share_url_params.to_query) if attrs[:share_url] && @share_url_params
-
-        attrs[:network] = name if attrs.present?
+      # TODO: merge default params after get all values of attributes
+      attrs = @attributes.each_with_object(default_params.dup) do |(a_name, value), result|
+        result[a_name] = get_value(value, context_params)
       end
+
+      # TODO: fix assign share_url from page_url
+      attrs[:share_url] = attrs[:page_url].dup if !attrs[:share_url] && attrs[:page_url]
+      attrs[:share_url] = add_params_to_url(attrs[:share_url], attrs[:share_url_params]) if attrs[:share_url] && attrs[:share_url_params].present?
+      attrs[:network] = name if attrs.present?
+      
+      attrs
     end
 
     protected
@@ -113,10 +137,9 @@ module SharingTags
 
     def get_value(value, context_params)
       if value.is_a?(Proc)
-
-        if @context && running_context = @context.configuraton.running_context
+        if @context && @running_context
           # execute proc within the view context with context_params
-          running_context.instance_exec(*context_params, &value)
+          @running_context.instance_exec(*context_params, &value)
         else
           value.call(context_params)
         end
@@ -124,5 +147,16 @@ module SharingTags
         value
       end
     end
+
+    def add_params_to_url(url, params = {})
+      uri = URI.parse(url)
+      new_query_array = URI.decode_www_form(uri.query || '') + params.to_a
+      uri.query = URI.encode_www_form(new_query_array)
+
+      uri.to_s.html_safe
+    rescue URI::Error
+      # TODO: raise error
+      url
+    end
   end
 end

data/lib/sharing_tags/network/facebook.rb

@@ -1,14 +1,17 @@
 module SharingTags
-  class Network::Facebook < Network
+  class Network
+    class Facebook < Network
+      def self.available_attributes
+        super + %i( app_id provider )
+      end
 
-    def self.available_attributes
-      super + %i( app_id )
-    end
+      def provider(provider = 'auto', &block)
+        attributes[:provider] = store_value(provider, &block)
+      end
 
-    def app_id(app_id = nil, &block)
-      attributes[:app_id] = store_value(app_id, &block)
+      def app_id(app_id = nil, &block)
+        attributes[:app_id] = store_value(app_id, &block)
+      end
     end
-
   end
-
 end

data/lib/sharing_tags/railtie.rb

@@ -1,17 +1,11 @@
 module SharingTags
-  class Railtie < Rails::Railtie
-
-    # config.eager_load_namespaces << SharingTags
-
+  # = Sharing Tags Railtie
+  class Railtie < Rails::Railtie # :nodoc:
     generators do
       require "generators/sharing_tags/install/install_generator"
     end
 
-    # rake_tasks do
-    #   load "rspec/rails/tasks/rspec.rake"
-    # end
-
-    initializer "sharing_tags.configure_view_controller" do |app|
+    initializer "sharing_tags.configure_view_controller" do
       ActiveSupport.on_load :action_view do
         include SharingTags::ActionView::MetaHelper
         include SharingTags::ActionView::ButtonHelper
@@ -27,5 +21,8 @@ module SharingTags
       end
     end
 
+    console do
+      ApplicationController.new.view_context
+    end
   end
 end

data/lib/sharing_tags/version.rb

@@ -1,3 +1,3 @@
 module SharingTags
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/sharing_tags.gemspec

@@ -39,6 +39,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'guard', '~> 2.12'
   spec.add_development_dependency 'guard-rspec', '~> 4.5'
   spec.add_development_dependency 'guard-teaspoon', '~> 0.8'
+  spec.add_development_dependency 'guard-rubocop', '>= 1.2.0'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
   spec.add_development_dependency 'pry', '~> 0.10'