enju_news 0.2.0 → 0.3.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a407ab2202d6d1b25ea75ab2e854fd219196c2a6
-  data.tar.gz: 91ca31384c943d00df948b939e5b6a9d997b6d76
+  metadata.gz: bf7a06c14b5363ec0633b8ea6d0c4a376c6b6b87
+  data.tar.gz: e82abc6e283d8f0410d6070bb9697b1bdc85b741
 SHA512:
-  metadata.gz: f8c9c988d5bb3f1cdc34abc56b2bbedf81d6a6d16b57ad3e550f1f3860f4137b99a4aa7d22c3f59276a06ca0bc8b3cf6adc919f4e2080c7ddfec2e52182c23c2
-  data.tar.gz: edd652e749a4de9eb0ecda0dc918699c0c45ab3760d2fa360df8d0e0f5b82338e6cd0afacb145b67dd4f6c756c897b36d1637a16f239cb4758f1de34a0b90000
+  metadata.gz: cdcb2143a4d1ed98b6fd99736e9afe7ae3cce9ff53f6e5e81cf72f296e4bca771812dc009e0e2cb49a390e6911ba6438f9c123350f69866f48975dc27154453e
+  data.tar.gz: ba6a9724e2c6d0e74290eb865fdd2a66c8164f633d1738a3fc64c048b303718cef708f7ee5128e92a889fef55e2547d914016c729ab787a350e667073377b4e1

data/README.rdoc

@@ -1,10 +1,10 @@
 = EnjuNews
