spontaneous 0.2.0.alpha2 → 0.2.0.alpha3

data/lib/spontaneous/utils/smush_it.rb

@@ -0,0 +1,66 @@
+require 'net/http'
+
+module Spontaneous::Utils
+  class SmushIt
+    def self.smush!(path, format = nil)
+      self.new(path, format).smush!
+    end
+    attr_reader :src_file
+
+    def initialize(file_path, format = nil)
+      @src_file = file_path
+      @format = format
+    end
+
+    # Smush the source file in-place
+    # In development mode the file isn't available under a public url for smushit to download
+    # so we just skip it completely
+    def smush!
+      p src_file
+      return if ::Spontaneous.development?
+      ext = @format.nil? ? File.extname(src_file) : ".#{@format}"
+      id = [Time.now.to_i, Time.now.usec].join('-')
+      public_filepath = File.join(public_path, "%s-smush%s" % [id, ext])
+      p public_filepath
+      FileUtils.cp(src_file, public_filepath)
+      filename = File.basename(public_filepath)
+      url = Site.public_url(public_url(filename))
+      p url
+      path = "/ysmush.it/ws.php?img=#{::Rack::Utils.escape(url)}&task=#{id}&id=paste1"
+      # resp, data = http.get(path, nil)
+      data = Net::HTTP.get('www.smushit.com', path)
+      data = Spontaneous::JSON.parse(data)
+      p data
+
+      if data[:dest]
+        smushed = URI(data[:dest])
+        p smushed
+        # download smushed version to tempfile first in case something stops us downloading
+        # it
+        Tempfile.open("smushing") do |temp|
+          temp.binmode
+          Net::HTTP.start(smushed.host, smushed.port) do |http|
+            http.request_get(smushed.request_uri) do |response|
+              response.read_body do |segment|
+                temp.write(segment)
+              end
+            end
+          end
+          ::FileUtils.cp(temp.path, src_file)
+        end
+      end
+    rescue Exception => e
+      logger.error(e)
+    ensure
+      FileUtils.rm(public_filepath) if public_filepath and File.exist?(public_filepath)
+    end
+
+    def public_path
+      Spontaneous.media_path
+    end
+
+    def public_url(path)
+      Site.default_storage.public_url(path)
+    end
+  end
+end

data/lib/spontaneous/utils.rb

@@ -1,6 +1,8 @@
 
 module Spontaneous
   module Utils
-    autoload :Database, 'spontaneous/utils/database'
+    autoload :Database,     'spontaneous/utils/database'
+    autoload :SmartQuotes,  'spontaneous/utils/smart_quotes'
+    autoload :SmushIt,      'spontaneous/utils/smush_it'
   end
 end

data/lib/spontaneous/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module Spontaneous
-  VERSION = "0.2.0.alpha2"
-  GEM = true
+  VERSION = "0.2.0.alpha3"
+  GEM = false
 end

data/lib/spontaneous.rb

@@ -1,50 +1,32 @@
 # 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)   }
-)
-
 
-spontaneous = File.join(File.dirname(__FILE__), "spontaneous")
 
-Dir["#{spontaneous}/extensions/*.rb"].each { |file| require file }
+module Spontaneous
 
-require "spontaneous/logger"
-require "spontaneous/constants"
-require "spontaneous/errors"
-require "spontaneous/json"
+  require "spontaneous/logger"
+  require "spontaneous/constants"
+  require "spontaneous/errors"
+  require "spontaneous/json"
+  require "spontaneous/sequel"
 
-module Spontaneous
   include Constants
 
   def self.gem_root
@@ -63,6 +45,7 @@ module Spontaneous
   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"
@@ -72,7 +55,7 @@ module Spontaneous
   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"
@@ -87,6 +70,7 @@ module Spontaneous
   autoload :Storage,          "spontaneous/storage"
   autoload :Cli,              "spontaneous/cli"
   autoload :Utils,            "spontaneous/utils"
+  autoload :Asset,            "spontaneous/asset"
 
   module Prototypes
     autoload :FieldPrototype,   "spontaneous/prototypes/field_prototype"
@@ -130,6 +114,8 @@ module Spontaneous
     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"
@@ -138,19 +124,25 @@ module Spontaneous
     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
@@ -160,6 +152,7 @@ module Spontaneous
       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
 
@@ -169,8 +162,11 @@ module Spontaneous
   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"