enju_news 0.1.0.pre5 → 0.1.0.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72501f991235b88824ee7b19005bcb01556181fa
-  data.tar.gz: ca8ef233c067dd23660bec933039c091e3ed9426
+  metadata.gz: 47617cc6051a52fa925aa9224802cd83fe4a63d4
+  data.tar.gz: 16ce59dbcd93eda974894e024b50041b858a54bc
 SHA512:
-  metadata.gz: a06c80ef1234795a1f6772ad8f5866418de598998b13e25df385f50ab4171a020f7b733380b6a4f19bf3be32b5c030dfd2d0e2e43bd81955f27f0b326ceb0a5d
-  data.tar.gz: 5ffaa3679cd9c2d7f889cb8b7ab8a572712be6cd753287ce4001927a7b3dd1c881a4f9a9132c5dbc68c15cb7fc1c99cb945256d76cea9014b6a4541b5ee3addb
+  metadata.gz: fc41e5dc0474afd2f5edd41b156a7f9dc695fd97532d00bf06c024e91bbc5febfc0fdc4a4049c99b3d78ce7a314e55b277c7fba6d0bd7d7fd7ad45d9cb231346
+  data.tar.gz: fc13856f20ff4799e4788c9b4003ad4034be8a68081b64074ee0f079e85c1500faeebc7ce9a734c938225c75d0af7881be07f46052549a05b5cad2b50fbf0f02

data/app/controllers/news_feeds_controller.rb

@@ -1,6 +1,5 @@
 class NewsFeedsController < ApplicationController
   load_and_authorize_resource
-  cache_sweeper :news_feed_sweeper, :only => [:create, :update, :destroy]
 
   # GET /news_feeds
   # GET /news_feeds.json
@@ -8,7 +7,7 @@ class NewsFeedsController < ApplicationController
     @news_feeds = NewsFeed.page(params[:page])
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @news_feeds }
+      format.json { render json: @news_feeds }
     end
   end
 
@@ -16,12 +15,12 @@ class NewsFeedsController < ApplicationController
   # GET /news_feeds/1.json
   def show
     if params[:mode] == 'force_reload'
-      expire_cache
+      @news_feed.force_reload
     end
 
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @news_feed }
+      format.json { render json: @news_feed }
     end
   end
 
@@ -32,7 +31,7 @@ class NewsFeedsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @news_feed }
+      format.json { render json: @news_feed }
     end
   end
 
@@ -47,12 +46,12 @@ class NewsFeedsController < ApplicationController
 
     respond_to do |format|
       if @news_feed.save
-        flash[:notice] = t('controller.successfully_created', :model => t('activerecord.models.news_feed'))
+        flash[:notice] = t('controller.successfully_created', model: t('activerecord.models.news_feed'))
         format.html { redirect_to(@news_feed) }
-        format.json { render :json => @news_feed, :status => :created, :location => @news_feed }
+        format.json { render json: @news_feed, status: :created, location: @news_feed }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @news_feed.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @news_feed.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -70,12 +69,12 @@ class NewsFeedsController < ApplicationController
 
     respond_to do |format|
       if @news_feed.update_attributes(params[:news_feed])
-        flash[:notice] = t('controller.successfully_updated', :model => t('activerecord.models.news_feed'))
+        flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.news_feed'))
         format.html { redirect_to(@news_feed) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @news_feed.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @news_feed.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -93,9 +92,6 @@ class NewsFeedsController < ApplicationController
 
   private
   def expire_cache
-    Role.all.each do |role|
-      expire_fragment(:controller => :news_feeds, :action => :show, :id => @news_feed.id, :page => 'title', :role => role.name)
-    end
     @news_feed.force_reload
   end
 end

data/app/controllers/news_posts_controller.rb

@@ -1,6 +1,6 @@
 class NewsPostsController < ApplicationController
   load_and_authorize_resource
-  before_filter :prepare_options, :only => [:new, :edit]
+  before_filter :prepare_options, only: [:new, :edit]
 
   # GET /news_posts
   # GET /news_posts.json
@@ -13,8 +13,8 @@ class NewsPostsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @news_posts }
-      format.rss  { render :layout => false }
+      format.json { render json: @news_posts }
+      format.rss  { render layout: false }
       format.atom
     end
   end
@@ -24,7 +24,7 @@ class NewsPostsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @news_post }
+      format.json { render json: @news_post }
     end
   end
 
@@ -35,7 +35,7 @@ class NewsPostsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @news_post }
+      format.json { render json: @news_post }
     end
   end
 
