enju_news 0.1.1 → 0.2.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f990cda7c68cbca65c77e8c4586e2738d121e92
-  data.tar.gz: 1ddee41de86bdbc94821594fdb17260f09b76d17
+  metadata.gz: 27eacbefe4bd18016876aa0946e0653bd602a739
+  data.tar.gz: f76a744164203b419b4aed9b47d561cd8579fb25
 SHA512:
-  metadata.gz: f23f6f506fdd9b8627ce9e74248d9cc7076540f4e22e652ed528fe467ce9d818235a97b961bc02fd083d9dc890a31f7469ead5de3c8771de1aead562099e4aaa
-  data.tar.gz: 8a1b9134dce47f214d93e1748ec3ed137b0d779b3236b08bc72ecce44ca0cbf5206b44ac5b1744aa95fa052f570a33db7faf574f7a30f2f28777841178dd9843
+  metadata.gz: fe78c9b1b78c6e33ad4de9c680bd594a59ce6b88d1008567cab0dba27baf3a205cd496a7790a9a4d5adb1840511e6ade4d8133b9d9467b5393886c33e42bfd50
+  data.tar.gz: eea53bb6d08a22fe889653de1b62cba4befa63dd52a2e1ae7af4c9b5deeb2eb0081ac2086eb455491a26586a1c16dc63fda04bbb83e5a42b9e1f7717c3d82fce

data/README.rdoc

@@ -1,7 +1,7 @@
 = EnjuNews
