spontaneous 0.2.0.alpha3 → 0.2.0.alpha4

data/lib/spontaneous/cli/base.rb

@@ -77,7 +77,7 @@ module Spontaneous
         prepare :browse
         require 'launchy'
         boot!
-        ::Launchy::Browser.run("http://localhost:#{Site.config.port}/@spontaneous")
+        ::Launchy.open("http://localhost:#{Site.config.port}/@spontaneous")
       end
 
 

data/lib/spontaneous/cli/site.rb

@@ -150,7 +150,7 @@ module Spontaneous
         prepare :browse
         require 'launchy'
         boot!
-        ::Launchy::Browser.run("http://localhost:#{::Site.config.port}/@spontaneous")
+        ::Launchy.open("http://localhost:#{::Site.config.port}/@spontaneous")
       end
     end
   end

data/lib/spontaneous/json.rb

@@ -3,7 +3,6 @@
 require 'oj'
 
 Oj.default_options = {
-  symbol_keys: true,
   mode: :compat
 } if defined?(Oj)
 
@@ -11,7 +10,7 @@ module Spontaneous
   module JSON
     module OjParser
       def parse(json_string)
-        ::Oj.load(json_string)
+        ::Oj.load(json_string, symbol_keys: true)
       rescue
         nil
       end

data/lib/spontaneous/sequel.rb

@@ -12,6 +12,6 @@ require 'sequel/plugins/serialization'
 Sequel::Plugins::Serialization.register_format(
   :ojson,
   lambda { |v| Oj.dump(v) },
-  lambda { |v| Oj.load(v)   }
+  lambda { |v| Oj.load(v, symbol_keys: true)   }
 )
 

data/lib/spontaneous/server.rb

@@ -4,7 +4,6 @@
 
 ## thanks again to the stirling work of the Padrino guys & gals.
 require 'rack'
-require 'launchy'
 
 module Spontaneous
 
@@ -41,7 +40,6 @@ module Spontaneous
         end
         trap(:INT, &term)
         trap(:TERM, &term)
-        # ::Launchy::Browser.run("http://localhost:#{port}/@spontaneous") if Spontaneous.mode == :back
       end
     rescue RuntimeError => e
       if e.message =~ /no acceptor/

data/lib/spontaneous/storage/cloud.rb

@@ -5,6 +5,9 @@ require 'tempfile'
 
 module Spontaneous::Storage
   class Cloud < Backend
+    # Thanks thoughtbot (via paperclip)
+    # http://rdoc.info/github/thoughtbot/paperclip/Paperclip/Storage/Fog
+    AWS_BUCKET_SUBDOMAIN_RESTRICTON_REGEX = /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
     #  bucket_name = "media.kitmonsters.com"
     #  connection = Fog::Storage.new({
     #     :provider=>"AWS",
@@ -97,7 +100,23 @@ module Spontaneous::Storage
       if @public_host
         "#{@public_host}/#{join_path(path)}"
       else
-        bucket.files.new(:key => join_path(path)).public_url
+        if @config[:provider] == "AWS"
+          public_url_aws(path)
+        else
+          bucket.files.new(:key => join_path(path)).public_url
+        end
+      end
+    end
+
+    # AWS Redirects to the bucketname.s3.amazonaws.com style of public URL
+    # if you use the s3.amazonaws.com/bucketname/ style so to avoid a lot of
+    # slow redirects when loading a page's media we use the fastest available
+    # version
+    def public_url_aws(path)
+      if bucket_name =~ AWS_BUCKET_SUBDOMAIN_RESTRICTON_REGEX
+        "https://#{bucket_name}.s3.amazonaws.com/#{join_path(path)}"
+      else
+        "https://s3.amazonaws.com/#{bucket_name}/#{join_path(path)}"
       end
     end
 

data/lib/spontaneous/version.rb

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

data/spontaneous.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'spontaneous'
-  s.version           = '0.2.0.alpha3'
+  s.version           = '0.2.0.alpha4'
   s.date              = '2012-10-15'
   s.rubyforge_project = 'spontaneous'
 
@@ -54,10 +54,10 @@ Gem::Specification.new do |s|
   s.add_dependency('coffee-script',   ["~> 2.2.0"])
   s.add_dependency('cutaneous',       ["~> 0.1.3"])
   s.add_dependency('erubis',          ["~> 2.6"])
-  s.add_dependency('fog',             ["~> 1.1.1"])
+  s.add_dependency('fog',             ["~> 1.6.0"])
   s.add_dependency('foreman',         ["~> 0.22.0"])
-  s.add_dependency('kramdown',        ["~> 0.13.3"])
-  s.add_dependency('launchy',         ["~> 0.4.0"])
+  s.add_dependency('kramdown',        ["~> 0.14.0"])
+  s.add_dependency('launchy',         ["~> 2.1.2"])
   s.add_dependency('mini_magick',     ["~> 3.3"])
   s.add_dependency('nokogiri',        ["~> 1.5.0"])
   s.add_dependency('public_suffix',   ["~> 1.0"])