@@ -51,12 +51,12 @@ class NewsPostsController < ApplicationController
 
     respond_to do |format|
       if @news_post.save
-        format.html { redirect_to(@news_post, :notice => t('controller.successfully_created', :model => t('activerecord.models.news_post'))) }
-        format.json { render :json => @news_post, :status => :created, :location => @news_post }
+        format.html { redirect_to(@news_post, notice: t('controller.successfully_created', model: t('activerecord.models.news_post'))) }
+        format.json { render json: @news_post, status: :created, location: @news_post }
       else
         prepare_options
-        format.html { render :action => "new" }
-        format.json { render :json => @news_post.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @news_post.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -71,12 +71,12 @@ class NewsPostsController < ApplicationController
 
     respond_to do |format|
       if @news_post.update_attributes(params[:news_post])
-        format.html { redirect_to(@news_post, :notice => t('controller.successfully_updated', :model => t('activerecord.models.news_post'))) }
+        format.html { redirect_to(@news_post, notice: t('controller.successfully_updated', model: t('activerecord.models.news_post'))) }
         format.json { head :no_content }
       else
         prepare_options
-        format.html { render :action => "edit" }
-        format.json { render :json => @news_post.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @news_post.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/models/news_feed.rb

@@ -1,60 +1,34 @@
 class NewsFeed < ActiveRecord::Base
   attr_accessible :title, :url
-  include ExpireEditableFragment
-  default_scope :order => "news_feeds.position"
-  belongs_to :library_group, :validate => true
+  default_scope order: "news_feeds.position"
+  belongs_to :library_group, validate: true
 
   validates_presence_of :title, :url, :library_group
   validates_associated :library_group
-  validates_length_of :url, :maximum => 255
+  validates_length_of :url, maximum: 255
+  before_save :fetch
 
   acts_as_list
 
-  after_save :expire_cache
-  after_destroy :expire_cache
-
   def self.per_page
     10
   end
 
-  def expire_cache
-    expire_fragment_cache
-    Rails.cache.delete('news_feed_all')
-    true
-  end
-
-  def expire_fragment_cache
-    Role.all.each do |role|
-      Rails.cache.delete("views/news_feed_content_#{id}_#{role.name}")
-      logger.info "#{Time.zone.now} feed reloaded! : #{url}"
-    end
-  end
-
-  def content(clear_cache = false)
-    #page_url = URI.parse(url.rewrite_my_url)
-    #if page_url.port == 80
-    #  if Feedbag.feed?(url)
-    #    feed_url = url
-    #  else
-    #    feed_url = Feedbag.find(url).first
-    #  end
-    #else
-      # auto-discovery 非対応
-      feed_url = url
-    #end
+  def fetch
     begin
-      if clear_cache or body.blank?
-        feed = open(feed_url) do |f|
-          f.read
-        end
-        if rss = RSS::Parser.parse(feed, false)
-          self.body = feed
-          save!
-        end
+      feed = open(url) do |f|
+        f.read
+      end
+      if rss = RSS::Parser.parse(feed, false)
+        self.body = feed
       end
     rescue StandardError, Timeout::Error
       nil
     end
+  end
+
+  def content
+    if body
     # tDiary の RSS をパースした際に to_s が空になる
     # rss = RSS::Parser.parse(feed)
     # rss.to_s
@@ -68,16 +42,16 @@ class NewsFeed < ActiveRecord::Base
         nil
       end
     #end
+    end
   end
 
   def force_reload
-    expire_cache
-    content(true)
+    save!
   end
 
   def self.fetch_feeds
     NewsFeed.all.each do |news_feed|
-      news_feed.force_reload
+      news_feed.touch
     end
   end
 end

data/app/models/news_post.rb

@@ -1,9 +1,9 @@
 class NewsPost < ActiveRecord::Base
   attr_accessible :title, :body
-  scope :published, where(:draft => false)
+  scope :published, where(draft: false)
   default_scope order('news_posts.start_date DESC')
   belongs_to :user
-  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id', :validate => true
+  belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id', validate: true
 
   validates_presence_of :title, :body, :user_id
   validates_associated :user

data/app/views/news_feeds/_content.html.erb

@@ -1,9 +1,7 @@
-<%
-  cache("news_feed_content_#{news_feed.id}_#{current_user_role_name}") do
-%>
-<%- if news_feed.content.is_a?(RSS::Atom::Feed) -%>
-  <%= render :partial => 'news_feeds/content_atom', :locals => {:news_feed => news_feed} -%>
-<%- else -%>
-  <%= render :partial => 'news_feeds/content_rss', :locals => {:news_feed => news_feed} -%>
-<%- end -%>
+<% cache([news_feed], role: current_user_role_name, locale: @locale do %>
+  <%- if news_feed.content.is_a?(RSS::Atom::Feed) -%>
+    <%= render partial: 'news_feeds/content_atom', locals: {news_feed: news_feed} -%>
+  <%- else -%>
+    <%= render partial: 'news_feeds/content_rss', locals: {news_feed: news_feed} -%>
+  <%- end -%>
 <%- end -%>

data/app/views/news_feeds/_content_atom.html.erb

@@ -4,7 +4,7 @@
     <%- news_feed.content.items[0..2].each do |item| -%>
       <li><%= link_to h(item.title.content), h(item.link.href) -%>
       <%- if date = Time.zone.parse(item.updated.content.to_s) rescue nil -%>
-        (<%= l(date, :format => :short) -%>)
+        (<%= l(date, format: :short) -%>)
       <%- end -%>
       <%- if item.summary -%>
         <br />

data/app/views/news_feeds/_content_rss.html.erb

@@ -4,7 +4,7 @@
     <%- news_feed.content.items[0..2].each do |item| -%>
       <li><%= link_to h(item.title), h(item.link) -%>
       <%- if date = Time.zone.parse(item.pubDate.to_s) rescue nil -%>
-        (<%= l(date, :format => :short) -%>)
+        (<%= l(date, format: :short) -%>)
       <%- end -%>
       <%- if item.description -%>
         <br />

data/app/views/news_feeds/_form.html.erb

@@ -2,11 +2,11 @@
   <%= f.error_messages -%>
   <div class="field">
     <%= f.label t('activerecord.attributes.news_feed.title') -%><br />
-    <%= f.text_field :title, :class => 'resource_title' -%>
+    <%= f.text_field :title, class: 'resource_title' -%>
   </div>
   <div class="field">
     <%= f.label t('activerecord.attributes.news_feed.url') -%><br />
-    <%= f.url_field :url, :class => 'resource_url' -%>
+    <%= f.url_field :url, class: 'resource_url' -%>
   </div>
   <div class="actions">
     <%= f.submit -%>

data/app/views/news_feeds/_list.html.erb

@@ -1,6 +1,6 @@
 <%- if @news_feeds -%>
   <%- @news_feeds.each do |news_feed| -%>
-    <%= render :partial => 'news_feeds/content', :locals => {:news_feed => news_feed} -%>
+    <%= render partial: 'news_feeds/content', locals: {news_feed: news_feed} -%>
   <%- end -%>
 <%- else -%>
   <p><%= t('news_feed.failed_to_fetch_feed') -%></p>

data/app/views/news_feeds/edit.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.news_feed')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.news_feed')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@news_feed) do |f| -%>
@@ -7,11 +7,11 @@
 
   <p>
     <%= f.label t('activerecord.attributes.news_feed.title') -%><br />
-    <%= f.text_field :title, :class => 'resource_class' -%>
+    <%= f.text_field :title, class: 'resource_class' -%>
   </p>
   <p>
     <%= f.label t('activerecord.attributes.news_feed.url') -%><br />
-    <%= f.text_field :url, :class => 'resource_url' -%>
+    <%= f.text_field :url, class: 'resource_url' -%>
   </p>
   <p>
     <%= f.submit t('page.update') -%>

data/app/views/news_feeds/index.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.news_feed')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.news_feed')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -22,7 +22,7 @@
     <td>
       <%- if can? :delete, news_feed -%>
         <%= link_to t('page.edit'), edit_news_feed_path(news_feed) -%>
