middleman-headless 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3511cd0a8e7eaeb9ae1f43f98724fb79cd3974bd
-  data.tar.gz: a70dfec8c556aa76b3d1ebb843f6bbcfe1c4ea00
+  metadata.gz: 4a313f95df220ded23eaf7b53d45fe4f7b9a5db3
+  data.tar.gz: 113bb0e0c349221122bed050bb67a4061a91988b
 SHA512:
-  metadata.gz: 030def5dcf075c2efb10310dfe732dae03a9f964c10f5945efb949651f6778e62ea794bc60a2142f8f24ca595b3207e14f5198861918dce41dccc4d84cdf9884
-  data.tar.gz: 828711ce679cbae8c4c6dba0be0a5becee44e476654ea4ed8a6054f78e1167f1fb239679ca3af4526cd73b72b443b489121e4494ebafd09bc42137a971d89286
+  metadata.gz: d0fd6bb4f7d1c5eecd69cab8bddb918b8529042d8c451e88c15fd218b49b68321795dbe7a646e2d8d295a3fd2d5e6d41a65d9698f7c2137845a72c4340d00d2d
+  data.tar.gz: e4aed804224f0e4510811606e2f53df6b29fe346d82a0085ce7af00810ba15edaaa7d244fd07ceff4b2fdca560b9e344f22445c8578cfcef067495c4ee730024

data/.ruby-version

@@ -0,0 +1 @@
+2.4.2

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+ruby '2.4.2'
+
 gemspec

data/README.md

@@ -13,7 +13,7 @@ After that you need to create the following content types:
 ```
 post:
   title: string
-  body: string (multiline)
+  body: document
   image: asset
   author: reference (author)
 

data/example/Gemfile.lock

@@ -1,71 +1,69 @@
 PATH
-  remote: ../
+  remote: ..
   specs:
     middleman-headless (0.4.1)
       middleman-core (~> 4.1)
       mime-types (~> 3.1)
+      nokogiri (~> 1.10)
       oauth2 (~> 1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.0.6)
+    activesupport (5.0.7.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
-    backports (3.10.3)
+    backports (3.12.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    compass-import-once (1.0.5)
-      sass (>= 3.2, < 3.5)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.4)
     contracts (0.13.0)
-    dotenv (2.2.1)
+    dotenv (2.7.1)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     erubis (2.7.0)
-    eventmachine (1.2.5)
+    eventmachine (1.2.7)
     execjs (2.7.0)
-    faraday (0.12.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     fast_blank (1.0.0)
-    fastimage (2.1.0)
-    ffi (1.9.18)
+    fastimage (2.1.5)
+    ffi (1.10.0)
     haml (5.0.4)
       temple (>= 0.8.0)
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hashie (3.5.6)
+    hashie (3.6.0)
     http_parser.rb (0.6.0)
-    i18n (0.7.0)
-    jwt (1.5.6)
-    kramdown (1.15.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    jwt (2.1.0)
+    kramdown (1.17.0)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
     memoist (0.16.0)
-    middleman (4.2.1)
+    middleman (4.3.3)
       coffee-script (~> 2.2)
-      compass-import-once (= 1.0.5)
       haml (>= 4.0.5)
       kramdown (~> 1.2)
-      middleman-cli (= 4.2.1)
-      middleman-core (= 4.2.1)
-      sass (>= 3.4.0, < 4.0)
-    middleman-cli (4.2.1)
+      middleman-cli (= 4.3.3)
+      middleman-core (= 4.3.3)
+    middleman-cli (4.3.3)
       thor (>= 0.17.0, < 2.0)
-    middleman-core (4.2.1)
+    middleman-core (4.3.3)
       activesupport (>= 4.2, < 5.1)
       addressable (~> 2.3)
       backports (~> 3.6)
-      bundler (~> 1.1)
+      bundler
       contracts (~> 0.13.0)
       dotenv
       erubis
@@ -74,30 +72,33 @@ GEM
       fastimage (~> 2.0)
       hamster (~> 3.0)
       hashie (~> 3.4)
-      i18n (~> 0.7.0)
+      i18n (~> 0.9.0)
       listen (~> 3.0.0)
       memoist (~> 0.14)
       padrino-helpers (~> 0.13.0)
       parallel
       rack (>= 1.4.5, < 3)
-      sass (>= 3.4)
+      sassc (~> 2.0)
       servolux
-      tilt (~> 2.0)
+      tilt (~> 2.0.9)
       uglifier (~> 3.0)
     middleman-livereload (3.4.6)
       em-websocket (~> 0.5.1)
       middleman-core (>= 3.3)
       rack-livereload (~> 0.3.15)
-    mime-types (3.1)
+    mime-types (3.2.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    minitest (5.10.3)
-    multi_json (1.12.2)
+    mime-types-data (3.2018.0812)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    nokogiri (1.10.1)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
@@ -107,21 +108,24 @@ GEM
       tilt (>= 1.4.1, < 3)
     padrino-support (0.13.3.4)
       activesupport (>= 3.1)
-    parallel (1.12.0)
-    public_suffix (3.0.0)
-    rack (2.0.3)
-    rack-livereload (0.3.16)
+    parallel (1.14.0)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-livereload (0.3.17)
       rack
-    rb-fsevent (0.10.2)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
-    sass (3.4.25)
+    rake (12.3.2)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
+    sassc (2.0.1)
+      ffi (~> 1.9)
+      rake
     servolux (0.13.0)
-    temple (0.8.0)
-    thor (0.20.0)
+    temple (0.8.1)
+    thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.8)
-    tzinfo (1.2.3)
+    tilt (2.0.9)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
@@ -135,4 +139,4 @@ DEPENDENCIES
   middleman-livereload
 
 BUNDLED WITH
-   1.13.6
+   2.0.1

data/example/config.rb

@@ -1,9 +1,8 @@
 activate :headless,
-  address: 'http://0.0.0.0:4000',
-  app_key: '4cb0c70e-734c-487e-85a8-e85fc65bafe2',
-  app_secret: '171445d9-020d-42c4-8513-b8674203eeaf',
-  space: 'example',
-  download_assets: true
+  address: 'http://0.0.0.0:8000',
+  app_key: '4b64998c-da49-4c5c-baf0-dd039f2d501d',
+  app_secret: '133560ba-7393-4fd4-815e-3b5ac03346a9',
+  space: 'example'
 
 configure :development do
   activate :livereload

data/example/source/index.html.erb

@@ -18,9 +18,9 @@
 
 <% headless.posts.each do |post| %>
   <h2><%= post.title %></h2>
-  <p><%= image_tag post.asset(:image).url(width: 400), alt: post.asset(:image).name %></p>
-  <p><%= post.body %></p>
-  <p>Written by <%= post.reference(:author).name %></p>
+  <p><%= image_tag post.asset(:image)&.url(width: 400), alt: post.asset(:image)&.name %></p>
+  <p><%= post.render(:body, 400) %></p>
+  <p>Written by <%= post.reference(:author)&.name %></p>
 <% end %>
 
 </body>

data/lib/middleman-headless/interface.rb

@@ -32,7 +32,7 @@ module MiddlemanHeadless
 
     def entries(content_type)
       content_type = content_type[:slug] if content_type.is_a?(Hash)
-      path = "entries/#{@options.space}/#{content_type}"
+      path = "entries/#{@options.space}/#{content_type}?render-documents=true"
       @entries_cache[content_type.to_sym] ||= get(path).map do |item|
         Entry.new(item.with_indifferent_access, self)
       end
@@ -112,40 +112,27 @@ module MiddlemanHeadless
     end
 
     def field(key)
-      v = version(I18n.locale)
-      return nil if v.nil?
-      v.field(key)
+      version(I18n.locale)&.field(key)
     end
 
     def asset(key)
-      @interface.asset(field(key))
+      version(I18n.locale)&.asset(key)
     end
 
     def assets(key)
-      assets = field(key)
-      return [] if assets.nil?
-
-      assets.map do |value|
-        @interface.asset(value)
-      end
+      version(I18n.locale)&.assets(key)
     end
 
     def reference(key, type=nil)
-      type = key if type.nil?
-      ref = field(key)
-      return nil if ref.nil?
-
-      Reference.new(type, ref, @interface)
+      version(I18n.locale)&.reference(key, type)
     end
 
     def references(key, type=nil)
-      type = key if type.nil?
-      refs = field(key)
-      return [] if refs.nil?
+      version(I18n.locale)&.references(key, type)
+    end
 
-      refs.map do |value|
-        Reference.new(type, value, @interface)
-      end
+    def render(key, width)
+      version(I18n.locale)&.render(key, width)
     end
 
     def method_missing(key)
@@ -171,6 +158,50 @@ module MiddlemanHeadless
       @data[:published_at]
     end
 
+    def asset(key)
+      @interface.asset(field(key))
+    end
+
+    def assets(key)
+      assets = field(key)
+      return [] if assets.nil?
+
+      assets.map do |value|
+        @interface.asset(value)
+      end
+    end
+
+    def reference(key, type=nil)
+      type = key if type.nil?
+      ref = field(key)
+      return nil if ref.nil?
+
+      Reference.new(type, ref, @interface)
+    end
+
+    def references(key, type=nil)
+      type = key if type.nil?
+      refs = field(key)
+      return [] if refs.nil?
+
+      refs.map do |value|
+        Reference.new(type, value, @interface)
+      end
+    end
+
+    def render(key, width)
+      doc = field(key)
+      return '' if doc.nil?
+
+      html = Nokogiri::HTML::DocumentFragment.parse(doc)
+
+      html.css('img').each do |img|
+        img['src'] += "?width=#{width}"
+      end
+
+      html.to_html
+    end
+
     def method_missing(key)
       field(key)
     end
@@ -223,9 +254,7 @@ module MiddlemanHeadless
     end
 
     def method_missing(*args)
-      e = entry
-      return nil if e.nil?
-      entry.send(*args)
+      entry&.send(*args)
     end
   end
 end

data/middleman-headless.gemspec

@@ -1,15 +1,14 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'middleman-headless'
-  s.version     = '0.4.1'
+  s.version     = '0.5.0'
   s.licenses    = ['MIT']
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Joël Gähwiler']
   s.email       = ['joel@twomanyprojects.com']
   s.homepage    = 'https://github.com/twomanyprojects/middleman-headless'
-  s.summary     = %q{Middleman extension to load content from the Headless Content Management System.}
+  s.summary     = 'Middleman extension to load content from the Headless CMS.'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
@@ -17,6 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_runtime_dependency('middleman-core', ['~> 4.1'])
-  s.add_runtime_dependency('oauth2', ['~> 1.4'])
   s.add_runtime_dependency('mime-types', ['~> 3.1'])
+  s.add_runtime_dependency('nokogiri', ['~> 1.10'])
+  s.add_runtime_dependency('oauth2', ['~> 1.4'])
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-headless
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Joël Gähwiler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-23 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -25,33 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: oauth2
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: oauth2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 description: 
 email:
 - joel@twomanyprojects.com
@@ -60,6 +74,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -91,9 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: Middleman extension to load content from the Headless Content Management
-  System.
+summary: Middleman extension to load content from the Headless CMS.
 test_files: []