locomotivecms_steam 1.2.1 → 1.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0638993657ef4d9c1daeacceaf92343dced8b62
-  data.tar.gz: 88c03d05c185a8e33de76a7c83f0414d9c463ec0
+  metadata.gz: 2f196a0b63817aacbd1564c4f1e48f11f3d9a099
+  data.tar.gz: f2abdbd4a45e167bec4ec66ed0e4fe8ecb51f41a
 SHA512:
-  metadata.gz: 81a06d2a759297e8177148cba1d9a00bf1baf925d4335465f82e03541362259855056a68b6656a6be41d140713fd4cd1755fc9890985b4ba2d698a30e9904ac5
-  data.tar.gz: 008df971169a7c5c267bf2eb521276ca35814006e038b90b4ac57723971d00ab270824f7a9517e78743b91d80e5639ef0d7c192486494916103a509245791c8e
+  metadata.gz: 70e71b96955c2395129bfb9c42b83a581592a7c55ec814b682b3f3919a2b55d63c87a42fe5fc671600ff4674202c19d6c2e462d9581fd2341f820fbe2d3027c8
+  data.tar.gz: efc45f6d8acb3117e4b9154830b1b43fbeb299358c60e57d606692b0eb3a86fe0ea4ac05d095f080331bcb0ea6358a9d8f23cbed96311bac21239f4de40a4c39

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 services: mongodb
 before_script: ./script/ci/before_build.sh
 rvm:
-  - 2.2.3
+  - 2.3.3
 env:
   - CODECLIMATE_REPO_TOKEN=3fa74f2ade25037fccd7261090acbdeae232639c3a83aafb80ee428ec16b8cf9
 addons:

data/Gemfile

@@ -8,9 +8,10 @@ group :development do
   # gem 'locomotivecms_models', '~> 0.0.1', path: '../models'
   # gem 'locomotivecms_models', '0.0.1.pre.alpha'
   # gem 'locomotivecms-liquid', path: '/Users/didier/Documents/LocomotiveCMS/gems/liquid'
+  # gem 'duktape', path: '/Users/didier/Documents/NoCoffee/ProjectsX/duktape.rb'
+  # gem 'duktape', github: 'judofyr/duktape.rb', ref: '20ef6a5'
   # gem 'thin'
   gem 'puma'
-  gem 'yui-compressor',     '~> 0.12.0'
   gem 'haml',               '~> 4.0.6'
 
   gem 'rack-mini-profiler', '~> 0.10.1'
@@ -35,5 +36,5 @@ group :test do
 end
 
 platform :ruby do
-  ruby '2.2.3'
+  ruby '2.3.3'
 end

data/Gemfile.lock

@@ -1,30 +1,32 @@
 PATH
   remote: .
   specs:
-    locomotivecms_steam (1.2.1)
+    locomotivecms_steam (1.3.0.rc1)
       RedCloth (~> 4.3.2)
-      autoprefixer-rails (~> 6.3.3.1)
+      autoprefixer-rails (~> 6.7.2)
+      bcrypt (~> 3.1.11)
       chronic (~> 0.10.2)
       coffee-script (~> 2.4.1)
       compass (~> 1.0.3)
-      dragonfly (~> 1.0.12)
-      duktape (~> 1.3.0.6)
-      httparty (~> 0.13.6)
-      kramdown (~> 1.10.0)
+      dragonfly (~> 1.1.1)
+      duktape (~> 1.6.1.0)
+      httparty (~> 0.14.0)
+      kramdown (~> 1.13.2)
       locomotivecms-solid (~> 4.0.1)
       locomotivecms_common (~> 0.2.0)
-      mime-types (~> 2.6.1)
+      mime-types (~> 3.1.0)
       mimetype-fu (~> 0.1.2)
-      moneta (~> 0.8.0)
+      moneta (~> 1.0.0)
       morphine (~> 0.1.1)
-      nokogiri (~> 1.6.8)
+      nokogiri (~> 1.7.0.1)
       pony (~> 1.11)
