caboose-cms 0.5.54 → 0.5.55

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzE3ZmY5M2U0OTYyOWE1YTNlOGQ2Y2VmYTk1ODQ3MTY4ODExMzYxYg==
+    YWFiNTgyMjY5NzczYmMzNjA4NDY5MjAxOGQxNzI2MmM2NmNlMGIzNQ==
   data.tar.gz: !binary |-
-    MDU4ZjM3NTBlYjU0NjZlNmJmZTZmYzc1MzlmNDZhMzM3Y2ExYzE4MQ==
+    Y2E4YzI3MzkwNjk0ZTYwMjU0OWQyMjFjMzkxN2E3M2RhM2ExNmViMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjNiODQxOGQ1Y2Q2Y2U5MDBiMjk3ZmE3M2MyYzljYjQ4OTBiNjA4NTc2OTJj
-    Y2FjODQ4OTRhMjgzZDkyZTY1Njk3Yjk4ZGIwNWZkZTM1YWFkNzE4Mzk4MDNm
-    OGJhOThmZGVmNWIyODEyMjJhZTA4NDU2YmQwYzkxOWMzYmIxMTU=
+    NmM3MDdkMGU3M2ZhZjNiZmI2NjhiOTY0ZmMyZmIzZGU1MDMzNjg3MjAxNWNl
+    YjFmODAyMDIyOWY0YTQ5Mzk4YTViNGVmMGQwZWMzNDljN2NjNjk4MTA4ZjBm
+    YmQ3OTk5ZmQwZjQ3MDRlNThmOWM2ZTkyZmQxNWFhZjU4MGFiY2E=
   data.tar.gz: !binary |-
-    N2FkYTQxZGQ1ZmYwYjIwZGY5N2MwZGY0ZjljYjM2YzI1ZDNiYTYyNzY5ZmQy
-    ZWU3NjNkNDE4NjFiYzBjODdkMTQ5MDUzZTliODUyZmFiNzdkMzY0YWYzZmUy
-    ZDg1MzY4ZjY1Yjg2NjE4NzBiNTZhYTg4NGUyOGJjNWEzZDFlNDY=
+    NWY1Y2E4MjUzMTc5MDFhZjk1ZWIzMTJhZmFhYzE4MTAzMTg0ZTQ0YzgwOTM4
+    OTNlZmJhNjc3OGNmOTVkZWEzNTc4MzhmMjgzNWZjNDI5NDdhOTI1M2RkZjc4
+    MWFjYzYwMDI1YzkwZWZhOTczYzAyMmE2NzkzNWU0MzIxYzE2YzU=

data/app/models/caboose/category.rb

@@ -30,6 +30,7 @@ module Caboose
     attr_accessible :id,
       :site_id,
       :parent_id,
+      :alternate_id,
       :name,
       :url,
       :slug,
@@ -42,6 +43,9 @@ module Caboose
       :square_offset_x,
       :square_offset_y,
       :square_scale_factor
+      
+    STATUS_ACTIVE = 'Active'
+    STATUS_INACTIVE = 'Inactive'
     
     #
     # Class Methods
@@ -77,7 +81,7 @@ module Caboose
     end
     
     def active_products
-      self.products.where(:status => 'Active')
+      self.products.where(:status => 'Active')      
     end
     
     def ancestry

data/app/models/caboose/product_image.rb

@@ -5,9 +5,9 @@ module Caboose
     belongs_to :product
     has_many :product_image_variants
     has_many :variants, :through => :product_image_variants
-    
-    
+        
     attr_accessible :id,
+      :alternate_id,
       :product_id,
       :title,
       :position,
@@ -30,11 +30,11 @@ module Caboose
         large:  '800x800>',
         huge:   '1200x1200>'
       }
+    do_not_validate_attachment_file_type :image
+    #validates_attachment_content_type :image, :content_type => ["image/jpg", "image/jpeg", "image/png"]
     
     default_scope order('position ASC')
-    
-    validates_attachment_content_type :image, :content_type => ["image/jpg", "image/jpeg", "image/png"]
-    
+            
     def process
       config = AssetSync.config
       bucket = config.fog_directory

data/app/models/caboose/schema.rb

@@ -56,7 +56,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       ],
       #Caboose::PageCache => [:block],
       Caboose::Variant => [:quantity],
-      Caboose::Vendor => [:vendor]
+      Caboose::Vendor => [:vendor, :vendor_id]
     }
   end
 
@@ -200,6 +200,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::Category => [
         [ :site_id               , :integer   ],
         [ :parent_id             , :integer   ],
+        [ :alternate_id          , :string    ],
         [ :name                  , :string    ],
         [ :url                   , :string    ],
         [ :slug                  , :string    ],
@@ -419,6 +420,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
       ],
       Caboose::ProductImage => [
         [ :product_id            , :integer  ],
+        [ :alternate_id          , :string   ],
         [ :title                 , :string   ],
         [ :position              , :integer  ],
         [ :image_file_name       , :string   ],
@@ -577,9 +579,11 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :sort_order            , :integer  , { :defult => 0 }]
       ],
       Caboose::Vendor => [
-        [ :site_id , :integer ],
-        [ :name    , :string  ],
-        [ :status  , :string, { default: 'Active' } ]
+        [ :site_id      , :integer    ],
+        [ :alternate_id , :string     ],
+        [ :name         , :string     ],
+        [ :status       , :string     , { :default => 'Active' } ],
+        [ :image        , :attachment ]
       ]
     }
 

data/app/models/caboose/vendor.rb

@@ -5,13 +5,23 @@ module Caboose
 
     belongs_to :site    
     has_many :products
-    attr_accessible :id,
+    has_attached_file :image, 
+      :path => ':path_prefixvendors/:id_:style.:extension',    
+      :default_url => 'http://placehold.it/300x300',    
+      :styles => {
+        :tiny  => '150x200>',
+        :thumb => '300x400>',
+        :large => '600x800>'
+      }
+    do_not_validate_attachment_file_type :image
+    attr_accessible :id,    
       :site_id,
+      :alternate_id,
       :name, 
       :status,
       :sort_order
     after_save :clear_filters
-    
+
     def self.active
       where(:status => 'Active')
     end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.54'
+  VERSION = '0.5.55'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.54
+  version: 0.5.55
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2014-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg