RubyGems - locomotivecms_wagon - Versions diffs - 1.1.0 → 1.2.0 - Mend

locomotivecms_wagon 1.1.0 → 1.2.0

Files changed (43) hide show

data/Gemfile CHANGED Viewed

@@ -4,6 +4,6 @@ source 'https://rubygems.org'
 gemspec
 # Development
-#gem 'locomotivecms_mounter', path: '../gems/mounter', require: false
+# gem 'locomotivecms_mounter', path: '../gems/mounter', require: false
 gem 'rb-fsevent', '~> 0.9.1'

data/generators/bootstrap/app/views/pages/index.liquid CHANGED Viewed

@@ -11,6 +11,13 @@ published: true
     <meta name="description" content="{{ site.meta_description }}">
     <meta name="keywords" content="{{ site.meta_keywords }}">
+	<!-- Fonts -->
+	{{ 'fonts/awesome.css' | stylesheet_tag }}
+	{{ 'fonts/font-awesome.css' | stylesheet_tag }}
+    <!--[if IE 7]>
+      {{ 'fonts/font-awesome-ie7.min.css' | stylesheet_tag }}
+    <![endif]-->
     <!-- Le styles -->
     {{ 'bootstrap.css' | stylesheet_tag }}
     {{ 'bootstrap-responsive.css' | stylesheet_tag }}
@@ -20,6 +27,8 @@ published: true
     <!--[if lt IE 9]>
       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
     <![endif]-->
+    {% inline_editor %}
   </head>
   <body>
@@ -42,7 +51,7 @@ published: true
       <div class="jumbotron">
         <h1>Super awesome marketing speak!</h1>
         <p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
-        <a class="btn btn-large btn-success" href="#">Sign up today</a>
+        <a class="btn btn-large btn-success icon-flag" href="#">Sign up today</a>
       </div>
       <hr>

data/generators/bootstrap/app/views/pages/index.liquid.haml CHANGED Viewed

@@ -13,6 +13,12 @@ published: true
     %meta{:content => "{{ site.meta_description }}", :name => "description"}
     %meta{:content => "{{ site.meta_keywords }}", :name => "keywords"}
+    / Fonts
+    {{ 'fonts/awesome.css' | stylesheet_tag }}
+    {{ 'fonts/font-awesome.css' | stylesheet_tag }}
+    /[if IE 7]
+      {{ 'fonts/font-awesome-ie7.min.css' | stylesheet_tag }}
     / Le styles
     {{ 'bootstrap.css' | stylesheet_tag }}
     {{ 'bootstrap-responsive.css' | stylesheet_tag }}
@@ -21,6 +27,8 @@ published: true
     / HTML5 shim, for IE6-8 support of HTML5 elements
     /[if lt IE 9]
       <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    {% inline_editor %}
   %body
     .container-narrow
@@ -40,7 +48,7 @@ published: true
       .jumbotron
         %h1 Super awesome marketing speak!
         %p.lead Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.
-        %a.btn.btn-large.btn-success{:href => "#"} Sign up today
+        %a.btn.icon-flag.btn-large.btn-success{:href => "#"} Sign up today
       %hr

data/generators/bootstrap/public/stylesheets/fonts/awesome.css.scss ADDED Viewed

@@ -0,0 +1,3 @@
+@import "compass/css3/font-face";
+@include font-face("FontAwesome", font-files("fontawesome-webfont.woff", "fontawesome-webfont.eot", "fontawesome-webfont.ttf"));

data/generators/bootstrap/public/{fonts → stylesheets/fonts}/font-awesome-ie7.min.css RENAMED Viewed

File without changes

data/generators/bootstrap/public/{fonts → stylesheets/fonts}/font-awesome.css RENAMED Viewed

@@ -20,15 +20,6 @@
     Work: Lead Product Designer @ http://kyruus.com
     */
