dragonfly 0.3.7 → 0.3.8

data/VERSION

@@ -1 +1 @@
-0.3.7
+0.3.8

data/dragonfly.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dragonfly}
-  s.version = "0.3.7"
+  s.version = "0.3.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Evans"]

data/extra_docs/UsingWithRails.md

@@ -81,21 +81,21 @@ For reference, the contents of the metal file is given below. You could do somet
     require 'dragonfly'
 
     # Configuration of the Dragonfly App
-    Dragonfly::App[:images].configure_with(Dragonfly::RMagickConfiguration)
-    Dragonfly::App[:images].configure do |c|
+    app = Dragonfly::App[:images]
+    app.configure_with(Dragonfly::RMagickConfiguration)
+    app.configure do |c|
       c.log = RAILS_DEFAULT_LOGGER
       c.datastore.configure do |d|
         d.root_path = "#{Rails.root}/public/system/dragonfly/#{Rails.env}"
       end
       c.url_handler.configure do |u|
-        u.secret = '29205f3e01648d0966bd5b119cd53347390a9ba9'
-        u.path_prefix = '/images'
+        u.secret = '42fb1c533022556651af59d2a4302f44b37491e5'
+        u.path_prefix = '/media'
       end
     end
 
     # The metal, for running the app
-    app = Dragonfly::App[:images]
-    Images = Rack::Builder.new do
+    ImageServer = Rack::Builder.new do
 
       # UNCOMMENT ME!!!
       # ... if you want to use super-dooper middleware 'rack-cache'
@@ -104,7 +104,7 @@ For reference, the contents of the metal file is given below. You could do somet
       #   :verbose     => true,
       #   :metastore   => 'file:/var/cache/rack/meta',
       #   :entitystore => 'file:/var/cache/rack/body'
-
+  
       run app
-
+  
     end

data/generators/dragonfly_app/dragonfly_app_generator.rb

@@ -4,9 +4,10 @@ class DragonflyAppGenerator < Rails::Generator::NamedBase
  
   def manifest
     app_name = plural_name
-    metal_name = plural_name.camelize
-    path_prefix = plural_name
     single_name = singular_name.singularize
+    metal_file = "#{single_name}_server"
+    metal_name = metal_file.camelize
+    path_prefix = 'media'
     
     record do |m|
       # The initializer
@@ -27,7 +28,7 @@ class DragonflyAppGenerator < Rails::Generator::NamedBase
       m.directory('app/metal')
       m.template(
         'metal_file.erb',
-        "app/metal/#{plural_name}.rb",
+        "app/metal/#{metal_file}.rb",
         :assigns => {
           :app_name => app_name,
           :metal_name => metal_name,

data/generators/dragonfly_app/templates/metal_file.erb

@@ -3,8 +3,9 @@ require(File.dirname(__FILE__) + "/../../config/environment") unless defined?(Ra
 require 'dragonfly'
 
 # Configuration of the Dragonfly App
-Dragonfly::App[:<%= app_name %>].configure_with(Dragonfly::RMagickConfiguration)
-Dragonfly::App[:<%= app_name %>].configure do |c|
+app = Dragonfly::App[:<%= app_name %>]
+app.configure_with(Dragonfly::RMagickConfiguration)
+app.configure do |c|
   c.log = RAILS_DEFAULT_LOGGER
   c.datastore.configure do |d|
     d.root_path = "#{Rails.root}/public/system/dragonfly/#{Rails.env}"
@@ -16,7 +17,6 @@ Dragonfly::App[:<%= app_name %>].configure do |c|
 end
 
 # The metal, for running the app
-app = Dragonfly::App[:<%= app_name %>]
 <%= metal_name %> = Rack::Builder.new do
 
   # UNCOMMENT ME!!!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dragonfly
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Mark Evans