multi_auth 0.0.2 → 0.0.3

data/README

@@ -15,6 +15,15 @@ or
 Setup
 =====
 
+RAILS_ROOT/config/environment.rb:
+
+  config.gem "multi_auth"
+
+or
+
+  config.gem "okkez-multi_auth", :lib => "multi_auth"
+
+
   $ ruby script/generate open_id_authentication_tables create_open_id_authentication_tables
 
 Create migrations for open_id_authentication.
@@ -41,11 +50,15 @@ Ex.
     include MultiAuthHelper
   end
 
+You can use default style sheet and icons.
+
+  $ ruby script/generate multi_auth_public_assets
+
 
 Customize
 =========
 
-If you want to custom views, you create RAILS_ROOT/app/view/{activation_mailer,auth,credentials,signup}/*.
+If you want to use custom views, you can create RAILS_ROOT/app/view/{activation_mailer,auth,credentials,signup}/*.
 
 
 TODO

data/app/views/auth/open_id/index.html.erb

@@ -1,16 +1,25 @@
 
 <%- @title = "ログイン" -%>
+<%- @enable_side_column = false -%>
 
-<h1>OpenID によるログイン</h1>
+<div id="dialog">
+  <h1>OpenID によるログイン</h1>
 
-<%- form_tag(:action => "login") { -%>
-  <table border="1">
-    <tr>
-      <th><%= label_tag(:openid_url, "OpenID") %></th>
-      <td>
-        <%= text_field_tag(:openid_url, "", :size => 30) %>
-      </td>
-    </tr>
-  </table>
-  <div><%= submit_tag("ログイン") %></div>
-<%- } -%>
+  <%- form_tag(:action => "login") do -%>
+    <table border="1">
+      <tr>
+        <th><%= label_tag(:openid_url, "OpenID") %></th>
+        <td>
+          <%= text_field_tag(:openid_url, "", :size => 30) %>
+        </td>
+      </tr>
+    </table>
+    <div><%= submit_tag("ログイン") %></div>
+  <%- end -%>
+</div>
+
+<%- unless production? -%>
+  <div class="debug">
+    <%= error_messages_for(:login_form) %>
+  </div>
+<%- end -%>

data/generators/multi_auth_migration/USAGE

@@ -2,4 +2,4 @@ Description:
     Sets up MultiAuth in your Rails project. 
 
 Examples:
-    `./script/generate mutli_auth`
+    `./script/generate mutli_auth_migration create_multi_auth_tables`

data/generators/multi_auth_public_assets/USAGE

@@ -0,0 +1,5 @@
+Description:
+    Sets up MultiAuth style sheet and icons in your Rails project. 
+
+Examples:
+    `./script/generate mutli_auth_public_assets`

data/generators/multi_auth_public_assets/multi_auth_public_assets_generator.rb

@@ -0,0 +1,27 @@
+
+class MultiAuthPublicAssetsGenerator < Rails::Generator::Base
+  def initialize(runtime_args, runtime_options = { })
+    super
+  end
+
+  def manifest
+    record do |m|
+      m.directory('public/stylesheets')
+      m.file('style.css', 'public/stylesheets/multi_auth.css')
+      m.directory('public/images/icons/fam')
+      ['openid.png', 'openid-with-desc.png'].each do |file|
+        m.file("images/icons/#{file}", "public/images/icons/#{file}")
+      end
+      ['add.png', 'bomb.png', 'delete.png', 'email.png', 'help.png', 'key.png', 'plugin.png',
+       'table_save.png', 'user.png', 'bin.png', 'cog.png', 'email-with-desc.png', 'feed.png',
+       'key-with-desc.png', 'lightning.png', 'stop.png', 'tick.png', 'vcard.png'
+      ].each do |file|
+        m.file("images/icons/fam/#{file}", "public/images/icons/fam/#{file}")
+      end
+      m.directory('public/images/favicons')
+      ['livedoor.png', 'mixi.png', 'yahoo.png'].each do |file|
+        m.file("images/favicons/#{file}", "public/images/favicons/#{file}")
+      end
+    end
+  end
+end

data/generators/{multi_auth_style_sheet → multi_auth_public_assets}/templates/style.css

@@ -242,103 +242,6 @@ table.list tbody tr.odd td
     background-color: #D0D0D0;
 }
 
-/* table.energies */
-
-table.energies img
-{
-    vertical-align: text-top;
-}
-
-table.energies thead tr th
-{
-    font-size: 70%;
-}
-
-table.energies tbody tr td
-{
-    font-size: 80%;
-}
-
-table.energies tfoot td
-{
-    color: #999999;
-    text-align: right;
-}
-
-/* table.events */
-
-table.events img
-{
-    vertical-align: text-top;
-}
-
-table.events thead tr th
-{
-    font-size: 70%;
-}
-
-table.events tbody tr td
-{
-    font-size: 80%;
-}
-
-table.events tfoot td
-{
-    color: #999999;
-    text-align: right;
-}
-
-/* battery */
-
-div.battery-cell
-{
-    margin: 0;
-    padding: 4px 7px 4px 5px;
-    width: 100px;
-    height: 13px;
-    background-image: url(/images/battery/cell.png);
-    background-repeat: no-repeat;
-}
-
-div.battery-level
-{
-    margin: 0;
-    padding: 0;
-    width: 100px;
-    height: 13px;
-}
-
-div.battery-high,
-div.battery-middle,
-div.battery-low,
-div.battery-empty
-{
-    margin: 0;
-    padding: 0;
-    height: 13px;
-    background-repeat: repeat-x;
-}
-
-div.battery-high
-{
-    background-image: url(/images/battery/level-green.png);
-}
-
-div.battery-middle
-{
-    background-image: url(/images/battery/level-orange.png);
-}
-
-div.battery-low
-{
-    background-image: url(/images/battery/level-yellow.png);
-}
-
-div.battery-empty
-{
-    background-image: url(/images/battery/level-red.png);
-}
-
 /* signup-progress */
 /* FIXME: 別ファイルに分離 */
 

