spontaneous 0.2.0.beta9 → 0.2.0.beta10

data/test/unit/test_media.rb

@@ -50,9 +50,9 @@ describe "Media" do
         :aws_access_key_id=>"ACCESS_KEY_ID",
         :public_host => "http://media.example.com"
       }
-      @storage = Spontaneous::Media::Store::Cloud.new(@aws_credentials, 'media.example.com')
+      @storage = Spontaneous::Media::Store::Cloud.new("S3", @aws_credentials, 'media.example.com')
       @storage.backend.directories.create(:key => @bucket_name)
-      @site.stubs(:storage).with(anything).returns(@storage)
+      @site.storage_backends.unshift(@storage)
       @content = ::Piece.create
       @content.stubs(:id).returns(99)
       Spontaneous::State.stubs(:revision).returns(853)
@@ -60,7 +60,7 @@ describe "Media" do
 
     it "return an absolute path for the url" do
       file = file(@content, "file name.txt")
-      file.url.must_equal "http://media.example.com/00099/0853/file-name.txt"
+      file.url.must_equal "/00099/0853/file-name.txt"
     end
 
     it "create a new instance with a different name" do
@@ -68,7 +68,7 @@ describe "Media" do
       file2 = file1.rename("another.jpg")
       file2.owner.must_equal file1.owner
       file2.mimetype.must_equal "image/jpeg"
-      file2.url.must_equal "http://media.example.com/00099/0853/another.jpg"
+      file2.url.must_equal "/00099/0853/another.jpg"
     end
 
     it "be able to copy a file into place if passed the path of an existing file" do
@@ -115,8 +115,8 @@ describe "Media" do
   describe "Local media files" do
     before do
       @media_dir = Dir.mktmpdir
-      @storage = Spontaneous::Media::Store::Local.new(@media_dir, '/media')
-      @site.stubs(:storage).with(anything).returns(@storage)
+      @storage = Spontaneous::Media::Store::Local.new("local", @media_dir, '/media')
+      @site.stubs(:storage_for_mimetype).with(anything).returns(@storage)
       @content = ::Piece.create
       @content.stubs(:id).returns(99)
       Spontaneous::State.stubs(:revision).returns(853)
@@ -188,11 +188,11 @@ describe "Media" do
         :aws_access_key_id=>"ACCESS_KEY_ID",
         :public_host => "http://media.example.com"
       }
-      cloud = Spontaneous::Media::Store::Cloud.new(@aws_credentials, 'media.example.com')
+      cloud = Spontaneous::Media::Store::Cloud.new("S3", @aws_credentials, 'media.example.com')
       cloud.backend.directories.create(:key => @bucket_name)
-      @site.stubs(:storage).with(anything).returns(cloud)
+      @site.stubs(:storage_for_mimetype).with(anything).returns(cloud)
       @media_dir = Dir.mktmpdir
-      @storage = Spontaneous::Media::Store::Local.new(@media_dir, '/media')
+      @storage = Spontaneous::Media::Store::Local.new("local", @media_dir, '/media')
       @site.stubs(:local_storage).with(anything).returns(@storage)
       @site.stubs(:default_storage).with(anything).returns(@storage)
       @content = ::Piece.create

data/test/unit/test_page.rb

@@ -142,6 +142,19 @@ describe "Page" do
       p.reload.slug.wont_equal ""
     end
 
+    it 'can be given a type specific root' do
+      class Page
+        def default_slug_root
+          'fishies'
+        end
+      end
+      o = Page.create
+      p = Page.create
+      p.save
+      p.slug.must_match /^fishies/
+      p.has_generated_slug?.must_equal true
+    end
+
     it "be made URL safe" do
       o = Page.create
       p = Page.create
@@ -477,6 +490,40 @@ describe "Page" do
       @p.at_depth(1).must_equal [@q]
       lambda { @p.at_depth(2) }.must_raise(ArgumentError)
     end
+
+    describe 'custom path roots' do
+      before do
+        Page.box :custom do
+          def path_origin
+            root
+          end
+        end
+        Page.box :custom_string do
+          def path_origin
+            "/"
+          end
+        end
+        Page.box :sections
+        @parent = @p
+        @child = Page.create(slug: 'child')
+        @parent.sections << @child
+        @child.path.must_equal '/child'
+      end
+
+      it "defines child paths according to the custom path root" do
+        page = Page.create(slug: 'balloon')
+        @child.custom << page
+        page.save.reload
+        page.path.must_equal '/balloon'
+      end
+
+      it "allows for string based path origins" do
+        page = Page.create(slug: 'balloon')
+        @child.custom_string << page
+        page.save.reload
+        page.path.must_equal '/balloon'
+      end
+    end
   end
 
   describe "page pieces" do

data/test/unit/test_publishing_pipeline.rb

@@ -829,8 +829,8 @@ describe "Publishing Pipeline" do
       end
     }
 
