metova 0.0.10 → 0.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDFiZDg5N2UxN2E5ZDIxY2NiMmI4YjhkYzRmY2Y3OGIzYWFjYjA0ZA==
+    NWYxMjlmMjEyNzY2ZDI5ODk2ZTQyMjc1MGNmM2JmNTE0MGNjOGQwNg==
   data.tar.gz: !binary |-
-    MWEzZTNkYmY5OWNiNGYwNzVlOGQwMWRiODg4Y2EwMWUzODY5ZGVlZg==
+    MWQ2NjA5YjU1NmI2NDYxMTYwZjU2OTNjNGNiZDRhNDlhNDU1NWE0Yg==
 SHA512:
   metadata.gz: !binary |-
-    ZDhlYzQ1YzdlZDk5MDcxZTk2NzAzMGNiZTBiYTMxMzM1MGRjNTI3NzgxMDU0
-    Yzc2OWFkNGM0ZWI0Y2E1NTEwMDZmMWRlYTA2MzQ5YTY1MjkxNzdlNGU5ZDZh
-    NjNkYjNlM2QzZmFmMjM4Mjc5MGRjMTliOGVlMmQ2MDFlYWZiZTE=
+    NjJlYjE2ZGJiNjFjMWJkMGE0Y2ZlNDlmZDNkYjY2YzY4OTY3MzE4MjYyNzA0
+    MGQxZTZjYzMwM2Q0YzM2YzVlNzA5NDg4MTg4NTBhZmVjYWM0OTcyYTUzMTA4
+    ZWIzZmQzZTgzNzcxODg1ZjQxODFkMGI3MjJmYzg2NmQzOTAwM2E=
   data.tar.gz: !binary |-
-    NmIzNjU1NDc4YmI0NjJkOTc5NDQxYmVlYmZmNGQ2NTRjOTA5NzYwMDQxN2Zk
-    ZGZhYTk5YmY4MGExY2FkMDNlOGE1YzY4ZjFiMDE2YWVlMzkzZTM5NmQ5OTg2
-    ZDY5YzI1MGRlZTllNTBhOTljM2U5M2UxMmIzOWZhYzhhOGU0NDM=
+    NmYyOTU3YzVlOTYzMjc1NzBjNGI0NDlmYzNkNjdjNTY1ZjBkYzBjYzgyMjZm
+    YzVkNDgzNDA2ZDY2ODcyZmJjZTNlZDkwNjk4NWYxN2ExYjU5NDA1MWNhYzRi
+    ODAxMmRjNDlmNzg3MTBmZmJiMTJiYjk0ODcyMWUyNWJjODE4NzA=

data/app/controllers/metova/api/sessions_controller.rb

@@ -51,7 +51,7 @@ class Metova::API::SessionsController < ::Devise::SessionsController
           respond_with user
         end
       else
-        render json: Metova::GenericError.new("#{auth.name} authentication failed")
+        render json: Metova::GenericError.new("#{auth.name} authentication failed"), status: 401
       end
     end
 end

data/lib/metova/oauth.rb

@@ -7,6 +7,8 @@ require 'metova/oauth/twitter_provider'
 require 'metova/oauth/flux_provider'
 require 'metova/oauth/google_provider'
 
+require 'metova/oauth/error/devise_not_configured'
+
 begin
   require 'omniauth'
 rescue LoadError

data/lib/metova/oauth/error/devise_not_configured.rb

@@ -0,0 +1,8 @@
+module Metova
+  module Oauth
+    module Error
+      class DeviseNotConfigured < StandardError
+      end
+    end
+  end
+end

data/lib/metova/oauth/facebook_provider.rb

@@ -18,12 +18,11 @@ module Metova
         :facebook
       end
 
-      private
-        def me
-          super do
-            JSON.parse URI.parse(ME_URL[access_token]).read
-          end
+      def me
+        super do
+          JSON.parse URI.parse(ME_URL[access_token]).read
         end
+      end
     end
   end
 end

data/lib/metova/oauth/flux_provider.rb

@@ -18,12 +18,11 @@ module Metova
         :flux
       end
 
-      private
-        def me
-          super do
-            JSON.parse URI.parse(ME_URL[access_token]).read
-          end
+      def me
+        super do
+          JSON.parse URI.parse(ME_URL[access_token]).read
         end
+      end
     end
   end
 end

data/lib/metova/oauth/generic_provider.rb

@@ -16,6 +16,32 @@ module Metova
         'OAuth'
       end
 
+      protected
+        def me(&block)
+          yield
+          # rescue errors
+        end
+
+        def setup_with_devise?
+          devise_configuration.present?
+        end
+
+        def devise_configuration
+          ::Devise.omniauth_configs[provider]
+        end
+
+        def devise_strategy
+          devise_configuration.strategy
+        end
+
+        def consumer_key
+          devise_strategy.consumer_key
+        end
+
+        def consumer_secret
+          devise_strategy.consumer_secret
+        end
+
       private
         def self.find_provider(provider)
           map = {
@@ -27,11 +53,6 @@ module Metova
 
           map.fetch provider.to_sym
         end
-
-        def me(&block)
-          yield
-          # rescue errors
-        end
     end
   end
 end

data/lib/metova/oauth/google_provider.rb

@@ -18,14 +18,13 @@ module Metova
         :google_oauth2
       end
 
-      private
-        def me
-          super do
-            client = OAuth2
-            token = OAuth2::AccessToken.new
-            JSON.parse URI.parse(ME_URL[access_token]).read
-          end
+      def me
+        super do
+          client = OAuth2
+          token = OAuth2::AccessToken.new
+          JSON.parse URI.parse(ME_URL[access_token]).read
         end
+      end
     end
   end
 end

data/lib/metova/oauth/twitter_provider.rb

@@ -19,22 +19,22 @@ module Metova
         :twitter
       end
 
-      private
-        def me
-          super do
-            JSON.parse(oauth_access_token.get(ME_URL).body)
-          end
+      def me
+        super do
+          JSON.parse oauth_access_token.get(ME_URL).body
         end
+      end
 
-        def oauth_access_token
-          OAuth::AccessToken.from_hash consumer, oauth_token: access_token, oauth_token_secret: token_secret
-        end
+      def oauth_access_token
+        OAuth::AccessToken.from_hash consumer, oauth_token: access_token, oauth_token_secret: token_secret
+      end
 
-        def consumer
-          @consumer ||= begin
-            OAuth::Consumer.new(ENV['TWITTER_APP_ID'], ENV['TWITTER_APP_SECRET'], site: TWITTER_SITE_URL, scheme: :header)
-          end
+      def consumer
+        @consumer ||= begin
+          raise Metova::Oauth::Error::DeviseNotConfigured.new unless setup_with_devise?
+          OAuth::Consumer.new(consumer_key, consumer_secret, site: TWITTER_SITE_URL, scheme: :header)
         end
+      end
     end
   end
 end

data/lib/metova/version.rb

@@ -1,3 +1,3 @@
 module Metova
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metova
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Logan Serman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -252,6 +252,7 @@ files:
 - lib/metova/mandrill/railtie.rb
 - lib/metova/models/filterable.rb
 - lib/metova/oauth.rb
+- lib/metova/oauth/error/devise_not_configured.rb
 - lib/metova/oauth/facebook_provider.rb
 - lib/metova/oauth/flux_provider.rb
 - lib/metova/oauth/generic_provider.rb