data/rails/init.rb

@@ -17,6 +17,12 @@ config.gem "gettext_activerecord", :version => ">= 2.0.4"
 config.gem "gettext_rails", :version => ">= 2.0.4"
 config.gem "nayutaya-active-form", :lib => "active_form"
 
+unless File.exist?(Rails.root + "config/smtp.yml")
+  FileUtils.cp(File.join(plugin_root, 'config/smtp.yml.sample'),
+               Rails.root + "config/smtp.yml",
+               :verbose => true)
+end
+
 # FIXME: これで正しいのかもう少し考える
 config.action_mailer.raise_delivery_errors = true
 config.action_mailer.delivery_method = :smtp

data/test/unit/multi_auth_public_assets_generator_test.rb

@@ -0,0 +1,55 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'rails_generator'
+require 'rails_generator/scripts/generate'
+
+class MultiAuthPublicAssetsGeneratorTest < Test::Unit::TestCase
+
+  def setup
+    @src = File.expand_path(File.join(File.dirname(__FILE__), '../..', 'generators'))
+    @dest = File.expand_path(File.join(File.dirname(__FILE__), '../..', 'lib', 'generators'))
+    FileUtils.ln_s(@src, @dest)
+    FileUtils.mkdir_p(fake_rails_root)
+    @original_files = file_list
+  end
+
+  def teardown
+    FileUtils.safe_unlink(@dest)
+    FileUtils.rm_r(fake_rails_root)
+  end
+
+  def test_generates_correct_file_name
+    Rails::Generator::Scripts::Generate.new.run(["multi_auth_public_assets"],
+                                                :destination => fake_rails_root)
+    new_icons = Dir.glob(File.join(fake_rails_root, 'public/images/icons/*.png')).sort
+    assert_equal 2, new_icons.size
+    ['openid-with-desc.png', 'openid.png'].sort.map{|f|
+      "#{fake_rails_root}/public/images/icons/#{f}"
+    }.zip(new_icons) do |expected, actual|
+      assert_equal expected, actual
+    end
+    new_fam_icons = Dir.glob(File.join(fake_rails_root, 'public/images/icons/fam/*.png')).sort
+    assert_equal 18, new_fam_icons.size
+    ['add.png', 'bomb.png', 'delete.png', 'email.png', 'help.png', 'key.png', 'plugin.png',
+     'table_save.png', 'user.png', 'bin.png', 'cog.png', 'email-with-desc.png', 'feed.png',
+     'key-with-desc.png', 'lightning.png', 'stop.png', 'tick.png', 'vcard.png'
+    ].sort.map{|f|
+      "#{fake_rails_root}/public/images/icons/fam/#{f}"
+    }.zip(new_fam_icons) do |expected, actual|
+      assert_equal expected, actual
+    end
+    new_favicons = Dir.glob(File.join(fake_rails_root, 'public/images/favicons/*.png')).sort
+    assert_equal 3, new_favicons.size
+    ['livedoor.png', 'mixi.png', 'yahoo.png'].sort.map{|f|
+      "#{fake_rails_root}/public/images/favicons/#{f}"
+    }.zip(new_favicons) do |expected, actual|
+      assert_equal expected, actual
+    end
+  end
+
+  private
+
+  def fake_rails_root
+    File.join(File.dirname(__FILE__), 'rails_root')
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: multi_auth
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - okkez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-11 00:00:00 +09:00
+date: 2009-12-13 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,11 +91,11 @@ files:
 - app/views/signup/email/validated.html.erb
 - app/views/signup/email/activation.html.erb
 - config/routes.rb
