middleman-dato 0.0.1.rc12 → 0.5.0

data/lib/dato/meta_tags/article_modified_time.rb

@@ -1,5 +1,5 @@
-require "dato/meta_tags/og_meta_tag"
-require "time"
+require 'dato/meta_tags/og_meta_tag'
+require 'time'
 
 module Dato
   module MetaTags
@@ -9,7 +9,7 @@ module Dato
       end
 
       def name
-        "article:modified_time"
+        'article:modified_time'
       end
 
       def value

data/lib/dato/meta_tags/article_publisher.rb

@@ -1,5 +1,5 @@
-require "dato/meta_tags/og_meta_tag"
-require "time"
+require 'dato/meta_tags/og_meta_tag'
+require 'time'
 
 module Dato
   module MetaTags
@@ -10,7 +10,7 @@ module Dato
       end
 
       def name
-        "article:publisher"
+        'article:publisher'
       end
 
       def value

data/lib/dato/meta_tags/base.rb

@@ -1,5 +1,5 @@
-require "forwardable"
-require "dato/fields/seo"
+require 'forwardable'
+require 'dato/field_type/seo'
 
 module Dato
   module MetaTags
@@ -29,45 +29,38 @@ module Dato
       end
 
       def title_suffix
-        global_seo_field(:title_suffix) || ""
+        global_seo_field(:title_suffix) || ''
       end
 
       def no_index?
-        space && space[:attributes][:no_index]
+        space && space.no_index
       end
 
       def global_seo_field(attribute)
-        if global_seo
-          global_seo[attribute]
-        end
+        global_seo[attribute] if global_seo
       end
 
       def first_record_field_of_type(type)
         return nil unless record
 
-        field = record.fields.detect do |_name, f|
-          f[:field_type] == type.to_s
+        field = record.fields.detect do |f|
+          f.field_type == type.to_s
         end
 
-        if field
-          field_name = field.first
-          record.send(field_name)
-        end
+        record.send(field.api_key) if field
       end
 
       def fallback_seo
         @fallback_seo ||= begin
-          if global_seo
-            Fields::Seo.new(global_seo[:fallback_seo])
-          end
+          FieldType::Seo.parse(global_seo[:fallback_seo], nil) if global_seo
         end
       end
 
       def global_seo
         @global_seo ||= begin
-          if space && space[:attributes][:global_seo]
-            global_seo = space[:attributes][:global_seo]
-            if space[:attributes][:locales].size > 1
+          if space && space.global_seo
+            global_seo = space.global_seo
+            if space.locales.size > 1
               global_seo[I18n.locale]
             else
               global_seo

data/lib/dato/meta_tags/description.rb

@@ -1,4 +1,4 @@
-require "dato/meta_tags/base"
+require 'dato/meta_tags/base'
 
 module Dato
   module MetaTags
@@ -8,17 +8,17 @@ module Dato
           [
             builder.tag(
               :meta,
-              name: "description",
+              name: 'description',
               content: description
             ),
             builder.tag(
               :meta,
-              property: "og:description",
+              property: 'og:description',
               content: description
             ),
             builder.tag(
               :meta,
-              name: "twitter:description",
+              name: 'twitter:description',
               content: description
             )
           ]

data/lib/dato/meta_tags/image.rb

@@ -1,4 +1,4 @@
-require "dato/meta_tags/base"
+require 'dato/meta_tags/base'
 
 module Dato
   module MetaTags
@@ -6,8 +6,8 @@ module Dato
       def build
         if image.present?
           [
-            builder.tag(:meta, property: "og:image", content: image),
-            builder.tag(:meta, name: "twitter:image", content: image)
+            builder.tag(:meta, property: 'og:image', content: image),
+            builder.tag(:meta, name: 'twitter:image', content: image)
           ]
         end
       end
@@ -17,13 +17,10 @@ module Dato
           :image,
           first_record_field_of_type(:image)
         ) do |i|
-          i.attributes[:width] >= 200 &&
-          i.attributes[:height] >= 200
+          i.width >= 200 && i.height >= 200
         end
 
-        if image
-          image.file.format("jpg").to_url
-        end
+        image.file.format('jpg').to_url if image
       end
     end
   end

data/lib/dato/meta_tags/og_locale.rb

