locomotivecms 3.0.0.pre.alpha.3 → 3.0.0.pre.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4e648a311d3ce09779e9d4fed45788a010785e6
-  data.tar.gz: 27930ac44850b8afc52dc064057092c20433212a
+  metadata.gz: 6b4009f2488429e00c7d89ed8d530b3063ce5ebe
+  data.tar.gz: 523238ddc19928abc3f801e8d09d096baf5a8701
 SHA512:
-  metadata.gz: a199883b73bc3ba82d6e103bd9afbd6a1f87c7d3819dc38b78af40f869d699a353cfb9b5f0bbeceffbe0f6884ec3c07935f321635fc45e3d84e6c0501fa32be6
-  data.tar.gz: be98674b892846c91b6001dc6fd17e8d85b90b4e2b24737acefee63f9db30b116612b356ab66618a67d4a4f8ba17a6700c2f4fe8283e34744613317281558336
+  metadata.gz: 75a9d1de7dab0849ba152f7844ba387dff44dc97ac4bb17da20d3ca7a352085dd46757a9681db1f4e141a39943c11b7a0e8b827976f66ae51bfb5b07173b827a
+  data.tar.gz: 40665a5be1905a6405f88d476091a79fe2be2530b78abfebe879bf5102c4c969e9ced4ec74bc8f7adefa33b7ae85a48dd14a327e1b343c2a759c266c7eb8a6d0

data/Gemfile

@@ -22,7 +22,7 @@ group :development do
   # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '15cceb66ed'
 
   # gem 'locomotivecms_steam', path: '../in_progress/steam', require: false
-  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'c56798fc5d4a332', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '2650a1c', require: false
 
   # gem 'locomotive-aloha-rails', path: '../gems/aloha-rails' # for Developers
   # gem 'locomotive-tinymce-rails', path: '../gems/tinymce-rails' # for Developers
@@ -32,33 +32,40 @@ group :development do
   # gem 'carrierwave-mongoid', git: 'git://github.com/locomotivecms/carrierwave-mongoid.git'
 
   gem 'thor'
-  gem 'github_api'
 
   gem 'quiet_assets'
 
-  gem 'ruby-prof'
-
   gem 'better_errors'
   gem 'binding_of_caller'
+  gem 'pry-byebug'
 
   # gem 'unicorn-rails' # Using unicorn_rails instead of webrick (default server)
   # gem 'thin'
   gem 'puma'
 end
 
+group :profile, :development do
+  gem 'ruby-prof'
+end
+
 group :test do
   # gem 'launchy'
   # gem 'capybara',           '~> 2.0.2'
   # gem 'cucumber-rails', require: false
-  # gem 'poltergeist'
+  gem 'simplecov'
+
+
+  gem 'capybara',             '~> 2.4.4'
+  gem 'poltergeist'
 
-  gem 'shoulda-matchers',   '~> 2.7.0'
   gem 'grape-entity-matchers'
+  gem 'shoulda-matchers',     '2.7.0'
+
   gem 'factory_girl_rails'
   gem 'pickle'
-  gem 'json_spec',          '~> 1.1.4'
+  gem 'json_spec',            '~> 1.1.4'
   gem 'database_cleaner'
-  gem 'timecop',            '~> 0.7.1'
+  gem 'timecop',              '~> 0.7.1'
 
   # gem 'debugger', git: 'git://github.com/cldwalker/debugger.git'
 end

data/app/api/locomotive/api.rb

@@ -8,6 +8,7 @@ module Locomotive
       Rack::Builder.new do
         use Locomotive::API::Middlewares::LocaleMiddleware
         use Locomotive::API::Middlewares::LoggerMiddleware
+        use Locomotive::API::Middlewares::ParamsDecoderMiddleware
         run Locomotive::API::Dispatch
       end
     end

data/app/api/locomotive/api/entities/content_entry_entity.rb

@@ -28,6 +28,7 @@ module Locomotive
             method_name = :"expose_#{field.type}_field"
 
             hash[name] = send(method_name, name) if respond_to?(method_name)
+
             hash
           end
         end

data/app/api/locomotive/api/entities/content_type_entity.rb

@@ -4,7 +4,8 @@ module Locomotive
 
       class ContentTypeEntity < BaseEntity
 
-        expose :name, :slug, :description, :label_field_name, :order_direction, :public_submission_enabled, :raw_item_template
+        expose  :name, :slug, :description, :label_field_name, :order_direction,
+                :public_submission_enabled, :entry_template, :display_settings
 
         expose :fields, using: ContentTypeFieldEntity do |content_type, _|
           content_type.ordered_entries_custom_fields || []

data/app/api/locomotive/api/entities/site_entity.rb

@@ -19,6 +19,10 @@ module Locomotive
           site.picture.url
         end
 
+        expose :picture_thumbnail_url do |site, _|
+          Locomotive::Dragonfly.resize_url site.picture.url, '100x100#'
+        end
+
       end
 
     end

data/app/api/locomotive/api/entities/theme_asset_entity.rb

@@ -4,10 +4,10 @@ module Locomotive
 
       class ThemeAssetEntity < BaseEntity
 
-        expose :content_type, :folder, :checksum
+        expose :content_type, :local_path, :folder, :checksum
 
-        expose :local_path do |theme_asset, _|
-          theme_asset.local_path(true)
+        expose :filename do |theme_asset, _|
+          theme_asset.read_attribute(:source_filename)
         end
 
         expose :url do |theme_asset, _|

data/app/api/locomotive/api/forms/base_form.rb

@@ -66,12 +66,6 @@ module Locomotive
           instance_variable_set("@#{name}", value)
         end
 
-        # def attributes
-        #   self.class.attributes.inject({}) do |hash, attribute|
-        #     hash.merge(attribute => send(attribute))
-        #   end
-        # end
-
       end
 
     end

data/app/api/locomotive/api/forms/content_type_field_form.rb

@@ -4,17 +4,17 @@ module Locomotive
 
       class ContentTypeFieldForm < BaseForm
 
-        attr_accessor :content_type_service, :content_type
+        attr_accessor :content_type_service, :existing_field
 
         attrs :_id, :name, :type, :label, :hint,
               :required, :localized, :unique, :position,
               :text_formatting, :select_options_attributes,
               :target, :inverse_of, :order_by, :ui_enabled,
-              :class_name
+              :class_name, :_destroy
 
-        def initialize(content_type_service, content_type, attributes)
+        def initialize(content_type_service, existing_field, attributes)
           self.content_type_service = content_type_service
-          self.content_type = content_type
+          self.existing_field = existing_field
           super(attributes)
         end
 
@@ -41,12 +41,8 @@ module Locomotive
         private
 
         def attach_id_to_option(name, attributes)
-          field = content_type.try(:find_entries_custom_field, self.name)
-
-          return if field.nil?
-
-          if option = field.select_options.where(name: name).first
-            # update the option instead of creating it
+          return if existing_field.nil?
+          if option = existing_field.select_options.where(name: name).first
             attributes[:_id] = option._id
           end
         end

data/app/api/locomotive/api/forms/content_type_form.rb

@@ -10,8 +10,9 @@ module Locomotive
               :order_by, :order_direction, :group_by,
               :public_submission_enabled,
               :public_submission_accounts,
-              :raw_item_template,
-              :entries_custom_fields_attributes
+              :entry_template,
+              :entries_custom_fields_attributes,
+              :display_settings
 
         # @param [ Site ] the current site, or site to scope to
         def initialize(site, attributes = {})
@@ -20,8 +21,8 @@ module Locomotive
         end
 
         # If the current content type exists, look up the fields and add their IDs
-        #  to the attributes hash.  If not, set the entries_custom_fields_attributes
-        #  as-is
+        # to the attributes hash.  If not, set the entries_custom_fields_attributes
+        # as-is
         def fields=(fields)
           self.entries_custom_fields_attributes = fields.map do |attrs|
             if field = existing_content_type.try(:find_entries_custom_field, attrs[:name])
@@ -38,6 +39,27 @@ module Locomotive
           end.compact.map(&:id)
         end
 
+        # deprecated
+        def raw_item_template=(template)
+          set_attribute(:entry_template, template)
+        end
+
+        def order_by=(field)
+          field = '_position' if field == 'manually'
+          set_attribute(:order_by, field)
+        end
+
+        def display_settings=(settings)
+          (settings || {}).each do |k, v|
+            if k == 'position'
+              settings[k] = v.to_i
+            else
+              settings[k] = v == 'true'
+            end
+          end
+          set_attribute(:display_settings, settings)
+        end
+
         private
 
         def existing_content_type