-        <%= link_to t('page.destroy'), news_feed, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), news_feed, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -36,7 +36,7 @@
 
 <div id="submenu" class="ui-corner-all">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.news_feed')), new_news_feed_path -%></li>
-    <li><%= link_to t('page.clear_cache'), news_feeds_path(:mode => 'clear_cache') -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.news_feed')), new_news_feed_path -%></li>
+    <li><%= link_to t('page.clear_cache'), news_feeds_path(mode: 'clear_cache') -%></li>
   </ul>
 </div>

data/app/views/news_feeds/new.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.news_feed')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.news_feed')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@news_feed) do |f| -%>
@@ -7,11 +7,11 @@
 
   <p>
     <%= f.label t('activerecord.attributes.news_feed.title') -%><br />
-    <%= f.text_field :title, :class => 'resource_title' -%>
+    <%= f.text_field :title, class: 'resource_title' -%>
   </p>
   <p>
     <%= f.label t('activerecord.attributes.news_feed.url') -%><br />
-    <%= f.text_field :url, :class => 'resource_url' -%>
+    <%= f.text_field :url, class: 'resource_url' -%>
   </p>
   <p>
     <%= f.submit t('page.create') -%>

data/app/views/news_feeds/show.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.news_feed')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.news_feed')) -%></h1>
 <div id="content_list">
 <p>
   <strong><%= t('activerecord.attributes.news_feed.title') -%>:</strong>