-    def run_steps(steps = steps, progress = progress)
-      Spontaneous::Publishing::Pipeline.new(steps).run(@site, revision, pages, progress)
+    def run_steps(_steps = steps, _progress = progress)
+      Spontaneous::Publishing::Pipeline.new(_steps).run(@site, revision, pages, _progress)
     end
 
     def modify_some_pages

data/test/unit/test_serialisation.rb

@@ -2,6 +2,7 @@
 
 require File.expand_path('../../test_helper', __FILE__)
 require 'erb'
+require 'fog'
 
 describe "Serialisation" do
   before do
@@ -170,5 +171,41 @@ describe "Serialisation" do
       # hard to test this as the serialisation order appears to change
       Spot.deserialise_http(@root.serialise_http).must_equal @root.export
     end
+
+    describe 'cloud storage' do
+      before do
+        Fog.mock!
+        @bucket_name = "media.example.com"
+        @aws_credentials = {
+          :provider=>"AWS",
+          :aws_secret_access_key=>"SECRET_ACCESS_KEY",
+          :aws_access_key_id=>"ACCESS_KEY_ID",
+          :public_host => "http://media.example.com"
+        }
+        @storage = Spontaneous::Media::Store::Cloud.new("S3", @aws_credentials, 'media.example.com')
+        @storage.backend.directories.create(:key => @bucket_name)
+        @site.storage_backends.unshift(@storage)
+
+        existing_file = File.expand_path("../../fixtures/images/rose.jpg", __FILE__)
+        assert ::File.exist?(existing_file)
+        class ::SimplePiece < ::Piece
+          field :image
+        end
+        @instance = SimplePiece.create
+        @instance.image = existing_file
+        @instance.save
+      end
+
+      after do
+        Object.send(:remove_const, :SimplePiece)
+      end
+
+      it 'generates full urls when using cloud storage' do
+        export = @instance.export
+        image = export[:fields].detect { |f| f[:name] == "image" }
+        original = image[:processed_value][:original][:src]
+        original.must_match %r{^http://media.example.com}
+      end
+    end
   end
 end

data/test/unit/test_storage.rb

@@ -34,6 +34,30 @@ describe "Media Store" do
     it "provide a list of local storage backends" do
       @site.local_storage.must_equal [@storage]
     end
+
+    it "allows for configuring a custom url mapper" do
+      require 'zlib'
+      mapper = Class.new do
+        def initialize(pattern, servers)
+          @pattern = pattern
+          @servers = servers
+          @n = 0
+        end
+
+        def server(path)
+          @servers[Zlib.crc32(path) % @servers.length]
+        end
+
+        def call(path)
+          @pattern % [server(path), path]
+        end
+      end
+      @storage.url_mapper = mapper.new("http://%s.cdn.example.com%s", %w(m1 m2 m3 m4))
+      @storage.to_url('/image.jpg').must_equal "http://m3.cdn.example.com/image.jpg"
+      @storage.to_url('/image.jpg').must_equal "http://m3.cdn.example.com/image.jpg"
+      @storage.to_url('/image2.jpg').must_equal "http://m4.cdn.example.com/image2.jpg"
+      @storage.to_url('/image2.jpg').must_equal "http://m4.cdn.example.com/image2.jpg"
+    end
   end
 
   describe "cloud" do
@@ -104,19 +128,34 @@ describe "Media Store" do
       before do
         existing_file = File.expand_path("../../fixtures/images/rose.jpg", __FILE__)
         @media_path = %w(0003 0567 rose.jpg)
+        @path = "/" << @media_path.join("/")
         @storage.copy(existing_file, @media_path, { content_type: "image/jpeg" })
       end
 
       it "have the correct base url" do
-        @storage.public_url(@media_path).must_equal "https://media.example.com.s3.amazonaws.com/0003/0567/rose.jpg"
+        @storage.to_url(@path).must_equal "https://media.example.com.s3.amazonaws.com/0003/0567/rose.jpg"
       end
 
 
       it "use custom urls if configured" do
-        storage = Spontaneous::Media::Store::Cloud.new(@aws_credentials.merge({
+        storage = Spontaneous::Media::Store::Cloud.new("s3", @aws_credentials.merge({
           :public_host => "http://media.example.com",
         }), @bucket_name)
-        storage.public_url(@media_path).must_equal "http://media.example.com/0003/0567/rose.jpg"
+        storage.to_url(@path).must_equal "http://media.example.com/0003/0567/rose.jpg"
+      end
+
+      it 'gives valid s3 urls for different regions' do
+        storage = Spontaneous::Media::Store::Cloud.new("s3", @aws_credentials.merge({
+          region: "eu-west-1"
+        }), @bucket_name)
+        storage.to_url(@path).must_equal "https://media.example.com.s3-eu-west-1.amazonaws.com/0003/0567/rose.jpg"
+      end
+
+      it 'allows for providing a direct URL mapper proc' do
+        storage = Spontaneous::Media::Store::Cloud.new("s3", @aws_credentials.merge({
+          url_mapper: proc { |path| "http://wallowig.com#{path}" }
+        }), @bucket_name)
+        storage.to_url(@path).must_equal "http://wallowig.com/0003/0567/rose.jpg"
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spontaneous
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta9
+  version: 0.2.0.beta10
 platform: ruby
 authors:
 - Garry Hill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -296,14 +296,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
@@ -389,19 +389,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -472,13 +472,14 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.5'
-description: Spontaneous is a next-generation Ruby CMS
+description: Spontaneous is a content management framework that allows the easy development
+  of sophisticated & beautiful websites with powerful developer tools & an elegant
+  editing interface.
 email: garry@spontaneous.io
 executables:
 - spot
 extensions: []
-extra_rdoc_files:
-- LICENSE
+extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".locat"
@@ -750,6 +751,7 @@ files:
 - lib/spontaneous/generators/site/config/environments/development.rb.tt
 - lib/spontaneous/generators/site/config/environments/production.rb.tt
 - lib/spontaneous/generators/site/config/front.ru
+- lib/spontaneous/generators/site/config/initializers/fields.rb
 - lib/spontaneous/generators/site/config/initializers/indexes.rb.tt
 - lib/spontaneous/generators/site/config/initializers/publishing.rb.tt
 - lib/spontaneous/generators/site/config/schema.yml
@@ -912,6 +914,7 @@ files:
 - lib/spontaneous/rack/back/map.rb
 - lib/spontaneous/rack/back/page.rb
 - lib/spontaneous/rack/back/preview.rb
+- lib/spontaneous/rack/back/private.rb
 - lib/spontaneous/rack/back/schema.rb
 - lib/spontaneous/rack/back/site.rb
 - lib/spontaneous/rack/back/site_assets.rb
@@ -965,6 +968,7 @@ files:
 - lib/spontaneous/style.rb
 - lib/spontaneous/tasks.rb
 - lib/spontaneous/tasks/database.rake
+- lib/spontaneous/tasks/environment.rake
 - lib/spontaneous/utils.rb
 - lib/spontaneous/utils/database.rb
 - lib/spontaneous/utils/database/mysql_dumper.rb
@@ -1240,6 +1244,15 @@ files:
 - test/test_javascript.rb
 - test/ui/test_page_editing.rb
 - test/ui_helper.rb
+- test/unit/fields/test_boolean_fields.rb
+- test/unit/fields/test_date_fields.rb
+- test/unit/fields/test_file_field.rb
+- test/unit/fields/test_image_fields.rb
+- test/unit/fields/test_location_fields.rb
+- test/unit/fields/test_option_fields.rb
+- test/unit/fields/test_tag_list_fields.rb
+- test/unit/fields/test_text_fields.rb
+- test/unit/fields/test_web_video_fields.rb
 - test/unit/test_alias.rb
 - test/unit/test_asset_bundler.rb
 - test/unit/test_assets.rb
@@ -1262,7 +1275,6 @@ files:
 - test/unit/test_generators.rb
 - test/unit/test_helpers.rb
 - test/unit/test_image_size.rb
-- test/unit/test_images.rb
 - test/unit/test_layouts.rb
 - test/unit/test_logger.rb
 - test/unit/test_media.rb
@@ -1291,11 +1303,11 @@ files:
 - test/unit/test_type_hierarchy.rb
 - test/unit/test_visibility.rb
 homepage: http://spontaneous.io
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--charset=UTF-8"
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -1310,10 +1322,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Spontaneous is a next-generation Ruby CMS
+summary: Next-generation Ruby CMS and web framework.
 test_files:
 - test/disabled/test_slots.rb
 - test/fixtures/application/js/test.js
@@ -1582,6 +1594,15 @@ test_files:
 - test/test_javascript.rb
 - test/ui/test_page_editing.rb
 - test/ui_helper.rb
+- test/unit/fields/test_boolean_fields.rb
+- test/unit/fields/test_date_fields.rb
+- test/unit/fields/test_file_field.rb
+- test/unit/fields/test_image_fields.rb
+- test/unit/fields/test_location_fields.rb
+- test/unit/fields/test_option_fields.rb
+- test/unit/fields/test_tag_list_fields.rb
+- test/unit/fields/test_text_fields.rb
+- test/unit/fields/test_web_video_fields.rb
 - test/unit/test_alias.rb
 - test/unit/test_asset_bundler.rb
 - test/unit/test_assets.rb
@@ -1604,7 +1625,6 @@ test_files:
 - test/unit/test_generators.rb
 - test/unit/test_helpers.rb
 - test/unit/test_image_size.rb
-- test/unit/test_images.rb
 - test/unit/test_layouts.rb
 - test/unit/test_logger.rb
 - test/unit/test_media.rb