ems 0.1.6 → 0.1.7

data/app/controllers/ems/application_controller.rb

@@ -4,12 +4,12 @@ module Ems
     before_filter :authenticate_user!
     # Also make sure we either have to check cancan or skipit, emtpy is too risky
     check_authorization
-    
+
     # # Global cancan failure recovery
     # rescue_from CanCan::AccessDenied do |exception|
     #   redirect_to main_app.new_user_session_path, :alert => exception.message
     # end
-    
+
     # We need to make sure that we are using the ems abilities in the EMS
     def current_ability
       @current_ability ||= Ability.new(current_user)

data/app/controllers/ems/articles_controller.rb

@@ -1,53 +1,53 @@
 module Ems
   class ArticlesController < ApplicationController
-   load_and_authorize_resource    
-   
+   load_and_authorize_resource :class => Ems::Article
+
     # GET /articles
     # GET /articles.json
     def index
       @articles = Article.all
-  
+
       respond_to do |format|
         format.html # index.html.erb
         format.json { render json: @articles }
       end
     end
-  
+
     # GET /articles/1
     # GET /articles/1.json
     def show
       @article = Article.find(params[:id])
-  
+
       respond_to do |format|
         format.html # show.html.erb
         format.json { render json: @article }
       end
     end
-  
+
     # GET /articles/new
     # GET /articles/new.json
     def new
       @article = Article.new(:category => Category.find(params[:category_id]))
       @article.assets.build
       @article.category = Category.find params[:category_id]
-        
+
       respond_to do |format|
         format.html # new.html.erb
         format.json { render json: @article }
       end
     end
-  
+
     # GET /articles/1/edit
     def edit
       @article = Article.find(params[:id])
       @article.assets.build
     end
-  
+
     # POST /articles
     # POST /articles.json
     def create
       @article = Article.new(params[:article])
-  
+
       respond_to do |format|
         if @article.save
           format.html { redirect_to edit_category_article_path(@article.category, @article), notice: 'Article was successfully created.' }
@@ -58,12 +58,12 @@ module Ems
         end
       end
     end
-  
+
     # PUT /articles/1
     # PUT /articles/1.json
     def update
       @article = Article.find(params[:id])
-  
+
       respond_to do |format|
         if @article.update_attributes(params[:article])
           format.html { redirect_to edit_category_article_path(@article.category, @article), notice: 'Article was successfully updated.' }
@@ -74,14 +74,14 @@ module Ems
         end
       end
     end
-  
+
     # DELETE /articles/1
     # DELETE /articles/1.json
     def destroy
       @article = Article.find(params[:id])
       category = @article.category
       @article.destroy
-  
+
       respond_to do |format|
         format.html { redirect_to category_articles_path(category), notice: 'Article was successfully deleted.' }
         format.json { head :no_content }

data/app/controllers/ems/categories_controller.rb

@@ -1,6 +1,6 @@
 module Ems
   class CategoriesController < ApplicationController
-    load_and_authorize_resource
+    load_and_authorize_resource :class => Ems::Category
     # GET /categories
     # GET /categories.json
     def index

data/app/controllers/ems/channels_controller.rb

@@ -1,11 +1,11 @@
 module Ems
   class ChannelsController < ApplicationController
-    load_and_authorize_resource
+    load_and_authorize_resource :class => Ems::Channel
     # GET /channels
     # GET /channels.json
     def index
       @channels = Channel.all
-  
+
       respond_to do |format|
         format.html # index.html.erb
         format.json { render json: @channels }

data/app/controllers/ems/ems_controller.rb

@@ -1,14 +1,14 @@
 module Ems
   class EmsController < ApplicationController
     skip_authorization_check :only => [:index]
-        
+
     def index
       # Workaround for active admin routing problem.
       # see:
       # http://stackoverflow.com/questions/10684566/mountable-engine-routing-with-active-admin-on-rails
-      # @todo find a nicer solution for this problem.
+      # TODO find a nicer solution for this problem.
       render :layout => 'ems/application'
     end
-    
+
   end
 end

data/app/controllers/ems/images_controller.rb

@@ -1,6 +1,6 @@
 module Ems
   class ImagesController < ApplicationController
-    load_and_authorize_resource
+    load_and_authorize_resource :class => Ems::Image
     # GET /images
     # GET /images.json
     def index

data/app/controllers/ems/news_controller.rb

@@ -1,6 +1,6 @@
 module Ems
   class NewsController < ApplicationController
-    load_and_authorize_resource
+    load_and_authorize_resource :class => Ems::News
     # GET /news
     # GET /news.json
     def index
@@ -87,4 +87,4 @@ module Ems
       end
     end
   end
-end
+end

data/app/controllers/ems/reports_controller.rb

@@ -1,6 +1,6 @@
 module Ems
   class ReportsController < ApplicationController
-    load_and_authorize_resource
+    load_and_authorize_resource :class => Ems::Report
     # GET /reports
     # GET /reports.json
     def index

data/app/controllers/ems/tags_controller.rb

@@ -1,8 +1,8 @@
 module Ems
   class TagsController < ApplicationController
-    load_and_authorize_resource
+    load_and_authorize_resource :class => Ems::Tag
     include TagQueryBuilder
-    
+
     # GET /tags
     # GET /tags.json
     def index

data/app/models/ems/ability.rb

