yodel 0.0.4 → 0.0.7

data/lib/yodel/application/request_handler.rb

@@ -11,7 +11,7 @@ class RequestHandler
     env['rack.session']['a'] = 1
 
     # split the request path into a standard path and trailing file extension if present
-    components = PATH_FORMAT_REGEX.match(request.path)
+    components = PATH_FORMAT_REGEX.match(request.path.downcase)
     return fail_with "Unable to parse request path: #{request.path}" if components.nil?
     path, format = components.captures
     path = path[0...-1] if path.end_with?('/') && path.length != 1

data/lib/yodel/command/command.rb

@@ -38,7 +38,6 @@ class CommandRunner
     case command
     when 'server'
       require '../requires'
-      require '../middleware/development_server'
       
       Yodel.config.extensions_folder = $extensions_folder if $extensions_folder
       Yodel.config.web_port = $web_port if $web_port
@@ -50,9 +49,11 @@ class CommandRunner
       end
       
       if $reload
+        require '../middleware/development_server'
         Rack::Server.start(app: DevelopmentServer.new, Port: Yodel.config.web_port)
       else
-        require File.expand_path('../../yodel')
+        require '../middleware/rack_server'
+        require '../../yodel'
         Rack::Server.start(app: Application.new, Port: Yodel.config.web_port)
       end
   

data/lib/yodel/middleware/rack_server.rb

@@ -0,0 +1,17 @@
+module Rack
+  class Server
+    
+    alias :original_start :start
+    def start
+      trap(:TERM) do
+        if server.respond_to?(:shutdown)
+          server.shutdown
+        else
+          exit
+        end
+      end
+      original_start
+    end
+    
+  end
+end

data/lib/yodel/models/core/associations/embedded/many_embedded_association.rb

@@ -57,6 +57,29 @@ class ManyEmbeddedAssociation < Association
     raise "ManyEmbedded values must be enumerable (#{name})" unless value.respond_to?(:each)
     EmbeddedRecordArray.new(record, self, all(value, record))
   end
+  
+  def from_json(value, record)
+    # TODO: change to constructing a new array here instead of removing elements at the end
+    store = record.get(name)
+    existing_records = store.each_with_object({}) {|record, ids| ids[record.id.to_s] = record}
+    
+    # update and add existing/new records
+    value.each do |new_record|
+      next unless new_record.is_a?(Hash)
+      new_record_id = new_record['_id']
+      new_record.delete('_id')
+      if existing_records.key?(new_record_id)
+        existing_records[new_record_id].from_json(new_record)
+        existing_records.delete(new_record_id)
+      else
+        process_json_item(new_record, store, record).save
+      end
+    end
+    
+    # any remaining ids in existing_records were deleted
+    existing_records.values.each(&:destroy)
+    record.get(name)
+  end
 end
 
 Field::TYPES['many_embedded'] = ManyEmbeddedAssociation

data/lib/yodel/models/core/attachments/attachment.rb

@@ -22,7 +22,13 @@ class Attachment
   end
   
   def relative_directory_path
-    @relative_directory_path ||= File.join(@field.name, @record.id.to_s)
+    @relative_directory_path ||= begin
+      if @record.is_a?(EmbeddedRecord)
+        File.join("#{@record.embedded_field.name}_#{@field.name}", @record.parent_record.id.to_s, @record.id.to_s)
+      else
+        File.join(@field.name, @record.id.to_s)
+      end
+    end
   end
   
   def path

data/lib/yodel/models/core/attachments/image.rb

@@ -9,7 +9,9 @@ class Image < Attachment
     return unless exist?
     
     # determine image dimensions
-    dimensions = `#{Yodel.config.identify_path} -ping -format "%w %h" #{path}`
+    # FIXME: uploaded file names with '..' and slashes etc. could be a security issue
+    escaped_path = "\"#{path.gsub('"', '\"')}\""
+    dimensions = `#{Yodel.config.identify_path} -ping -format "%w %h" #{escaped_path}`
     unless ('0'..'9').include?(dimensions[0])
       raise "Invalid image format or unknown Image Magick error: #{dimensions}"
     else
@@ -25,7 +27,7 @@ class Image < Attachment
       w = [iw, w].min.to_i
       h = [ih, h].min.to_i
       
-      command = "#{Yodel.config.convert_path} #{path} "
+      command = "#{Yodel.config.convert_path} #{escaped_path} "
       command += "-crop '#{w}x#{h}+#{(iw-w)/2}+#{(ih-h)/2}' "
       command += "-resize '#{sw}x#{sh}' "
       command += "-quality #{Yodel.config.image_quality} "

data/lib/yodel/models/core/fields/attachment_field.rb

@@ -3,6 +3,10 @@ class AttachmentField < Field
     :file
   end
   
+  def default
+    Attachment.new({}, nil, self).to_hash
+  end
+  
   def untypecast(value, record)
     # expecting an Attachment object, or a hash of the original data
     value.to_hash

data/lib/yodel/models/core/fields/image_field.rb

@@ -3,6 +3,10 @@ class ImageField < AttachmentField
     :image
   end
   
+  def default
+    Image.new({}, nil, self).to_hash
+  end
+  
   def typecast(value, record)
     Image.new(value, record, self)
   end

data/lib/yodel/models/core/record/abstract_record.rb

@@ -274,6 +274,7 @@ class AbstractRecord
 
   def update(values, do_save=true)
     raise DestroyedRecord if destroyed?
+    return if values.empty?
     values.stringify_keys!
     values.each do |name, value|
       ensure_field_is_valid(name)

data/lib/yodel/models/core/record/embedded_record.rb

@@ -9,6 +9,18 @@ class EmbeddedRecord < AbstractRecord
     super(values, new_record)
   end
   
+  def id
+    @values['_id']
+  end
+  
+  def set_id(new_id)
+    @values['_id'] = new_id
+  end
+
+  def default_values
+    super.merge({'_id' => PrimaryKeyFactory.pk})
+  end
+  
   def site
     parent_record.site
   end
@@ -32,6 +44,10 @@ class EmbeddedRecord < AbstractRecord
     embedded_field.fields
   end
   
+  def field_sections
+    @sections ||= {nil => Section.new(nil, fields.values)}
+  end
+  
   def perform_save
     embedded_field.save(self, parent_record)
   end

data/lib/yodel/models/core/record/record.rb

@@ -78,22 +78,14 @@ class Record < SiteRecord
   end
   
   def field_sections
-    if @sections.nil?
+    @sections ||= begin
       keyed_sections = Hash.new do |hash, key|
         hash[key] = Section.new(key)
       end
       fields.each do |name, field|
         keyed_sections[field.section] << field
       end
-      @sections = keyed_sections.values
-    end
-    
-    @sections
-  end
-  
-  def fields_for_section(section)
-    fields.select do |name, field|
-      field.display? && field.section == section && field.default_input_type.present? && field.default_input_type != :embedded
+      keyed_sections
     end
   end
   

data/lib/yodel/models/core/record/section.rb

@@ -1,9 +1,10 @@
 class Section < Array
   attr_reader :name
   
-  def initialize(name)
-    @name = name
+  def initialize(name, initial_fields=[])
     super()
+    @name = name
+    push(*initial_fields)
   end
   
   def display?
@@ -16,6 +17,6 @@ class Section < Array
   
   private
     def display_field?(field)
-      field.display? && field.default_input_type.present? && field.default_input_type != :embedded
+      field.display? && field.default_input_type.present?
     end
 end

data/lib/yodel/models/pages/form_builder.rb

@@ -36,16 +36,23 @@ class FormBuilder
   end
   
   def form_for_section(section)
-    buffer = Ember::Template.buffer_from_block(@block)
-    section.displayed_fields.each do |field|
-      buffer << field_row(field.name, field)
-    end
-    ''
+    section.displayed_fields.collect do |field|
+      field_row(field.name, field)
+    end.join('')
   end
   
   def field_row(name, field=nil)
     field = @record.fields[name.to_s] if field.nil?
-    "<div class='contains-field-type-#{field.options['type']}'>" << label(name).to_s << "<div>" << field(name).to_s << status(name).to_s << "</div></div>"
+    html = "<div class='contains-field-type-#{field.options['type']}'>"
+    html << label(name).to_s << "<div>"
+    
+    if field.default_input_type == :embedded
+      html << field(name, blank_record: true).to_s
+    else
+      html << field(name).to_s
+    end
+    
+    html << status(name).to_s << "</div></div>"
   end
   
   
@@ -64,10 +71,13 @@ class FormBuilder
       value = value.id if value.is_a?(AbstractRecord)
       value = value.to_s("F") if value.is_a?(BigDecimal)
       element = build_element(:input, {type: type.to_s, value: value.to_s})
+      
     when :textarea
       element = build_element(:textarea, {}, value.to_s)
+      
     when :html
       element = build_element(:textarea, {class: 'html'}, value.to_s)
+      
     when :file, :image
       elements = []
       elements << build_element(:input, {type: 'hidden', name: input_name + '[_action]', value: 'set'})
@@ -88,6 +98,7 @@ class FormBuilder
       elements << build_element(:span, {}, "Delete")
       elements << build_element(:input, {type: 'file', value: value.name, name: input_name + '[_value]'})
       element = build_element(:span, {}, elements)
+      
     when :radio
       base = {type: 'radio', name: input_name}
       true_button   = build_element(:input, base.merge(condition('checked', value, ['true', true])))
@@ -95,13 +106,17 @@ class FormBuilder
       true_text     = options.delete(:true) || 'Yes'
       false_text    = options.delete(:false) || 'No'
       element = build_element(:span, {}, [true_text, true_button, false_text, false_button])
+      
     when :enum
       element = build_select(value, field.options['options'], show_blank: field.show_blank, blank_text: field.blank_text)
+      
     when :store_one
       element = build_select(value, field.record_options(@record), show_blank: field.show_blank, blank_text: field.blank_text, group_by: field.group_by, name_field: 'name', value_field: 'id')
+      
     when :store_many
       element = build_select(value.collect(&:id), field.record_options(@record), show_blank: false, name_field: 'name', value_field: 'id', multiple: true)
       input_name += '[]'
+      
     when :date, :datetime
       # day
       day_select = build_select(value.try(:day).to_s, (1..31), show_blank: true, blank_text: '', name_field: 'to_s', value_field: 'to_s')
@@ -134,23 +149,29 @@ class FormBuilder
       end
       
       element = build_element(:span, {}, elements)
+      
     when :embedded
-      if block_given?
-        if value.respond_to?(:each)
-          value.each do |document|
-            self.class.new(document, @action, {embedded_record: field, prefix: name, id: @id}, &block).render
-          end
-        else
-          self.class.new(value, @action, {embedded_record: field, prefix: name, id: @id}, &block).render
-        end
+      elements = []
       
-        if options.delete(:blank_record)
-          self.class.new(value.new, @action, {embedded_record: field, blank_record: true, prefix: name, id: @id}, &block).render
+      if value.respond_to?(:each)
+        value.each do |document|
+          elements << self.class.new(document, @action, {embedded_record: field, prefix: name, id: @id}, &block).render
         end
+      else
+        elements << self.class.new(value, @action, {embedded_record: field, prefix: name, id: @id}, &block).render
+      end
+  
+      if options.delete(:blank_record)
+        elements << self.class.new(value.new, @action, {embedded_record: field, blank_record: true, prefix: name, id: @id}, &block).render
       end
       
-      buffer = Ember::Template.buffer_from_block(@block)
-      buffer << build_element(:input, {'type' => 'hidden', 'data-field' => input_name}).to_s
+      if block_given?
+        buffer = Ember::Template.buffer_from_block(@block)
+        buffer << build_element(:input, {'type' => 'hidden', 'data-field' => input_name}).to_s
+      else
+        elements << build_element(:input, {'type' => 'hidden', 'data-field' => input_name})
+        element = build_element(:span, {}, elements)
+      end
     end
     
     element.tap do |element|
@@ -171,6 +192,9 @@ class FormBuilder
     @record
   end
   
+  def prefix
+    @prefix
+  end
   
   def label(name, text=nil, options={})
     text ||= name.to_s.humanize
@@ -244,46 +268,60 @@ class FormBuilder
   end
   
   def render
-    if @embedded_record
-      buffer = Ember::Template.buffer_from_block(@block)
-      buffer << Ember::Template.content_from_block(@block, self)
+    # render a default form
+    if @block.nil?
+      if @embedded_record
+        form_for_section(@record.field_sections[nil])
+      else
+        form_element(@record.field_sections[nil])
+      end
+    
+    # render a user supplied form
     else
-      Ember::Template.wrap_content_block(@block, self) do |content|
-        params = {
-          'action' => @action,
-          'method' => 'post',
-          'enctype' => 'multipart/form-data',
-          'data-remote' => (!!@remote).to_s,
-          'id' => @id
-        }.merge(@params)
-        
-        elements = [
-          Hpricot::Text.new(content.join),
-          Hpricot::Elem.new('input', {type: 'hidden', name: '_method', value: @method})
-        ]
-        
-        if @success_function
-          params['data-success-function'] = "#{@id}_success"
-          elements << Hpricot::Text.new(define_callback_function('success', 'record', @success_function))
-        end
-        
-        if @errors_function
-          params['data-errors-function'] = "#{@id}_errors"
-          elements << Hpricot::Text.new(define_callback_function('errors', 'errors', @errors_function))
-        end
-        
-        if @failure_function
-          params['data-failure-function'] = "#{@id}_failure"
-          elements << Hpricot::Text.new(define_callback_function('failure', 'xhr', @failure_function))
-        end
-        
-        Hpricot::Elem.new('form', params, elements)
+      if @embedded_record
+        buffer = Ember::Template.buffer_from_block(@block)
+        buffer << Ember::Template.content_from_block(@block, self)
+      else
+        Ember::Template.wrap_content_block(@block, self) {|content| form_element(content.join)}
       end
     end
+    
   end
   
   
   private
+    def form_element(content)
+      params = {
+        'action' => @action,
+        'method' => 'post',
+        'enctype' => 'multipart/form-data',
+        'data-remote' => (!!@remote).to_s,
+        'id' => @id
+      }.merge(@params)
+    
+      elements = [
+        Hpricot::Text.new(content),
+        Hpricot::Elem.new('input', {type: 'hidden', name: '_method', value: @method})
+      ]
+    
+      if @success_function
+        params['data-success-function'] = "#{@id}_success"
+        elements << Hpricot::Text.new(define_callback_function('success', 'record', @success_function))
+      end
+    
+      if @errors_function
+        params['data-errors-function'] = "#{@id}_errors"
+        elements << Hpricot::Text.new(define_callback_function('errors', 'errors', @errors_function))
+      end
+    
+      if @failure_function
+        params['data-failure-function'] = "#{@id}_failure"
+        elements << Hpricot::Text.new(define_callback_function('failure', 'xhr', @failure_function))
+      end
+    
+      Hpricot::Elem.new('form', params, elements)
+    end
+    
     def render_status(name, handles, message, state, new_text, valid_text, invalid_text)
       if @status_template
         element = Ember::Template.content_from_block(@status_template, name, message, state).join

data/lib/yodel/requires.rb

@@ -10,7 +10,6 @@ require 'uri'
 
 # load bundled gems
 require 'rubygems'
-require 'bundler'
 require 'rack'
 require 'plucky' # requires mongo
 require 'ember'
@@ -18,10 +17,7 @@ require 'mail'
 require 'hpricot'
 require 'json'
 require 'rack/contrib'
-require 'rubydns'
 require 'git'
-require 'highline'
-require 'mini_magick'
 require 'linguistics'
 
 # manually load active support extensions

data/lib/yodel/version.rb

@@ -1,3 +1,3 @@
 module Yodel
-  VERSION = '0.0.4'
+  VERSION = '0.0.7'
 end

data/yodel.gemspec

@@ -17,30 +17,30 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'bundler',        '~> 1.0.21'
-  s.add_runtime_dependency 'rack',           '~> 1.3.3'
-  s.add_runtime_dependency 'mongo',          '~> 1.3.1'
-  s.add_runtime_dependency 'bson',           '~> 1.3.1'
-  s.add_runtime_dependency 'bson_ext',       '~> 1.3.1'
-  s.add_runtime_dependency 'plucky',         '~> 0.4.1'
-  s.add_runtime_dependency 'activesupport',  '~> 3.0.3'
-  s.add_runtime_dependency 'ember',          '~> 0.3.1'
-  s.add_runtime_dependency 'mail',           '~> 2.3.0'
-  s.add_runtime_dependency 'hpricot',        '~> 0.8.4'
-  s.add_runtime_dependency 'json',           '~> 1.6.1'
-  s.add_runtime_dependency 'rack-contrib',   '~> 1.1.0'
-  s.add_runtime_dependency 'rubydns',        '~> 0.3.3'
-  s.add_runtime_dependency 'git',            '~> 1.2.5'
-  s.add_runtime_dependency 'highline',       '~> 1.6.2'
-  s.add_runtime_dependency 'linguistics',    '~> 1.0.9'
+  s.add_runtime_dependency 'bundler',         '~> 1.0.21'
+  s.add_runtime_dependency 'rack',            '~> 1.3.3'
+  s.add_runtime_dependency 'mongo',           '~> 1.3.1'
+  s.add_runtime_dependency 'bson',            '~> 1.3.1'
+  s.add_runtime_dependency 'bson_ext',        '~> 1.3.1'
+  s.add_runtime_dependency 'plucky',          '~> 0.4.1'
+  s.add_runtime_dependency 'activesupport',   '~> 3.0.3'
+  s.add_runtime_dependency 'ember',           '~> 0.3.1'
+  s.add_runtime_dependency 'mail',            '~> 2.3.0'
+  s.add_runtime_dependency 'hpricot',         '~> 0.8.4'
+  s.add_runtime_dependency 'json',            '~> 1.6.1'
+  s.add_runtime_dependency 'rack-contrib',    '~> 1.1.0'
+  s.add_runtime_dependency 'rubydns',         '~> 0.3.3'
+  s.add_runtime_dependency 'git',             '~> 1.2.5'
+  s.add_runtime_dependency 'highline',        '~> 1.6.2'
+  s.add_runtime_dependency 'linguistics',     '~> 1.0.9'
 
   # extensions
-  s.add_runtime_dependency 'yodel_admin'
-  s.add_runtime_dependency 'yodel_queue'
-  s.add_runtime_dependency 'yodel_blog'
-  s.add_runtime_dependency 'yodel_shop'
-
+  s.add_runtime_dependency 'yodel_admin',     '0.0.7'
+  s.add_runtime_dependency 'yodel_queue',     '0.0.7'
+  s.add_runtime_dependency 'yodel_blog',      '0.0.7'
+  s.add_runtime_dependency 'yodel_shop',      '0.0.7'
+  
   # environment support sites
-  s.add_runtime_dependency 'yodel_development_environment'
-  s.add_runtime_dependency 'yodel_production_environment'
+  s.add_runtime_dependency 'yodel_development_environment', '0.0.7'
+  s.add_runtime_dependency 'yodel_production_environment',  '0.0.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yodel
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-18 00:00:00.000000000Z
+date: 2012-01-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70185758343000 !ruby/object:Gem::Requirement
+  requirement: &70203218619040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.21
   type: :runtime
   prerelease: false
-  version_requirements: *70185758343000
+  version_requirements: *70203218619040
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70185758336560 !ruby/object:Gem::Requirement
+  requirement: &70203218618320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70185758336560
+  version_requirements: *70203218618320
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &70185758336040 !ruby/object:Gem::Requirement
+  requirement: &70203218617560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70185758336040
+  version_requirements: *70203218617560
 - !ruby/object:Gem::Dependency
   name: bson
-  requirement: &70185758335500 !ruby/object:Gem::Requirement
+  requirement: &70203218616920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70185758335500
+  version_requirements: *70203218616920
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70185758334940 !ruby/object:Gem::Requirement
+  requirement: &70203218616000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70185758334940
+  version_requirements: *70203218616000
 - !ruby/object:Gem::Dependency
   name: plucky
-  requirement: &70185758334180 !ruby/object:Gem::Requirement
+  requirement: &70203218609180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70185758334180
+  version_requirements: *70203218609180
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70185758333040 !ruby/object:Gem::Requirement
+  requirement: &70203218608540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70185758333040
+  version_requirements: *70203218608540
 - !ruby/object:Gem::Dependency
   name: ember
-  requirement: &70185758332380 !ruby/object:Gem::Requirement
+  requirement: &70203218607000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70185758332380
+  version_requirements: *70203218607000
 - !ruby/object:Gem::Dependency
   name: mail
-  requirement: &70185758331740 !ruby/object:Gem::Requirement
+  requirement: &70203218606380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70185758331740
+  version_requirements: *70203218606380
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70185758330900 !ruby/object:Gem::Requirement
+  requirement: &70203218605160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.8.4
   type: :runtime
   prerelease: false
-  version_requirements: *70185758330900
+  version_requirements: *70203218605160
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70185758329800 !ruby/object:Gem::Requirement
+  requirement: &70203218604680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70185758329800
+  version_requirements: *70203218604680
 - !ruby/object:Gem::Dependency
   name: rack-contrib
-  requirement: &70185758328680 !ruby/object:Gem::Requirement
+  requirement: &70203218604200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70185758328680
+  version_requirements: *70203218604200
 - !ruby/object:Gem::Dependency
   name: rubydns
-  requirement: &70185758321500 !ruby/object:Gem::Requirement
+  requirement: &70203218603380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *70185758321500
+  version_requirements: *70203218603380
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70185758320840 !ruby/object:Gem::Requirement
+  requirement: &70203218602440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +164,10 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70185758320840
+  version_requirements: *70203218602440
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70185758319960 !ruby/object:Gem::Requirement
+  requirement: &70203218598720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70185758319960
+  version_requirements: *70203218598720
 - !ruby/object:Gem::Dependency
   name: linguistics
-  requirement: &70185758319260 !ruby/object:Gem::Requirement
+  requirement: &70203218598160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,73 +186,73 @@ dependencies:
         version: 1.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70185758319260
+  version_requirements: *70203218598160
 - !ruby/object:Gem::Dependency
   name: yodel_admin
-  requirement: &70185758318680 !ruby/object:Gem::Requirement
+  requirement: &70203218597420 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70185758318680
+  version_requirements: *70203218597420
 - !ruby/object:Gem::Dependency
   name: yodel_queue
-  requirement: &70185758318200 !ruby/object:Gem::Requirement
+  requirement: &70203218596520 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70185758318200
+  version_requirements: *70203218596520
 - !ruby/object:Gem::Dependency
   name: yodel_blog
-  requirement: &70185758317780 !ruby/object:Gem::Requirement
+  requirement: &70203218595820 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70185758317780
+  version_requirements: *70203218595820
 - !ruby/object:Gem::Dependency
   name: yodel_shop
-  requirement: &70185758317320 !ruby/object:Gem::Requirement
+  requirement: &70203218595240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70185758317320
+  version_requirements: *70203218595240
 - !ruby/object:Gem::Dependency
   name: yodel_development_environment
-  requirement: &70185758316820 !ruby/object:Gem::Requirement
+  requirement: &70203218594480 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70185758316820
+  version_requirements: *70203218594480
 - !ruby/object:Gem::Dependency
   name: yodel_production_environment
-  requirement: &70185758316380 !ruby/object:Gem::Requirement
+  requirement: &70203218593600 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - =
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70185758316380
+  version_requirements: *70203218593600
 description: Yodel CMS
 email:
 - me@willcannings.com
@@ -302,6 +302,7 @@ files:
 - lib/yodel/middleware/development_server.rb
 - lib/yodel/middleware/error_pages.rb
 - lib/yodel/middleware/public_assets.rb
+- lib/yodel/middleware/rack_server.rb
 - lib/yodel/middleware/request.rb
 - lib/yodel/middleware/site_detector.rb
 - lib/yodel/mime_types/default_mime_set.rb