ems 0.1.7 → 0.1.8

data/app/controllers/ems/application_controller.rb

@@ -6,9 +6,9 @@ module Ems
     check_authorization
 
     # # Global cancan failure recovery
-    # rescue_from CanCan::AccessDenied do |exception|
-    #   redirect_to main_app.new_user_session_path, :alert => exception.message
-    # end
+    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

data/app/models/ems/article.rb

@@ -4,7 +4,7 @@ module Ems
 
     attr_accessible :category_id, :channel_ids, :tag_ids, :title, :publish_from,
       :status, :image, :standfirst, :content, :assets, :article_ids, :report_ids,
-      :news_ids, :hot, :featured
+      :news_ids, :hot, :featured, :assets_attributes
 
     # use friendly_id to handle our slugs
     extend FriendlyId
@@ -95,10 +95,14 @@ module Ems
       Kramdown::Document.new(content, :input => "BeanKramdown").to_html
     end
 
+    def image_url
+      self.image.url
+    end
+
     #
     # @param options
     def as_json(options={})
-      super( options.merge( :include => [ :category, :channels, :tags, :images ] ) )
+      super(options.merge(:include => [:category, :channels, :tags, :images], :methods => [:image_url]))
     end
 
     #

data/app/models/ems/asset.rb

@@ -1,17 +1,21 @@
 module Ems
   class Asset < ActiveRecord::Base
-    
+
+    attr_accessible :asset
+
     validates_attachment :asset, :presence => true,
       :content_type => { :content_type => ["image/jpg", "image/jpeg"] }
-          
+
     belongs_to :assetable, :polymorphic => true
-    
+    # accepts_nested_attributes_for :assets
+
     has_attached_file :asset, :styles => {:original => "564x252>"}
-    
+
     # virtual alt text accessor - returns the title of the image otherwise the path
     def alt
-      alt = self.title 
+      alt = self.title
       alt ||= self.image.url
     end
+
   end
 end

data/app/models/ems/news.rb

@@ -6,7 +6,7 @@ module Ems
     def should_generate_new_friendly_id?
       not self.is_live?
     end
-        
+
     # searchable do
     #   text :title, :stored => true
     #   text :standfirst, :stored => true
@@ -25,12 +25,12 @@ 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"
@@ -49,9 +49,9 @@ module Ems
     accepts_nested_attributes_for :news
     has_and_belongs_to_many :reports, :join_table => 'ems_news_reports'
     accepts_nested_attributes_for :reports
-    
+
     has_attached_file :image, :styles => { :image564x252 => "564x252#", :image312x189 => "312x189#", :image312x126 => "312x126", :image228x126 => "228x126"}
-    
+
     has_many :assets, :as => :assetable
     accepts_nested_attributes_for :assets, :allow_destroy => true    
 
@@ -60,7 +60,7 @@ module Ems
       self.status ||= :draft
       self.content_disposition ||= :markdown
     end
-    
+
     # Custom getter for status attribute to emulate ENUMs
     # @return [Symbol] status currently assigned to the attribute
     def status
@@ -84,22 +84,22 @@ 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
-    
+
     #
     def is_live?
       self.status === :live
     end
-    
+
     #
     # @param options
     def as_json(options={})
       super( options.merge( :include => [ :category, :channels, :tags ] ) )
     end
-    
+
     # base queries
     class << self
       def base_query(category=nil)
@@ -107,6 +107,6 @@ module Ems
         q = q.where('ems_categories.id' => category.id) if category
         return q
       end
-    end    
+    end
   end
 end

data/lib/ems/version.rb

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

data/test/dummy/log/development.log

@@ -0,0 +1 @@
+   (0.3ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ems
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
+date: 2012-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -473,6 +473,7 @@ files:
 - test/dummy/config.ru
 - test/dummy/db/migrate/20120520002317_devise_create_users.rb
 - test/dummy/db/schema.rb
+- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
@@ -552,7 +553,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1341355416954403944
+      hash: -2125801159709775580
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -561,10 +562,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1341355416954403944
+      hash: -2125801159709775580
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Editorial Management System
@@ -594,6 +595,7 @@ test_files:
 - test/dummy/config.ru
 - test/dummy/db/migrate/20120520002317_devise_create_users.rb
 - test/dummy/db/schema.rb
+- test/dummy/log/development.log
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html