@@ -28,4 +28,4 @@ module Ems
       # See the wiki for details: https://github.com/ryanb/cancan/wiki/Defining-Abilities
     end
   end
-end
+end

data/app/models/ems/article.rb

@@ -1,6 +1,11 @@
 module Ems
 
   class Article < ActiveRecord::Base
+
+    attr_accessible :category_id, :channel_ids, :tag_ids, :title, :publish_from,
+      :status, :image, :standfirst, :content, :assets, :article_ids, :report_ids,
+      :news_ids, :hot, :featured
+
     # use friendly_id to handle our slugs
     extend FriendlyId
     friendly_id :title, use: :slugged
@@ -13,17 +18,16 @@ module Ems
     validates :channels, :presence => true, :if => :is_live?
     validates :publish_from, :presence => true, :if => :is_live?
     validates :status, :presence => true
-    
+
     validates :image, :attachment_presence => true, :if => :is_live?
     validates :title, :presence => true, :if => :is_live?
     validates :standfirst, :presence => true, :if => :is_live?
     validates :content, :presence => true, :if => :is_live?
-        
+
     validates_uniqueness_of :slug
     validates_inclusion_of :content_disposition, :in => [ :html, :markdown ], :message => "Value is not a valid content disposition"
     validates_inclusion_of :status, :in => [ :draft, :pending, :live ], :message => "Value is not a valid status"
-    
-    
+
     # searchable do
     #   text :title, :stored => true
     #   text :standfirst, :stored => true
@@ -35,7 +39,6 @@ module Ems
 
     # after methods
     after_initialize :init
-    
 
     # relations
     belongs_to :category
@@ -52,7 +55,7 @@ module Ems
     accepts_nested_attributes_for :reports
     has_many :assets, :as => :assetable
     accepts_nested_attributes_for :assets, :allow_destroy => true
-    
+
     # paperclip files
     has_attached_file :image, :styles => { :image564x252 => "564x252#", :image312x189 => "312x189#", :image312x126 => "312x126", :image228x126 => "228x126"}
 
@@ -87,7 +90,7 @@ module Ems
     def content_disposition= (value)
      write_attribute(:content_disposition, value.to_s)
     end
-    
+
     def content_as_html
       Kramdown::Document.new(content, :input => "BeanKramdown").to_html
     end
@@ -97,15 +100,15 @@ module Ems
     def as_json(options={})
       super( options.merge( :include => [ :category, :channels, :tags, :images ] ) )
     end
-    
+
     #
     def is_live?
       self.status === :live
     end
-    
+
     # base queries
     class << self
-      
+
       def base_query(category=nil)
         q = self.joins(:category).where("publish_from <= :publish_from", {:publish_from => Time.now.strftime("%Y/%m/%d %H:00:00")}).where(:status => 'live')
         q = q.where('ems_categories.id' => category.id) if category

data/app/models/ems/category.rb

@@ -1,5 +1,8 @@
 module Ems
   class Category < ActiveRecord::Base
+
+    attr_accessible :name, :strapline
+
     # use friendly_id to handle our slugs
     extend FriendlyId
     friendly_id :name, use: :slugged

data/app/models/ems/channel.rb

@@ -1,11 +1,14 @@
 module Ems
   class Channel < ActiveRecord::Base
+
+    attr_accessible :name, :category_ids, :articles, :news, :reports
+
     extend FriendlyId
     friendly_id :name, use: :slugged
     def should_generate_new_friendly_id?
       new_record?
     end
-        
+
     # Validators
     validates_uniqueness_of :slug
     validates :slug, :presence => true
@@ -13,7 +16,7 @@ module Ems
 
     has_and_belongs_to_many :categories, :join_table => 'ems_categories_channels'
     accepts_nested_attributes_for :categories
-    
+
     has_and_belongs_to_many :articles, :join_table => 'ems_articles_channels'
     accepts_nested_attributes_for :articles
     has_and_belongs_to_many :news, :join_table => 'ems_channels_news'

data/app/models/ems/role.rb

@@ -1,5 +1,6 @@
 module Ems
   class Role < ActiveRecord::Base
+    attr_accessible :name
     has_and_belongs_to_many :users, :class_name => Ems.user_class, :join_table => 'ems_roles_users'
   end
 end

data/app/models/ems/tag.rb

@@ -1,11 +1,14 @@
 module Ems
   class Tag < ActiveRecord::Base
+
+    attr_accessible :title, :description
+
     extend FriendlyId
     friendly_id :title, use: :slugged
     def should_generate_new_friendly_id?
       new_record?
     end
-    
+
     has_and_belongs_to_many :articles, :join_table => 'ems_articles_tags'
     accepts_nested_attributes_for :articles
 
@@ -13,7 +16,7 @@ module Ems
     validates_uniqueness_of :slug
     validates :slug, :presence => true
     validates :title, :presence => true
-    
+
     #
     # @param options
     def as_json(options={})

data/app/views/layouts/ems/application.html.haml

@@ -22,5 +22,4 @@
         =yield
 
       %footer#footer
-        %p
-          \Powered by EMS
+        %p= "Powered by EMS #{Ems::VERSION}"

data/lib/ems/version.rb

@@ -1,3 +1,3 @@
 module Ems
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ems
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -552,7 +552,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 150353376208711007
+      hash: 1341355416954403944
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -561,10 +561,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 150353376208711007
+      hash: 1341355416954403944
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Editorial Management System