plataforma_social 0.0.26 → 0.0.27

data/lib/plataforma_social.rb

@@ -53,5 +53,9 @@ module PlataformaSocial
       configuration.admin_controller_name || 'admin'
     end
     
+    def environment
+      configuration.environment || Rails.env.to_s
+    end
+    
   end  
 end

data/lib/plataforma_social/configuration.rb

@@ -1,5 +1,5 @@
 module PlataformaSocial
   class Configuration
-    attr_accessor :api_key, :secret, :facebook_app_secret, :facebook_app_id, :facebook_app_namespace, :facebook_scope, :facebook_callback_url, :admin_controller_name
+    attr_accessor :api_key, :secret, :facebook_app_secret, :facebook_app_id, :facebook_app_namespace, :facebook_scope, :facebook_callback_url, :admin_controller_name, :environment
   end
 end

data/lib/plataforma_social/domains.rb

@@ -15,7 +15,7 @@ module PlataformaSocial
     if domains[module_name.to_sym].present?
       name = domains[module_name.to_sym]
   
-      url = case Rails.env
+      url = case environment
         when "production"
           "https://#{name}.plataformasocial.com.br"
         when "development" 

data/lib/plataforma_social/facebook.rb

@@ -29,7 +29,7 @@ module PlataformaSocial
           end
         end
       end
-      
+
       render :text => %|<script type="text/javascript">window.top.location.href="#{@oauth.url_for_oauth_code(:permissions => PlataformaSocial.configuration.facebook_scope)}";</script>| if redirect
     end
     

data/lib/plataforma_social/helpers.rb

@@ -94,30 +94,28 @@ module PlataformaSocial
       params.present? && params[:controller].present? && params[:controller].index(PlataformaSocial.admin_controller_name) == 0
     end
     
-    def link_to *args, &block
-      args[2] ||= {}
-      
-      if args[2][:normal] === true
-        super
+    def link_to_facebook *args, &block
+      if block_given?
+        href = capture(&block)
+        
+        args.unshift(href)
+        
+        link_to_facebook *args
       else
-        unless block_given?
-          if from_facebook? && !from_admin?
-            server_domain = request.env['HTTP_HOST']
-            url           = 'apps.facebook.com/' + PlataformaSocial.facebook_app_namespace 
-            
-            if args[1].include? server_domain
-              args[1].gsub! server_domain, url
-            else
-              args[1] = request.protocol + url + args[1]
-            end
-          
-            args[2][:target] = '_top'
-          else
-            super
-          end
+        args[2] ||= {}
+        
+        server_domain = request.env['HTTP_HOST']
+        url           = 'apps.facebook.com/' + PlataformaSocial.facebook_app_namespace 
+        
+        if args[1].include? server_domain
+          args[1].gsub! server_domain, url
+        else
+          args[1] = request.protocol + url + args[1]
         end
+      
+        args[2][:target] = '_top'
         
-        super
+        return link_to *args
       end
     end
   end

data/lib/plataforma_social/version.rb

@@ -1,3 +1,3 @@
 module PlataformaSocial
-  VERSION = "0.0.26"
+  VERSION = "0.0.27"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plataforma_social
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano