locomotivecms_wagon 1.0.0 → 1.0.1

data/.gitignore

@@ -20,6 +20,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+spec/fixtures/default/log
 
 /.rbenv-gemsets
 /.sass-cache/

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in wagon.gemspec
 gemspec
 
+# Development
 # gem 'locomotivecms_mounter', path: '../gems/mounter', require: false
 
 gem 'rb-fsevent', '~> 0.9.1'

data/README.md

@@ -1,13 +1,14 @@
 # LocomotiveCMS::Wagon
 
-The LocomotiveCMS wagon is a site generator for the LocomotiveCMS engine powered by all the efficient and modern HTML development tools (Haml, SASS, Compass, Less).
+Wagon is the officiel site generator for the LocomotiveCMS engine powered by all the efficient and modern HTML development tools (Haml, SASS, Compass, Less).
 
-(TO BE COMPLETED)
+## Documentation
 
-## Developers / Alpha users / Contributors
+Please, visit the documentation website of LocomotiveCMS.
 
-The push/pull functionalities require to have the edge version of the engine (master branch).
-Also, please, keep in mind, that is nearly an alpha version so it is not stable enough to be used in production.
+  [http://doc.locomotivecms.com](http://doc.locomotivecms.com)
+
+## Developers / Contributors
 
 ### Get the development of the mounter
 
@@ -19,7 +20,6 @@ Also, please, keep in mind, that is nearly an alpha version so it is not stable
 
     $ git clone git://github.com/locomotivecms/wagon.git
     $ cd wagon
-    $ git checkout wip
 
   Note: Again, if you want to contribute, you may consider to fork it instead
 
@@ -33,11 +33,11 @@ Also, please, keep in mind, that is nearly an alpha version so it is not stable
 
     $ bundle exec bin/wagon server <path to the mounter gem>/spec/fixtures/default
 
-#### Push a site (WIP)
+#### Push a site
 
     $ bundle exec bin/wagon push <path to your LocomotiveCMS local site> <url of your remote LocomotiveCMS site> <email of your admin account> <password>
 
-#### Pull a site (Not tested yet)
+#### Pull a site
 
     $ bundle exec bin/wagon pull <url of your remote LocomotiveCMS site> <email of your admin account> <password>
 
@@ -49,20 +49,8 @@ Also, please, keep in mind, that is nearly an alpha version so it is not stable
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-## Installation (TODO)
-
-Add this line to your application's Gemfile:
-
-    gem 'locomotive_wagon'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install locomotive_wagon
+## Contact
 
-## Usage
+Feel free to contact me at did at locomotivecms dot com.
 
-TODO: Write usage instructions here
+Copyright (c) 2013 NoCoffee, released under the MIT license

data/lib/locomotive/wagon/liquid/drops/site.rb

@@ -11,7 +11,7 @@ module Locomotive
           end
 
           def pages
-            @pages ||= liquify(*self._source.pages)
+            @pages ||= liquify(*self.mounting_point.pages.values)
           end
 
         end

data/lib/locomotive/wagon/liquid/filters/translate.rb

@@ -8,7 +8,7 @@ module Locomotive
             translation = @context.registers[:mounting_point].translations[key.to_s]
 
             if translation
-              translation.get(locale) || translation.get(Locomotive::Mounter.locale)
+              translation.get(locale) || translation.get(Locomotive::Mounter.locale.to_s)
             else
               "[unknown translation key: #{key}]"
             end

data/lib/locomotive/wagon/misc/dragonfly.rb

@@ -47,7 +47,6 @@ module Locomotive
 
         begin
           require 'rack/cache'
-          require 'RMagick'
           require 'dragonfly'
 
           ## initialize Dragonfly ##

data/lib/locomotive/wagon/server.rb

@@ -1,4 +1,4 @@
-require 'rack/showexceptions'
+require 'better_errors'
 require 'coffee_script'
 
 require 'locomotive/wagon/listen'
@@ -40,12 +40,11 @@ module Locomotive::Wagon
 
     def create_rack_app(reader)
       Rack::Builder.new do
-        use Rack::ShowExceptions
+        use BetterErrors::Middleware
         use Rack::Lint
 
         use Rack::Session::Cookie, {
-          key:          'rack.session',
-          domain:       '0.0.0.0',
+          key:          'wagon.session',
           path:         '/',
           expire_after: 2592000,
           secret:       'uselessinlocal'

data/lib/locomotive/wagon/server/entry_submission.rb

@@ -11,6 +11,8 @@ module Locomotive::Wagon
         if self.request.post? && env['PATH_INFO'] =~ /^\/entry_submissions\/(.*)/
           self.process_form($1)
 
+          # puts "html? #{html?} / json? #{json?} / #{self.callback_url} / #{params.inspect}"
+
           if @entry.valid?
             if self.html?
               self.record_submitted_entry
@@ -73,7 +75,9 @@ module Locomotive::Wagon
 
         raise "Unknown content type '#{@content_type.inspect}'" if @content_type.nil?
 
-        @entry = @content_type.build_entry(self.params[:entry] || self.params[:content])
+        attributes = self.params[:entry] || self.params[:content] || {}
+
+        @entry = @content_type.build_entry(attributes)
 
         # if not valid, we do not need to keep track of the entry
         @content_type.entries.delete(@entry) if !@entry.valid?

data/lib/locomotive/wagon/server/middleware.rb

@@ -37,7 +37,9 @@ module Locomotive::Wagon
       end
 
       def html?
-        self.request.media_type == 'text/html' || !self.request.xhr?
+        ['text/html', 'application/x-www-form-urlencoded'].include?(self.request.media_type) &&
+        !self.request.xhr? &&
+        !self.json?
       end
 
       def json?

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/locales/en.yml

@@ -14,7 +14,7 @@ en:
 
   errors:
     messages:
-      blank: "can't not blank"
+      blank: "can't not be blank"
 
   pagination:
     previous: "« Previous"

data/locomotivecms_wagon.gemspec

@@ -29,10 +29,9 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'listen',                '~> 0.7.0'
 
-  gem.add_dependency 'rmagick',               '2.12.2'
-  gem.add_dependency 'httmultiparty',         '~> 0.3.8'
+  gem.add_dependency 'httmultiparty',         '0.3.8'
   gem.add_dependency 'will_paginate',         '~> 3.0.3'
-  gem.add_dependency 'locomotivecms_mounter', '1.0.1'
+  gem.add_dependency 'locomotivecms_mounter', '1.0.2'
 
   gem.add_dependency 'faker',                 '~> 0.9.5'
 

data/spec/fixtures/default/app/content_types/bands.yml

@@ -0,0 +1,19 @@
+name: Bands
+description: List of bands
+slug: bands
+order_by: name
+fields:
+- name:
+    hint: Name of the band
+- leader:
+    type: string
+    label: Fullname of the leader
+- kind:
+    type: select
+    label: "Music kind (grunge, rock, pop, country)"
+    select_options: ['grunge', 'rock', 'country']
+- songs:
+    type: has_many
+    class_name: songs
+    inverse_of: band
+    ui_enabled: true

data/spec/fixtures/default/app/content_types/events.yml

@@ -0,0 +1,19 @@
+name: Events
+description: List of upcoming events
+slug: events
+order_by: created_at
+label_field_name: place
+fields:
+- place:
+    hint: Name of the place
+- date:
+    type: date
+    hint: Date of the event
+- city:
+    type: string
+    label: City of the event
+- state:
+    type: string
+    label: State of the event
+- notes:
+    type: text

data/spec/fixtures/default/app/content_types/messages.yml

@@ -0,0 +1,17 @@
+name: Messages
+description: Messages posted by new potential customers
+slug: messages
+label_field_name: name
+public_submission_enabled: true
+order_by: created_at
+fields:
+- name:
+    hint: Full name
+    required: true
+- email:
+    hint: Email
+    required: true
+- message:
+    hint: Customer message
+    type: text
+    required: true

data/spec/fixtures/default/app/content_types/songs.yml

@@ -0,0 +1,25 @@
+name: Songs
+label_field_name: title
+order_by: _position
+slug: songs
+fields:
+- title:
+    type: string
+    required: true
+    hint: Title of your song
+- band:
+    label: Band
+    type: belongs_to
+    target: bands
+- cover:
+    label: Cover
+    type: file
+    required: true
+- short_description:
+    type: text
+    text_formatting: html
+- audio_url:
+    type: string
+    hint: Url to a service like Blip for instance
+- duration:
+    hint: "format like: mm:ss"

data/spec/fixtures/default/app/content_types/updates.yml

@@ -0,0 +1,33 @@
+name: Updates
+description: List of updates
+slug: updates
+order_by: date
+label_field_name: title
+public_submission_enabled: false
+fields:
+- title:
+    hint: Not displayed in the website
+    localized: true
+- text:
+    type: text
+    hint: Text displayed in the home page
+    localized: true
+    text_formatting: html
+- category:
+    type: select
+    hint: Pick a category
+    localized: true
+    # select_options:
+    #   en: ['General', 'Gigs', 'Bands']
+    #   fr: ['Général', 'Concerts', 'Groupes']
+    select_options:
+    - en: General
+      fr: Général
+    - en: Gigs
+      fr: Concerts
+    - en: Bands
+      fr: Groupes
+    - Albums
+- date:
+    type: date
+    hint: Date of the update

data/spec/fixtures/default/app/views/pages/404.liquid.haml

@@ -0,0 +1,10 @@
+---
+title: Page not found
+---
+{% extends index %}
+
+{% block content %}
+
+%p.error page not found
+
+{% endblock %}

data/spec/fixtures/default/app/views/pages/about_us.fr.liquid.haml

@@ -0,0 +1,7 @@
+---
+title: A notre sujet
+slug: a-notre-sujet
+editable_elements:
+  'banner/page_image': "/samples/photo.jpg"
+  'banner/pitch': "<h2>A notre sujet</h2><p>Lorem ipsum...(FR)</p>"
+---

data/spec/fixtures/default/app/views/pages/about_us.liquid.haml

@@ -0,0 +1,20 @@
+---
+title: About Us
+listed: true
+position: 1
+editable_elements:
+  'banner/page_image': "/samples/photo_2.jpg"
+  'banner/pitch': "<h2>About us</h2><p>Lorem ipsum...</p>"
+---
+{% extends parent %}
+
+{% block content %}
+
+{% editable_long_text 'content' %}
+
+%p
+  Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur vitae tincidunt urna. Nunc felis purus, ultricies et venenatis bibendum, fringilla eu lectus. Sed cursus, sem at blandit mattis, libero quam egestas tortor, eget cursus dolor tellus id nunc. Quisque mauris diam, tincidunt in commodo sed, feugiat eu nibh. Nulla erat nunc, dapibus vel eleifend et, egestas sed quam. Vestibulum mollis eros at dolor vulputate vel sollicitudin enim convallis. Etiam velit nisi, rutrum vel sagittis facilisis, pretium id lorem. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Pellentesque mauris nisl, consequat sed tincidunt nec, lacinia in odio. In hac habitasse platea dictumst. Nam semper libero aliquam turpis gravida vel varius erat vulputate. Integer consequat ipsum vitae augue porttitor ullamcorper. Nam vulputate aliquet ante at gravida. Vestibulum luctus urna et dui hendrerit eu suscipit velit varius. Sed ornare eleifend sem, vitae pharetra dolor sodales egestas. Mauris lobortis hendrerit odio, vitae porttitor urna rutrum at. Ut at lectus erat, nec dictum dolor. Praesent in sapien interdum nibh euismod vestibulum. Vestibulum tincidunt pulvinar accumsan.
+
+{% endeditable_long_text %}
+
+{% endblock %}

data/spec/fixtures/default/app/views/pages/about_us.nb.liquid.haml

@@ -0,0 +1,4 @@
+---
+title: Om oss
+slug: om-oss
+---

data/spec/fixtures/default/app/views/pages/about_us/jane_doe.liquid.haml

@@ -0,0 +1,4 @@
+---
+position: 2
+---
+{% extends parent %}

data/spec/fixtures/default/app/views/pages/about_us/john_doe.fr.liquid.haml

@@ -0,0 +1,5 @@
+---
+title: Jean Personne
+slug: jean-personne
+---
+{% extends parent %}

data/spec/fixtures/default/app/views/pages/about_us/john_doe.liquid.haml

@@ -0,0 +1,4 @@
+---
+position: 1
+---
+{% extends parent %}

data/spec/fixtures/default/app/views/pages/all.liquid.haml

@@ -0,0 +1,13 @@
+---
+title: All the pages
+listed: false
+published: false
+---
+{% extends parent %}
+{% block content %}
+<ul>
+{% for page in site.pages %}
+<li>{{ page.title }}</li>
+{% endfor %}
+</ul>
+{% endblock %}

data/spec/fixtures/default/app/views/pages/archives/news.liquid.haml

@@ -0,0 +1,7 @@
+{% extends parent %}
+
+{% block content %}
+
+%p News Archives. Lorem ipsum....
+
+{% endblock %}

data/spec/fixtures/default/app/views/pages/contact.liquid.haml

@@ -0,0 +1,54 @@
+---
+title: Contact Us
+listed: true
+position: 4
+---
+{% extends 'parent' %}
+
+{% block content %}
+
+.text
+  {% editable_long_text 'text' %}
+  %p
+    Ut imperdiet velit eu metus semper tristique. Vivamus risus nisi, tincidunt et euismod a, auctor pretium eros. Vestibulum sed magna et velit pulvinar euismod. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean sed velit quis nisl blandit vulputate id non tortor. Mauris nec placerat massa. Vivamus sed odio non ligula pharetra pretium. Ut convallis, purus et lobortis suscipit, mauris orci ullamcorper lectus, nec vulputate turpis mauris sed augue. Maecenas faucibus ultricies nisl, non ullamcorper justo bibendum nec. Duis vitae mauris condimentum risus commodo mattis vel sed libero. Fusce diam elit, porta id vestibulum ut, aliquet mattis neque.
+  {% endeditable_long_text %}
+
+%form#contactform{ :name => 'contact', :action => '{{ contents.messages.public_submission_url }}.json', :method => 'post' }
+  / %input{ type: 'hidden', name: 'success_callback', value: '/events' }
+  / %input{ type: 'hidden', name: 'error_callback', value: '/contact' }
+
+  %p
+    %label{ :for => 'name' } Name
+    %input{ :type => 'text', :id => 'name', :name => 'content[name]', :placeholder => 'First and last name', :tabindex => '1', required: 'required', value: '{{ message.name }}' }
+    %span {{ message.errors.name }}
+
+  %p
+    %label{ :for => 'email' } Email
+    %input{ :type => 'text', :id => 'email', :name => 'content[email]', :placeholder => 'example@domain.com', :tabindex => '2', required: 'required', value: '{{ message.email }}' }
+    %span {{ message.errors.email }}
+
+  %p
+    %label{ :for => 'comment' } Your Message
+    %textarea{ :id => 'comment', :name => 'content[message]', :tabindex => '3', required: 'required' } {{ message.message }}
+    %span {{ message.errors.message }}
+
+  %p.action
+    %input{ :name => 'submit', :type => 'submit', :tabindex => '4', :value => 'Send Message' }
+
+:javascript
+  $(document).ready(function() {
+    var form = $('form[name=contact]');
+    form.submit(function(e) {
+      e.stopPropagation();
+      e.preventDefault();
+      $.post(form.attr('action'),
+        form.serializeArray(),
+        function() {
+          alert("Thank you ! Your message have been received");
+        }, "json").error(function(response) {
+          alert("We are sorry but we were unable to treat your message. Please try later.");
+        });
+    });
+  });
+
+{% endblock %}