-- config/smtp.yml.example
 - config/database.yml.sqlite3
 - config/environment.rb
 - config/boot.rb
 - config/database.yml
+- config/smtp.yml.sample
 - db/schema.rb
 - db/development.sqlite3
 - db/test.sqlite3
@@ -107,59 +107,36 @@ files:
 - lib/open_id_authentication/result.rb
 - lib/multi_auth/active_record.rb
 - lib/multi_auth/action_controller.rb
-- public/favicon.ico
-- public/422.html
-- public/503.html
-- public/stylesheets/home.css
-- public/stylesheets/application.css
-- public/stylesheets/auth.css
-- public/500.html
-- public/404.html
-- public/javascripts/dragdrop.js
-- public/javascripts/prototype.js
-- public/javascripts/effects.js
-- public/javascripts/controls.js
-- public/javascripts/application.js
-- public/images/battery/level-red.png
-- public/images/battery/level-orange.png
-- public/images/battery/cell.png
-- public/images/battery/level-green.png
-- public/images/battery/level-yellow.png
-- public/images/battery/style.html
-- public/images/favicons/yahoo.png
-- public/images/favicons/livedoor.png
-- public/images/favicons/mixi.png
-- public/images/icons/openid.png
-- public/images/icons/openid-with-desc.png
-- public/images/icons/fam/email-with-desc.png
-- public/images/icons/fam/plugin.png
-- public/images/icons/fam/key.png
-- public/images/icons/fam/feed.png
-- public/images/icons/fam/key-with-desc.png
-- public/images/icons/fam/help.png
-- public/images/icons/fam/cog.png
-- public/images/icons/fam/add.png
-- public/images/icons/fam/stop.png
-- public/images/icons/fam/tick.png
-- public/images/icons/fam/delete.png
-- public/images/icons/fam/vcard.png
-- public/images/icons/fam/table_save.png
-- public/images/icons/fam/lightning.png
-- public/images/icons/fam/email.png
-- public/images/icons/fam/bin.png
-- public/images/icons/fam/user.png
-- public/images/icons/fam/bomb.png
-- public/images/logo-back.png
-- public/images/side-column-back.png
-- public/images/logo.png
-- public/images/h1-back.png
-- public/robots.txt
 - rails/init.rb
-- generators/multi_auth_style_sheet/multi_auth_style_sheet_generator.rb
-- generators/multi_auth_style_sheet/templates/style.css
 - generators/multi_auth_migration/multi_auth_migration_generator.rb
 - generators/multi_auth_migration/USAGE
 - generators/multi_auth_migration/templates/migration.rb
+- generators/multi_auth_public_assets/multi_auth_public_assets_generator.rb
+- generators/multi_auth_public_assets/USAGE
+- generators/multi_auth_public_assets/templates/style.css
+- generators/multi_auth_public_assets/templates/images/favicons/yahoo.png
+- generators/multi_auth_public_assets/templates/images/favicons/livedoor.png
+- generators/multi_auth_public_assets/templates/images/favicons/mixi.png
+- generators/multi_auth_public_assets/templates/images/icons/openid.png
+- generators/multi_auth_public_assets/templates/images/icons/openid-with-desc.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/email-with-desc.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/plugin.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/key.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/feed.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/key-with-desc.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/help.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/cog.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/add.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/stop.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/tick.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/delete.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/vcard.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/table_save.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/lightning.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/email.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/bin.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/user.png
+- generators/multi_auth_public_assets/templates/images/icons/fam/bomb.png
 - test/unit/token_util_test.rb
 - test/unit/open_id_login_form_test.rb
 - test/unit/notice_formatter_test.rb