@@ -12,10 +12,10 @@
 </p>
 
 <div id="news_feed_box">
-  <%= render :partial => 'news_feeds/content', :locals => {:news_feed => @news_feed} -%>
+  <%= render partial: 'news_feeds/content', :locals => {:news_feed => @news_feed} -%>
 </div>
 
-<%= form_for(@news_feed, :url => news_feed_url(@news_feed, :mode => 'force_reload')) do |f| -%>
+<%= form_for(@news_feed, url: news_feed_url(@news_feed, mode: 'force_reload')) do |f| -%>
   <%= f.error_messages -%>
 
   <p>

data/app/views/news_posts/_form.html.erb

@@ -2,20 +2,20 @@
   <%= f.error_messages -%>
   <div class="field">
     <%= f.label t('activerecord.attributes.news_post.title') -%><br />
-    <%= f.text_field :title, :class => 'resource_title' -%>
+    <%= f.text_field :title, class: 'resource_title' -%>
   </div>
   <div class="field">
     <%= f.label t('activerecord.attributes.news_post.body') -%><br />
-    <%= f.text_area :body, :class => 'resource_textarea' -%>
+    <%= f.text_area :body, class: 'resource_textarea' -%>
   </div>
   <div class="field">
     <%= f.label t('activerecord.attributes.news_post.url') -%>
-    <%= f.url_field :url, :class => 'resource_url' -%>
+    <%= f.url_field :url, class: 'resource_url' -%>
   </div>
   <!--
   <div class="field">
     <%= f.label t('activerecord.models.user') -%><br />
-    <%= link_to h(@news_post.user.username), @news_post.user -%>
+    <%= link_to @news_post.user.username, @news_post.user.profile if @news_post.user.try(:profile) -%>
   </div>
   <div class="field">
     <%= f.label t('role.required_role') -%>
@@ -32,7 +32,7 @@
   </div>
   <div class="field">
     <%= f.label t('activerecord.attributes.news_post.note') -%><br />
-    <%= f.text_area :note, :class => 'resource_textarea' -%>
+    <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
   <div class="field">
     <%= f.label t('activerecord.attributes.news_post.draft') -%>

data/app/views/news_posts/edit.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.news_post')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.news_post')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/news_posts/index.atom.builder

@@ -1,5 +1,5 @@
-atom_feed(:url => news_posts_url(:format => :atom)) do |feed|
-  feed.title t('news_post.library_group_news_post', :library_group_name => @library_group.display_name.localize)
+atom_feed(url: news_posts_url(format: :atom)) do |feed|
+  feed.title t('news_post.library_group_news_post', library_group_name: @library_group.display_name.localize)
   feed.updated(@news_posts.first ? @news_posts.first.created_at : Time.zone.now)
 
   @news_posts.each do |news_post|

data/app/views/news_posts/index.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.news_post')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.news_post')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -24,7 +24,7 @@
     <td>
       <% if can? :delete, news_post %>
         <%= link_to t('page.edit'), edit_news_post_path(news_post) -%>
-        <%= link_to t('page.destroy'), news_post, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), news_post, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <% end %>
     </td>
   </tr>
@@ -37,6 +37,6 @@
 
 <div id="submenu" class="ui-corner-all">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.news_post')), new_news_post_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.news_post')), new_news_post_path -%></li>
   </ul>
 </div>

data/app/views/news_posts/index.rss.builder

