lib/spontaneous.rb in spontaneous-0.2.0.alpha2 vs lib/spontaneous.rb in spontaneous-0.2.0.alpha3

@@ -1,52 +1,34 @@
 # encoding: UTF-8
 
 
-if RUBY_VERSION < '1.9'
-  $KCODE='u'
-else
-  Encoding.default_external = Encoding::UTF_8
-  Encoding.default_internal = Encoding::UTF_8
-end
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
 
 require "fileutils"
-require "home_run"
 require "stringex"
-require "sequel"
-require "yajl"
 require "logger"
 
 require "active_support/concern"
 require "active_support/deprecation"
+require "active_support/time"
 require 'active_support/core_ext/class/attribute'
 require "active_support/core_ext/hash/keys"
-require "active_support/core_ext/date_time/conversions"
 require "active_support/core_ext/array/grouping"
 require "active_support/core_ext/array/extract_options"
 require "active_support/core_ext/file"
 
-Sequel.extension :inflector
 
-require 'sequel/plugins/serialization'
 
-Sequel::Plugins::Serialization.register_format(
-  :yajl,
-  lambda { |v| Yajl::Encoder.new.encode(v) },
-  lambda { |v| Yajl::Parser.new(:symbolize_keys => true).parse(v)   }
-)
+module Spontaneous
 
+  require "spontaneous/logger"
+  require "spontaneous/constants"
+  require "spontaneous/errors"
+  require "spontaneous/json"
+  require "spontaneous/sequel"
 
-spontaneous = File.join(File.dirname(__FILE__), "spontaneous")
-
-Dir["#{spontaneous}/extensions/*.rb"].each { |file| require file }
-
-require "spontaneous/logger"
-require "spontaneous/constants"
-require "spontaneous/errors"
-require "spontaneous/json"
-
-module Spontaneous
   include Constants
 
   def self.gem_root
     @gem_root ||= File.expand_path(File.dirname(__FILE__) / "..")
   end
@@ -61,20 +43,21 @@
   autoload :Content,          "spontaneous/content"
   autoload :Page,             "spontaneous/page"
   autoload :Piece,            "spontaneous/piece"
   autoload :Box,              "spontaneous/box"
   autoload :FieldTypes,       "spontaneous/field_types"
+  autoload :FieldVersion,     "spontaneous/field_version"
   autoload :PagePiece,        "spontaneous/page_piece"
   autoload :Style,            "spontaneous/style"
   autoload :BoxStyle,         "spontaneous/box_style"
   autoload :Layout,           "spontaneous/layout"
   autoload :Site,             "spontaneous/site"
   autoload :State,            "spontaneous/state"
   autoload :Schema,           "spontaneous/schema"
   autoload :ImageSize,        "spontaneous/image_size"
   autoload :Rack,             "spontaneous/rack"
-  autoload :Render,           "spontaneous/render"
+  autoload :Output,           "spontaneous/output"
   autoload :Media,            "spontaneous/media"
   autoload :Change,           "spontaneous/change"
   autoload :Revision,         "spontaneous/revision"
   autoload :Publishing,       "spontaneous/publishing"
   autoload :Generators,       "spontaneous/generators"
@@ -85,10 +68,11 @@
   autoload :Application,      "spontaneous/application"
   autoload :Search,           "spontaneous/search"
   autoload :Storage,          "spontaneous/storage"
   autoload :Cli,              "spontaneous/cli"
   autoload :Utils,            "spontaneous/utils"
+  autoload :Asset,            "spontaneous/asset"
 
   module Prototypes
     autoload :FieldPrototype,   "spontaneous/prototypes/field_prototype"
     autoload :BoxPrototype,     "spontaneous/prototypes/box_prototype"
     autoload :StylePrototype,   "spontaneous/prototypes/style_prototype"
@@ -128,49 +112,61 @@
     autoload :Aliases,          "spontaneous/plugins/aliases"
     autoload :Visibility,       "spontaneous/plugins/visibility"
     autoload :Prototypes,       "spontaneous/plugins/prototypes"
     autoload :Permissions,      "spontaneous/plugins/permissions"
     autoload :Controllers,      "spontaneous/plugins/controllers"
+    autoload :Modifications,    "spontaneous/plugins/modifications"
+    autoload :ContentGroups,    "spontaneous/plugins/content_groups"
 
     module Field
       autoload :EditorClass,    "spontaneous/plugins/field/editor_class"
     end
 
     module Page
       autoload :Formats,        "spontaneous/plugins/page/formats"
       autoload :Request,        "spontaneous/plugins/page/request"
+      autoload :SiteTimestamps, "spontaneous/plugins/page/site_timestamps"
     end
 
     module Site
       autoload :Publishing,     "spontaneous/plugins/site/publishing"
-      autoload :Revisions,      "spontaneous/plugins/site/revisions"
+      autoload :State,          "spontaneous/plugins/site/state"
       autoload :Selectors,      "spontaneous/plugins/site/selectors"
       autoload :Map,            "spontaneous/plugins/site/map"
+      autoload :Paths,          "spontaneous/plugins/site/paths"
       autoload :Instance,       "spontaneous/plugins/site/instance"
       autoload :Search,         "spontaneous/plugins/site/search"
       autoload :Features,       "spontaneous/plugins/site/features"
       autoload :Schema,         "spontaneous/plugins/site/schema"
       autoload :Level,          "spontaneous/plugins/site/level"
       autoload :Storage,        "spontaneous/plugins/site/storage"
+      autoload :Timestamps,     "spontaneous/plugins/site/timestamps"
+      autoload :URL,            "spontaneous/plugins/site/url"
+      autoload :Hooks,          "spontaneous/plugins/site/hooks"
+      autoload :Helpers,        "spontaneous/plugins/site/helpers"
     end
 
     module Application
       autoload :State,          "spontaneous/plugins/application/state"
       autoload :Paths,          "spontaneous/plugins/application/paths"
       autoload :Render,         "spontaneous/plugins/application/render"
       autoload :Facets,         "spontaneous/plugins/application/facets"
       autoload :Serialisation,  "spontaneous/plugins/application/serialisation"
       autoload :Features,       "spontaneous/plugins/application/features"
+      autoload :System,         "spontaneous/plugins/application/system"
     end
   end
 
   include Plugins::Application::State
   include Plugins::Application::Paths
   include Plugins::Application::Render
   include Plugins::Application::Facets
   include Plugins::Application::Serialisation
   include Plugins::Application::Features
+  include Plugins::Application::System
 end
+
+Dir["#{File.expand_path("../spontaneous", __FILE__)}/extensions/*.rb"].each { |file| require file }
 
 require "spontaneous/loader"
 require "spontaneous/version"