has_media 0.2.4 → 0.2.5

data/README.rdoc

@@ -90,6 +90,27 @@ Configuration take place in config/initializers/has_media.rb
     require uploader
   end
 
+== Routes
+
+Add routes for media in your config/routes.rb
+
+  resources :media, :only => [:destroy]
+
+== Helpers
+
+Now you can use the has_media_field helper.
+
+  <%= form_for(@model, :html => {:multipart => true}) do |f| %>
+    <%= has_media_field @model, :context %>
+    <%= f.submit %>
+  <%- end %>
+
+== Generating views
+
+If you need to overload has_media views, just run : rails generate has_media:views
+
+This will copy has_media views in your application
+
 == Encode with resque
 
 Just add a callback on media class you want to encode via resque.

data/Rakefile

@@ -16,7 +16,7 @@ begin
     gem.homepage = "http://github.com/klacointe/has_media"
     gem.authors = ["klacointe", "spk"]
     gem.add_development_dependency "rspec", "~>2.0.0"
-    gem.add_dependency('carrierwave-rails3', '~>0.4.5')
+    gem.add_dependency('carrierwave', '~>0.5')
     gem.add_dependency('activerecord', '~>3.0.0')
     gem.add_dependency('activesupport', '~>3.0.0')
     gem.add_dependency('mime-types', '~>1.16')

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/app/controllers/media_controller.rb

@@ -0,0 +1,7 @@
+class MediaController < ApplicationController
+  def destroy
+    @medium = Medium.find(params[:id])
+    @medium.destroy
+    render :template => 'has_media/destroy'
+  end
+end

data/app/helpers/has_media_helper.rb

@@ -0,0 +1,41 @@
+module HasMediaHelper
+
+  def generate_uid(*opts)
+    opts = opts.first
+    object = opts[:object]||nil
+    context = opts[:context]||nil
+    medium = opts[:medium]||nil
+    if medium.nil?
+      if object.nil? or object.new_record?
+        "#{object.class.to_s.underscore}-#{context.to_s.underscore}"
+      else
+        "#{object.class.to_s.underscore}-#{context.to_s.underscore}-#{object.id}"
+      end
+    else
+      "#{medium.class.to_s.underscore}-#{medium.id}"
+    end
+  end
+
+  def add_medium_link(opts)
+    link_to_function opts[:text] do |page| 
+      page.insert_html :bottom, generate_uid(:object => opts[:object], :context => opts[:context]), 
+        :partial => 'has_media/medium_field', 
+        :locals => {
+          :object => opts[:object], 
+          :context => opts[:context]
+        }
+    end 
+  end
+
+  def remove_medium_link(opts)
+    link_to opts[:text], medium_url(opts[:medium]), :remote => true, :method => :delete
+  end
+
+  def has_media_field(model, context)
+    render :partial => "has_media/media_fields", :locals => {
+      :object => model,
+      :context => context
+    }
+  end
+
+end

data/app/views/has_media/_media.html.erb

@@ -0,0 +1,18 @@
+<%- media = object.send(context) %>
+<%- media = [media] unless media.is_a?(Array) %>
+<%- if defined?(readonly); readonly = readonly else readonly = true end %>
+
+<%- media.each do |medium| %>
+  <%- unless medium.nil? %>
+    <div class="<%= medium.class.to_s.underscore %>" id="<%= generate_uid(:medium => medium) %>">
+      <%= link_to medium.original_file_uri, medium.original_file_uri %>
+
+      <%- if object.send(context).is_a?(Array) and !readonly %>
+        <%= remove_medium_link :text => "Remove", 
+          :object   => object, 
+          :context  => context, 
+          :medium   => medium %>
+      <%- end %>
+    </div>
+  <%- end %>
+<%- end %>

data/app/views/has_media/_media_fields.html.erb

@@ -0,0 +1,22 @@
+<div id="<%= generate_uid(:object => object, :context => context) %>">
+  <%= render :partial => 'has_media/media', :locals => {
+    :object => object,
+    :context => context,
+    :readonly => false
+  } %>
+
+  <%= render :partial => 'has_media/medium_field', 
+    :locals => {
+      :object => object, 
+      :context => context
+  } %>
+
+</div>
+<%- if object.send(context).is_a?(Array) %>
+  <p>
+  <%= add_medium_link :text => "Add #{context}", 
+    :object => object, 
+    :context => context %>
+  </p>
+<%- end %>
+

data/app/views/has_media/_medium_field.html.erb

