effective_assets 1.3.2 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2754992e54dcb1a9d86e184f1584ddd0631f3a3f
-  data.tar.gz: cc72cc93f2c212aeffedc815f64a3cd2642e295e
+  metadata.gz: 1b649c6f9b41d38fc33afb6d544d9647d3c715c9
+  data.tar.gz: dad8ac898260ea9affff90c095630fe03e6b1bef
 SHA512:
-  metadata.gz: c7bbc6c099054662f6f2ff13afa097b38ae2c708e742297d0d1a75f6b51d55e66ed49453e0c3ad51a75a93eab8420a6c1ee76a2aab1c842cc702ac539d76f479
-  data.tar.gz: 71724cb85e3c66a201cdb41324f150b6ef990fa7d6eca8d92a2738f04792e2fa7cac76710ac90dd3172e3017b477d991500fa07f8c3fc10cbd6b9eebf7a6c47f
+  metadata.gz: 47eb0c923377ea585157f6e4ec8b3ceb2bdec2f8bb651d8bc5d72759629b5c96f173e6b2a6ca3cb7108a236cb0003da5c9b1042dc950872fd95fc4e294b9052b
+  data.tar.gz: 620ef92e842acfe34937d4cf2410b59d676af875e82d3d4299bc8981213c813ed479bc45cfd4a83dc8907ab47a35198e9a6c7945d46889f3a74ac1835587f41a

data/app/helpers/effective_assets_helper.rb

@@ -13,14 +13,14 @@ module EffectiveAssetsHelper
       opts = {}
     end
 
-    opts = opts.merge({:alt => asset.description || asset.title || asset.file_name}).merge(options)
+    opts = opts.merge({:alt => asset.title || asset.file_name}).merge(options)
 
     content_tag(:img, nil, opts.merge(:src => _effective_asset_image_url(asset, version))).gsub('"', "'").html_safe
   end
 
   def effective_asset_link_to(asset, version = nil, options = {})
     options_title = options.delete(:title)
-    link_title = options_title || asset.title || asset.file_name || asset.description || "Asset ##{asset.id}"
+    link_title = options_title || asset.title || asset.file_name || "Asset ##{asset.id}"
 
     if asset.image?
       link_to(link_title, _effective_asset_image_url(asset, version), options).gsub('"', "'").html_safe # we need all ' quotes or it breaks Insert as functionality
@@ -36,8 +36,6 @@ module EffectiveAssetsHelper
   def effective_asset_title(asset)
     [
       asset.title,
-      asset.description,
-      asset.tags,
       "Size: #{number_to_human_size(asset.data_size)}",
       "Content Type: #{asset.content_type}"
     ].compact.join("\n")

data/app/models/effective/asset.rb

@@ -21,9 +21,6 @@ module Effective
 
     structure do
       title           :string
-
-      description     :text
-      tags            :string
       extra           :text
 
       content_type    :string, :validates => [:presence]

data/app/views/active_admin/effective_assets/_edit.html.haml

@@ -9,8 +9,6 @@
         - if defined? User
           = asset.try(:user)
     = f.input :title, :hint => "Give this asset a title"
-    = f.input :description, :as => :string, :hint => "Give this asset a description"
-    = f.input :tags, :hint => "Used for searching and filtering.  Separate multiple tags with a comma (i.e. blue,car,ford)"
     = f.input :content_type, :hint => "The computer detected type of file.  Be careful when changing this value as you may break things."
     %li
       %label.label Files

data/db/migrate/01_create_effective_assets.rb.erb

@@ -2,8 +2,6 @@ class CreateEffectiveAssets < ActiveRecord::Migration
   def self.up
     create_table <%= @assets_table_name %> do |t|
       t.string  :title
-      t.text    :description
-      t.string  :tags
       t.text    :extra
 
       t.integer :user_id

data/lib/effective_assets/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAssets
-  VERSION = '1.3.2'.freeze
+  VERSION = '1.4.0'.freeze
 end

data/spec/internal/db/schema.rb

@@ -2,8 +2,6 @@ ActiveRecord::Schema.define do
 
   create_table "assets", :force => true do |t|
     t.string   "title"
-    t.text     "description"
-    t.string   "tags"
     t.integer  "user_id"
     t.string   "content_type"
     t.string   "upload_file"

data/spec/models/asset_spec.rb

@@ -24,7 +24,7 @@ describe Effective::Asset do
   end
 
   it 'should be creatable from URL' do
-    asset = Effective::Asset.create_from_url(image_url, {:title => 'a title', :description => 'a description', :tags => 'a tags', :user_id => 1})
+    asset = Effective::Asset.create_from_url(image_url, {:title => 'a title', :user_id => 1})
 
     # A new asset should exist, and it should be unprocessed
     asset.should_not eq false
@@ -48,8 +48,6 @@ describe Effective::Asset do
     asset.processed.should eq true
     asset.data.kind_of?(TestAssetUploader).should eq true
     asset.title.should eq 'a title'
-    asset.description.should eq 'a description'
-    asset.tags.should eq 'a tags'
     asset.user_id.should eq 1
     asset.versions_info.present?.should eq true
     asset.content_type.should eq 'image/png'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_assets
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails