oauth-plugin 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e00863337c0f6f630e99c036361c7590f35e7035
-  data.tar.gz: 58fff0f6ec7e59f35615c9b395736adc9fe0eb81
+  metadata.gz: 401132149e044ecdceaf75dd6c9429909822c7ec
+  data.tar.gz: 83fbb145b545e4513149c028974ddb18535b3976
 SHA512:
-  metadata.gz: 85b490f713c4e5223b55b8c5e2b8e276103177b97b7f8aeae8887d0b73587083dcda787d1d0401717348ac7e0ba8f6eb55d55fc6bd8e04a528db926f72ee34a1
-  data.tar.gz: d43ead865825626ffdb3fd5e62edce078973b70b794ec61d72852b5aabdbc1573f83ca861c6058534ca4b1118193072da908e4181509d53f62680f32a7efa279
+  metadata.gz: 0588fbbd4e3af917bd41402124f13c0a0e00bef47724639a5b718dc6c8a54f9f6e1083c9e1e6e8f93acc64e21b75c40565251d3a99ac261a2f5b349c1edd2c36
+  data.tar.gz: 9bba1d5256f96c667ca3e6021b9b791999660cf571b0f2b0a72472ca37a8da99f50f458f2aed6102f66d0905b6b123f5575423ec0bdbca8d4cd316ed582d9c22

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.5.1
+  - Support slim templates for consumer [pelle]
+  - Add via argument to match routes to support 4.0 [pelle]
 0.5.0
   - Make compatible with Rails 4 [tomhughes]
   - Added support for RefreshTokens [RubenHoms]

data/generators/oauth_consumer/oauth_consumer_generator.rb

@@ -19,7 +19,7 @@ class OauthConsumerGenerator < Rails::Generator::Base
       m.template 'controller.rb',File.join('app/controllers',"oauth_consumers_controller.rb")
       m.route_entry "map.resources :oauth_consumers,:member=>{:callback=>:get}"
 
-      @template_extension= options[:haml] ? "haml" : "erb"
+      @template_extension= options[:haml] ? "haml" : ( options[:slim] ? "slim": "erb")
 
       m.template "show.html.#{@template_extension}",  File.join('app/views', 'oauth_consumers', "show.html.#{@template_extension}")
       m.template "index.html.#{@template_extension}",  File.join('app/views', 'oauth_consumers', "index.html.#{@template_extension}")
@@ -46,5 +46,7 @@ class OauthConsumerGenerator < Rails::Generator::Base
 #             "Generate the Test::Unit compatible tests instead of RSpec") { |v| options[:test_unit] = v }
       opt.on("--haml",
             "Templates use haml") { |v| options[:haml] = v }
+      opt.on("--slim",
+            "Templates use slim") { |v| options[:slim] = v }
     end
 end

data/generators/oauth_consumer/templates/index.html.slim

@@ -0,0 +1,15 @@
+h1 Services
+
+-if @consumer_tokens.empty?
+  p You are currently not connected to any external services.
+-else
+  p You are connected to the following services:
+  ul
+    -@consumer_tokens.each do |token|
+      li = link_to token.class.service_name.to_s.humanize, oauth_consumer_path(token.class.service_name)
+
+-unless @services.empty?
+  h3 You can connect to the following services:
+  ul
+    -@services.each do |service|
+      li = link_to service.to_s.humanize,oauth_consumer_path(service)

data/generators/oauth_consumer/templates/show.html.slim

@@ -0,0 +1,8 @@
+h1
+  | You are already Connected to
+  = params[:id].humanize
+- form_tag oauth_consumer_path(params[:id]),:method=>:delete do
+  = submit_tag "Disconnect"
+  | or
+  = submit_tag "Reconnect"
+  |if you experienced a problem.

data/lib/generators/oauth_consumer/oauth_consumer_generator.rb

@@ -22,7 +22,7 @@ resources :oauth_consumers do
     member do
       get :callback
       get :callback2
-      match 'client/*endpoint' => 'oauth_consumers#client'
+      match 'client/*endpoint' => 'oauth_consumers#client', :via => [:get, :post, :put, :delete]
     end
   end
 ROUTE

data/lib/generators/slim/oauth_consumer_generator.rb

@@ -0,0 +1,21 @@
+require 'rails/generators/erb/controller/controller_generator'
+
+module Slim
+  module Generators
+    class OauthConsumerGenerator < Erb::Generators::Base
+      source_root File.expand_path('../oauth_consumer_templates', __FILE__)
+
+      argument :name, :type => :string, :default => 'Oauth'
+
+      def copy_view_files
+        template 'index.html.slim',              File.join('app/views', class_path, 'oauth_consumers', 'index.html.slim')
+        template 'show.html.slim',               File.join('app/views', class_path, 'oauth_consumers', 'show.html.slim')
+      end
+
+      protected
+      def handler
+        :slim
+      end
+    end
+  end
+end

data/lib/generators/slim/oauth_consumer_templates/index.html.slim

@@ -0,0 +1,15 @@
+h1 Services
+
+-if @consumer_tokens.empty?
+  p You are currently not connected to any external services.
+-else
+  p You are connected to the following services:
+  ul
+    -@consumer_tokens.each do |token|
+      li = link_to token.class.service_name.to_s.humanize, oauth_consumer_path(token.class.service_name)
+
+-unless @services.empty?
+  h3 You can connect to the following services:
+  ul
+    -@services.each do |service|
+      li = link_to service.to_s.humanize,oauth_consumer_path(service)

data/lib/generators/slim/oauth_consumer_templates/show.html.slim

@@ -0,0 +1,8 @@
+h1
+  | You are already Connected to
+  = params[:id].humanize
+- form_tag oauth_consumer_path(params[:id]),:method=>:delete do
+  = submit_tag "Disconnect"
+  | or
+  = submit_tag "Reconnect"
+  |if you experienced a problem.

data/lib/oauth-plugin/version.rb

@@ -1,5 +1,5 @@
 module Oauth
   module Plugin
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oauth-plugin
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Pelle Braendgaard
@@ -185,10 +185,12 @@ files:
 - generators/oauth_consumer/templates/controller.rb
 - generators/oauth_consumer/templates/index.html.erb
 - generators/oauth_consumer/templates/index.html.haml
+- generators/oauth_consumer/templates/index.html.slim
 - generators/oauth_consumer/templates/migration.rb
 - generators/oauth_consumer/templates/oauth_config.rb
 - generators/oauth_consumer/templates/show.html.erb
 - generators/oauth_consumer/templates/show.html.haml
+- generators/oauth_consumer/templates/show.html.slim
 - generators/oauth_provider/USAGE
 - generators/oauth_provider/lib/insert_routes.rb
 - generators/oauth_provider/oauth_provider_generator.rb
@@ -303,6 +305,9 @@ files:
 - lib/generators/rspec/templates/oauth_nonces.yml
 - lib/generators/rspec/templates/oauth_token_spec.rb
 - lib/generators/rspec/templates/oauth_tokens.yml
+- lib/generators/slim/oauth_consumer_generator.rb
+- lib/generators/slim/oauth_consumer_templates/index.html.slim
+- lib/generators/slim/oauth_consumer_templates/show.html.slim
 - lib/generators/test_unit/oauth_provider_generator.rb
 - lib/generators/test_unit/templates/client_application_test.rb
 - lib/generators/test_unit/templates/client_applications.yml