@@ -4,14 +4,14 @@ xml.rss('version' => "2.0",
         'xmlns:dc' => "http://purl.org/dc/elements/1.1/",
         'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
-    xml.title t('news_post.library_group_news_post', :library_group_name => @library_group.display_name.localize)
+    xml.title t('news_post.library_group_news_post', library_group_name: @library_group.display_name.localize)
     xml.link news_posts_url
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", :rel => 'self', :href => news_posts_url(:format => :rss)
-    xml.tag! "atom:link", :rel => 'alternate', :href => root_url
-    xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => page_opensearch_url
+    xml.tag! "atom:link", rel: 'self', href: news_posts_url(format: :rss)
+    xml.tag! "atom:link", rel: 'alternate', href: root_url
+    xml.tag! "atom:link", rel: 'search', :type => 'application/opensearchdescription+xml', href: page_opensearch_url
     unless params[:query].blank?
       xml.tag! "opensearch:startIndex", @news_posts.offset + 1
       xml.tag! "opensearch:itemsPerPage", @news_posts.per_page

data/app/views/news_posts/new.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.news_post')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.news_post')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/news_posts/show.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.news_post')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.news_post')) -%></h1>
 <div id="content_list">
 <p>
   <strong><%= t('activerecord.attributes.news_post.title') -%>:</strong>

data/lib/enju_news/version.rb

@@ -1,3 +1,3 @@
 module EnjuNews
-  VERSION = "0.1.0.pre5"
+  VERSION = "0.1.0.pre6"
 end

data/spec/dummy/db/migrate/{20111201155513_add_devise_to_users.rb → 002_devise_create_users.rb}

@@ -1,6 +1,6 @@
-class AddDeviseToUsers < ActiveRecord::Migration
-  def self.up
-    change_table(:users) do |t|
+class DeviseCreateUsers < ActiveRecord::Migration
+  def change
+    create_table(:users) do |t|
       ## Database authenticatable
       t.string :email,              :null => false, :default => ""
       t.string :encrypted_password, :null => false, :default => ""
@@ -19,26 +19,28 @@ class AddDeviseToUsers < ActiveRecord::Migration
       t.string   :current_sign_in_ip
       t.string   :last_sign_in_ip
 
-      # t.encryptable
-      # t.confirmable
-      # t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
-      # t.token_authenticatable
+      ## Confirmable
+      # t.string   :confirmation_token
+      # t.datetime :confirmed_at
+      # t.datetime :confirmation_sent_at
+      # t.string   :unconfirmed_email # Only if using reconfirmable
 
+      ## Lockable
+      # t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+      # t.string   :unlock_token # Only if unlock strategy is :email or :both
+      # t.datetime :locked_at
 
-      # Uncomment below if timestamps were not included in your original model.
-      # t.timestamps
+      ## Token authenticatable
+      # t.string :authentication_token
+
+
+      t.timestamps
     end
 
-    add_index :users, :email #,                :unique => true
+    add_index :users, :email,                :unique => true
     add_index :users, :reset_password_token, :unique => true
     # add_index :users, :confirmation_token,   :unique => true
     # add_index :users, :unlock_token,         :unique => true
     # add_index :users, :authentication_token, :unique => true
   end
-
-  def self.down
-    # By default, we don't want to make any assumption about how to roll back a migration when your
-    # model already existed. Please edit below which fields you would like to remove in this migration.
-    raise ActiveRecord::IrreversibleMigration
-  end
 end

data/spec/dummy/db/migrate/041_create_roles.rb

@@ -0,0 +1,13 @@
+class CreateRoles < ActiveRecord::Migration
+  def change
+    create_table "roles" do |t|
+      t.column :name, :string, :null => false
+      t.column :display_name, :string
+      t.column :note, :text
+      t.column :created_at, :datetime
+      t.column :updated_at, :datetime
+      t.integer :score, :default => 0, :null => false
+      t.integer :position
+    end
+  end
+end

data/spec/dummy/db/migrate/077_create_user_groups.rb

@@ -1,16 +1,12 @@
 class CreateUserGroups < ActiveRecord::Migration
-  def self.up
+  def change
     create_table :user_groups do |t|
-      t.string :name, :string, :not_null => true
-      t.text :display_name, :string
+      t.string :name, :not_null => true
+      t.text :display_name
       t.text :note
       t.integer :position
       t.timestamps
       t.datetime :deleted_at
     end
   end
-
-  def self.down
-    drop_table :user_groups
-  end
 end

data/spec/dummy/db/migrate/080_create_library_groups.rb

@@ -4,7 +4,6 @@ class CreateLibraryGroups < ActiveRecord::Migration
       t.string :name, :null => false
       t.text :display_name
       t.string :short_name, :null => false
-      t.string :email
       t.text :my_networks
       t.text :login_banner
       t.text :note