-{<img src="https://travis-ci.org/next-l/enju_news.svg?branch=1.1" 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.1&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_news?branch=1.1]
-{<img src="https://hakiri.io/github/next-l/enju_news/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_news/1.1]
+{<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]
 
 This project rocks and uses MIT-LICENSE.
 

data/app/controllers/news_feeds_controller.rb

@@ -1,5 +1,6 @@
 class NewsFeedsController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_news_feed, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /news_feeds
   # GET /news_feeds.json
@@ -91,6 +92,15 @@ class NewsFeedsController < ApplicationController
   end
 
   private
+  def set_news_feed
+    @news_feed = NewsFeed.find(params[:id])
+    authorize @news_feed
+  end
+
+  def check_policy
+    authorize NewsFeed
+  end
+
   def news_feed_params
     params.require(:news_feed).permit(:title, :url)
   end

data/app/controllers/news_posts_controller.rb

@@ -1,6 +1,7 @@
 class NewsPostsController < ApplicationController
-  load_and_authorize_resource
-  before_filter :prepare_options, only: [:new, :edit]
+  before_action :set_news_post, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /news_posts
   # GET /news_posts.json
@@ -93,6 +94,15 @@ class NewsPostsController < ApplicationController
   end
 
   private
+  def set_news_post
+    @news_post = NewsPost.find(params[:id])
+    authorize @news_post
+  end
+
+  def check_policy
+    authorize NewsPost
+  end
+
   def news_post_params
     params.require(:news_post).permit(:title, :body)
   end

data/app/models/news_post.rb

@@ -1,11 +1,13 @@
 class NewsPost < ActiveRecord::Base
   scope :published, -> { where(draft: false) }
+  scope :current, -> { where('start_date <= ? AND end_date >= ?', Time.zone.now, Time.zone.now) }
   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
 
   validates_presence_of :title, :body, :user_id
   validates_associated :user
+  validate :check_date
 
   acts_as_list
 
@@ -17,6 +19,16 @@ class NewsPost < ActiveRecord::Base
   def self.per_page
     10
   end
+
+  def check_date
+    if start_date and end_date
+      self.end_date = end_date.end_of_day
+      if start_date >= end_date
+        errors.add(:start_date)
+        errors.add(:end_date)
+      end
+    end
+  end
 end
 
 # == Schema Information

data/app/policies/news_feed_policy.rb

@@ -0,0 +1,21 @@
+class NewsFeedPolicy < ApplicationPolicy
+  def index?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def show?
+    true if user.try(:has_role?, 'Librarian')
+  end
+
+  def create?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    true if user.try(:has_role?, 'Administrator')
+  end
+end

data/app/policies/news_post_policy.rb

@@ -0,0 +1,21 @@
+class NewsPostPolicy < ApplicationPolicy
+  def index?
+    true
+  end
+
+  def show?
+    true
+  end
+
+  def create?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def update?
+    true if user.try(:has_role?, 'Administrator')
+  end
+
+  def destroy?
+    true if user.try(:has_role?, 'Administrator')
+  end
+end

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

@@ -13,15 +13,17 @@
 <%- @news_feeds.each do |news_feed| -%>
   <tr class="line<%= cycle("0", "1") -%>">
     <td>
-      <%- if can? :delete, news_feed -%>
+      <%- if policy(news_feed).update? -%>
         <%= move_position(news_feed) -%>
       <%- end -%>
     </td>
     <td><%= link_to h(news_feed.title), news_feed -%></td>
     <td><%= link_to h(news_feed.url), news_feed.url -%></td>
     <td>
-      <%- if can? :delete, news_feed -%>
+      <%- if policy(news_feed).update? -%>
         <%= link_to t('page.edit'), edit_news_feed_path(news_feed) -%>
+      <%- end -%>
+      <%- if policy(news_feed).destroy? -%>
         <%= link_to t('page.destroy'), news_feed, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>

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

@@ -22,8 +22,10 @@
     </td>
     <td><%= news_post.required_role.display_name.localize -%></td>
     <td>
-      <% if can? :delete, news_post %>
+      <% if policy(news_post).update? %>
         <%= link_to t('page.edit'), edit_news_post_path(news_post) -%>
+      <% end %>
+      <% if policy(news_post).destroy? %>
         <%= link_to t('page.destroy'), news_post, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <% end %>
     </td>

data/lib/enju_news/engine.rb

@@ -1,4 +1,4 @@
-require 'faraday'
+require 'enju_library'
 
 module EnjuNews
   class Engine < ::Rails::Engine

data/lib/enju_news/version.rb

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

data/spec/controllers/news_feeds_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe NewsFeedsController do
   fixtures :all
@@ -35,7 +35,7 @@ describe NewsFeedsController do
 
       it "assigns empty as @news_feeds" do
         get :index
-        assigns(:news_feeds).should be_empty
+        assigns(:news_feeds).should be_nil
         response.should be_forbidden
       end
     end
@@ -43,7 +43,7 @@ describe NewsFeedsController do
     describe "When not logged in" do
       it "assigns all news_feeds as @news_feeds" do
         get :index
-        assigns(:news_feeds).should be_empty
+        assigns(:news_feeds).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -105,7 +105,7 @@ describe NewsFeedsController do
 
       it "should not assign the requested news_feed as @news_feed" do
         get :new
-        assigns(:news_feed).should_not be_valid
+        assigns(:news_feed).should be_nil
         response.should be_forbidden
       end
     end
@@ -115,7 +115,7 @@ describe NewsFeedsController do
 
       it "should not assign the requested news_feed as @news_feed" do
         get :new
-        assigns(:news_feed).should_not be_valid
+        assigns(:news_feed).should be_nil
         response.should be_forbidden
       end
     end
@@ -123,7 +123,7 @@ describe NewsFeedsController do
     describe "When not logged in" do
       it "should not assign the requested news_feed as @news_feed" do
         get :new
-        assigns(:news_feed).should_not be_valid
+        assigns(:news_feed).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -209,7 +209,7 @@ describe NewsFeedsController do
       describe "with valid params" do
         it "assigns a newly created news_feed as @news_feed" do
           post :create, :news_feed => @attrs
-          assigns(:news_feed).should be_valid
+          assigns(:news_feed).should be_nil
         end
 
         it "should be forbidden" do
@@ -221,7 +221,7 @@ describe NewsFeedsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_feed as @news_feed" do
           post :create, :news_feed => @invalid_attrs
-          assigns(:news_feed).should_not be_valid
+          assigns(:news_feed).should be_nil
         end
 
         it "should be forbidden" do
@@ -237,7 +237,7 @@ describe NewsFeedsController do
       describe "with valid params" do
         it "assigns a newly created news_feed as @news_feed" do
           post :create, :news_feed => @attrs
-          assigns(:news_feed).should be_valid
+          assigns(:news_feed).should be_nil
         end
 
         it "should be forbidden" do
@@ -249,7 +249,7 @@ describe NewsFeedsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_feed as @news_feed" do
           post :create, :news_feed => @invalid_attrs
-          assigns(:news_feed).should_not be_valid
+          assigns(:news_feed).should be_nil
         end
 
         it "should be forbidden" do
@@ -263,7 +263,7 @@ describe NewsFeedsController do
       describe "with valid params" do
         it "assigns a newly created news_feed as @news_feed" do
           post :create, :news_feed => @attrs
-          assigns(:news_feed).should be_valid
+          assigns(:news_feed).should be_nil
         end
 
         it "should be forbidden" do
@@ -275,7 +275,7 @@ describe NewsFeedsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_feed as @news_feed" do
           post :create, :news_feed => @invalid_attrs
-          assigns(:news_feed).should_not be_valid
+          assigns(:news_feed).should be_nil
         end
 
         it "should be forbidden" do

data/spec/controllers/news_posts_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe NewsPostsController do
   fixtures :all
@@ -103,7 +103,7 @@ describe NewsPostsController do
 
       it "should not assign the requested news_post as @news_post" do
         get :new
-        assigns(:news_post).should_not be_valid
+        assigns(:news_post).should be_nil
         response.should be_forbidden
       end
     end
@@ -113,7 +113,7 @@ describe NewsPostsController do
 
       it "should not assign the requested news_post as @news_post" do
         get :new
-        assigns(:news_post).should_not be_valid
+        assigns(:news_post).should be_nil
         response.should be_forbidden
       end
     end
@@ -121,7 +121,7 @@ describe NewsPostsController do
     describe "When not logged in" do
       it "should not assign the requested news_post as @news_post" do
         get :new
-        assigns(:news_post).should_not be_valid
+        assigns(:news_post).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -207,7 +207,7 @@ describe NewsPostsController do
       describe "with valid params" do
         it "assigns a newly created news_post as @news_post" do
           post :create, :news_post => @attrs
-          assigns(:news_post).should_not be_valid
+          assigns(:news_post).should be_nil
         end
 
         it "should be forbidden" do
@@ -219,7 +219,7 @@ describe NewsPostsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_post as @news_post" do
           post :create, :news_post => @invalid_attrs
-          assigns(:news_post).should_not be_valid
+          assigns(:news_post).should be_nil
         end
 
         it "should be forbidden" do
@@ -235,7 +235,7 @@ describe NewsPostsController do
       describe "with valid params" do
         it "assigns a newly created news_post as @news_post" do
           post :create, :news_post => @attrs
-          assigns(:news_post).should_not be_valid
+          assigns(:news_post).should be_nil
         end
 
         it "should be forbidden" do
@@ -247,7 +247,7 @@ describe NewsPostsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_post as @news_post" do
           post :create, :news_post => @invalid_attrs
-          assigns(:news_post).should_not be_valid
+          assigns(:news_post).should be_nil
         end
 
         it "should be forbidden" do
@@ -261,7 +261,7 @@ describe NewsPostsController do
       describe "with valid params" do
         it "assigns a newly created news_post as @news_post" do
           post :create, :news_post => @attrs
-          assigns(:news_post).should_not be_valid
+          assigns(:news_post).should be_nil
         end
 
         it "should be forbidden" do
@@ -273,7 +273,7 @@ describe NewsPostsController do
       describe "with invalid params" do
         it "assigns a newly created but unsaved news_post as @news_post" do
           post :create, :news_post => @invalid_attrs
-          assigns(:news_post).should_not be_valid
+          assigns(:news_post).should be_nil
         end
 
         it "should be forbidden" do

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,6 +1,9 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
 
-  enju_leaf
-  enju_library
+  include EnjuLibrary::Controller
+  before_action :set_paper_trail_whodunnit
+  after_action :verify_authorized
+
+  include Pundit
 end

data/spec/dummy/app/models/user.rb

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 class User < ActiveRecord::Base
   devise :database_authenticatable, #:registerable,
     :recoverable, :rememberable, :trackable, #, :validatable
     :lockable, :lock_strategy => :none, :unlock_strategy => :none
 
-  enju_leaf_user_model
+  include EnjuSeed::EnjuUser
 end

data/spec/dummy/config/application.rb

@@ -2,8 +2,11 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require
-require "enju_news"
+Bundler.require(*Rails.groups)
+require 'enju_news'
+require 'enju_leaf'
+require 'globalize'
+require 'globalize-accessors'
 
 module Dummy
   class Application < Rails::Application
@@ -11,16 +14,6 @@ module Dummy
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
-    # Custom directories with classes and modules you want to be autoloadable.
-    # config.autoload_paths += %W(#{config.root}/extras)
-
-    # Only load the plugins named here, in the order given (default is alphabetical).
-    # :all can be used as a placeholder for all plugins not explicitly named.
-    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
-
-    # Activate observers that should always be running.
-    # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
-
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
@@ -29,18 +22,8 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Configure the default encoding used in templates for Ruby 1.9.
-    config.encoding = "utf-8"
-
-    # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters += [:password]
-
-    # Enable the asset pipeline
-    config.assets.enabled = true
-
-    # Version of your assets, change this if you want to expire all your assets
-    config.assets.version = '1.0'
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true
   end
 end
 
-require 'enju_leaf'