-      rack-cache (~> 1.6.1)
+      rack-cache (~> 1.7.0)
       rack-rewrite (~> 1.5.1)
-      rack_csrf (~> 2.5.0)
-      sanitize (~> 4.0.1)
-      sass (~> 3.4.21)
-      sprockets (~> 3.5.2)
+      rack_csrf (~> 2.6.0)
+      sanitize (~> 4.4.0)
+      sass (~> 3.4.23)
+      sprockets (~> 3.7.1)
+      uglifier (~> 3.1.6)
 
 GEM
   remote: https://rubygems.org/
@@ -38,9 +40,10 @@ GEM
     addressable (2.5.0)
       public_suffix (~> 2.0, >= 2.0.2)
     attr_extras (4.4.0)
-    autoprefixer-rails (6.3.3.1)
+    autoprefixer-rails (6.7.6)
       execjs
-    bson (4.1.1)
+    bcrypt (3.1.11)
+    bson (4.2.1)
     byebug (8.2.5)
     chronic (0.10.2)
     chunky_png (1.3.8)
@@ -65,38 +68,37 @@ GEM
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
     concurrent-ruby (1.0.5)
-    coveralls (0.8.15)
+    coveralls (0.8.19)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-      tins (>= 1.6.0, < 2)
+      tins (~> 1.6)
     crass (1.0.2)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
-    dragonfly (1.0.12)
+    dragonfly (1.1.1)
       addressable (~> 2.3)
       multi_json (~> 1.0)
-      rack (>= 1.3.0)
-    duktape (1.3.0.6)
+      rack (>= 1.3)
+    duktape (1.6.1.0)
     execjs (2.7.0)
     ffi (1.9.18)
     flamegraph (0.9.5)
     haml (4.0.7)
       tilt
-    httparty (0.13.7)
-      json (~> 1.8)
+    httparty (0.14.0)
       multi_xml (>= 0.5.2)
-    i18n (0.7.0)
+    i18n (0.8.0)
     i18n-spec (0.6.0)
       iso
     iso (0.2.2)
       i18n
-    json (1.8.3)
+    json (1.8.6)
     json_spec (1.1.4)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    kramdown (1.10.0)
+    kramdown (1.13.2)
     locomotivecms-liquid (4.0.0)
     locomotivecms-solid (4.0.1)
       locomotivecms-liquid (~> 4.0.0)
@@ -107,23 +109,25 @@ GEM
       stringex (~> 2.6.0)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    memory_profiler (0.9.6)
+    memory_profiler (0.9.7)
     method_source (0.8.2)
-    mime-types (2.6.2)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
     mimetype-fu (0.1.2)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
-    moneta (0.8.1)
-    mongo (2.2.7)
-      bson (~> 4.0)
+    moneta (1.0.0)
+    mongo (2.4.1)
+      bson (>= 4.2.1, < 5.0.0)
     morphine (0.1.1)
     multi_json (1.12.1)
     multi_xml (0.6.0)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     nokogumbo (1.4.10)
       nokogiri
-    origin (2.2.0)
+    origin (2.3.0)
     pony (1.11)
       mail (>= 2.0)
     pry (0.10.4)
@@ -134,16 +138,16 @@ GEM
       byebug (~> 8.0)
       pry (~> 0.10)
     public_suffix (2.0.5)
-    puma (3.6.0)
+    puma (3.7.0)
     rack (2.0.1)
-    rack-cache (1.6.1)
+    rack-cache (1.7.0)
       rack (>= 0.4)
