locomotivecms_wagon 1.4.0 → 1.5.0.rc1

data/lib/locomotive/wagon.rb

@@ -5,14 +5,65 @@ require 'locomotive/wagon/exceptions'
 module Locomotive
   module Wagon
 
+    # Authenticate an user to the Hosting platform.
+    # If the user does not exist, then create an account for her/him.
+    # At the end, store the API key in the ~/.netrc file
+    #
+    # @param [ String ] email The email of the user
+    # @param [ String ] password The password of the user
+    # @param [ Object ] shell Used to ask for/prompt information
+    #
+    def self.authenticate(email, password, shell)
+      require 'locomotive/wagon/misc/hosting_api'
+      require 'netrc'
+
+      api_key = nil
+      api     = Locomotive::HostingAPI.new(email: email, password: password)
+
+      if api.authenticated?
+        # existing account
+        api_key = api.api_key
+        shell.say "You have been successfully authenticated.", :green
+      else
+        # new account?
+        shell.say "No account found for #{email} or invalid credentials", :yellow
+
+        if shell.yes?('Do you want to create a new account? [Y/N]')
+          name = shell.ask 'What is your name?'
+
+          account = api.create_account(name: name, email: email, password: password)
+
+          if account.success?
+            shell.say "Your account has been successfully created.", :green
+            api_key = account['api_key']
+          else
+            shell.say "We were unable to create your account, reason(s): #{account.error_messages.join(', ')}", :red
+          end
+        end
+      end
+
+      if api_key
+        # record the credentials
+        netrc = Netrc.read
+        netrc[api.domain_with_port] = email, api_key
+        netrc.save
+      else
+        shell.say "We were unable to authenticate you on our platform.", :red
+      end
+    end
+
     # Create a site from a site generator.
     #
-    # @param [ String ] name The name of the site (underscored)
-    # @param [ String ] path The destination path of the site
     # @param [ Object ] generator The wrapping class of the generator itself
+    # @param [ Array ] args [name of the site, destination path of the site, skip bundle flag, force_haml]
+    # @param [ Hash ] options General options (ex: --force-color)
     #
-    def self.init(name, path, generator)
-      generator.klass.start [name, path]
+    def self.init(generator_klass, args, options = {})
+      args, opts = Thor::Options.split(args)
+
+      generator = generator_klass.new(args, opts, {})
+      generator.force_color_if_asked(options)
+      generator.invoke_all
     end
 
     # Start the thin server which serves the LocomotiveCMS site from the system.
@@ -22,37 +73,76 @@ module Locomotive
     #
     def self.serve(path, options)
       if reader = self.require_mounter(path, true)
-        Bundler.require 'misc'
+        use_listen = !options[:disable_listen]
+
+        if options[:force]
+          begin
+            self.stop(path)
+            sleep(2) # make sure we wait enough for the server process to stop
+          rescue
+          end
+        end
+
+        # TODO: new feature -> pick the right Rack handler (Thin, Puma, ...etc)
+        server = self.thin_server(reader, options.slice(:host, :port, :disable_listen, :live_reload_port))
+
+        if options[:daemonize]
+          # very important to get the parent pid in order to differenciate the sub process from the parent one
+          parent_pid = Process.pid
+
+          # The Daemons gem closes all file descriptors when it daemonizes the process. So any logfiles that were opened before the Daemons block will be closed inside the forked process.
+          # So, close the current logger and set it up again when daemonized.
+          Locomotive::Wagon::Logger.close
 
-        require 'locomotive/wagon/server'
-        app = Locomotive::Wagon::Server.new(reader)
+          server.log_file = File.join(File.expand_path(path), 'log', 'server.log')
+          server.pid_file = File.join(File.expand_path(path), 'log', 'server.pid')
+          server.daemonize
+
+          use_listen = Process.pid != parent_pid && !options[:disable_listen]
+
+          if Process.pid != parent_pid
+            # A "new logger" inside the daemon.
+            Locomotive::Wagon::Logger.setup(path, false)
+          end
+        end
+
+        # listen_thread = Thread.new do
+        Locomotive::Wagon::Listen.instance.start(reader) if use_listen
 
-        require 'thin'
-        server = Thin::Server.new(options[:host], options[:port], app)
-        server.threaded = true # TODO: make it an option ?
         server.start
+        # end
+
+        # server_thread = Thread.new { server.start }
 
-        # require 'unicorn' # TODO: gem 'unicorn'
-        # server = Unicorn::HttpServer.new(app)
-        # server.start
+        # hit Control + C to stop
+        # Signal.trap('INT')  { EventMachine.stop }
+        # Signal.trap('TERM') { EventMachine.stop }
 
-        # require 'rack'
-        # Rack::Handler::WEBrick.run(app, { :'Port' => options[:port], :'Host' => options[:host] })
+        # listen_thread.join
+        # server_thread.join
       end
     end
 
+    def self.stop(path)
+      pid_file = File.join(File.expand_path(path), 'log', 'server.pid')
+      pid = File.read(pid_file).to_i
+      Process.kill('TERM', pid)
+    end
+
     # Generate components for the LocomotiveCMS site such as content types, snippets, pages.
     #
     # @param [ Symbol ] name The name of the generator
     # @param [ Array ] *args The arguments for the generator
+    # @param [ Hash ] options The options for the generator
     #
-    def self.generate(name, *args)
+    def self.generate(name, args, options = {})
       Bundler.require 'misc'
 
       lib = "locomotive/wagon/generators/#{name}"
       require lib
 
-      generator = lib.camelize.constantize.new(args, {}, {})
+      generator = lib.camelize.constantize.new(args, options, { behavior: :skip })
+      generator.force_color_if_asked(options)
       generator.invoke_all
     end
 
@@ -66,18 +156,15 @@ module Locomotive
     def self.push(path, connection_info, options = {})
       if reader = self.require_mounter(path, true)
 
-        reader.mounting_point.site.domains   = connection_info['domains']   if connection_info["domains"]
-        reader.mounting_point.site.subdomain = connection_info['subdomain'] if connection_info["subdomain"]
-        require 'bundler'
-        Bundler.require 'misc'
+        reader.mounting_point.site.domains   = connection_info['domains']   if connection_info['domains']
+        reader.mounting_point.site.subdomain = connection_info['subdomain'] if connection_info['subdomain']
 
-        writer = Locomotive::Mounter::Writer::Api.instance
-        self.validate_resources(options[:resources], writer.writers)
+        writer    = Locomotive::Mounter::Writer::Api.instance
+        resources = self.validate_resources(options[:resources], writer.writers)
 
         connection_info[:uri] = "#{connection_info.delete(:host)}/locomotive/api"
 
-        _options = { mounting_point: reader.mounting_point, console: true }.merge(options).symbolize_keys
-        _options[:only] = _options.delete(:resources)
+        _options = { mounting_point: reader.mounting_point, only: resources, console: true }.merge(options).symbolize_keys
 
         writer.run!(_options.merge(connection_info).with_indifferent_access)
       end
@@ -91,9 +178,7 @@ module Locomotive
     # @param [ Hash ] options The options passed to the pull process
     #
     def self.pull(path, connection_info, options = {})
-      self.require_mounter(path)
-
-      Bundler.require 'misc' unless options[:disable_misc]
+      self.require_mounter(path, false, options[:disable_misc])
 
       connection_info[:uri] = "#{connection_info.delete(:host)}/locomotive/api"
 
@@ -126,7 +211,7 @@ module Locomotive
       # generate an almost blank site
       require 'locomotive/wagon/generators/site'
       generator = Locomotive::Wagon::Generators::Site::Cloned
-      generator.start [name, path, connection_info.symbolize_keys]
+      generator.start [name, path, true, connection_info.symbolize_keys]
 
       # pull the remote site
       self.pull(target_path, options.merge(connection_info).with_indifferent_access, { disable_misc: true })
@@ -153,16 +238,22 @@ module Locomotive
     #
     # @param [ String ] path The path to the local site
     # @param [ Boolean ] get_reader Tell if it builds an instance of the reader.
+    # @param [ Boolean ] require_misc Tell if it requires the gems inside the misc bundler group
     #
     # @param [ Object ] An instance of the reader is the get_reader parameter has been set.
     #
-    def self.require_mounter(path, get_reader = false)
+    def self.require_mounter(path, get_reader = false, require_misc = true)
       Locomotive::Wagon::Logger.setup(path, false)
 
       require 'locomotive/mounter'
 
       Locomotive::Mounter.logger = Locomotive::Wagon::Logger.instance.logger
 
+      if require_misc
+        require 'bundler'
+        Bundler.require 'misc'
+      end
+
       if get_reader
         begin
           reader = Locomotive::Mounter::Reader::FileSystem.instance
@@ -175,12 +266,32 @@ module Locomotive
     end
 
     protected
+
+    def self.thin_server(reader, options)
+      require 'locomotive/wagon/server'
+      app = Locomotive::Wagon::Server.new(reader, options)
+
+      # TODO: new feature -> pick the right Rack handler (Thin, Puma, ...etc)
+      require 'thin'
+      Thin::Server.new(options[:host], options[:port], { signals: true }, app).tap do |server|
+        server.threaded = true
+      end
+    end
+
     def self.validate_resources(resources, writers_or_readers)
       return if resources.nil?
+
+      # FIXME: for an unknown reason, when called from Cocoa, the resources are a string
+      resources = resources.map { |resource| resource.split(' ') }.flatten
+
       valid_resources = writers_or_readers.map { |thing| thing.to_s.demodulize.gsub(/Writer$|Reader$/, '').underscore }
+
       resources.each do |resource|
         raise ArgumentError, "'#{resource}' resource not recognized. Valid resources are #{valid_resources.join(', ')}." unless valid_resources.include?(resource)
       end
+
+      resources
     end
+
   end
 end

data/locomotivecms_wagon.gemspec

@@ -19,22 +19,23 @@ Gem::Specification.new do |gem|
   gem.executables   = ['wagon']
 
   gem.add_dependency 'thor'
-  gem.add_dependency 'thin',                  '~> 1.5.1'
-  gem.add_dependency 'activesupport',         '~> 3.2.11'
+  gem.add_dependency 'thin',                  '~> 1.6.1'
+  gem.add_dependency 'activesupport',         '~> 3.2.18'
   gem.add_dependency 'locomotivecms-solid',   '~> 0.2.2.1'
   gem.add_dependency 'RedCloth',              '~> 4.2.8'
   gem.add_dependency 'redcarpet',             '~> 3.0.0'
   gem.add_dependency 'dragonfly',             '~> 0.9.12'
-  gem.add_dependency 'sprockets',             '~> 2.0'
-  gem.add_dependency 'sprockets-sass',        '~> 1.0.1'
   gem.add_dependency 'rack-cache',            '~> 1.1'
   gem.add_dependency 'better_errors',         '~> 1.0.1'
+  gem.add_dependency 'rubyzip',               '~> 1.1.0'
+  gem.add_dependency 'netrc',                 '~> 0.7.7'
 
-  gem.add_dependency 'listen',                '~> 0.7.0'
+  gem.add_dependency 'listen',                '~> 2.7.5'
+  gem.add_dependency 'rack-livereload',       '~> 0.3.15'
 
   gem.add_dependency 'httmultiparty',         '0.3.10'
   gem.add_dependency 'will_paginate',         '~> 3.0.3'
-  gem.add_dependency 'locomotivecms_mounter', '~> 1.4.0'
+  gem.add_dependency 'locomotivecms_mounter', '~> 1.4.4'
 
   gem.add_dependency 'faker',                 '~> 0.9.5'
 

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

@@ -16,4 +16,6 @@ fields:
     type: has_many
     class_name: songs
     inverse_of: band
-    ui_enabled: true
+    ui_enabled: true
+- featured:
+    type: boolean

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

@@ -10,4 +10,7 @@ published: false
 <li>{{ page.title }}</li>
 {% endfor %}
 </ul>
+
+{% fetch_page our-music as my_page %}
+<p>Single page: {{ my_page.title }}</p>
 {% endblock %}

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

@@ -19,6 +19,27 @@ position: 5
     {% endfor %}
 
 #sidebar.unit.size1of3
+
+  {% model_form 'messages', id: 'contactform' %}
+  %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' }
+  {% endmodel_form %}
+
   {% editable_long_text 'sidebar' %}
 
   %p

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

@@ -5,6 +5,16 @@ title: Various uses of the with_scope tag
 {% assign end     = '2012-06-10 23:59:59' %}
 {% assign prices  = '5.0,5.5' | split: ',' | map: 'to_f' %}
 
-{% with_scope date.gte: begin, date.lte: end, city: /Kansas/, state.ne: 'Illinois', tags: 'awesome', tags.nin: 'bad', price.in: prices %}
+{% with_scope date.gte: begin, date.lte: end, city: /Kansas/, state.ne: 'Illinois', tags: 'awesome', tags.nin: 'bad', price.in: prices, order_by: 'price.desc' %}
 events={{ contents.events.count }}.
+{% endwith_scope %}
+
+{% with_scope tags.in: 'awesome', order_by: 'price.desc' %}
+first event={{ contents.events.first.place }}.
+{% endwith_scope %}
+
+{% assign featured = false %}
+
+{% with_scope featured: featured %}
+bands={{ contents.bands.count }}.
 {% endwith_scope %}

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