@@ -175,6 +152,7 @@ files:
 - test/unit/helpers/email_signup_helper_test.rb
 - test/unit/helpers/credentials_helper_test.rb
 - test/unit/helpers/auth_helper_test.rb
+- test/unit/multi_auth_public_assets_generator_test.rb
 - test/unit/action_mailer_util_test.rb
 - test/unit/open_id_credential_test.rb
 - test/unit/dummy_user_test.rb

data/generators/multi_auth_style_sheet/multi_auth_style_sheet_generator.rb

@@ -1,13 +0,0 @@
-
-class MultiAuthStyleSheetGenerator < Rails::Generator::Base
-  def initialize(runtime_args, runtime_options = { })
-    super
-  end
-
-  def manifest
-    record do |m|
-      m.directory('public/stylesheets')
-      m.file('style.css', 'public/stylesheets/multi_auth.css')
-    end
-  end
-end

data/public/404.html

@@ -1,92 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>404: Not Found</title>
-    <style type="text/css">
-      *
-      {
-        margin: 0;
-        padding: 0;
-      }
-      #dialog
-      {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        width: 650px;
-        height: 200px;
-        margin: -100px 0px 0px -325px;
-      }
-      #code-outer
-      {
-        position: absolute;
-        top: 0px;
-        left: 0px;
-        width: 249px;
-        height: 200px;
-        border-style: solid;
-        border-color: #CCCCCC;
-        border-width: 0px 1px 0px 0px;
-      }
-      #code-inner
-      {
-        font-size: 150px;
-        line-height: 200px;
-        text-align: center;
-        color: #999999;
-      }
-      #message
-      {
-        position: absolute;
-        top: 0px;
-        left: 250px;
-        width: 400px;
-        height: 200px;
-      }
-      #status-outer
-      {
-        height: 75px;
-      }
-      #status-inner
-      {
-        padding: 40px 0px 0px 10px;
-        font-size: 24px;
-        font-weight: bold;
-        color: #999999;
-      }
-      #description-outer
-      {
-        height: 124px;
-        border-style: solid;
-        border-color: #CCCCCC;
-        border-width: 1px 0px 0px 0px;
-      }
-      #description-inner
-      {
-        padding: 10px;
-        font-size: 14px;
-        line-height: 24px;
-        color: #999999;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="dialog">
-      <div id="code-outer">
-        <div id="code-inner">404</div>
-      </div>
-      <div id="message">
-        <div id="status-outer">
-          <div id="status-inner">Not Found</div>
-        </div>
-        <div id="description-outer">
-          <div id="description-inner">
-            <div>要求されたURLは見つかりませんでした。URLが間違っている可能性があります。</div>
-            <div>The requested URL was not found on this server.</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>

data/public/422.html

@@ -1,91 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>422: Unprocessable Entity</title>
-    <style type="text/css">
-      *
-      {
-        margin: 0;
-        padding: 0;
-      }
-      #dialog
-      {
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        width: 650px;
-        height: 200px;
-        margin: -100px 0px 0px -325px;
-      }
-      #code-outer
-      {
-        position: absolute;
-        top: 0px;
-        left: 0px;
-        width: 249px;
-        height: 200px;
-        border-style: solid;
-        border-color: #CCCCCC;
-        border-width: 0px 1px 0px 0px;
-      }
-      #code-inner
-      {
-        font-size: 150px;
-        line-height: 200px;
-        text-align: center;
-        color: #999999;
-      }
-      #message
-      {
-        position: absolute;
-        top: 0px;
-        left: 250px;
-        width: 400px;
-        height: 200px;
-      }
-      #status-outer
-      {
-        height: 75px;
-      }
-      #status-inner
-      {
-        padding: 40px 0px 0px 10px;
-        font-size: 24px;
-        font-weight: bold;
-        color: #999999;
-      }
-      #description-outer
-      {
-        height: 124px;
-        border-style: solid;
-        border-color: #CCCCCC;
-        border-width: 1px 0px 0px 0px;
-      }
-      #description-inner
-      {
-        padding: 10px;
-        font-size: 14px;
-        line-height: 24px;
-        color: #999999;
-      }
-    </style>
-  </head>
-  <body>
-    <div id="dialog">
-      <div id="code-outer">
-        <div id="code-inner">422</div>
-      </div>
-      <div id="message">
-        <div id="status-outer">
-          <div id="status-inner">Unprocessable Entity</div>
-        </div>
-        <div id="description-outer">
-          <div id="description-inner">
-            <div>要求されたURLは処理できませんでした。</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>