-{<img src="https://travis-ci.org/next-l/enju_news.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_news]
-{<img src="https://coveralls.io/repos/next-l/enju_news/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_news?branch=1.2]
-{<img src="https://hakiri.io/github/next-l/enju_news/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_news/1.2]
+{<img src="https://travis-ci.org/next-l/enju_news.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_news]
+{<img src="https://coveralls.io/repos/next-l/enju_news/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_news?branch=1.3]
+{<img src="https://hakiri.io/github/next-l/enju_news/1.3.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_news/1.3]
 
 This project rocks and uses MIT-LICENSE.
 
 == 製作者・貢献者 (Authors and contributors)
 * {TANABE, Kosuke}[https://github.com/nabeta] ({@nabeta}[https://twitter.com/nabeta])
-* {Project Next-L}[http://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])
+* {Project Next-L}[https://www.next-l.jp] ({@ProjectNextL}[https://twitter.com/ProjectNextL])

data/Rakefile

@@ -44,4 +44,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
 end
 
 
-task :default => :spec
+task default: :spec

data/app/controllers/news_feeds_controller.rb

@@ -69,7 +69,7 @@ class NewsFeedsController < ApplicationController
     end
 
     respond_to do |format|
-      if @news_feed.update_attributes(news_feed_params)
+      if @news_feed.update(news_feed_params)
         flash[:notice] = t('controller.successfully_updated', model: t('activerecord.models.news_feed'))
         format.html { redirect_to(@news_feed) }
         format.json { head :no_content }

data/app/controllers/news_posts_controller.rb

@@ -71,7 +71,7 @@ class NewsPostsController < ApplicationController
     end
 
     respond_to do |format|
-      if @news_post.update_attributes(news_post_params)
+      if @news_post.update(news_post_params)
         format.html { redirect_to(@news_post, notice: t('controller.successfully_updated', model: t('activerecord.models.news_post'))) }
         format.json { head :no_content }
       else

data/app/models/news_feed.rb

@@ -2,9 +2,9 @@ class NewsFeed < ActiveRecord::Base
   default_scope { order("news_feeds.position") }
   belongs_to :library_group, validate: true
 
-  validates_presence_of :title, :url, :library_group
+  validates :title, :url, :library_group, presence: true
   validates_associated :library_group
-  validates_length_of :url, maximum: 255
+  validates :url, length: { maximum: 255 }
   before_save :fetch
 
   acts_as_list
@@ -30,7 +30,7 @@ class NewsFeed < ActiveRecord::Base
     # rss = RSS::Parser.parse(feed)
     # rss.to_s
     # => ""
-    #if rss.nil?
+    # if rss.nil?
       begin
         rss = RSS::Parser.parse(body)
       rescue RSS::InvalidRSSError
@@ -38,7 +38,7 @@ class NewsFeed < ActiveRecord::Base
       rescue RSS::NotWellFormedError, TypeError
         nil
       end
-    #end
+    # end
     end
   end
 

data/app/models/news_post.rb

@@ -5,7 +5,7 @@ class NewsPost < ActiveRecord::Base
   belongs_to :user
   belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id', validate: true
 
-  validates_presence_of :title, :body, :user_id
+  validates :title, :body, :user_id, presence: true
   validates_associated :user
   validate :check_date
 

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

@@ -1,9 +1,9 @@
-xml.instruct! :xml, :version=>"1.0"
+xml.instruct! :xml, version: "1.0"
 xml.rss('version' => "2.0",
         'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
         'xmlns:dc' => "http://purl.org/dc/elements/1.1/",
-        'xmlns:atom' => "http://www.w3.org/2005/Atom"){
-  xml.channel{
+        'xmlns:atom' => "http://www.w3.org/2005/Atom") do
+  xml.channel do
     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"
@@ -11,7 +11,7 @@ xml.rss('version' => "2.0",
     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: '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
@@ -24,9 +24,9 @@ xml.rss('version' => "2.0",
           # rfc822
           xml.pubDate h(news_post.created_at.utc.iso8601)
           xml.link news_post_url(news_post)
-          xml.guid news_post_url(news_post), :isPermaLink => "true"
+          xml.guid news_post_url(news_post), isPermaLink: "true"
         end
       end
     end
-  }
-}
+  end
+end

data/db/migrate/20081031033632_create_news_feeds.rb

@@ -1,7 +1,7 @@
-class CreateNewsFeeds < ActiveRecord::Migration
+class CreateNewsFeeds < ActiveRecord::Migration[4.2]
   def change
     create_table :news_feeds do |t|
-      t.integer :library_group_id, :default => 1, :null => false
+      t.integer :library_group_id, default: 1, null: false
       t.string :title
       t.string :url
       t.text :body

data/db/migrate/20090126071155_create_news_posts.rb

@@ -1,4 +1,4 @@
-class CreateNewsPosts < ActiveRecord::Migration
+class CreateNewsPosts < ActiveRecord::Migration[4.2]
   def change
     create_table :news_posts do |t|
       t.text :title
@@ -6,10 +6,10 @@ class CreateNewsPosts < ActiveRecord::Migration
       t.integer :user_id
       t.datetime :start_date
       t.datetime :end_date
-      t.integer :required_role_id, :default => 1, :null => false
+      t.integer :required_role_id, default: 1, null: false
       t.text :note
       t.integer :position
-      t.boolean :draft, :default => false, :null => false
+      t.boolean :draft, default: false, null: false
 
       t.timestamps
     end

data/db/migrate/20110220103937_add_url_to_news_post.rb

@@ -1,4 +1,4 @@
-class AddUrlToNewsPost < ActiveRecord::Migration
+class AddUrlToNewsPost < ActiveRecord::Migration[4.2]
   def self.up
     add_column :news_posts, :url, :string
   end

data/lib/enju_news/version.rb

@@ -1,3 +1,3 @@
 module EnjuNews
-  VERSION = "0.2.0"
+  VERSION = "0.3.0.beta.1"
 end

data/spec/controllers/news_feeds_controller_spec.rb

@@ -4,12 +4,12 @@ describe NewsFeedsController do
   fixtures :all
 
   def valid_attributes
-    FactoryGirl.attributes_for(:news_feed)
+    FactoryBot.attributes_for(:news_feed)
   end
 
   describe "GET index" do
     before(:each) do
-      FactoryGirl.create(:news_feed)
+      FactoryBot.create(:news_feed)
     end
 
     describe "When logged in as Administrator" do
@@ -51,14 +51,14 @@ describe NewsFeedsController do
 
   describe "GET show" do
     before(:each) do
-      @news_feed = FactoryGirl.create(:news_feed)
+      @news_feed = FactoryBot.create(:news_feed)
     end
 
     describe "When logged in as Administrator" do
       login_admin
 
       it "assigns the requested news_feed as @news_feed" do
-        get :show, :id => @news_feed.id
+        get :show, params: { id: @news_feed.id }
         assigns(:news_feed).should eq(@news_feed)
       end
     end
@@ -67,7 +67,7 @@ describe NewsFeedsController do
       login_librarian
 
       it "assigns the requested news_feed as @news_feed" do
-        get :show, :id => @news_feed.id
+        get :show, params: { id: @news_feed.id }
         assigns(:news_feed).should eq(@news_feed)
       end
     end
@@ -76,14 +76,14 @@ describe NewsFeedsController do
       login_user
 
       it "assigns the requested news_feed as @news_feed" do
-        get :show, :id => @news_feed.id
+        get :show, params: { id: @news_feed.id }
         assigns(:news_feed).should eq(@news_feed)
       end
     end
 
     describe "When not logged in" do
       it "assigns the requested news_feed as @news_feed" do
-        get :show, :id => @news_feed.id
+        get :show, params: { id: @news_feed.id }
         assigns(:news_feed).should eq(@news_feed)
       end
     end
@@ -131,14 +131,14 @@ describe NewsFeedsController do
 
   describe "GET edit" do
     before(:each) do
-      @news_feed = FactoryGirl.create(:news_feed)
+      @news_feed = FactoryBot.create(:news_feed)
     end
 
     describe "When logged in as Administrator" do
       login_admin
 
       it "assigns the requested news_feed as @news_feed" do
-        get :edit, :id => @news_feed.id
+        get :edit, params: { id: @news_feed.id }
         assigns(:news_feed).should eq(@news_feed)
       end
     end
@@ -147,7 +147,7 @@ describe NewsFeedsController do
       login_librarian
 
       it "assigns the requested news_feed as @news_feed" do
-        get :edit, :id => @news_feed.id
+        get :edit, params: { id: @news_feed.id }
         response.should be_forbidden
       end
     end
@@ -156,14 +156,14 @@ describe NewsFeedsController do
       login_user
 
       it "assigns the requested news_feed as @news_feed" do
-        get :edit, :id => @news_feed.id
+        get :edit, params: { id: @news_feed.id }
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "should not assign the requested news_feed as @news_feed" do
-        get :edit, :id => @news_feed.id
+        get :edit, params: { id: @news_feed.id }
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -172,7 +172,7 @@ describe NewsFeedsController do
   describe "POST create" do
     before(:each) do
       @attrs = valid_attributes
-      @invalid_attrs = {:title => ''}
+      @invalid_attrs = {title: ''}
     end
 
     describe "When logged in as Administrator" do
@@ -180,24 +180,24 @@ describe NewsFeedsController do
 
       describe "with valid params" do
         it "assigns a newly created news_feed as @news_feed" do
-          post :create, :news_feed => @attrs
+          post :create, params: { news_feed: @attrs }
           assigns(:news_feed).should be_valid
         end
 
         it "redirects to the created news_feed" do
-          post :create, :news_feed => @attrs
+          post :create, params: { news_feed: @attrs }
           response.should redirect_to(assigns(:news_feed))
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_feed as @news_feed" do
-          post :create, :news_feed => @invalid_attrs
+          post :create, params: { news_feed: @invalid_attrs }
           assigns(:news_feed).should_not be_valid
         end
 
         it "should be successful" do
-          post :create, :news_feed => @invalid_attrs
+          post :create, params: { news_feed: @invalid_attrs }
           response.should be_success
         end
       end
@@ -208,24 +208,24 @@ describe NewsFeedsController do
 
       describe "with valid params" do
         it "assigns a newly created news_feed as @news_feed" do
-          post :create, :news_feed => @attrs
+          post :create, params: { news_feed: @attrs }
           assigns(:news_feed).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :news_feed => @attrs
+          post :create, params: { news_feed: @attrs }
           response.should be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_feed as @news_feed" do
-          post :create, :news_feed => @invalid_attrs
+          post :create, params: { news_feed: @invalid_attrs }
           assigns(:news_feed).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :news_feed => @invalid_attrs
+          post :create, params: { news_feed: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -236,24 +236,24 @@ describe NewsFeedsController do
 
       describe "with valid params" do
         it "assigns a newly created news_feed as @news_feed" do
-          post :create, :news_feed => @attrs
+          post :create, params: { news_feed: @attrs }
           assigns(:news_feed).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :news_feed => @attrs
+          post :create, params: { news_feed: @attrs }
           response.should be_forbidden
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_feed as @news_feed" do
-          post :create, :news_feed => @invalid_attrs
+          post :create, params: { news_feed: @invalid_attrs }
           assigns(:news_feed).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :news_feed => @invalid_attrs
+          post :create, params: { news_feed: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -262,24 +262,24 @@ describe NewsFeedsController do
     describe "When not logged in" do
       describe "with valid params" do
         it "assigns a newly created news_feed as @news_feed" do
-          post :create, :news_feed => @attrs
+          post :create, params: { news_feed: @attrs }
           assigns(:news_feed).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :news_feed => @attrs
+          post :create, params: { news_feed: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_feed as @news_feed" do
-          post :create, :news_feed => @invalid_attrs
+          post :create, params: { news_feed: @invalid_attrs }
           assigns(:news_feed).should be_nil
         end
 
         it "should be forbidden" do
-          post :create, :news_feed => @invalid_attrs
+          post :create, params: { news_feed: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -288,9 +288,9 @@ describe NewsFeedsController do
 
   describe "PUT update" do
     before(:each) do
-      @news_feed = FactoryGirl.create(:news_feed)
+      @news_feed = FactoryBot.create(:news_feed)
       @attrs = valid_attributes
-      @invalid_attrs = {:title => ''}
+      @invalid_attrs = {title: ''}
     end
 
     describe "When logged in as Administrator" do
@@ -298,23 +298,23 @@ describe NewsFeedsController do
 
       describe "with valid params" do
         it "updates the requested news_feed" do
-          put :update, :id => @news_feed.id, :news_feed => @attrs
+          put :update, params: { id: @news_feed.id, news_feed: @attrs }
         end
 
         it "assigns the requested news_feed as @news_feed" do
-          put :update, :id => @news_feed.id, :news_feed => @attrs
+          put :update, params: { id: @news_feed.id, news_feed: @attrs }
           assigns(:news_feed).should eq(@news_feed)
         end
 
         it "moves its position when specified" do
-          put :update, :id => @news_feed.id, :news_feed => @attrs, :move => 'lower'
+          put :update, params: { id: @news_feed.id, news_feed: @attrs, move: 'lower' }
           response.should redirect_to(news_feeds_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested news_feed as @news_feed" do
-          put :update, :id => @news_feed.id, :news_feed => @invalid_attrs
+          put :update, params: { id: @news_feed.id, news_feed: @invalid_attrs }
           response.should render_template("edit")
         end
       end
@@ -325,11 +325,11 @@ describe NewsFeedsController do
 
       describe "with valid params" do
         it "updates the requested news_feed" do
-          put :update, :id => @news_feed.id, :news_feed => @attrs
+          put :update, params: { id: @news_feed.id, news_feed: @attrs }
         end
 
         it "assigns the requested news_feed as @news_feed" do
-          put :update, :id => @news_feed.id, :news_feed => @attrs
+          put :update, params: { id: @news_feed.id, news_feed: @attrs }
           assigns(:news_feed).should eq(@news_feed)
           response.should be_forbidden
         end
@@ -337,7 +337,7 @@ describe NewsFeedsController do
 
       describe "with invalid params" do
         it "assigns the requested news_feed as @news_feed" do
-          put :update, :id => @news_feed.id, :news_feed => @invalid_attrs
+          put :update, params: { id: @news_feed.id, news_feed: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -348,11 +348,11 @@ describe NewsFeedsController do
 
       describe "with valid params" do
         it "updates the requested news_feed" do
-          put :update, :id => @news_feed.id, :news_feed => @attrs
+          put :update, params: { id: @news_feed.id, news_feed: @attrs }
         end
 
         it "assigns the requested news_feed as @news_feed" do
-          put :update, :id => @news_feed.id, :news_feed => @attrs
+          put :update, params: { id: @news_feed.id, news_feed: @attrs }
           assigns(:news_feed).should eq(@news_feed)
           response.should be_forbidden
         end
@@ -360,7 +360,7 @@ describe NewsFeedsController do
 
       describe "with invalid params" do
         it "assigns the requested news_feed as @news_feed" do
-          put :update, :id => @news_feed.id, :news_feed => @invalid_attrs
+          put :update, params: { id: @news_feed.id, news_feed: @invalid_attrs }
           response.should be_forbidden
         end
       end
@@ -369,18 +369,18 @@ describe NewsFeedsController do
     describe "When not logged in" do
       describe "with valid params" do
         it "updates the requested news_feed" do
-          put :update, :id => @news_feed.id, :news_feed => @attrs
+          put :update, params: { id: @news_feed.id, news_feed: @attrs }
         end
 
         it "should be forbidden" do
-          put :update, :id => @news_feed.id, :news_feed => @attrs
+          put :update, params: { id: @news_feed.id, news_feed: @attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
 
       describe "with invalid params" do
         it "assigns the requested news_feed as @news_feed" do
-          put :update, :id => @news_feed.id, :news_feed => @invalid_attrs
+          put :update, params: { id: @news_feed.id, news_feed: @invalid_attrs }
           response.should redirect_to(new_user_session_url)
         end
       end
@@ -389,18 +389,18 @@ describe NewsFeedsController do
 
   describe "DELETE destroy" do
     before(:each) do
-      @news_feed = FactoryGirl.create(:news_feed)
+      @news_feed = FactoryBot.create(:news_feed)
     end
 
     describe "When logged in as Administrator" do
       login_admin
 
       it "destroys the requested news_feed" do
-        delete :destroy, :id => @news_feed.id
+        delete :destroy, params: { id: @news_feed.id }
       end
 
       it "redirects to the news_feeds list" do
-        delete :destroy, :id => @news_feed.id
+        delete :destroy, params: { id: @news_feed.id }
         response.should redirect_to(news_feeds_url)
       end
     end
@@ -409,11 +409,11 @@ describe NewsFeedsController do
       login_librarian
 
       it "destroys the requested news_feed" do
-        delete :destroy, :id => @news_feed.id
+        delete :destroy, params: { id: @news_feed.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @news_feed.id
+        delete :destroy, params: { id: @news_feed.id }
         response.should be_forbidden
       end
     end
@@ -422,22 +422,22 @@ describe NewsFeedsController do
       login_user
 
       it "destroys the requested news_feed" do
-        delete :destroy, :id => @news_feed.id
+        delete :destroy, params: { id: @news_feed.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @news_feed.id
+        delete :destroy, params: { id: @news_feed.id }
         response.should be_forbidden
       end
     end
 
     describe "When not logged in" do
       it "destroys the requested news_feed" do
-        delete :destroy, :id => @news_feed.id
+        delete :destroy, params: { id: @news_feed.id }
       end
 
       it "should be forbidden" do
-        delete :destroy, :id => @news_feed.id
+        delete :destroy, params: { id: @news_feed.id }
         response.should redirect_to(new_user_session_url)
       end
     end