-@font-face {
-  font-family: 'FontAwesome';
-  src: url('fontawesome-webfont.eot');
-  src: url('fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
-    url('fontawesome-webfont.woff') format('woff'),
-    url('fontawesome-webfont.ttf') format('truetype');
-  font-weight: normal;
-  font-style: normal;
-}
 /*  Font Awesome styles
     ------------------------------------------------------- */
 /* includes sprites.less reset */

data/generators/foundation/app/views/pages/index.liquid CHANGED Viewed

@@ -17,6 +17,7 @@ published: true
   {{ 'vendor/custom.modernizr.js' | javascript_tag }}
+  {% inline_editor %}
 </head>
 <body>

data/generators/foundation/app/views/pages/index.liquid.haml CHANGED Viewed

@@ -16,6 +16,8 @@ published: true
     {{ 'foundation.css' | stylesheet_tag }}
     {{ 'vendor/custom.modernizr.js' | javascript_tag }}
+    {% inline_editor %}
   %body
     .row
       .large-12.columns
@@ -96,7 +98,7 @@ published: true
     {{ 'foundation.min.js' | javascript_tag }}
       / {{ 'foundation/foundation.js' | javascript_tag }}
       / {{ 'foundation/foundation.alerts.js' | javascript_tag }}

data/lib/locomotive/wagon/liquid.rb CHANGED Viewed

@@ -1,6 +1,8 @@
 require 'liquid'
 require 'locomotive/mounter'
+require 'locomotive/wagon/liquid/scopeable'
 require 'locomotive/wagon/liquid/drops/base'
+require 'locomotive/wagon/liquid/tags/hybrid'
 %w{. drops tags filters}.each do |dir|
   Dir[File.join(File.dirname(__FILE__), 'liquid', dir, '*.rb')].each { |lib| require lib }

data/lib/locomotive/wagon/liquid/drops/content_types.rb CHANGED Viewed

@@ -1,5 +1,3 @@
-require "locomotive/wagon/scopeable"
 module Locomotive
   module Wagon
     module Liquid
@@ -14,6 +12,7 @@ module Locomotive
         end
         class ProxyCollection < ::Liquid::Drop
           include Scopeable
           def initialize(content_type)
@@ -21,6 +20,10 @@ module Locomotive
             @collection = nil
           end
+          def all
+            self.collection
+          end
           def first
             self.collection.first
           end
@@ -95,7 +98,7 @@ module Locomotive
           def collection
             return unless @collection.blank?
             @collection = apply_scope(@content_type.entries)
           end
         end

data/lib/locomotive/wagon/liquid/drops/page.rb CHANGED Viewed

@@ -5,7 +5,7 @@ module Locomotive
         class Page < Base
           delegate :title, :slug, :fullpath, :parent, :depth, :seo_title, :redirect_url, :meta_description, :meta_keywords,
-                   :templatized?, :published?, :redirect?, :listed?, to: '_source'
+                   :templatized?, :published?, :redirect?, :listed?, :handle, to: '_source'
           def children
             _children = _source.children || []
@@ -16,7 +16,7 @@ module Locomotive
           def content_type
             ProxyCollection.new(_source.content_type) if _source.content_type
           end
           def breadcrumbs
             # TODO
             ''

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

@@ -1,5 +1,3 @@
-require "locomotive/wagon/scopeable"
 module Locomotive
   module Wagon
     module Liquid

data/lib/locomotive/wagon/liquid/filters/misc.rb CHANGED Viewed

@@ -18,6 +18,10 @@ module Locomotive
             input.blank? ? value : input
           end
+          def random(input)
+            rand(input.to_i)
+          end
         end
         ::Liquid::Template.register_filter(Misc)

data/lib/locomotive/wagon/liquid/filters/text.rb CHANGED Viewed

@@ -35,7 +35,6 @@ module Locomotive
             result
           end
           def textile(input)
             ::RedCloth.new(input).to_html
           end

data/lib/locomotive/wagon/liquid/scopeable.rb ADDED Viewed

@@ -0,0 +1,32 @@
+module Locomotive
+  module Wagon
+    module Liquid
+      module Scopeable
+        def apply_scope(entries)
+          if @context['with_scope'].blank?
+            entries
+          else
+            collection = []
+            conditions = @context['with_scope'].clone.delete_if { |k, _| %w(order_by per_page page).include?(k) }
+            entries.each do |content|
+              accepted = (conditions.map do |key, value|
+                case value
+                when TrueClass, FalseClass, String, Integer then content.send(key) == value
+                else
+                  true
+                end
+              end).all? # all conditions works ?
+              collection << content if accepted
+            end
+            collection
+          end
+        end
+      end
+    end
+  end
+end

data/lib/locomotive/wagon/liquid/tags/editable.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 require 'locomotive/wagon/liquid/tags/editable/base'
+require 'locomotive/wagon/liquid/tags/editable/text'
 require 'locomotive/wagon/liquid/tags/editable/short_text'
 require 'locomotive/wagon/liquid/tags/editable/long_text'
 require 'locomotive/wagon/liquid/tags/editable/file'

data/lib/locomotive/wagon/liquid/tags/editable/base.rb CHANGED Viewed

@@ -22,7 +22,7 @@ module Locomotive
             def render(context)
               current_page = context.registers[:page]
-              element = current_page.find_editable_element(context['block'].try(:name), @slug)
+              element = current_page.find_editable_element(self.current_block_name(context), @slug)
               if element.present?
                 render_element(context, element)
@@ -37,6 +37,10 @@ module Locomotive
               element.content
             end
+            def current_block_name(context)
+              context['block'].try(:name)
+            end
           end
         end

data/lib/locomotive/wagon/liquid/tags/editable/short_text.rb CHANGED Viewed

@@ -5,6 +5,11 @@ module Locomotive
         module Editable
           class ShortText < Base
+            def render(context)
+              Locomotive::Wagon::Logger.warn "  [#{self.current_block_name(context)}/#{@slug}] The editable_{short|long}_text tags are deprecated. Use editable_text instead.".colorize(:orange)
+              super(context)
+            end
           end
           ::Liquid::Template.register_tag('editable_short_text', ShortText)

data/lib/locomotive/wagon/liquid/tags/editable/text.rb ADDED Viewed

@@ -0,0 +1,15 @@
+module Locomotive
+  module Wagon
+    module Liquid
+      module Tags
+        module Editable
+          class Text < Base
+          end
+          ::Liquid::Template.register_tag('editable_text', Text)
+        end
+      end
+    end
+  end
+end

data/lib/locomotive/wagon/liquid/tags/hybrid.rb ADDED Viewed

@@ -0,0 +1,27 @@
+module Locomotive
+  module Wagon
+    module Liquid
+      module Tags
+        class Hybrid < ::Liquid::Block
+          def parse(tokens)
+            nesting = 0
+            tokens.each do |token|
+              next unless token =~ IsTag
+              if token =~ FullToken
+                if nesting == 0 && $1 == block_delimiter
+                  @render_as_block = true
+                  super
+                  return
+                elsif $1 == block_name
+                  nesting += 1
+                elsif $1 == block_delimiter
+                  nesting -= 1
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/locomotive/wagon/liquid/tags/link_to.rb ADDED Viewed

@@ -0,0 +1,112 @@
+module Locomotive
+  module Wagon
+    module Liquid
+      module Tags
+        class LinkTo < Hybrid
+          Syntax = /(#{::Liquid::Expression}+)(#{::Liquid::TagAttributes}?)/
+          def initialize(tag_name, markup, tokens, context)
+            if markup =~ Syntax
+              @handle = $1
+              @options = {}
+              markup.scan(::Liquid::TagAttributes) do |key, value|
+                @options[key] = value
+              end
+            else
+              raise SyntaxError.new("Syntax Error in 'link_to' - Valid syntax: link_to page_handle, locale es (locale is optional)")
+            end
+            super
+          end
+          def render(context)
+            if page = self.retrieve_page_from_handle(context)
+              label = self.label_from_page(page)
+              path  = self.public_page_url(context, page)
+              if @render_as_block
+                context.scopes.last['target'] = page
+                label = super.html_safe
+              end
+              %{<a href="#{path}">#{label}</a>}
+            else
+              '' # no page found
+            end
+          end
+          protected
+          def retrieve_page_from_handle(context)
+            mounting_point = context.registers[:mounting_point]
+            context.scopes.reverse_each do |scope|
+              handle = scope[@handle] || @handle
+              page = case handle
+              when Locomotive::Mounter::Models::Page          then handle
+              when String                                     then fetch_page(mounting_point, handle)
+              when Liquid::Drops::ContentEntry                then fetch_page(mounting_point, handle._source, true)
+              when Locomotive::Mounter::Models::ContentEntry  then fetch_page(mounting_point, handle, true)
+              else
+                nil
+              end
+              return page unless page.nil?
+            end
+            nil
+          end
+          def fetch_page(mounting_point, handle, templatized = false)
+            ::Locomotive::Mounter.with_locale(@options['locale']) do
+              if templatized
+                page = mounting_point.pages.values.find do |_page|
+                  _page.templatized? &&
+                  _page.content_type.slug == handle.content_type.slug &&
+                  (@options['with'].nil? || _page.handle == @options['with'])
+                end
+                page.content_entry = handle if page
+                page
+              else
+                mounting_point.pages.values.find { |_page| _page.handle == handle }
+              end
+            end
+          end
+          def label_from_page(page)
+            ::Locomotive::Mounter.with_locale(@options['locale']) do
+              if page.templatized?
+                page.content_entry._label
+              else
+                page.title
+              end
+            end
+          end
+          def public_page_url(context, page)
+            mounting_point  = context.registers[:mounting_point]
+            fullpath = ::Locomotive::Mounter.with_locale(@options['locale']) do
+              page.fullpath.clone
+            end
+            fullpath = "#{::I18n.locale}/#{fullpath}" if ::I18n.locale.to_s != mounting_point.default_locale.to_s
+            if page.templatized?
+              fullpath.gsub!(/(content_type_template|template)/, page.content_entry._slug)
+            end
+            File.join('/', fullpath)
+          end
+        end
+        ::Liquid::Template.register_tag('link_to', LinkTo)
+      end
+    end
+  end
+end