@@ -71,19 +71,19 @@ Gem::Specification.new do |s|
   s.add_dependency('simultaneous',    ["~> 0.4.1"])
   s.add_dependency('sinatra',         ["= 1.3.2"])
   s.add_dependency('sinatra-contrib', ["~> 1.3.1"])
-  s.add_dependency('sprockets',       ["~> 2.4.3"])
+  s.add_dependency('sprockets',       ["~> 2.7.0"])
   s.add_dependency('stringex',        ["= 1.3"])
   s.add_dependency('therubyracer',    ['~> 0.9.10'])
   s.add_dependency('thin',            ["~> 1.2"])
   s.add_dependency('thor',            ["~> 0.14.6"])
-  s.add_dependency('uglifier',        ["~> 1.2.4"])
+  s.add_dependency('uglifier',        ["~> 1.3.0"])
   s.add_dependency('oj',              ["~> 1.4"])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development
   s.add_development_dependency('minitest', ["~> 2.1.0"])
   s.add_development_dependency('mysql2', ["~> 0.3.11"])
-  s.add_development_dependency('pg', ["~> 0.13.2"])
+  s.add_development_dependency('pg', ["~> 0.14.1"])
   s.add_development_dependency('jeweler', ["~> 1.5"])
   s.add_development_dependency('jnunemaker-matchy', ["~> 0.4"])
   s.add_development_dependency('shoulda', ["~> 2.11.3"])

data/test/unit/test_asset_bundler.rb

@@ -42,9 +42,9 @@ class AssetBundler < MiniTest::Spec
       compiled_js_path = Dir["#{@site.root}/public/@spontaneous/assets/spontaneous*.js"].first
       js = File.read(compiled_js_path)
       # hard to test because we don't know exactly what the uglifier is going to do
-      js.should =~ /var a;a="yes"/
-      js.should =~ /var a;a="#{Date.today.day}"/
-      js.should =~ /var a;a="subdir\/#{Date.today.day}"/
+      js.should =~ /var (\w);\1="yes"/
+      js.should =~ /var (\w);\1="#{Date.today.day}"/
+      js.should =~ /var (\w);\1="subdir\/#{Date.today.day}"/
     end
 
     should "compile CSS into any destination directory" do
@@ -118,7 +118,7 @@ class AssetBundler < MiniTest::Spec
     end
   end
 
-  context "Production mode editing app xxxx" do
+  context "Production mode editing app" do
     setup do
       @compiler = Spontaneous::Asset::AppCompiler.new(fixture_dir, @site.root)
       @compiler.compile

data/test/unit/test_assets.rb

@@ -108,18 +108,7 @@ class AssetTest < MiniTest::Spec
   context "CoffeeScript assets" do
     should "be compiled & compressed in live environment" do
       files = [@fixture_root / "public1/js/m.js", @fixture_root / "public2/js/n.js"]
-      Shine.expects(:compress_string).with((<<-COMPILED), :js, {}).once.returns("var A;\nvar B;\n")
-(function() {
-  var square;
-
-  square = function(x) {
-    return x * x;
-  };
-
-  if (typeof elvis !== "undefined" && elvis !== null) alert("I knew it!");
-
-}).call(this);
-      COMPILED
+      Shine.expects(:compress_string).with(regexp_matches(/square = function/), :js, {}).once.returns("var A;\nvar B;\n")
       context = new_context
       result = context.scripts("/js/m", "/js/n")
       result.should =~ /src="\/rev\/5dde6b3e04ce364ef23f51048006e5dd7e6f62ad\.js"/
@@ -129,20 +118,7 @@ class AssetTest < MiniTest::Spec
     end
 
     should "be correctly compiled when mixed with plain js" do
-      Shine.expects(:compress_string).with((<<-COMPILED), :js, {}).once.returns("var A;\nvar B;\n")
-var A;
-(function() {
-  var square;
-
-  square = function(x) {
-    return x * x;
-  };
-
-  if (typeof elvis !== "undefined" && elvis !== null) alert("I knew it!");
-
-}).call(this);
-var B;
-      COMPILED
+      Shine.expects(:compress_string).with(regexp_matches(/square = function/), :js, {}).once.returns("var A;\nvar B;\n")
       context = new_context
       result = context.scripts("/js/a", "/js/m", "/js/n", "/js/b")
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spontaneous
 version: !ruby/object:Gem::Version
-  version: 0.2.0.alpha3
+  version: 0.2.0.alpha4
   prerelease: 6
 platform: ruby
 authors:
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -386,7 +386,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -394,7 +394,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.3
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -466,7 +466,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -474,7 +474,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -530,7 +530,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -538,7 +538,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.2
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement