imagine 0.2.1 → 0.2.2

data/README.md

@@ -21,9 +21,11 @@ And run the migrations with:
 
 Finally, visit /imagine/albums in your browser to get started.
 
+## EXTERNAL DEPENDENCIES
+Imagine uses Dragonfly, which assumes you have ImageMagick installed on your server.
+
 ## TODO
 * Allow a user to choose the default display style at album level
-* API to define a default view for albums, images (so define a default plugin)
 * Provide a standard means of wrapping with authentication
 * Provide a happy-path for attaching albums polymorphically to other objects
 * Make it look a little prettier.  Provide a stylesheet that you can include if you so desire.

data/app/controllers/imagine/albums_controller.rb

@@ -1,5 +1,5 @@
 module Imagine
-  class AlbumsController < ::ApplicationController
+  class AlbumsController < ::Imagine::ApplicationController
     def index
     end
 

data/app/controllers/imagine/application_controller.rb

@@ -1,4 +1,4 @@
 module Imagine
-  class ApplicationController < ActionController::Base
+  class ApplicationController < ::ApplicationController
   end
 end

data/app/controllers/imagine/images_controller.rb

@@ -1,5 +1,5 @@
 module Imagine
-  class ImagesController < ::ApplicationController
+  class ImagesController < ::Imagine::ApplicationController
     before_filter :load_album
 
     def show
@@ -13,7 +13,7 @@ module Imagine
     def create
       load_new_image
       if ::Imagine::Warehouses::Image.save(@image)
-        redirect_to [@album, @image], :notice => "Image has been attached!"
+        redirect_to @album, :notice => "Image has been attached!"
       else
         flash.now[:error] = "There was a problem creating the image."
         render :action => 'new'

data/app/views/imagine/albums/new.html.haml

@@ -1,3 +1,4 @@
+%h2 Create a new album
 = form_for @album do |f|
   = f.label :name
   = f.text_field :name

data/lib/imagine/engine.rb

@@ -2,8 +2,10 @@ module Imagine
   class Engine < ::Rails::Engine
     isolate_namespace Imagine
   end
-end
 
-# FIXME: Why can't I get this into autoload for rails?
-require File.expand_path('../../../app/warehouses/imagine/album', __FILE__)
-require File.expand_path('../../../app/warehouses/imagine/image', __FILE__)
+  module Warehouses
+    warehouses = File.expand_path('../../../app/warehouses/imagine/', __FILE__)
+    autoload :Album, warehouses + '/album'
+    autoload :Image, warehouses + '/image'
+  end
+end

data/lib/imagine/version.rb

@@ -1,7 +1,7 @@
 module Imagine
   class << self
     def version
-      %q{0.2.1}
+      %q{0.2.2}
     end
   end
 end

data/lib/tasks/imagine_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :imagine do
-#   # Task goes here
-# end

data/orbit_view/app/views/imagine/albums/orbit_view/show.html.haml

@@ -1,15 +1,17 @@
 %h2= @album.name
 %h3 Orbit View
 
-.images#featured
-  - @album.images.each do |image|
-    = render :partial => 'imagine/images/orbit_view/image', :object => image
-
 = link_to "New Image", new_album_image_path(@album)
 
-= javascript_include_tag 'jquery.orbit-1.2.3.min.js'
-= stylesheet_link_tag 'orbit-1.2.3.css'
-:javascript
-   $(window).load(function() {
-     $('#featured').orbit();
-   });
+- if @album.images.any?
+  .images#featured
+    - @album.images.each do |image|
+      = render :partial => 'imagine/images/orbit_view/image', :object => image
+
+  = javascript_include_tag 'jquery.orbit-1.2.3.min.js'
+  = stylesheet_link_tag 'orbit-1.2.3.css'
+
+  :javascript
+     $(window).load(function() {
+       $('#featured').orbit();
+     });

data/orbit_view/imagine-orbit_view.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{imagine-orbit_view}
-  s.version           = %q{0.1.8}
+  s.version           = %q{0.1.9}
   s.summary           = %q{Orbit slider view for Imagine}
   s.description       = %q{A jquery slider album view for Imagine.  Uses orbit.}
   s.date              = %q{2011-09-29}

data/orbit_view/lib/imagine-orbit_view.rb

@@ -9,7 +9,7 @@ module Imagine
           plugin.pathname = root
           plugin.name = 'imagine_orbit_view'
           plugin.directory = 'orbit_view'
-          plugin.version = %q{0.1.8}
+          plugin.version = %q{0.1.9}
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imagine
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: imagine-basic_list_view
-  requirement: &12684640 !ruby/object:Gem::Requirement
+  requirement: &11332120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *12684640
+  version_requirements: *11332120
 - !ruby/object:Gem::Dependency
   name: imagine-orbit_view
-  requirement: &12684140 !ruby/object:Gem::Requirement
+  requirement: &11331620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *12684140
+  version_requirements: *11331620
 - !ruby/object:Gem::Dependency
   name: haml-rails
-  requirement: &12683660 !ruby/object:Gem::Requirement
+  requirement: &11331160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12683660
+  version_requirements: *11331160
 - !ruby/object:Gem::Dependency
   name: dragonfly
-  requirement: &12683080 !ruby/object:Gem::Requirement
+  requirement: &11330560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *12683080
+  version_requirements: *11330560
 - !ruby/object:Gem::Dependency
   name: rack-cache
-  requirement: &12682560 !ruby/object:Gem::Requirement
+  requirement: &11330040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *12682560
+  version_requirements: *11330040
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &12682080 !ruby/object:Gem::Requirement
+  requirement: &11329560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *12682080
+  version_requirements: *11329560
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &12681700 !ruby/object:Gem::Requirement
+  requirement: &11329180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12681700
+  version_requirements: *11329180
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &12681220 !ruby/object:Gem::Requirement
+  requirement: &11328700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12681220
+  version_requirements: *11328700
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &12680760 !ruby/object:Gem::Requirement
+  requirement: &11328280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12680760
+  version_requirements: *11328280
 description: Imagine can be dropped into an app to provide albums and images in your
   app.  It supports extensions to specify new view styles.
 email: josh@isotope11.com
@@ -146,6 +146,7 @@ files:
 - basic_list_view/app/views/imagine/images/basic_list_view/_image.html.haml
 - basic_list_view/app/views/imagine/albums/basic_list_view/show.html.haml
 - basic_list_view/lib/imagine-basic_list_view.rb
+- orbit_view/imagine-orbit_view-0.1.9.gem
 - orbit_view/app/assets/javascripts/jquery.orbit-1.2.3.min.js
 - orbit_view/app/assets/images/orbit/loading.gif
 - orbit_view/app/assets/images/orbit/pause-black.png
@@ -159,7 +160,6 @@ files:
 - orbit_view/app/views/imagine/images/orbit_view/_image.html.haml
 - orbit_view/app/views/imagine/albums/orbit_view/show.html.haml
 - orbit_view/lib/imagine-orbit_view.rb
-- orbit_view/imagine-orbit_view-0.1.8.gem
 - orbit_view/imagine-orbit_view.gemspec
 - MIT-LICENSE
 - Rakefile