spontaneous 0.2.0.alpha2 → 0.2.0.alpha3

data/test/fixtures/asset_pipeline/application/js/subdir/simple.js

@@ -0,0 +1 @@
+var simple_subdir = "yes";

data/test/fixtures/asset_pipeline/application/js/vendor/jquery.js

@@ -0,0 +1 @@
+jQuery = function() {};

data/test/fixtures/assets/public1/css/a.scss

@@ -0,0 +1 @@
+.a { width: 4 * 2px; }

data/test/fixtures/assets/public1/js/a.js

@@ -0,0 +1 @@
+var A;

data/test/fixtures/assets/public1/js/m.coffee

@@ -0,0 +1 @@
+square = (x) -> x * x

data/test/fixtures/assets/public2/css/b.scss

@@ -0,0 +1 @@
+.b { height: 6*7px; }

data/test/fixtures/assets/public2/css/c.css

@@ -0,0 +1 @@
+.c { color: #fff; }

data/test/fixtures/assets/public2/js/b.js

@@ -0,0 +1 @@
+var B;

data/test/fixtures/assets/public2/js/c.js

@@ -0,0 +1 @@
+var C;

data/test/fixtures/assets/public2/js/n.coffee

@@ -0,0 +1 @@
+alert "I knew it!" if elvis?

data/test/fixtures/back/config/user_levels.yml

@@ -0,0 +1,3 @@
+
+- :name:    editor
+  :publish: true

data/test/fixtures/back/public/js/coffeescript.coffee

@@ -0,0 +1 @@
+square = (x) -> x * x

data/test/fixtures/back/templates/layouts/standard.css.cut

@@ -0,0 +1 @@
+body { /* template */ }

data/test/fixtures/back/templates/layouts/standard.js.cut

@@ -0,0 +1 @@
+HI

data/test/fixtures/example_application/config/database.yml

@@ -1,10 +1,10 @@
 ---
 :development: &defaults
-  :adapter:    mysql2
+  :adapter:    postgres
   :database:   spontaneous2_test
-  :user:       root
-  :password:
-  :host:       localhost
+  # :user:       root
+  # :password:
+  # :host:       localhost
 
 :gem:
   <<:         *defaults

data/test/fixtures/helpers/templates/layouts/standard.html.cut

@@ -0,0 +1 @@
+<${ here_is_my_custom_helper3 }>

data/test/fixtures/helpers/templates/layouts/standard.mobile.cut

@@ -0,0 +1 @@
+<${ here_is_my_custom_helper4 }>

data/test/fixtures/outputs/templates/layouts/standard.atom.cut

@@ -0,0 +1 @@
+<atom>

data/test/fixtures/permissions/config/user_levels.yml

@@ -1,9 +1,12 @@
 
-- :name: editor
+- :name:    editor
   :publish: false
-- :name: admin
+
+- :name:    admin
+  :admin:   true
   :publish: false
-- :name: designer
+
+- :name:    designer
   :publish: true
   :developer: true
 

data/test/fixtures/serialisation/class_hash.yaml.erb

@@ -30,6 +30,7 @@
   :title: Date
   :comment: ""
   :writable: true
+  :date_format: "%A, %-d %B, %Y"
 - :name: image
   :schema_id: <%= @fp[:image].schema_id.to_s %>
   :type: Spontaneous.FieldTypes.ImageField

data/test/fixtures/serialisation/root_hash.yaml.erb

@@ -58,7 +58,7 @@
       :id: <%= SerialisedPiece.field_prototypes[:location].schema_id.to_s %>
 
     - :unprocessed_value: "2011-07-07"
-      :processed_value: "2011-07-07"
+      :processed_value: "<time datetime=\"2011-07-07\">Thursday, 7 July, 2011</time>"
       :version: 1
       :id: <%= SerialisedPiece.field_prototypes[:date].schema_id.to_s %>
       :name: date
@@ -146,7 +146,7 @@
       :name: location
 
     - :unprocessed_value: "2011-07-07"
-      :processed_value: "2011-07-07"
+      :processed_value: "<time datetime=\"2011-07-07\">Thursday, 7 July, 2011</time>"
       :version: 1
       :id: <%= SerialisedPiece.field_prototypes[:date].schema_id.to_s %>
       :name: date

data/test/fixtures/templates/extended/grandparent.html.cut

@@ -1,10 +1,10 @@
-%{ block :title }Grandparent Title%{ endblock }
-%{ block :navigation  }
+%{ block :title }Grandparent Title%{ endblock -}
+%{ block :navigation  -}
 Grandparent Nav
-%{ endblock }
-%{ block :body  }
+%{ endblock -}
+%{ block :body  -}
 Grandparent Body
-%{ endblock }
-%{ block :footer }
+%{ endblock -}
+%{ block :footer -}
 Grandparent Footer
-%{ endblock }
+%{ endblock -}

data/test/fixtures/templates/extended/main.html.cut

@@ -1,6 +1,6 @@
-%{ extends 'parent' }
-%{ block :title }Main Title {{page.title}}%{ endblock }
-%{ block :body }
+%{ extends 'parent' -}
+%{ block :title }Main Title {{page.title}}%{ endblock -}
+%{ block :body -}
 Main Body
-%{ block_super }
-%{ endblock }
+%{ block_super -}
+%{ endblock -}

data/test/fixtures/templates/extended/parent.html.cut

@@ -1,12 +1,12 @@
-%{ extends 'grandparent' }
+%{ extends 'grandparent' -}
 %{ block :title  }Parent Title
-%{ endblock }
+%{ endblock -}
 
-%{ block :body  }
+%{ block :body  -}
 Parent Body
-%{ block_super }
-%{ endblock }
-%{ block :footer  }
-%{ block_super }
+%{ block_super -}
+%{ endblock -}
+%{ block :footer  -}
+%{ block_super -}
 Parent Footer
-%{ endblock }
+%{ endblock -}

data/test/fixtures/templates/extended/partial_with_locals.html.cut

@@ -1 +1 @@
-${ title }
+${ newtitle }

data/test/fixtures/templates/extended/with_includes.html.cut

@@ -1,9 +1,9 @@
-%{ extends 'parent' }
-%{ block :navigation }
+%{ extends 'parent' -}
+%{ block :navigation -}
 
-%{ endblock }
-%{ block :body }
+%{ endblock -}
+%{ block :body -}
 INCLUDE
-%{ include 'partial' }
-%{ endblock }
+%{ include 'partial' -}
+%{ endblock -}
 

data/test/fixtures/templates/extended/with_includes_and_locals.html.cut

@@ -1,9 +1,8 @@
-%{ extends 'parent' }
-%{ block :navigation }
+%{ extends 'parent' -}
+%{ block :navigation -}
 
-%{ endblock }
-%{ block :body }
+%{ endblock -}
+%{ block :body -}
 INCLUDE
-%{ include 'partial_with_locals', :title => "local title" }
-%{ endblock }
-
+%{ include 'partial_with_locals', :newtitle => "local title" -}
+%{ endblock -}

data/test/fixtures/templates/layouts/entries.html.cut

@@ -1,7 +1,7 @@
-%{ images.each do |image| }
+%{ images.each do |image| -}
 ${image.position}%{ if image.first? }>%{ end }%{ if image.last? }<%{ end }${ image.title }
-%{ end }
-%{ images.each_with_index do |image, i| }
+%{ end -}
+%{ images.each_with_index do |image, i| -}
 ${ i }:${ image.title }
-%{ end }
+%{ end -}
 ${ images.map do |i|; i.title end.join('.') }

data/test/fixtures/templates/layouts/standard.html.cut

@@ -0,0 +1 @@
+

data/test/fixtures/templates/layouts/variables.html.cut

@@ -1,7 +1,7 @@
 %{
 local = "local"
 @variable = "variable"
-}
+-}
 ${ param }
 ${ images }
 ${ local }

data/test/fixtures/templates/publishing/templates/layouts/static.html.cut

@@ -1 +1 @@
-Page: '${ title }'
+Page: '${ title }' ${ revision }

data/test/fixtures/templates/publishing/templates/layouts/static.rtf.cut

@@ -0,0 +1 @@
+SUPERRICH!

data/test/fixtures/templates/template_class/complex_template.html.cut

@@ -1,6 +1,6 @@
 <complex>
 ${ title }
-%{ content.each do |piece| }
+%{ content.each do |piece| -}
 <piece>${ piece }</piece>
-%{ end }
+%{ end -}
 </complex>

data/test/fixtures/templates/template_class/complex_template.pdf.cut

@@ -1,6 +1,6 @@
 <pdf>
 ${ title }
-%{ content.each do |piece| }
+%{ content.each do |piece| -}
 <piece>${ piece }</piece>
-%{ end }
+%{ end -}
 </pdf>

data/test/fixtures/templates/template_class/default_template_style.html.cut

@@ -1,4 +1,4 @@
 <root>
 ${ images_with_template.introduction }
-${ images_with_template }
+${ images_with_template -}
 </root>

data/test/fixtures/templates/template_class/images_with_template.html.cut

@@ -1,5 +1,5 @@
 <images>
-%{ pieces.each do |image| }
+%{ pieces.each do |image| -}
   ${ image }
-%{ end }
+%{ end -}
 </images>

data/test/fixtures/templates/template_class/slots_template.html.cut

@@ -1,5 +1,5 @@
 <boxes>
-%{ images.entries.each do |image| }
+%{ images.entries.each do |image| -}
   <img>${ image }</img>
-%{ end }
+%{ end -}
 </boxes>

data/test/fixtures/templates/template_class/slots_template.pdf.cut

@@ -1,5 +1,5 @@
 <boxes-pdf>
-%{ images.entries.each do |image| }
+%{ images.entries.each do |image| -}
   <img>${ image }</img>
-%{ end }
+%{ end -}
 </boxes-pdf>

data/test/fixtures/user_manager/config/user_levels.yml

@@ -0,0 +1,9 @@
+
+- :name:    editor
+  :publish: false
+
+- :name:    admin
+  :admin:   true
+
+- :name:    designer
+  :publish: true

data/test/functional/test_application.rb

@@ -75,16 +75,16 @@ class ApplicationTest < MiniTest::Spec
     end
 
     should "have correct db settings" do
-      Site.config.db[:adapter].should == "mysql2"
+      Site.config.db[:adapter].should == "postgres"
       Site.config.db[:database].should == "spontaneous2_test"
-      Site.config.db[:user].should == "root"
-      Site.config.db[:password].should be_nil
-      Site.config.db[:host].should == "localhost"
+      # Site.config.db[:user].should == "root"
+      # Site.config.db[:password].should be_nil
+      # Site.config.db[:host].should == "localhost"
     end
 
     should "configure the datamapper connection" do
       db = Spontaneous.database
-      db.adapter_scheme.should == :mysql2
+      db.adapter_scheme.should == :postgres
       # opts.should == {"username"=>"spontaneous", "adapter"=>"mysql", "database"=>"spontaneous_example", "host"=>"localhost", "password"=>"password"}
     end
 
@@ -142,11 +142,11 @@ class ApplicationTest < MiniTest::Spec
     end
 
     should "have correct db settings" do
-      Site.config.db[:adapter].should == "mysql2"
+      Site.config.db[:adapter].should == "postgres"
       Site.config.db[:database].should == "spontaneous_example_production"
       Site.config.db[:user].should == "spontaneous_prod"
       Site.config.db[:password].should == "Passw0rd"
-      Site.config.db[:host].should == "localhost"
+      # Site.config.db[:host].should == "localhost"
     end
 
     should "have the right rack port" do