-    rack-mini-profiler (0.10.1)
+    rack-mini-profiler (0.10.2)
       rack (>= 1.2.0)
     rack-rewrite (1.5.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rack_csrf (2.5.0)
+    rack_csrf (2.6.0)
       rack (>= 1.1.0)
     rake (10.4.2)
     rb-fsevent (0.9.8)
@@ -162,7 +166,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    sanitize (4.0.1)
+    sanitize (4.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.4.4)
       nokogumbo (~> 1.4.1)
@@ -173,21 +177,22 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (3.5.2)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    stackprof (0.2.9)
+    stackprof (0.2.10)
     stringex (2.6.1)
-    term-ansicolor (1.3.2)
+    term-ansicolor (1.4.0)
       tins (~> 1.0)
-    thor (0.19.1)
+    thor (0.19.4)
     thread_safe (0.3.6)
-    tilt (2.0.5)
+    tilt (2.0.6)
     timecop (0.8.1)
-    tins (1.12.0)
+    tins (1.13.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    yui-compressor (0.12.0)
+    uglifier (3.1.6)
+      execjs (>= 0.3.0, < 3)
 
 PLATFORMS
   ruby
@@ -202,8 +207,8 @@ DEPENDENCIES
   json_spec (~> 1.1.4)
   locomotivecms_steam!
   memory_profiler
-  mongo (~> 2.2.7)
-  origin (~> 2.2.0)
+  mongo (~> 2.4.1)
+  origin (~> 2.3.0)
   pry-byebug (~> 3.3.0)
   puma
   rack-mini-profiler (~> 0.10.1)
@@ -212,7 +217,9 @@ DEPENDENCIES
   rspec (~> 3.4.0)
   stackprof
   timecop (~> 0.8.0)
-  yui-compressor (~> 0.12.0)
+
+RUBY VERSION
+   ruby 2.3.3p222
 
 BUNDLED WITH
-   1.11.2
+   1.14.6

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 NoCoffee
+Copyright (c) 2017 NoCoffee
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -61,4 +61,4 @@ see the list in the issues section.
 
 ## License
 
-Copyright (c) 2016 NoCoffee. MIT Licensed, see LICENSE for details.
+Copyright (c) 2017 NoCoffee. MIT Licensed, see LICENSE for details.

data/config/locales/nl.yml

@@ -13,7 +13,7 @@ nl:
 
   errors:
     messages:
-      blank: "kan ikke være blank"
+      blank: "mag niet leeg zijn"
 
   number:
     format:
@@ -157,4 +157,4 @@ nl:
 
   pagination:
     previous: "« Vorige"
-    next: "Volgende »"
+    next: "Volgende »"

data/lib/locomotive/steam/adapters/filesystem/yaml_loaders/content_entry.rb

@@ -23,6 +23,7 @@ module Locomotive
                   modify_for_selects(_attributes)
                   modify_for_associations(_attributes)
                   modify_for_files(_attributes)
+                  modify_for_passwords(_attributes)
 
                   list << _attributes
                 end
@@ -56,6 +57,13 @@ module Locomotive
               end
             end
 
+            def modify_for_passwords(attributes)
+              content_type.password_fields.each do |field|
+                uncrypted_password = attributes.delete(field.name.to_sym)
+                attributes[:"#{field.name}_hash"] = BCrypt::Password.create(uncrypted_password)
+              end
+            end
+
             def file_size(path)
               return nil if path.blank?
 

data/lib/locomotive/steam/adapters/memory/condition.rb

@@ -47,7 +47,7 @@ module Locomotive::Steam
         protected
 
         def entry_value(entry)
-          value = entry.send(@field)
+          value = entry.send(@field) rescue nil # not just it's safe to rely on rescue (hidden errors)
 
           if value.respond_to?(:translations)
             value[@locale]

data/lib/locomotive/steam/configuration.rb

@@ -65,7 +65,7 @@ module Locomotive
       attr_accessor :asset_path
 
       # If java is installed and if this option is enabled,
-      # then YUI::JavaScriptCompressor and YUI::CssCompressor are used to minify the css and the javascript.
+      # then Uglifier and Sass are used to minify the javascript and the css.
       #
       # default: false
       #

data/lib/locomotive/steam/decorators/template_decorator.rb

@@ -38,7 +38,7 @@ module Locomotive
           begin
             Haml::Engine.new(source).render
           rescue Haml::SyntaxError => e
-            raise Steam::RenderError.new(e.message, template_path, source, e.line, e.backtrace)
+            raise Steam::RenderError.new(e, template_path, source)
           end
         end
 

data/lib/locomotive/steam/entities/content_entry.rb

@@ -1,4 +1,5 @@
 require 'chronic'
+require 'bcrypt'
 
 module Locomotive::Steam
 
@@ -131,6 +132,22 @@ module Locomotive::Steam
       _cast_convertor(field.name, &:to_f)
     end
 
+    def _cast_json(field)
+      _cast_convertor(field.name) do |value|
+        if value.respond_to?(:to_h)
+          value
+        else
+          value.blank? ? nil : JSON.parse(value)
+        end
+      end
+    end
+
+    def _cast_password(field)
+      _cast_convertor(:"#{field.name}_hash") do |value|
+        value.blank? ? nil : BCrypt::Password.new(value)
+      end
+    end
+
     def _cast_file(field)
       _cast_convertor(field.name) do |value, locale|
         if value.respond_to?(:url)

data/lib/locomotive/steam/entities/content_type.rb

@@ -8,6 +8,7 @@ module Locomotive::Steam
     def_delegator :fields, :associations, :association_fields
     def_delegator :fields, :selects, :select_fields
     def_delegator :fields, :files, :file_fields
+    def_delegator :fields, :passwords, :password_fields
     def_delegator :fields, :default, :fields_with_default
 
     def initialize(attributes = {})

data/lib/locomotive/steam/entities/content_type_field.rb

@@ -66,6 +66,7 @@ module Locomotive::Steam
       when :belongs_to, :select then "#{name}_id"
       when :many_to_many        then "#{name.singularize}_ids"
       when :has_many            then nil
+      when :password            then nil
       else name
       end
     end

data/lib/locomotive/steam/entities/editable_element.rb

@@ -20,6 +20,10 @@ module Locomotive::Steam
       self[:source].blank? ? self.content : self[:source]
     end
 
+    def content
+      self[:source].blank? ? self[:content] : self[:source]
+    end
+
     def format
       self[:format] || 'html' # only editable_text elements
     end

data/lib/locomotive/steam/errors.rb

@@ -3,14 +3,22 @@ module Locomotive::Steam
   class NoSiteException < ::Exception
   end
 
-  class ActionException < ::Exception
+  class RedirectionException < ::Exception
+
+    attr_reader :url
+
+    def initialize(url)
+      @url = url
+      super("Redirect to #{url}")
+    end
+
   end
 
-  class RenderError < ::StandardError
+  class ParsingRenderingError < ::StandardError
 
     LINES_RANGE = 10
 
-    attr_reader :file, :source, :line, :original_backtrace
+    attr_accessor :file, :line, :source, :original_backtrace
 
     def initialize(message, file, source, line, original_backtrace)
       @file, @source, @line, @original_backtrace = file, source, line, original_backtrace
@@ -23,10 +31,10 @@ module Locomotive::Steam
       lines = source.split("\n")
 
       start   = line - (LINES_RANGE / 2)
-      start   = 0 if start < 0
+      start   = 1 if start <= 0
       finish  = line + (LINES_RANGE / 2)
 
-      (start..finish).map { |i| [i, lines[i]] }
+      (start..finish).map { |i| [i, lines[i - 1]] }
     end
 
     def backtrace
@@ -35,4 +43,26 @@ module Locomotive::Steam
 
   end
 
+  class RenderError < ParsingRenderingError
+
+    def initialize(error, file, source)
+      message   = error.message
+      line      = error.respond_to?(:line_number) ? error.line_number : error.line
+      backtrace = error.backtrace
+
+      super(message, file, source, line, backtrace)
+    end
+
+  end
+
+  class ActionError < ParsingRenderingError
+
+    attr_accessor :action
+
+    def initialize(error, script)
+      super(error.message, nil, script, 0, error.backtrace)
+    end
+
+  end
+
 end