@@ -1,4 +1,4 @@
-require "dato/meta_tags/og_meta_tag"
+require 'dato/meta_tags/og_meta_tag'
 
 module Dato
   module MetaTags
@@ -8,7 +8,7 @@ module Dato
       end
 
       def name
-        "og:locale"
+        'og:locale'
       end
 
       def value

data/lib/dato/meta_tags/og_meta_tag.rb

@@ -1,4 +1,4 @@
-require "dato/meta_tags/base"
+require 'dato/meta_tags/base'
 
 module Dato
   module MetaTags
@@ -8,9 +8,7 @@ module Dato
       end
 
       def build
-        if buildable?
-          builder.tag(:meta, property: name, content: value)
-        end
+        builder.tag(:meta, property: name, content: value) if buildable?
       end
 
       def name

data/lib/dato/meta_tags/og_site_name.rb

@@ -1,4 +1,4 @@
-require "dato/meta_tags/og_meta_tag"
+require 'dato/meta_tags/og_meta_tag'
 
 module Dato
   module MetaTags
@@ -8,7 +8,7 @@ module Dato
       end
 
       def name
-        "og:site_name"
+        'og:site_name'
       end
 
       def value

data/lib/dato/meta_tags/og_type.rb

@@ -1,4 +1,4 @@
-require "dato/meta_tags/og_meta_tag"
+require 'dato/meta_tags/og_meta_tag'
 
 module Dato
   module MetaTags
@@ -8,16 +8,16 @@ module Dato
       end
 
       def name
-        "og:type"
+        'og:type'
       end
 
       def value
         if !record
-          "website"
+          'website'
         elsif record.singleton?
-          "website"
+          'website'
         else
-          "article"
+          'article'
         end
       end
     end

data/lib/dato/meta_tags/robots.rb

@@ -1,12 +1,10 @@
-require "dato/meta_tags/base"
+require 'dato/meta_tags/base'
 
 module Dato
   module MetaTags
     class Robots < Base
       def build
-        if no_index?
-          builder.tag(:meta, name: "robots", content: "noindex")
-        end
+        builder.tag(:meta, name: 'robots', content: 'noindex') if no_index?
       end
     end
   end

data/lib/dato/meta_tags/title.rb

@@ -1,4 +1,4 @@
-require "dato/meta_tags/base"
+require 'dato/meta_tags/base'
 
 module Dato
   module MetaTags
@@ -7,8 +7,8 @@ module Dato
         if title.present?
           [
             builder.content_tag(:title, title_with_suffix),
-            builder.tag(:meta, property: "og:title", content: title),
-            builder.tag(:meta, name: "twitter:title", content: title)
+            builder.tag(:meta, property: 'og:title', content: title),
+            builder.tag(:meta, name: 'twitter:title', content: title)
           ]
         end
       end
@@ -16,7 +16,8 @@ module Dato
       def title
         @title ||= seo_field_with_fallback(
           :title,
-          first_record_field_of_type(:title)
+          record && record.title_attribute &&
+            record.send(record.title_attribute)
         )
       end
 

data/lib/dato/meta_tags/twitter_card.rb

@@ -1,4 +1,4 @@
-require "dato/meta_tags/twitter_meta_tag"
+require 'dato/meta_tags/twitter_meta_tag'
 
 module Dato
   module MetaTags
@@ -8,11 +8,11 @@ module Dato
       end
 
       def name
-        "twitter:card"
+        'twitter:card'
       end
 
       def value
-        "summary"
+        'summary'
       end
     end
   end

data/lib/dato/meta_tags/twitter_meta_tag.rb

@@ -1,4 +1,4 @@
-require "dato/meta_tags/base"
+require 'dato/meta_tags/base'
 
 module Dato
   module MetaTags
@@ -8,9 +8,7 @@ module Dato
       end
 
       def build
-        if buildable?
-          builder.tag(:meta, name: name, content: value)
-        end
+        builder.tag(:meta, name: name, content: value) if buildable?
       end
 
       def name

data/lib/dato/meta_tags/twitter_site.rb

@@ -1,4 +1,4 @@
-require "dato/meta_tags/twitter_meta_tag"
+require 'dato/meta_tags/twitter_meta_tag'
 
 module Dato
   module MetaTags
@@ -8,7 +8,7 @@ module Dato
       end
 
       def name
-        "twitter:site"
+        'twitter:site'
       end
 
       def value

