avatars_for_rails 0.1.6 → 0.2.0

data/app/assets/javascripts/{avatars.js → avatars_for_rails.js}

@@ -1,3 +1,10 @@
+//= require jquery
+//= require jquery-ui
+//= require jquery.Jcrop.min
+//= require jquery.form
+//= require jquery.fileupload
+//= require jquery.fileupload-ui
+
 $(document).ready( function() {
   //Full Caption Sliding (Hidden to Visible)
   $('.boxgrid.captionfull').hover( function() {
@@ -5,4 +12,4 @@ $(document).ready( function() {
   }, function() {
     $(".cover", this).stop().animate({top:'104px'},{queue:false,duration:160});
   });
-});
+});

data/app/assets/stylesheets/{avatars.css → avatars_for_rails.css}

@@ -1,3 +1,8 @@
+/*
+ *= require jquery.Jcrop
+ *= require jquery.fileupload-ui
+ */
+
 /******************** Common ***********************/
 *{
   font-family: Arial;

data/app/views/avatars/edit.html.erb

@@ -1,5 +1,3 @@
-<%= render :partial => 'includes' %>
-
 <h1>Editing logo</h1>
 
 <%= render 'form' %>

data/app/views/avatars/index.html.erb

@@ -1,4 +1,2 @@
-<%= render :partial => 'includes' %>
-
 <%= render :partial => 'list' %>
-<%= render :partial => 'form' %>
+<%= render :partial => 'form' %>

data/app/views/avatars/show.html.erb

@@ -1,6 +1,3 @@
-<%= render :partial => 'includes' %>
-
-
 <p id="notice"><%= notice %></p>
 
 

data/avatars_for_rails.gemspec

@@ -2,7 +2,7 @@
 # project in your rails apps through git.
 Gem::Specification.new do |s|
   s.name = "avatars_for_rails"
-  s.version = "0.1.6"
+  s.version = "0.2.0"
   s.authors = ["Jaime Castro Montero", "GING"]
   s.summary = "Avatar manager for rails apps."
   s.description = "A Rails engine that allows any model to act as avatarable, permitting it to have a complete avatar manager with a few options. Adapted to rails 3"
@@ -12,6 +12,7 @@ Gem::Specification.new do |s|
   #s.files = Dir["{app,lib,config}/**/*"] + ["MIT-LICENSE", "Rakefile", "Gemfile", "README.rdoc"]
   # Gem dependencies
   #
+  s.add_runtime_dependency('jquery-rails', '>= 1.0.9')
   # SQL foreign keys
   s.add_runtime_dependency('foreigner', '>= 0.9.1')
   s.add_runtime_dependency('paperclip', '>= 2.3.4')

data/lib/generators/avatars_for_rails/install_generator.rb

@@ -1,4 +1,3 @@
-#class AvatarsForRails::InstallGenerator < Rails::Generators::Base #:nodoc:
 class AvatarsForRails::InstallGenerator < Rails::Generators::NamedBase #:nodoc:
   include Rails::Generators::Migration
   
@@ -17,4 +16,16 @@ class AvatarsForRails::InstallGenerator < Rails::Generators::NamedBase #:nodoc:
   def create_migration_file
     migration_template 'migration.rb', 'db/migrate/create_avatars_for_rails_' + file_name + '.rb'
   end
-end
+
+  def require_javascripts
+    inject_into_file 'app/assets/javascripts/application.js',
+                     "//= require avatars_for_rails\n",
+                     :before => '//= require_tree .'
+  end
+
+  def require_stylesheets
+    inject_into_file 'app/assets/stylesheets/application.css',
+                     " *= require avatars_for_rails\n",
+                     :before => ' *= require_tree .'
+  end
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 6
-  version: 0.1.6
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jaime Castro Montero
@@ -23,6 +23,22 @@ dependencies:
   prerelease: false
   type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 1
+        - 0
+        - 9
+        version: 1.0.9
+  name: jquery-rails
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,11 +50,11 @@ dependencies:
         - 1
         version: 0.9.1
   name: foreigner
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,11 +66,11 @@ dependencies:
         - 4
         version: 2.3.4
   name: paperclip
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,11 +82,11 @@ dependencies:
         - 1
         version: 2.13.1
   name: rmagick
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -82,11 +98,11 @@ dependencies:
         - 0
         version: 3.1.0
   name: rails
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,11 +112,11 @@ dependencies:
         - 0
         version: "0"
   name: sqlite3-ruby
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,11 +128,11 @@ dependencies:
         - 3
         version: 0.10.3
   name: ruby-debug
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,11 +144,11 @@ dependencies:
         - 0
         version: 2.5.0
   name: rspec-rails
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,11 +160,11 @@ dependencies:
         - 2
         version: 1.3.2
   name: factory_girl
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -160,11 +176,11 @@ dependencies:
         - 6
         version: 0.3.6
   name: forgery
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   prerelease: false
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -176,7 +192,7 @@ dependencies:
         - 9
         version: 0.3.9
   name: capybara
-  version_requirements: *id010
+  version_requirements: *id011
 description: A Rails engine that allows any model to act as avatarable, permitting it to have a complete avatar manager with a few options. Adapted to rails 3
 email: social-stream@dit.upm.es
 executables: []
@@ -192,19 +208,12 @@ files:
 - README.rdoc
 - Rakefile
 - app/assets/images/pbar-ani.gif
-- app/assets/javascripts/avatars.js
-- app/assets/javascripts/jquery.Jcrop.min.js
-- app/assets/javascripts/jquery.fileupload-ui.js
-- app/assets/javascripts/jquery.fileupload.js
-- app/assets/javascripts/jquery.form.js
-- app/assets/stylesheets/avatars.css
-- app/assets/stylesheets/jquery.Jcrop.css
-- app/assets/stylesheets/jquery.fileupload-ui.css
+- app/assets/javascripts/avatars_for_rails.js
+- app/assets/stylesheets/avatars_for_rails.css
 - app/controllers/avatars_controller.rb
 - app/models/avatar.rb
 - app/views/avatars/_errors.html.erb
 - app/views/avatars/_form.html.erb
-- app/views/avatars/_includes.html.erb
 - app/views/avatars/_list.html.erb
 - app/views/avatars/_new.html.erb
 - app/views/avatars/_precrop.html.erb
@@ -307,6 +316,12 @@ files:
 - spec/dummy/script/rails
 - spec/integration/navigation_spec.rb
 - spec/spec_helper.rb
+- vendor/assets/javascripts/jquery.Jcrop.min.js
+- vendor/assets/javascripts/jquery.fileupload-ui.js
+- vendor/assets/javascripts/jquery.fileupload.js
+- vendor/assets/javascripts/jquery.form.js
+- vendor/assets/stylesheets/jquery.Jcrop.css
+- vendor/assets/stylesheets/jquery.fileupload-ui.css
 has_rdoc: true
 homepage: http://github.com/ging/avatars_for_rails
 licenses: []

data/app/views/avatars/_includes.html.erb

@@ -1,14 +0,0 @@
-<% content_for :headers do %>
-  
-  <%= javascript_include_tag 'jquery.Jcrop.min' %>
-  <%= javascript_include_tag 'jquery-ui.min' %>
-  <%= javascript_include_tag 'rails' %>
-  <%= javascript_include_tag 'jquery.form' %>
-  <%= javascript_include_tag 'jquery.fileupload' %>
-  <%= javascript_include_tag 'jquery.fileupload-ui' %>
-  <%= javascript_include_tag 'avatars' %>
-
-  <%= stylesheet_link_tag "jquery.Jcrop", :media => "screen, projection" %>
-  <%= stylesheet_link_tag "avatars", :media => "screen, projection" %><br/>
-  <%= stylesheet_link_tag "jquery.fileupload-ui", :media => "screen, projection" %><br/>
-<%end%>