@@ -0,0 +1,12 @@
+<%- klass = object.class.to_s.underscore %>
+<%- if object.send(context).is_a?(Array) %>
+  <p>
+    <%= label_tag "#{klass}[#{context}][]" %>
+    <%= file_field_tag "#{klass}[#{context}][]" %>
+  </p>
+<%- else %>
+  <p>
+    <%= label_tag "#{klass}[#{context}]" %>
+    <%= file_field_tag "#{klass}[#{context}]" %>
+  </p>
+<%- end %>

data/app/views/has_media/destroy.js.erb

@@ -0,0 +1 @@
+$("#<%= generate_uid(:medium => @medium ) %>").remove();

data/examples/uploaders/image_uploader.rb

@@ -1,7 +1,12 @@
 # encoding: utf-8
 
 class ImageUploader < MediumUploader
+  include CarrierWave::RMagick
 
   # Choose what kind of storage to use for this uploader
   storage :file
+
+  version :thumb do
+    process :resize_to_fit => [100, 100]
+  end 
 end

data/has_media.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{has_media}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["klacointe", "spk"]
-  s.date = %q{2010-11-09}
+  s.date = %q{2010-11-23}
   s.description = %q{Media Managment Library for ActiveRecord and Carrierwave}
   s.email = %q{kevinlacointe@gmail.com}
   s.extra_rdoc_files = [
@@ -24,6 +24,13 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "app/controllers/media_controller.rb",
+     "app/helpers/has_media_helper.rb",
+     "app/views/has_media/_media.html.erb",
+     "app/views/has_media/_media_fields.html.erb",
+     "app/views/has_media/_medium.html.erb",
+     "app/views/has_media/_medium_field.html.erb",
+     "app/views/has_media/destroy.js.erb",
      "config/locales/en.yml",
      "examples/models/audio.rb",
      "examples/models/document.rb",
@@ -36,9 +43,11 @@ Gem::Specification.new do |s|
      "examples/uploaders/pdf_uploader.rb",
      "examples/uploaders/video_uploader.rb",
      "has_media.gemspec",
+     "lib/carrierwave/uploader/url.rb",
      "lib/generators/active_record/has_media_generator.rb",
      "lib/generators/active_record/templates/migration.rb",
      "lib/generators/has_media/install_generator.rb",
+     "lib/generators/has_media/views_generator.rb",
      "lib/generators/templates/README",
      "lib/generators/templates/has_media.rb",
      "lib/has_media.rb",
@@ -84,20 +93,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_runtime_dependency(%q<carrierwave-rails3>, ["~> 0.4.5"])
+      s.add_runtime_dependency(%q<carrierwave>, ["~> 0.5"])
       s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
       s.add_runtime_dependency(%q<mime-types>, ["~> 1.16"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_dependency(%q<carrierwave-rails3>, ["~> 0.4.5"])
+      s.add_dependency(%q<carrierwave>, ["~> 0.5"])
       s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
       s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
       s.add_dependency(%q<mime-types>, ["~> 1.16"])
     end
   else
     s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-    s.add_dependency(%q<carrierwave-rails3>, ["~> 0.4.5"])
+    s.add_dependency(%q<carrierwave>, ["~> 0.5"])
     s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
     s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
     s.add_dependency(%q<mime-types>, ["~> 1.16"])

data/lib/carrierwave/uploader/url.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+module CarrierWave
+  module Uploader
+    module Url 
+      ##  
+      # === Returns
+      #   
+      # [String] the location where this file is accessible via a url
+      #   
+      def url 
+        if file.respond_to?(:url) and not file.url.blank?
+          file.url
+        elsif current_path
+          File.expand_path(current_path).gsub(File.expand_path(root), HasMedia.directory_uri)
+        end 
+      end 
+    end # Url
+  end # Uploader
+end # CarrierWave

data/lib/generators/has_media/views_generator.rb

@@ -0,0 +1,60 @@
+module HasMedia
+  module Generators
+    class ViewsGenerator < Rails::Generators::Base
+      source_root File.expand_path("../../../../app/views", __FILE__)
+      desc "Copies all HasMedia views to your application."
+
+      class_option :template_engine, :type => :string, :aliases => "-t",
+                                     :desc => "Template engine for the views. Available options are 'erb' and 'haml'."
+
+      def copy_views
+        case options[:template_engine].to_s
+        when "haml"
+          verify_haml_existence
+          verify_haml_version
+          create_and_copy_haml_views
+        else
+          directory "has_media", "app/views/has_media"
+        end
+      end
+
+    protected
+
+      def verify_haml_existence
+        begin
+          require 'haml'
+        rescue LoadError
+          say "HAML is not installed, or it is not specified in your Gemfile."
+          exit
+        end
+      end
+
+      def verify_haml_version
+        unless Haml.version[:major] == 2 and Haml.version[:minor] >= 3 or Haml.version[:major] >= 3
+          say "To generate HAML templates, you need to install HAML 2.3 or above."
+          exit
+        end
+      end
+
+      def create_and_copy_haml_views
+        require 'tmpdir'
+        html_root = "#{self.class.source_root}/has_media"
+
+        Dir.mktmpdir("has_media-haml.") do |haml_root|
+          Dir["#{html_root}/**/*"].each do |path|
+            relative_path = path.sub(html_root, "")
+            source_path   = (haml_root + relative_path).sub(/erb$/, "haml")
+
+            if File.directory?(path)
+              FileUtils.mkdir_p(source_path)
+            else
+              `html2haml -r #{path} #{source_path}`
+            end
+          end
+
+          directory haml_root, "app/views/has_media"
+        end
+      end
+    end
+  end
+end

data/lib/has_media.rb

@@ -1,11 +1,16 @@
 require 'rubygems'
+require 'rails'
 require 'active_record'
 require 'active_support'
 require 'carrierwave'
 require 'mime/types'
+require File.expand_path(File.dirname(__FILE__)) + '/../app/helpers/has_media_helper'
 
 module HasMedia
 
+  class Engine < Rails::Engine
+  end
+
   VERSION = "0.0.1"
 
   @@medium_types = {}
@@ -168,6 +173,9 @@ end
 class ActiveRecord::Base
   include HasMedia
 end
+class ActionController::Base
+  helper HasMediaHelper
+end
 
 require File.dirname(__FILE__) + '/has_media/uploaders/medium_uploader'
 Dir.glob(File.dirname(__FILE__) + '/has_media/uploaders/*.rb').each do |uploader|

data/spec/has_media_spec.rb

@@ -168,6 +168,25 @@ describe "HasMedia" do
                                                           @medium.image.filename)
     end
 
+    it "should define file_uri for custom versions" do
+      @medium.image = @image
+      @medium.save!
+      @medium.image.file_uri(:thumb).should == "/media/image/#{@medium.image.id}/image_thumb.png"
+      @medium.image.file_path(:thumb).should == "/tmp/image/#{@medium.image.id}/image_thumb.png"
+    end
+
+    it "should define file url for carrierwave versions" do
+      @medium.image = @image
+      @medium.save!
+      @medium.image.file.thumb.url.should == "/media/image/#{@medium.image.id}/thumb_image.jpg"
+    end
+
+    it "should define file path for carrierwave versions" do
+      @medium.image = @image
+      @medium.save!
+      @medium.image.file.thumb.path.should == "/tmp/image/#{@medium.image.id}/thumb_image.jpg"
+    end
+
     it "pdf should exist" do
       @medium.pdf = @pdf
       @medium.save!

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ class TestMigration < ActiveRecord::Migration
       t.string  :filename
       t.integer :encode_status
       t.string  :type
+      t.string  :file
       t.timestamps
     end
     create_table :media_links, :force => true do |t|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: has_media
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - klacointe
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 +01:00
+date: 2010-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,19 +36,18 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: carrierwave-rails3
+  name: carrierwave
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 1
         segments: 
         - 0
-        - 4
         - 5
-        version: 0.4.5
+        version: "0.5"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -115,6 +114,13 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/controllers/media_controller.rb
+- app/helpers/has_media_helper.rb
+- app/views/has_media/_media.html.erb
+- app/views/has_media/_media_fields.html.erb
+- app/views/has_media/_medium.html.erb
+- app/views/has_media/_medium_field.html.erb
+- app/views/has_media/destroy.js.erb
 - config/locales/en.yml
 - examples/models/audio.rb
 - examples/models/document.rb
@@ -127,9 +133,11 @@ files:
 - examples/uploaders/pdf_uploader.rb
 - examples/uploaders/video_uploader.rb
 - has_media.gemspec
+- lib/carrierwave/uploader/url.rb
 - lib/generators/active_record/has_media_generator.rb
 - lib/generators/active_record/templates/migration.rb
 - lib/generators/has_media/install_generator.rb
+- lib/generators/has_media/views_generator.rb
 - lib/generators/templates/README
 - lib/generators/templates/has_media.rb
 - lib/has_media.rb