data/lib/dato/meta_tags/url.rb

@@ -1,4 +1,4 @@
-require "dato/meta_tags/base"
+require 'dato/meta_tags/base'
 
 module Dato
   module MetaTags
@@ -6,9 +6,9 @@ module Dato
       def build
         if url.present?
           [
-            builder.tag(:link, rel: "canonical", href: url),
-            builder.tag(:meta, property: "og:url", content: url),
-            builder.tag(:meta, name: "twitter:url", content: url)
+            builder.tag(:link, rel: 'canonical', href: url),
+            builder.tag(:meta, property: 'og:url', content: url),
+            builder.tag(:meta, name: 'twitter:url', content: url)
           ]
         end
       end

data/lib/dato/meta_tags_builder.rb

@@ -1,15 +1,15 @@
-require "dato/meta_tags/title"
-require "dato/meta_tags/description"
-require "dato/meta_tags/image"
-require "dato/meta_tags/url"
-require "dato/meta_tags/robots"
-require "dato/meta_tags/og_locale"
-require "dato/meta_tags/og_type"
-require "dato/meta_tags/og_site_name"
-require "dato/meta_tags/article_modified_time"
-require "dato/meta_tags/article_publisher"
-require "dato/meta_tags/twitter_card"
-require "dato/meta_tags/twitter_site"
+require 'dato/meta_tags/title'
+require 'dato/meta_tags/description'
+require 'dato/meta_tags/image'
+require 'dato/meta_tags/url'
+require 'dato/meta_tags/robots'
+require 'dato/meta_tags/og_locale'
+require 'dato/meta_tags/og_type'
+require 'dato/meta_tags/og_site_name'
+require 'dato/meta_tags/article_modified_time'
+require 'dato/meta_tags/article_publisher'
+require 'dato/meta_tags/twitter_card'
+require 'dato/meta_tags/twitter_site'
 
 module Dato
   class MetaTagsBuilder
@@ -26,7 +26,7 @@ module Dato
       MetaTags::ArticlePublisher,
       MetaTags::TwitterCard,
       MetaTags::TwitterSite
-    ]
+    ].freeze
 
     def initialize(*args)
       @args = args

data/lib/dato/middleman_extension.rb

@@ -1,29 +1,24 @@
-require "middleman-core"
-require "dato/repo"
-require "dato/meta_tags_builder"
-require "ostruct"
+require 'middleman-core'
+require 'dato/space'
+require 'dato/meta_tags_builder'
 
 module Dato
   class MiddlemanExtension < ::Middleman::Extension
-    option :domain, nil, "Space domain"
-    option :token, nil, "Space API token"
-    option :api_host, "http://dato-api.herokuapp.com", "Space API token"
-    option :base_url, nil, "Website base URL"
+    attr_reader :space
 
-    attr_reader :records
+    option :domain, nil, 'Space domain'
+    option :token, nil, 'Space API token'
+    option :api_host, 'http://api.datocms.com', 'Space API token'
+    option :base_url, nil, 'Website base URL'
 
     def initialize(app, options_hash = {}, &block)
       super
 
-      Repo.instance.connection_options = options
-      Repo.instance.sync!
+      @space = space = Dato::Space.new(options)
+      @space.refresh!
 
       app.before do
-        if !build? && !ENV.fetch("DISABLE_DATO_REFRESH", false)
-          print "Syncing Dato space... "
-          Repo.instance.sync!
-          puts "done."
-        end
+        space.refresh! if !build? && !ENV.fetch('DISABLE_DATO_REFRESH', false)
         true
       end
 
@@ -32,26 +27,23 @@ module Dato
 
     module InstanceMethods
       def dato
-        OpenStruct.new(Repo.instance.records_per_content_type)
+        extensions[:dato].space.records_repo
       end
     end
 
     helpers do
       def dato
-        OpenStruct.new(Repo.instance.records_per_content_type)
+        extensions[:dato].space.records_repo
       end
 
       def dato_meta_tags(record)
         builder = MetaTagsBuilder.new(
           self,
-          Repo.instance.connection_options[:base_url],
-          Repo.instance.space,
+          extensions[:dato].options[:base_url],
+          extensions[:dato].space.entity,
           record
         )
         builder.meta_tags
-      rescue Exception => e
-        puts e.message
-        puts e.backtrace.join("\n")
       end
     end
   end