data/app/api/locomotive/api/middlewares/params_decoder_middleware.rb

@@ -0,0 +1,91 @@
+# Issue here: https://github.com/ruby-grape/grape/issues/1028
+# Solution: https://github.com/typhoeus/typhoeus/blob/master/lib/rack/typhoeus/middleware/params_decoder/helper.rb
+#
+# MIT License Paul Dix, David Balatero, Hans Hasselberg
+#
+module Locomotive
+  module API
+    module Middlewares
+
+      class ParamsDecoderMiddleware
+
+        def initialize(app)
+          @app = app
+        end
+
+        def call(env)
+          request = Rack::Request.new(env)
+          decode(request.params).each_pair { |k, v| update_params request, k, v }
+          @app.call(env)
+        end
+
+        private
+
+        # Persist params change in environment. Extracted from:
+        # https://github.com/rack/rack/blob/master/lib/rack/request.rb#L243
+        def update_params(req, k, v)
+          found = false
+          if req.GET.has_key?(k)
+            found = true
+            req.GET[k] = v
+          end
+          if req.POST.has_key?(k)
+            found = true
+            req.POST[k] = v
+          end
+          unless found
+            req.GET[k] = v
+          end
+        end
+
+        def decode!(hash)
+          return hash unless hash.is_a?(Hash)
+          hash.each_pair do |key,value|
+            if value.is_a?(Hash)
+              decode!(value)
+              hash[key] = convert(value)
+            end
+          end
+          hash
+        end
+
+        def decode(hash)
+          decode!(hash.dup)
+        end
+
+        # Checks if Hash is an Array encoded as a Hash.
+        # Specifically will check for the Hash to have this
+        # form: {'0' => v0, '1' => v1, .., 'n' => vN }
+        #
+        # @param hash [Hash]
+        #
+        # @return [Boolean] True if its a encoded Array, else false.
+        def encoded?(hash)
+          return false if hash.empty?
+          if hash.keys.size > 1
+            keys = hash.keys.map{|i| i.to_i if i.respond_to?(:to_i)}.sort
+            keys == hash.keys.size.times.to_a
+          else
+            hash.keys.first =~ /0/
+          end
+        end
+
+        # If the Hash is an array encoded by typhoeus an array is returned
+        # else the self is returned
+        #
+        # @param hash [Hash] The Hash to convert into an Array.
+        #
+        # @return [Arraya/Hash]
+        def convert(hash)
+          if encoded?(hash)
+            hash.sort{ |a, b| a[0].to_i <=> b[0].to_i }.map{ |key, value| value }
+          else
+            hash
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/app/api/locomotive/api/resources/content_type_resource.rb

@@ -58,7 +58,9 @@ module Locomotive
               optional :order_direction
               optional :group_by
               optional :label_field_name
-              optional :raw_item_template
+              optional :entry_template
+              optional :raw_item_template # deprecated
+              optional :display_settings
               optional :public_submission_account_emails
               optional :public_submission_accounts
             end
@@ -94,12 +96,15 @@ module Locomotive
                 optional :inverse_of
                 optional :order_by
                 optional :ui_enabled
+                optional :_destroy
               end
               optional :order_by
               optional :order_direction
               optional :group_by
               optional :label_field_name
-              optional :raw_item_template
+              optional :entry_template
+              optional :raw_item_template # deprecated
+              optional :display_settings
               optional :public_submission_account_emails
               optional :public_submission_accounts
             end

data/app/api/locomotive/api/resources/current_site_resource.rb

@@ -11,6 +11,14 @@ module Locomotive
             authenticate_locomotive_account!
           end
 
+          helpers do
+
+            def service
+              @service ||= Locomotive::SiteService.new(current_account)
+            end
+
+          end
+
           desc 'Show current_site'
           get do
             authorize current_site, :show?
@@ -31,14 +39,14 @@ module Locomotive
               optional :locales, type: Array
               optional :domains, type: Array
               optional :timezone