@@ -7,7 +7,7 @@ title: Home page
   %head
     %meta{ :charset => "utf-8" }
 
-    %title {{ site.name }}
+    %title {{ site.name }} | {{ page.title }}
 
     %meta{ :content => "{{ site.meta_description }}", :name => "description" }
     %meta{ :content => "{{ site.meta_keywords }}", :name => "keywords" }

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

@@ -1,10 +1,13 @@
 - Pearl Jam:
     leader: Eddie
     kind: grunge
+    featured: false
 - Alice in Chains:
     leader: Layne
     kind: grunge
+    featured: false
 - The who:
     leader: Peter
     kind: rock
+    featured: true
 

data/spec/integration/server/basic_spec.rb

@@ -37,6 +37,7 @@ describe Locomotive::Wagon::Server do
   it 'shows a content type template ' do
     get '/songs/song-number-1'
     last_response.body.should =~ /Song #1/
+    last_response.body.should =~ /Sample website | Song #1/
   end
 
   it 'renders a page under a templatized one' do

data/spec/integration/server/contact_form_spec.rb

@@ -29,7 +29,7 @@ describe 'ContactForm' do
     describe 'with json request' do
 
       let(:response) { post_contact_form(params, true) }
-      let(:entry) { JSON.parse(response.body)['message'] }
+      let(:entry) { JSON.parse(response.body) }
 
       context 'when not valid' do
 

data/spec/integration/server/liquid_spec.rb

@@ -46,7 +46,7 @@ describe Locomotive::Wagon::Server do
 
     it "writes a localized a link" do
       get '/events'
-      last_response.body.should =~ /Plus à notre sujet: <a href="\/a-notre-sujet">Qui sommes nous \?<\/a>/
+      last_response.body.should =~ /Plus à notre sujet: <a href="\/fr\/a-notre-sujet">Qui sommes nous \?<\/a>/
     end
 
     it "writes a link to a page with a custom label" do
@@ -88,4 +88,11 @@ describe Locomotive::Wagon::Server do
     end
   end
 
+  describe 'fetch_page' do
+    it 'returns the title of a page' do
+      get '/all'
+      last_response.body.should =~ %r(<p>Single page: Music</p>)
+    end
+  end
+
 end

data/spec/integration/server/new_contact_form_spec.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+
+require File.dirname(__FILE__) + '/../integration_helper'
+require 'locomotive/wagon/server'
+require 'rack/test'
+
+describe 'NewContactForm' do
+
+  include Rack::Test::Methods
+
+  def app
+    run_server
+  end
+
+  it 'renders the form' do
+    get '/events'
+    last_response.body.should =~ %r(<form method="POST" enctype="multipart/form-data" id="contactform">)
+  end
+
+  describe '#submit' do
+
+    let(:params) { {
+      'content_type_slug' => 'messages',
+      'entry' => { 'name' => 'John', 'email' => 'j@doe.net', 'message' => 'Bla bla' } } }
+    let(:response) { post_contact_form(params) }
+    let(:status) { response.status }
+
+    context 'when not valid' do
+
+      let(:params) { { 'content_type_slug' => 'messages' } }
+
+      it 'returns a success status' do
+        response.status.should == 200
+      end
+
+      it 'displays errors' do
+        response.body.to_s.should =~ /can't not be blank/
+      end
+
+    end
+
+    context 'when valid' do
+
+      let(:response) { post_contact_form(params, true) }
+
+      it 'returns a success status' do
+        response.status.should == 200
+      end
+
+      it 'displays a success message' do
+        response.body.should =~ /Thank you John/
+      end
+
+    end
+
+  end
+
+  def post_contact_form(params, follow_redirect = false)
+    url = '/events'
+    post url, params
+
+    follow_redirect! if follow_redirect
+
+    last_response
+  end
+
+end

data/spec/integration/server/with_scope_spec.rb

@@ -17,4 +17,14 @@ describe 'Complex with_scope conditions' do
     last_response.body.should =~ /events=1./
   end
 
+  it 'returns the right number of bands' do
+    get '/filtered'
+    last_response.body.should =~ /bands=2./
+  end
+
+  it 'returns the first band in the right order' do
+    get '/filtered'
+    last_response.body.should =~ /first event=Browne's Market/
+  end
+
 end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 require "locomotive/wagon"
 require "rspec"
 require "launchy"
+require 'coveralls'
+
+Coveralls.wear!
 
 Dir["#{File.expand_path('../support', __FILE__)}/*.rb"].each do |file|
   require file