radiant-images-extension 0.4.4 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.5.0

data/app/models/attachment.rb

@@ -0,0 +1,49 @@
+require 'acts_as_list'
+
+class Attachment < ActiveRecord::Base
+  
+  default_scope :order => 'attachments.position ASC'
+  
+  belongs_to    :page
+  belongs_to    :image
+  
+  belongs_to    :created_by,  :class_name => 'User'
+  belongs_to    :updated_by,  :class_name => 'User'
+  
+  acts_as_list  :scope =>     :page
+  
+  def url(*params)
+    image.url(*params) rescue nil
+  end
+  
+  def title(*params)
+    image.title(*params) rescue nil
+  end
+  
+  def caption(*params)
+    image.caption(*params) rescue nil
+  end
+  
+  # Overloads the base to_json to return what we want
+  def to_json(*attrs); super self.class.params; end
+  
+  class << self
+    
+    # Returns attributes attached to the attachment
+    def attrs
+      [ :id, :title, :caption, :image_file_name, :image_content_type, :image_file_size ]
+    end
+    
+    # Returns methods with usefuly information
+    def methds
+      [ :url, :title, :caption ]
+    end
+    
+    # Returns a custom hash of attributes on the product
+    def params
+      { :only  => self.attrs, :methods => self.methds }
+    end
+    
+  end
+  
+end

data/db/migrate/20101208095450_create_attachments.rb

@@ -0,0 +1,19 @@
+class CreateAttachments < ActiveRecord::Migration
+  def self.up
+    create_table :attachments, :force => true do |t|
+      t.integer :position,     :default => 1
+      t.integer :image_id
+      t.integer :page_id
+      t.integer :created_by_id
+      t.integer :updated_by_id
+    end
+    add_index :attachments, ["image_id"], :name => "index_attachments_on_image_id"
+    add_index :attachments, ["page_id"],  :name => "index_attachments_on_page_id"
+    add_index :attachments, ["position"], :name => "index_attachments_on_position"
+    
+  end
+
+  def self.down
+    drop_table :attachments
+  end
+end

data/images_extension.rb

@@ -23,6 +23,7 @@ class ImagesExtension < Radiant::Extension
     
     Paperclip::Railtie.insert
     
+    Page.send :include, Images::Models::Page
     Page.send :include, Images::Tags::Core
 
     UserActionObserver.instance.send :add_observer!, Image 

data/lib/images/models/page.rb

@@ -0,0 +1,15 @@
+module Images
+  module Models
+    module Page
+    
+      def self.included(base)
+        base.class_eval do
+          has_many    :attachments
+          has_many    :images,      :through => :attachments
+        end
+      end
+      
+    end
+  end
+end
+

data/radiant-images-extension.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{radiant-images-extension}
-  s.version = "0.4.4"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dirk Kelly", "Mario Visic"]
-  s.date = %q{2010-12-06}
+  s.date = %q{2010-12-09}
   s.description = %q{Image Radiant Extension management tool, meant only to be useful to pages and extensions that need to require images.}
   s.email = %q{info@squaretalent.com}
   s.extra_rdoc_files = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/controllers/admin/images_controller.rb",
+    "app/models/attachment.rb",
     "app/models/image.rb",
     "app/views/admin/images/_bottom.haml",
     "app/views/admin/images/_fields.haml",
@@ -38,10 +39,12 @@ Gem::Specification.new do |s|
     "db/migrate/20100601042237_create_images.rb",
     "db/migrate/20100602044124_add_position_to_images.rb",
     "db/migrate/20100929150930_change_images_to_created_by_id.rb",
+    "db/migrate/20101208095450_create_attachments.rb",
     "features/support/env.rb",
     "features/support/paths.rb",
     "images_extension.rb",
     "lib/images/interface/admin/images.rb",
+    "lib/images/models/page.rb",
     "lib/images/tags/core.rb",
     "lib/images/tags/helpers.rb",
     "lib/radiant-images-extension.rb",
@@ -54,10 +57,12 @@ Gem::Specification.new do |s|
     "public/stylesheets/sass/admin/extensions/images/index.sass",
     "radiant-images-extension.gemspec",
     "spec/controllers/admin/images_controller_spec.rb",
+    "spec/datasets/attachments.rb",
     "spec/datasets/images.rb",
     "spec/datasets/squaretalent.png",
     "spec/lib/images/tags/core_spec.rb",
     "spec/lib/images_extension_spec.rb",