+              optional :picture
             end
           end
           put do
             authorize current_site, :update?
 
             current_site_form = Forms::SiteForm.new(permitted_params[:site])
-            current_site.assign_attributes(current_site_form.serializable_hash)
-            current_site.save
+            service.update(current_site, current_site_form.serializable_hash)
 
             present current_site, with: entity_klass
           end

data/app/assets/javascripts/locomotive/not_logged_in.js.coffee

@@ -1 +1,11 @@
-#= require jquery
+#= require jquery
+#= require_self
+#= require underscore
+#= require locomotive/bootstrap-notify
+#= require ./utils/notify
+
+window.Locomotive = {}
+
+$ ->
+  _.each window.flash_messages, (couple) ->
+      Locomotive.notify couple[1], couple[0]

data/app/assets/javascripts/locomotive/views/application_view.js.coffee

@@ -42,79 +42,3 @@ class Locomotive.Views.ApplicationView extends Backbone.View
     height      = max_height - @header_view.height()
 
     @$('> .wrapper').height(height)
-
-  # center_ui_dialog: ->
-  #   $(window).resize ->
-  #     $('.ui-dialog-content:visible').dialog('option', 'position', 'center')
-
-  # add_submenu_behaviours: ->
-  #   $('#submenu ul li.hoverable').each ->
-  #     timer = null
-  #     link  = $(@)
-  #     (popup = link.find('.popup')).removeClass('popup').addClass('submenu-popup'
-  #     ).bind('show', ->
-  #       link.find('a').addClass('hover') & popup.css(
-  #         top:  link.offset().top + link.height() - 2
-  #         left: link.offset().left - parseInt(popup.css('padding-left'))
-  #       ).show()
-  #     ).bind('hide', ->
-  #       link.find('a').removeClass('hover') & $(@).hide()
-  #     ).bind('mouseleave', -> popup.trigger('hide')
-  #     ).bind 'mouseenter', -> clearTimeout(timer)
-
-  #     $(document.body).append(popup)
-
-  #     link.hover(
-  #       -> popup.trigger('show')
-  #       -> timer = window.setTimeout (-> popup.trigger('hide')), 30
-  #     )
-
-  #   css = $('#submenu > ul').attr('class')
-  #   $("#submenu > ul > li.#{css}").addClass('on') if css != ''
-
-  # enable_sites_picker: ->
-  #   link    = @$('#sites-picker-link')
-  #   picker  = @$('#sites-picker')
-
-  #   return if picker.size() == 0
-
-  #   left = link.position().left + link.parent().position().left - (picker.width() - link.width())
-  #   picker.css('left', left)
-
-  #   link.bind 'click', (event) ->
-  #     event.stopPropagation() & event.preventDefault()
-  #     picker.toggle()
-
-  # enable_content_locale_picker: ->
-  #   link    = @$('#content-locale-picker-link')
-  #   picker  = @$('#content-locale-picker')
-
-  #   return if picker.size() == 0
-
-  #   link.bind 'click', (event) ->
-  #     event.stopPropagation() & event.preventDefault()
-  #     picker.toggle()
-
-  #   picker.find('li').bind 'click', (event) ->
-  #     locale = $(@).data('locale')
-  #     window.addParameterToURL 'content_locale', locale
-
-  # set_locale_for_tinymce_widgets: ->
-  #   # tinyMCE likes only lowercase locales
-  #   tinymce_locale = window.locale.toLowerCase()
-
-  #   # pt-BR does not exist, pt does though
-  #   tinymce_locale = 'pt' if tinymce_locale == 'pt-br'
-
-  #   # set the default tinyMCE language
-  #   window.Locomotive.tinyMCE.defaultSettings.language  = tinymce_locale
-  #   window.Locomotive.tinyMCE.minimalSettings.language  = tinymce_locale
-  #   window.Locomotive.tinyMCE.popupSettings.language    = tinymce_locale
-
-  unique_dialog_zindex: ->
-    # returns the number of jQuery UI modals created in order to set a valid zIndex for each of them.
-    # Each modal window should have a different zIndex, otherwise there will be conflicts between them.
-    window.Locomotive.jQueryModals ||= 0
-
-    # 998 + window.Locomotive.jQueryModals++
-    300000 + window.Locomotive.jQueryModals++