locomotivecms_wagon 2.0.0.pre.alpha.3 → 2.0.0.pre.beta.1

data/lib/locomotive/wagon/decorators/content_type_decorator.rb

@@ -14,18 +14,18 @@ module Locomotive
         %i(name slug description label_field_name fields
           order_by order_direction group_by
           public_submission_enabled public_submission_accounts
-          raw_item_template)
+          raw_item_template display_settings)
       end
 
       def fields
         return @fields if @fields
 
-        @fields = __getobj__.fields.no_associations.map { |f| ContentTypeFieldDecorator.new(f) }
+        @fields = __getobj__.fields.no_associations.map { |f| ContentTypeFieldDecorator.new(f, @existing_fields.include?(f.name)) }
 
         @existing_fields.each do |name|
           # the field exists remotely but does not exist locally, delete it
           if __getobj__.fields.by_name(name).nil?
-            @fields << { name: name, _destroy: true }
+            @fields.insert(0, { name: name, _destroy: true })
           end
         end
 
@@ -56,6 +56,10 @@ module Locomotive
         self[:raw_item_template]
       end
 
+      def display_settings
+        self[:display_settings]
+      end
+
       def with_relationships?
         __getobj__.fields.associations.count > 0
       end

data/lib/locomotive/wagon/decorators/content_type_field_decorator.rb

@@ -5,6 +5,11 @@ module Locomotive
 
       include ToHashConcern
 
+      def initialize(entity, persisted = false)
+        @persisted = persisted
+        super(entity)
+      end
+
       def __attributes__
         %i(name type label hint required localized unique position
           text_formatting select_options
@@ -50,7 +55,7 @@ module Locomotive
       end
 
       def select_options
-        return nil unless type.to_sym == :select
+        return nil if type.to_sym != :select || @persisted
 
         @_select_options ||= __getobj__.select_options.all.map { |o| SelectOptionDecorator.new(o) }
       end

data/lib/locomotive/wagon/decorators/site_decorator.rb

@@ -28,5 +28,13 @@ module Locomotive
 
     end
 
+    class IconSiteDecorator < SiteDecorator
+
+      def __attributes__
+        %i(picture)
+      end
+
+    end
+
   end
 end

data/lib/locomotive/wagon/generators/site/base.rb

@@ -87,4 +87,4 @@ module Locomotive
       end
     end
   end
-end
+end

data/lib/locomotive/wagon/generators/site/cloned.rb

@@ -24,4 +24,4 @@ module Locomotive
       end
     end
   end
-end
+end

data/lib/locomotive/wagon/generators/site.rb

@@ -110,8 +110,6 @@ module Locomotive
                 path:         path,
                 icon:         icon && File.exists?(icon) ? icon : nil,
                 options:      class_options_to_json(template)
-
-
               }
             end.to_json
           end

data/lib/locomotive/wagon/tools/styled_yaml.rb

@@ -0,0 +1,122 @@
+require 'psych'
+require 'stringio'
+
+# Public: A Psych extension to enable choosing output styles for specific
+# objects.
+#
+# Thanks to Tenderlove for help in <http://stackoverflow.com/q/9640277/11687>
+#
+# Examples
+#
+#   data = {
+#     response: { body: StyledYAML.literal(json_string), status: 200 },
+#     person: StyledYAML.inline({ 'name' => 'Stevie', 'age' => 12 }),
+#     array: StyledYAML.inline(%w[ apples bananas oranges ])
+#   }
+#
+#   StyledYAML.dump data, $stdout
+#
+module StyledYAML
+  # Tag strings to be output using literal style
+  def self.literal obj
+    obj.extend LiteralScalar
+    return obj
+  end
+
+  # http://www.yaml.org/spec/1.2/spec.html#id2795688
+  module LiteralScalar
+    def yaml_style() Psych::Nodes::Scalar::LITERAL end
+  end
+
+  # Tag Hashes or Arrays to be output all on one line
+  def self.inline obj
+    case obj
+    when Hash  then obj.extend FlowMapping
+    when Array then obj.extend FlowSequence
+    else
+      warn "#{self}: unrecognized type to inline (#{obj.class.name})"
+    end
+    return obj
+  end
+
+  # http://www.yaml.org/spec/1.2/spec.html#id2790832
+  module FlowMapping
+    def yaml_style() Psych::Nodes::Mapping::FLOW end
+  end
+
+  # http://www.yaml.org/spec/1.2/spec.html#id2790320
+  module FlowSequence
+    def yaml_style() Psych::Nodes::Sequence::FLOW end
+  end
+
+  # Custom tree builder class to recognize scalars tagged with `yaml_style`
+  class TreeBuilder < Psych::TreeBuilder
+    attr_writer :next_sequence_or_mapping_style
+
+    def initialize(*args)
+      super
+      @next_sequence_or_mapping_style = nil
+    end
+
+    def next_sequence_or_mapping_style default_style
+      style = @next_sequence_or_mapping_style || default_style
+      @next_sequence_or_mapping_style = nil
+      style
+    end
+
+    def scalar value, anchor, tag, plain, quoted, style
+      if style_any?(style) and value.respond_to?(:yaml_style) and style = value.yaml_style
+        if style_literal? style
+          plain = false
+          quoted = true
+        end
+      end
+      super
+    end
+
+    def style_any?(style) Psych::Nodes::Scalar::ANY == style end
+
+    def style_literal?(style) Psych::Nodes::Scalar::LITERAL == style end
+
+    %w[sequence mapping].each do |type|
+      class_eval <<-RUBY
+        def start_#{type}(anchor, tag, implicit, style)
+          style = next_sequence_or_mapping_style(style)
+          super
+        end
+      RUBY
+    end
+  end
+
+  # Custom tree class to handle Hashes and Arrays tagged with `yaml_style`
+  class YAMLTree < Psych::Visitors::YAMLTree
+    %w[Hash Array Psych_Set Psych_Omap].each do |klass|
+      class_eval <<-RUBY
+        def visit_#{klass} o
+          if o.respond_to? :yaml_style
+            @emitter.next_sequence_or_mapping_style = o.yaml_style
+          end
+          super
+        end
+      RUBY
+    end
+  end
+
+  # A Psych.dump alternative that uses the custom TreeBuilder
+  def self.dump obj, io = nil, options = {}
+    real_io = io || StringIO.new(''.encode('utf-8'))
+    visitor = YAMLTree.new(options, TreeBuilder.new)
+    visitor << obj
+    ast = visitor.tree
+
+    begin
+      ast.yaml real_io
+    rescue
+      # The `yaml` method was introduced in later versions, so fall back to
+      # constructing a visitor
+      Psych::Visitors::Emitter.new(real_io).accept ast
+    end
+
+    io ? io : real_io.string
+  end
+end

data/lib/locomotive/wagon/version.rb

@@ -1,5 +1,5 @@
 module Locomotive
   module Wagon
-    VERSION = '2.0.0-alpha.3'
+    VERSION = '2.0.0-beta.1'
   end
 end

data/lib/locomotive/wagon.rb

@@ -80,21 +80,21 @@ module Locomotive
     # @param [ Hash ] connection_info The information to get connected to the remote site
     # @param [ Hash ] options The options passed to the pull process
     #
-    def self.pull(path, connection_info, options = {})
-      raise 'TODO'
-      # self.require_mounter(path, false, options[:disable_misc])
-
-      # connection_info[:uri] = "#{connection_info.delete(:host)}/locomotive/api"
-
-      # _options = { console: true }.merge(options).symbolize_keys
-      # _options[:only] = _options.delete(:resources)
-
-      # reader = Locomotive::Mounter::Reader::Api.instance
-      # self.validate_resources(_options[:only], reader.readers)
-      # reader.run!(_options.merge(connection_info))
+    def self.pull(env, path, options = {}, shell)
+      require_relative 'wagon/commands/pull_command'
+      Locomotive::Wagon::PullCommand.pull(env, path, options, shell)
+    end
 
-      # writer = Locomotive::Mounter::Writer::FileSystem.instance
-      # writer.run!(_options.merge(mounting_point: reader.mounting_point, target_path: path))
+    # Synchronize the local content with the one from a remote Locomotive engine.
+    # by the config/deploy.yml file of the site and for a specific environment.
+    #
+    # @param [ String ] path The path of the site
+    # @param [ Hash ] connection_info The information to get connected to the remote site
+    # @param [ Hash ] options The options passed to the pull process
+    #
+    def self.sync(env, path, options = {})
+      require_relative 'wagon/commands/sync_command'
+      Locomotive::Wagon::SyncCommand.sync(env, path, options)
     end
 
     # Clone a site from a remote LocomotiveCMS engine.
@@ -104,56 +104,21 @@ module Locomotive
     # @param [ Hash ] connection_info The host, email and password needed to access the remote engine
     # @param [ Hash ] options The options for the API reader
     #
-    def self.clone(name, path, connection_info, options = {})
-      raise 'TODO'
-      # target_path = File.expand_path(File.join(path, name))
-
-      # if File.exists?(target_path)
-      #   puts "Path already exists. If it's an existing site, you might want to pull instead of clone."
-      #   return false
-      # end
-
-      # # generate an almost blank site
-      # require 'locomotive/wagon/generators/site'
-      # generator = Locomotive::Wagon::Generators::Site::Cloned
-      # 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 })
+    def self.clone(name, path, options, shell)
+      require_relative 'wagon/commands/clone_command'
+      Locomotive::Wagon::CloneCommand.clone(name, path, options, shell)
     end
 
     # Destroy a remote site
     #
+    # @param [ String ] env The environment we use to deploy the site to
     # @param [ String ] path The path of the site
-    # @param [ Hash ] connection_info The information to get connected to the remote site
-    # @param [ Hash ] options The options passed to the push process
+    # @param [ Hash ] options The options passed to the destroy command
     #
-    def self.destroy(path, connection_info, options = {})
-      raise 'TODO'
-      # self.require_mounter(path)
-
-      # connection_info['uri'] = "#{connection_info.delete('host')}/locomotive/api"
-
-      # Locomotive::Mounter::EngineApi.set_token connection_info.symbolize_keys
-      # Locomotive::Mounter::EngineApi.delete('/current_site.json')
+    def self.destroy(env, path, options = {})
+      require_relative 'wagon/commands/destroy_command'
+      Locomotive::Wagon::DestroyCommand.destroy(env, path, options)
     end
 
-    # protected
-
-    # 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

@@ -25,8 +25,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rubyzip',               '~> 1.1.7'
   gem.add_dependency 'netrc',                 '~> 0.10.3'
 
-  gem.add_dependency 'locomotivecms_coal',    '~> 1.0.0-alpha.3'
-  gem.add_dependency 'locomotivecms_steam',   '~> 1.0.0-alpha.2'
+  gem.add_dependency 'locomotivecms_coal',    '~> 1.0.0-beta.2'
+  gem.add_dependency 'locomotivecms_steam',   '~> 1.0.0-beta.2'
 
   gem.add_dependency 'listen',                '~> 2.10.0'
   gem.add_dependency 'rack-livereload',       '~> 0.3.15'

data/spec/fixtures/cassettes/authenticate.yml

@@ -17,43 +17,35 @@ http_interactions:
       - Ruby
   response:
     status:
-      code: 201
-      message: Created
+      code: 401
+      message: Unauthorized
     headers:
       Content-Type:
       - application/json
-      Content-Length:
-      - '32'
-      Etag:
-      - W/"2245a1c3eefc06a0a39cca5e28eb4822"
+      X-Error-Detail:
+      - Invalid email or password.
       Cache-Control:
-      - max-age=0, private, must-revalidate
+      - no-cache
       X-Request-Id:
-      - c7ddea05-6b69-4454-8f5a-b667a8628ef9
+      - d5acbb60-75e3-4167-91bc-1f6aee2caaa9
       X-Runtime:
-      - '0.590206'
-      Connection:
-      - keep-alive
-      Server:
-      - thin
+      - '0.405045'
+      Content-Length:
+      - '40'
     body:
       encoding: UTF-8
-      string: '{"token":"ib6bXanDDnsFjyujf9Gt"}'
+      string: '{"message":"Invalid email or password."}'
     http_version: 
-  recorded_at: Mon, 25 May 2015 23:06:12 GMT
+  recorded_at: Tue, 11 Aug 2015 16:47:38 GMT
 - request:
-    method: get
+    method: post
     uri: http://localhost:3000/locomotive/api/v3/my_account.json
     body:
       encoding: UTF-8
