caboose-cms 0.5.21 → 0.5.22

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjcxMGIwMjJjMWQxYzNkOGFkNDMyNDY5ZDQ1M2FkMmUwMGFiZGM2MQ==
+    ZWNkNzBkNTU4MjRhNmJhZDlkNTY4NjRiZTAyNzgyMzkwOTRkYjE0Mw==
   data.tar.gz: !binary |-
-    MzE0OGIxODAwMDk3NjAwYjBmZjY4MDFmMzk2M2E4ZWUyOWMwM2U0Mw==
+    ZjI4ZDM2N2VhYmE3OGIzNGM4NDFlMmIzYzg1ZDEzNGIzM2ZmYjI2Mw==
 SHA512:
   metadata.gz: !binary |-
-    ZjJlNGM0YmUwOTI5ODBmNGYzYjE3ZTUzMDliMjE4YWQ3YWZhN2QxMWE0NjU2
-    NjNjZTUwMDlmZDNjMTgwZmIzODlhZGVhNWJlNzNiZTljNDgyMjNmYzIzMDMw
-    YzRlNGEzOWIwOWI4ZDA0MWJkYTAwN2I3MjA1YmRjMTBhOTM5NTY=
+    YTVmMjIyM2I0M2Y2MzE1Zjk0YjhhNDc4MzFiZTk0MThlZDI4ZmQ3MDliZTg3
+    NmZiZGQ4NTczZWY5N2ZkMWFkNTdjZDQ2MTJiMTYwZWZiM2RlMDliZDY1Y2Ix
+    NWU4OGYwY2FkZDhkMzExNjEyZjIwODE3ODI0MDI3ZGIzYTE5NWU=
   data.tar.gz: !binary |-
-    Y2Q0YTk3YjA1Y2UxYTYwZWE1Y2E2YzViMTk4Yzk3YWZjMmJhYmQyZTBhZDBm
-    NmJhOTEzOWEwYTNmMDU3NzBjZGYyNzU4Y2JhZWE5ODNlN2UzMTg1ZjZjYjZi
-    MDZiMTY4YzU2M2FkOTBjMGQ5MTlmY2JiM2MxMzcyNjRlMTA0YmU=
+    ZTc2MWE5MGQ4NDA3ODk0MjU2ZDVkNzFkODg5MzYzNTY1M2QxMmU5MjNmNzRm
+    YmU4NmM2ZDU4NWY2YmM3NDk5MWVmZTVlYjUzYjhhZmM2NTZkYzEyZTk5ZTIz
+    ZDM2YTMxYzAzZTZlYzhhMzkyMDcyMDJhYTgwNGNkMDlmNGQzYWY=

data/app/models/caboose/block.rb

@@ -8,10 +8,10 @@ class Caboose::Block < ActiveRecord::Base
   belongs_to :block_type
   belongs_to :parent, :foreign_key => 'parent_id', :class_name => 'Caboose::Block'   
   has_many :children, :foreign_key => 'parent_id', :class_name => 'Caboose::Block', :dependent => :delete_all, :order => 'sort_order'
-  has_attached_file :file, :path => '/uploads/:id.:extension'
+  has_attached_file :file, :url => '/assets/uploads/:id.:extension'
   do_not_validate_attachment_file_type :file
-  has_attached_file :image, 
-    :path => 'uploads/:id_:style.:extension',
+  has_attached_file :image,     
+    :url => '/assets/uploads/:id_:style.:extension',
     :default_url => "http://placehold.it/300x300",
     :styles => {
       :tiny  => '160x120>',

data/app/models/caboose/category.rb

@@ -13,18 +13,17 @@ module Caboose
     has_many :products, :through => :category_memberships, :order => 'title'
     has_many :category_memberships
     
-    has_attached_file :image,
-      :path => 'categories/:id_:style.jpg',
-      :default_url => '/categories/default.jpg',
+    has_attached_file :image,      
+      :url => '/assets/categories/:id_:style.:extension',      
+      :default_url => 'http://placehold.it/300x300',
       :s3_protocol => :https,
       :styles => {
-        tiny:   '100x100>',
-        thumb:  '250x250>',
-        medium: '400x400>',
-        large:  '800x800>',
-        huge:   '1200x1200>'
+        :tiny   => '100x100>',
+        :thumb  => '250x250>',
+        :medium => '400x400>',
+        :large  => '800x800>',
+        :huge   => '1200x1200>'
       }
-      
     validates_attachment_content_type :image, :content_type => %w(image/jpeg image/jpg image/png)
     
     attr_accessible :id,

data/app/models/caboose/media_file.rb

@@ -2,7 +2,7 @@ class Caboose::MediaFile < ActiveRecord::Base
 
   self.table_name = "media_files"
   belongs_to :media_category
-  has_attached_file :file, :path => 'media-files/:id.:extension'
+  has_attached_file :file, :url => '/assets/media-files/:id.:extension'
   do_not_validate_attachment_file_type :file  
   attr_accessible :id, :media_category_id, :name, :description
   

data/app/models/caboose/media_image.rb

@@ -6,8 +6,8 @@ class Caboose::MediaImage < ActiveRecord::Base
   self.table_name = "media_images"
   belongs_to :media_category  
   has_attached_file :image, 
-    :path => 'media-images/:id_:style.:extension',
-    :default_url => "#{Caboose::cdn_domain}/media-images/default_user_image.jpg",    
+    :url => '/assets/media-images/:id_:style.:extension',
+    :default_url => 'http://placehold.it/300x300',    
     :styles => {
       :tiny  => '150x200>',
       :thumb => '300x400>',

data/app/models/caboose/post.rb

@@ -14,7 +14,8 @@ class Caboose::Post < ActiveRecord::Base
     :published,
     :created_at
   has_attached_file :image, 
-    :path => 'posts/:id_:style.:extension', 
+    :url => '/assets/posts/:id_:style.:extension',
+    :default_url => 'http://placehold.it/300x300',
     :styles => {
       :tiny  => '75x75>',
       :thumb => '150x150>',

data/app/models/caboose/product_image.rb

@@ -19,9 +19,9 @@ module Caboose
       :square_offset_y,
       :square_scale_factor
       
-    has_attached_file :image,
-      :path        => "products/:product_id_:id_:style.:extension",
-      :default_url => '/products/:id_:style.:extension',
+    has_attached_file :image,      
+      :url         => '/assets/products/:product_id_:id_:style.:extension',      
+      :default_url => 'http://placehold.it/300x300',
       :s3_protocol => :https,
       :styles      => {
         tiny:   '100x100>',

data/app/models/caboose/user.rb

@@ -4,8 +4,8 @@ class Caboose::User < ActiveRecord::Base
   has_many :role_memberships
   has_many :roles, :through => :role_memberships
   has_attached_file :image, 
-    :path => 'users/:id_:style.:extension',
-    :default_url => "#{Caboose::cdn_domain}/images/default_user_image.jpg",    
+    :url => '/assets/users/:id_:style.:extension',    
+    :default_url => 'http://placehold.it/300x300',    
     :styles => {
       :tiny  => '150x200>',
       :thumb => '300x400>',

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.21'
+  VERSION = '0.5.22'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.21
+  version: 0.5.22
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-26 00:00:00.000000000 Z
+date: 2014-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails