spontaneous 0.2.0.beta9 → 0.2.0.beta10

data/lib/spontaneous/field/base.rb

@@ -53,6 +53,12 @@ module Spontaneous
         def export(user)
           {}
         end
+
+        # Allows for field type classes to map a human readable default value
+        # to the correct serialized value
+        def make_default_value(instance, value)
+          value
+        end
       end
 
       extend ClassMethods
@@ -380,6 +386,10 @@ module Spontaneous
         self.prototype.owner
       end
 
+      def site
+        owner.try(:site)
+      end
+
       def owner_sid
         schema_owner.schema_id
       end

data/lib/spontaneous/field/file.rb

@@ -7,6 +7,12 @@ module Spontaneous::Field
   class File < Base
     has_editor
 
+    def blank?
+      values[:path].blank?
+    end
+
+    alias_method :empty?, :blank?
+
     # In the case of clearing the field we will have been given a pending_value of ""
     # we don't want that to run asynchronously
     def asynchronous?
@@ -15,7 +21,7 @@ module Spontaneous::Field
     end
 
     def outputs
-      [:html, :path, :filesize, :filename]
+      [:html, :path, :filesize, :filename, :storage_name]
     end
 
     def set_pending_value(value, site)
@@ -115,6 +121,17 @@ module Spontaneous::Field
       generate_path(input, site)
     end
 
+    def generate_storage_name(input, site)
+      if (storage = input.try(:storage))
+        return storage.name
+      end
+      nil
+    end
+
+    def storage
+      site.storage(storage_name)
+    end
+
     def export(user = nil)
       super(user).merge({
         :processed_value => processed_values
@@ -133,8 +150,21 @@ module Spontaneous::Field
       @file_info ||= Spontaneous::JSON.parse(unprocessed_value)
     end
 
+    def value(format = :html)
+      case format
+      when :html, "html"
+        path
+      else
+        super
+      end
+    end
+
     def path
-      value(:html)
+      storage.to_url(super)
+    end
+
+    def url
+      path
     end
 
     self.register

data/lib/spontaneous/field/image.rb

@@ -46,12 +46,26 @@ module Spontaneous::Field
       [ {}, proc { width 300 } ]
     end
 
+    def self.default_attributes
+      @default_attributes ||= {}
+    end
+
+    def self.default_attributes=(default_attributes = {})
+      @default_attributes = default_attributes
+    end
+
     def image?
       true
     end
 
+    def blank?
+      original.blank?
+    end
+
     def sizes
-      @sizes ||= Hash.new { |hash, key| hash[key] = S::Media::Image::Attributes.new(processed_values[key]) }
+      @sizes ||= Hash.new { |hash, key|
+        hash[key] = S::Media::Image::Attributes.new(site, processed_values[key])
+      }
     end
 
     # value used to show conflicts between the current value and the value they're attempting to enter
@@ -93,6 +107,10 @@ module Spontaneous::Field
       original.src
     end
 
+    def url
+      original.url
+    end
+
     def filepath
       unprocessed_value
     end
@@ -122,8 +140,12 @@ module Spontaneous::Field
 
 
     def export(user = nil)
+      processed = Hash[outputs.map { |size|
+        [size, sizes[size].export(user)]
+      }]
+      processed.update(__pending__: pending_value) if has_pending_value?
       super(user).merge({
-        :processed_value => processed_values
+        processed_value: processed
       })
     end
 

data/lib/spontaneous/field/select.rb

@@ -78,6 +78,14 @@ module Spontaneous::Field
       end
     end
 
+    # Maps a configured default value to the appropriate JSON encoded [value, label] array
+    def self.make_default_value(instance, value)
+      return nil if value.blank?
+      option = option_list(instance.owner).detect { |opt, label| opt == value }
+      return nil if option.nil?
+      Spontaneous::JSON.encode option
+    end
+
     def option_list
       self.class.option_list(self.owner)
     end

data/lib/spontaneous/field/webvideo.rb

@@ -75,6 +75,10 @@ module Spontaneous::Field
           hash[k] = 0 if v == false
         }
       end
+
+      def name
+        self.class.id
+      end
     end
 
     def self.providers
@@ -151,6 +155,10 @@ module Spontaneous::Field
       src
     end
 
+    def aspect_ratio
+      values.fetch(:width, 1).to_f / values.fetch(:height, 1).to_f
+    end
+
     self.register(:webvideo)
   end
 end

data/lib/spontaneous/generators/site/config/initializers/fields.rb

@@ -0,0 +1,55 @@
+# The following controls the default render output or image fields.
+#
+# By default inserting an image field instance into a template like this:
+#
+#     ${ image }
+#
+# will output an `img` tag with the image's `src` attribute and an empty `alt`
+# value:
+#
+#     <img src="/path/to/image.jpg" alt="" />
+#
+# You can override the default attributes by setting an options hash here:
+#
+Spontaneous::Field::Image.default_attributes = {
+  # Include the image's natural width & height by default when rendering an image field
+  # size: true,
+
+  # Include only the images’ natural width
+  # `true`, `:auto` or `'auto'` are equivalent
+
+  # width: true,
+
+  # Force all images to render at a fixed width (odd but possible)
+
+  # width: 42,
+
+  # Or the same for the image height:
+
+  # height: true,
+  # height: 42,
+
+  # Set a default alt attribute (not generally recommended)
+
+  # alt: 'Inappropriate',
+
+  # Or, more usefully, if you want to use a dynamic value based on the field
+  # being rendered then pass a proc
+
+  # alt: proc { |field| field.page.title },
+
+  # Or you can set any attribute you want by just adding it in here:
+
+  # crossorigin: 'crossorigin',
+
+  # If you want to set data attributes then you can pass a hash, e.g. to add a data-id attribute
+  # based on the images’ owning page e.g.
+  #
+  #     <img src="..." alt="..." data-id="1234" />
+  #
+  # You would set a data attribute thusly:
+
+  # data: {
+  #   id: proc { |field| field.owner.page.id }
+  # },
+}

data/lib/spontaneous/json.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
-require 'yajl'
+# require 'yajl'
+require 'oj'
 
 Oj.default_options = { mode: :compat } if defined?(Oj)
 
@@ -23,7 +24,7 @@ module Spontaneous
     if defined?(::Yajl)
       module YajlParser
         def parser
-          Yajl::Parser.new(:symbolize_keys => true)
+          Yajl::Parser.new(symbolize_keys: true)
         end
         def encoder
           Yajl::Encoder.new

data/lib/spontaneous/logger.rb

@@ -136,8 +136,8 @@ module Spontaneous
     # Setup a new logger with options
     #
     def self.setup(options = {})
-      config_level = (SPOT_LOG_LEVEL || Spontaneous.env || :test).to_sym # need this for SPOT_LOG_LEVEL
-      config = Config[config_level]
+      config_level = (SPOT_LOG_LEVEL || Spontaneous.env || :production).to_sym # need this for SPOT_LOG_LEVEL
+      config = Config[config_level] || Config[:production]                     # default to a production level
       stream = \
         if logfile = options[:logfile]
           FileUtils.mkdir_p(File.dirname(logfile)) unless File.directory?(File.dirname(logfile))

data/lib/spontaneous/media/file.rb

@@ -41,7 +41,7 @@ module Spontaneous::Media
     end
 
     def url
-      storage.public_url(storage_path)
+      storage.url_path(storage_path)
     end
 
     def mimetype
@@ -59,7 +59,7 @@ module Spontaneous::Media
     end
 
     def storage
-      @storage ||= @site.storage(mimetype)
+      @storage ||= @site.storage_for_mimetype(mimetype)
     end
 
     def padded_id
@@ -95,7 +95,7 @@ module Spontaneous::Media
     end
 
     def serialize
-      { :url => url, :type => mimetype, :filename => filename }
+      { url: url, type: mimetype, filename: filename, storage_name: storage.name }
     end
   end
 end

data/lib/spontaneous/media/image/attributes.rb

@@ -3,15 +3,19 @@ module Spontaneous::Media
     class Attributes
       include Renderable
 
-      attr_reader  :src, :width, :height, :filesize, :filepath
+      attr_reader  :storage, :filepath, :storage
 
-      def initialize(params={})
-        params ||= {}
-        @src, @width, @height, @filesize, @filepath = params.values_at(:src, :width, :height, :filesize, :path)
+      def initialize(site, params={})
+        @params = params.try(:dup) || {}
+        @storage = site.storage(storage_name)
       end
 
       def serialize
-        { :src => src, :width => width, :height => height, :filesize => filesize }
+        { src: src, width: width, height: height, dimensions: dimensions, filesize: filesize, storage_name: storage_name }
+      end
+
+      def export(user = nil)
+        serialize.delete_if { |k, v| v.nil? }
       end
 
       def inspect
@@ -19,7 +23,69 @@ module Spontaneous::Media
       end
 
       def blank?
-        src.blank?
+        @params[:src].blank?
+      end
+
+      alias_method :empty?, :blank?
+
+      def src
+        storage.to_url(@params[:src])
+      end
+
+      alias_method :url, :src
+
+      def storage_name
+        @params[:storage_name]
+      end
+
+      def width
+        @params[:width]
+      end
+
+      def height
+        @params[:height]
+      end
+
+      def filesize
+        @params[:filesize]
+      end
+
+      def dimensions
+        @params[:dimensions]
+      end
+
+      def filepath
+        @params[:path]
+      end
+
+      def src
+        storage.to_url(@params[:src])
+      end
+
+      alias_method :url, :src
+
+      def storage_name
+        @params[:storage_name]
+      end
+
+      def width
+        @params[:width]
+      end
+
+      def height
+        @params[:height]
+      end
+
+      def filesize
+        @params[:filesize]
+      end
+
+      def dimensions
+        @params[:dimensions]
+      end
+
+      def filepath
+        @params[:path]
       end
 
       # Will only work for files in local storage

data/lib/spontaneous/media/image/renderable.rb

@@ -14,32 +14,65 @@ module Spontaneous::Media::Image
 
     alias_method :render_inline, :render
 
-    def to_html(attr={})
-      default_attr = {
-        :src => src,
-        :width => width,
-        :height => height,
-        :alt => ""
-      }
-      default_attr.delete(:width) if (width.nil? || width == 0)
-      default_attr.delete(:height) if (height.nil? || height == 0)
+    DEFAULT_SIZE_FLAGS = ['auto'.freeze, :auto, true].freeze
+
+    def to_html(opts={})
+      default_attr = { src: src, alt: "" }
+      attrs = Spontaneous::Field::Image.default_attributes.merge(opts)
+
       if template_params && template_params.length > 0 && template_params[0].is_a?(Hash)
-        attr = template_params[0].merge(attr)
+        attrs = template_params[0].merge(attrs)
+      end
+
+      case attrs.delete(:size)
+      when true, :auto, 'auto'
+        attrs[:width] = width if has_width?
+        attrs[:height] = height if has_height?
       end
-      if attr.key?(:width) || attr.key?(:height)
-        default_attr.delete(:width)
-        default_attr.delete(:height)
-        if (attr.key?(:width) && !attr[:width]) || (attr.key?(:height) && !attr[:height])
-          attr.delete(:width)
-          attr.delete(:height)
+
+      if attrs.key?(:width) || attrs.key?(:height)
+        attrs.delete(:width)  if (attrs.key?(:width) && !attrs[:width])
+        attrs.delete(:height) if (attrs.key?(:height) && !attrs[:height])
+        if has_width? && DEFAULT_SIZE_FLAGS.include?(attrs[:width])
+          attrs[:width] = width
+        end
+        if has_height? && DEFAULT_SIZE_FLAGS.include?(attrs[:height])
+          attrs[:height] = height
         end
       end
-      attr = default_attr.merge(attr)
+
+      attrs = default_attr.merge(attrs)
+      params = parameterize_attributes(attrs)
+      %(<img #{params} />)
+    end
+
+    def parameterize_attributes(attrs, namespace = [])
       params = []
-      attr.each do |name, value|
-        params << %(#{name}="#{value.to_s.escape_html}")
+      attrs.each do |name, value|
+        key = (namespace + [name])
+        v = case value
+        when Hash
+          parameterize_attributes(value, key)
+        when Proc
+          %(#{key.join('-')}="#{value.call(self).to_s.escape_html}")
+        else
+          %(#{key.join('-')}="#{value.to_s.escape_html}")
+        end
+        params << v
       end
-      %(<img #{params.join(' ')} />)
+      params.join(' ')
+    end
+
+    def has_height?
+      has_dim?(height)
+    end
+
+    def has_width?
+      has_dim?(width)
+    end
+
+    def has_dim?(dim)
+      !(dim.nil? || dim == 0)
     end
 
     def to_s