-      string: auth_token=ib6bXanDDnsFjyujf9Gt
+      string: account%5Bemail%5D=john%40doe.net&account%5Bname%5D=John&account%5Bpassword%5D=asimplepassword
     headers:
       Accept:
       - application/json
-      X-Locomotive-Account-Email:
-      - john@doe.net
-      X-Locomotive-Account-Token:
-      - ib6bXanDDnsFjyujf9Gt
       Content-Type:
       - application/x-www-form-urlencoded
       Accept-Encoding:
@@ -62,75 +54,26 @@ http_interactions:
       - Ruby
   response:
     status:
-      code: 200
-      message: OK
+      code: 201
+      message: Created
     headers:
       Content-Type:
       - application/json
-      Content-Length:
-      - '250'
       Etag:
-      - W/"77a6faa0568f7ba809893a63188e0841"
+      - W/"2af9bbd65bd5918efea9dd9fd195971d"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - ea9681b4-a8ed-4c0e-86e7-da1824762b79
+      - 05621e5a-d0fc-4850-974b-025767e46794
       X-Runtime:
-      - '0.087301'
-      Connection:
-      - keep-alive
-      Server:
-      - thin
-    body:
-      encoding: UTF-8
-      string: '{"_id":"555b4492646964986c220000","created_at":"2015-05-19T14:11:30Z","updated_at":"2015-05-19T14:11:30Z","name":"John","email":"john@doe.net","locale":"en","api_key":"c17eb23cfde7a2f7f3d08689dd20470cf9bd95a8","super_admin":false,"local_admin":false}'
-    http_version: 
-  recorded_at: Mon, 25 May 2015 23:06:12 GMT
-- request:
-    method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json
-    body:
-      encoding: UTF-8
-      string: auth_token=ib6bXanDDnsFjyujf9Gt
-    headers:
-      Accept:
-      - application/json
-      X-Locomotive-Account-Email:
-      - john@doe.net
-      X-Locomotive-Account-Token:
-      - ib6bXanDDnsFjyujf9Gt
-      Content-Type:
-      - application/x-www-form-urlencoded
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-      User-Agent:
-      - Ruby
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Content-Type:
-      - application/json
+      - '0.078440'
       Content-Length:
       - '250'
-      Etag:
-      - W/"77a6faa0568f7ba809893a63188e0841"
-      Cache-Control:
-      - max-age=0, private, must-revalidate
-      X-Request-Id:
-      - 736fdff0-e01e-424f-9071-619960ad972f
-      X-Runtime:
-      - '0.013798'
-      Connection:
-      - keep-alive
-      Server:
-      - thin
     body:
       encoding: UTF-8
-      string: '{"_id":"555b4492646964986c220000","created_at":"2015-05-19T14:11:30Z","updated_at":"2015-05-19T14:11:30Z","name":"John","email":"john@doe.net","locale":"en","api_key":"c17eb23cfde7a2f7f3d08689dd20470cf9bd95a8","super_admin":false,"local_admin":false}'
+      string: '{"_id":"55ca272a87f6432b4e000000","created_at":"2015-08-11T16:47:38Z","updated_at":"2015-08-11T16:47:38Z","name":"John","email":"john@doe.net","locale":"en","api_key":"3e4794ac44f4cbf9efc9277eb59384120418c02b","super_admin":false,"local_admin":false}'
     http_version: 
-  recorded_at: Mon, 25 May 2015 23:06:12 GMT
+  recorded_at: Tue, 11 Aug 2015 16:47:38 GMT
 - request:
     method: post
     uri: http://localhost:3000/locomotive/api/v3/tokens.json
@@ -153,40 +96,34 @@ http_interactions:
     headers:
       Content-Type:
       - application/json
-      Content-Length:
-      - '32'
       Etag:
-      - W/"6b081cb1b0d50389aeec251b56dc5e74"
+      - W/"3b6ceb0d2ba232a8d48dd0dc8f702ef4"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - a19a725f-16bd-4e61-9965-0663181e5262
+      - 2bed1193-24c8-46d0-bcf3-6e462c4177ee
       X-Runtime:
-      - '0.014548'
-      Connection:
-      - keep-alive
-      Server:
-      - thin
+      - '0.016216'
+      Content-Length:
+      - '32'
     body:
       encoding: UTF-8
-      string: '{"token":"6UA3Po7vVz4Ry34swEqa"}'
+      string: '{"token":"xM_3r1zn2aQAinPFqSvd"}'
     http_version: 
-  recorded_at: Mon, 25 May 2015 23:06:12 GMT
+  recorded_at: Tue, 11 Aug 2015 16:47:38 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=xM_3r1zn2aQAinPFqSvd
     body:
-      encoding: UTF-8
-      string: auth_token=6UA3Po7vVz4Ry34swEqa
+      encoding: US-ASCII
+      string: ''
     headers:
       Accept:
       - application/json
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - 6UA3Po7vVz4Ry34swEqa
-      Content-Type:
-      - application/x-www-form-urlencoded
+      - xM_3r1zn2aQAinPFqSvd
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       User-Agent:
@@ -198,41 +135,35 @@ http_interactions:
     headers:
       Content-Type:
       - application/json
-      Content-Length:
-      - '264'
       Etag:
-      - W/"cd64b967426892bd75445b74968ee0e7"
+      - W/"52bd05e384c279a85dca7d54c93622f3"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 1637260c-7fdc-47cc-b2cb-4b32a976146a
+      - 1ff524e7-715b-4a2d-b282-281975ca8f94
       X-Runtime:
-      - '0.014046'
-      Connection:
-      - keep-alive
-      Server:
-      - thin
+      - '0.050613'
+      Content-Length:
+      - '264'
     body:
       encoding: UTF-8
-      string: '{"_id":"5555b35a646964e1ca000000","created_at":"2015-05-15T08:50:34Z","updated_at":"2015-05-21T11:12:17Z","name":"John
+      string: '{"_id":"55c9f4a387f6432a1e000000","created_at":"2015-08-11T13:12:03Z","updated_at":"2015-08-11T13:12:39Z","name":"John
         Doe","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Mon, 25 May 2015 23:06:12 GMT
+  recorded_at: Tue, 11 Aug 2015 16:47:38 GMT
 - request:
     method: get
-    uri: http://localhost:3000/locomotive/api/v3/my_account.json
+    uri: http://localhost:3000/locomotive/api/v3/my_account.json?auth_token=xM_3r1zn2aQAinPFqSvd
     body:
-      encoding: UTF-8
-      string: auth_token=6UA3Po7vVz4Ry34swEqa
+      encoding: US-ASCII
+      string: ''
     headers:
       Accept:
       - application/json
       X-Locomotive-Account-Email:
       - admin@locomotivecms.com
       X-Locomotive-Account-Token:
-      - 6UA3Po7vVz4Ry34swEqa
-      Content-Type:
-      - application/x-www-form-urlencoded
+      - xM_3r1zn2aQAinPFqSvd
       Accept-Encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
       User-Agent:
@@ -244,24 +175,20 @@ http_interactions:
     headers:
       Content-Type:
       - application/json
-      Content-Length:
-      - '264'
       Etag:
-      - W/"cd64b967426892bd75445b74968ee0e7"
+      - W/"52bd05e384c279a85dca7d54c93622f3"
       Cache-Control:
       - max-age=0, private, must-revalidate
       X-Request-Id:
-      - 286b83c2-dc57-4ff6-b93e-69d4b083b7ef
+      - 41e6457b-6fba-4e25-b58d-43bd072c22bd
       X-Runtime:
-      - '0.019133'
-      Connection:
-      - keep-alive
-      Server:
-      - thin
+      - '0.014797'
+      Content-Length:
+      - '264'
     body:
       encoding: UTF-8
-      string: '{"_id":"5555b35a646964e1ca000000","created_at":"2015-05-15T08:50:34Z","updated_at":"2015-05-21T11:12:17Z","name":"John
+      string: '{"_id":"55c9f4a387f6432a1e000000","created_at":"2015-08-11T13:12:03Z","updated_at":"2015-08-11T13:12:39Z","name":"John
         Doe","email":"admin@locomotivecms.com","locale":"en","api_key":"d49cd50f6f0d2b163f48fc73cb249f0244c37074","super_admin":false,"local_admin":true}'
     http_version: 
-  recorded_at: Mon, 25 May 2015 23:06:12 GMT
+  recorded_at: Tue, 11 Aug 2015 16:47:38 GMT
 recorded_with: VCR 2.9.3