+    "spec/models/attachment_spec.rb",
     "spec/models/image_spec.rb",
     "spec/spec.opts",
     "spec/spec_helper.rb"
@@ -68,9 +73,11 @@ Gem::Specification.new do |s|
   s.summary = %q{Images Extension for Radiant CMS}
   s.test_files = [
     "spec/controllers/admin/images_controller_spec.rb",
+    "spec/datasets/attachments.rb",
     "spec/datasets/images.rb",
     "spec/lib/images/tags/core_spec.rb",
     "spec/lib/images_extension_spec.rb",
+    "spec/models/attachment_spec.rb",
     "spec/models/image_spec.rb",
     "spec/spec_helper.rb"
   ]

data/spec/datasets/attachments.rb

@@ -0,0 +1,17 @@
+class AttachmentsDataset < Dataset::Base
+  
+  uses :images, :pages
+  
+  def load
+    
+    { :parent => [ :first, :second, :third ], :child => [ :fourth, :fifth, :sixth ]}.map do |page, attachments|
+      attachments.each_with_index do |attachment, i|
+        create_record :attachment, attachment,
+          :image    => images(attachment),
+          :page     => pages(page),
+          :position => i+1
+      end
+    end
+    
+  end
+end

data/spec/models/attachment_spec.rb

@@ -0,0 +1,52 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe Attachment do
+  
+  dataset :attachments
+  
+  context 'attributes' do
+  
+    before(:each) do
+      @attachment = attachments(:first)
+    end
+      
+    it 'should have a position' do
+      @attachment.position.should === 1
+    end
+    
+    it 'should have a product' do
+      @attachment.page.class.should == Page
+    end
+    
+    it 'should have an image' do
+      @attachment.image.class.should == Image
+    end
+    
+  end
+  
+  context 'alias methods' do
+    
+    before(:each) do
+      stub(AWS::S3::Base).establish_connection!
+      @attachment = attachments(:first)
+    end
+    
+    describe '#url' do
+      it 'should return its assets url' do
+        stub(@attachment).image.stub!.url { 'url' }
+        @attachment.url.should === @attachment.image.url
+      end
+    end
+    describe '#title' do
+      it 'should return its assets title' do
+        @attachment.title.should === @attachment.image.title
+      end
+    end
+    describe '#caption' do
+      it 'should return its assets caption' do
+        @attachment.caption.should === @attachment.image.caption
+      end
+    end
+  end
+  
+end

data/spec/models/image_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 
 describe Image do
   dataset :images

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-images-extension
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 4
-  version: 0.4.4
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Dirk Kelly
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-06 00:00:00 +08:00
+date: 2010-12-09 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,6 +130,7 @@ files:
 - Rakefile
 - VERSION
 - app/controllers/admin/images_controller.rb
+- app/models/attachment.rb
 - app/models/image.rb
 - app/views/admin/images/_bottom.haml
 - app/views/admin/images/_fields.haml
@@ -146,10 +147,12 @@ files:
 - db/migrate/20100601042237_create_images.rb
 - db/migrate/20100602044124_add_position_to_images.rb
 - db/migrate/20100929150930_change_images_to_created_by_id.rb
+- db/migrate/20101208095450_create_attachments.rb
 - features/support/env.rb
 - features/support/paths.rb
 - images_extension.rb
 - lib/images/interface/admin/images.rb
+- lib/images/models/page.rb
 - lib/images/tags/core.rb
 - lib/images/tags/helpers.rb
 - lib/radiant-images-extension.rb
@@ -162,10 +165,12 @@ files:
 - public/stylesheets/sass/admin/extensions/images/index.sass
 - radiant-images-extension.gemspec
 - spec/controllers/admin/images_controller_spec.rb
+- spec/datasets/attachments.rb
 - spec/datasets/images.rb
 - spec/datasets/squaretalent.png
 - spec/lib/images/tags/core_spec.rb
 - spec/lib/images_extension_spec.rb
+- spec/models/attachment_spec.rb
 - spec/models/image_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
@@ -205,8 +210,10 @@ specification_version: 3
 summary: Images Extension for Radiant CMS
 test_files: 
 - spec/controllers/admin/images_controller_spec.rb
+- spec/datasets/attachments.rb
 - spec/datasets/images.rb
 - spec/lib/images/tags/core_spec.rb
 - spec/lib/images_extension_spec.rb
+- spec/models/attachment_spec.rb
 - spec/models/image_spec.rb
 - spec/spec_helper.rb