middleman-dato 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 847b712bcdae73ce71dfc2202f07c21a77ee0357
-  data.tar.gz: 5a2ccd82a4132674cee8ef7beee080d4deb4f445
+  metadata.gz: e514bf545d59aaa6843c2ee8d0259a36e8897b40
+  data.tar.gz: 78f3d9cdc1f73b51ab35b82f8e5c0930c1dd02a5
 SHA512:
-  metadata.gz: 23dec01ce0b72dc2223cddca7d2a21108c2775dd977b847d323afc53849d397814c0c6bbe6e42a48e9fa014cdbd87372cafffdf9815eea95a5466aa8b212e2c5
-  data.tar.gz: 9a1d93e32b80245ac29d292b79baa33703f42445181b185fbf359a2ef0fa22429244887023f3896730b5195c558243f08e42a7841c74af4a8dfa878d39a8ed77
+  metadata.gz: 2548e31a5d023fcf633b3b037fe330c1e3cc6de150920a94e17b0e532b79f28d038e66e724073ba152150981b7b04cf31776ec951dd3681a9ca48b6c33847f2a
+  data.tar.gz: c7888a2cadf22659e248f4031a04a00aaee8cb45be7ed9d080c2618540f8cecf748703a15e0029fca4804148872c516b79c8a5315a2a9651d37f3b454d0c150b

data/README.md

@@ -21,18 +21,18 @@ activate :dato,
 
 ### `dato`
 
-Using this helper you can access to any record stored in your space by content type. 
-That is, if your space has a Content Type with `article` as API identifier, you can get 
-the complete array of records with `dato.articles` (yep, the identifier pluralized). 
+Using this helper you can access to any item stored in your site by item type. 
+That is, if your site has an Item Type with `article` as API identifier, you can get 
+the complete array of items with `dato.articles` (yep, the identifier pluralized). 
 
-If a Content Type is marked as Singleton (ie. `about_page`) you don't need to pluralize and 
-a call to `dato.about_page` directly returns the Record (or `nil`, if still hasn't been created
+If a Item Type is marked as Singleton (ie. `about_page`) you don't need to pluralize and 
+a call to `dato.about_page` directly returns the Item (or `nil`, if still hasn't been created
 within the backend).
 
-You can query any Record field value with a method called like the field API identifier.
+You can query any Item field value with a method called like the field API identifier.
 
-If a Content Type has a String field with Title appeareance, than the record responds to `.slug`,
-returning a slugified version of the title itself (or the record identifier, if the title is empty).
+If a Item Type has a String field with Title appeareance, than the item responds to `.slug`,
+returning a slugified version of the title itself (or the item identifier, if the title is empty).
 
 You can use this helper within Middleman `config.rb`, as well as within your views:
 
@@ -61,7 +61,7 @@ Please [refer to the code](https://github.com/datocms/middleman-dato/tree/master
 
 ### `dato_meta_tags`
 
-This helper takes any record with a SEO field and generates SEO, Facebook OpenGraph and Twitter card meta tags based on it:
+This helper takes any item with a SEO field and generates SEO, Facebook OpenGraph and Twitter card meta tags based on it:
 
 ```ruby
 <%= dato_meta_tags(dato.homepage) %>
@@ -91,7 +91,7 @@ This helper takes any record with a SEO field and generates SEO, Facebook OpenGr
 
 ### `dato_favicon_meta_tags`
 
-This helper generates meta tags based on the Favicon image specified within the Space:
+This helper generates meta tags based on the Favicon image specified within the Site:
 
 ```ruby
 <%= dato_favicon_meta_tags(theme_color: '#D97C5F') %>

data/lib/middleman_dato/client.rb

@@ -11,16 +11,16 @@ module MiddlemanDato
       @token = token
     end
 
-    def space
+    def site
       include = [
-        'content_types',
-        'content_types.fields'
+        'item_types',
+        'item_types.fields'
       ]
-      get('space', include: include).body.with_indifferent_access
+      get('site', include: include).body.with_indifferent_access
     end
 
-    def records
-      get('records', 'page[limit]' => 10_000).body.with_indifferent_access
+    def items
+      get('items', 'page[limit]' => 10_000).body.with_indifferent_access
     end
 
     def get(*args)
@@ -37,13 +37,13 @@ module MiddlemanDato
         headers: {
           'Content-Type' => 'application/json',
           'Accept' => 'application/json',
-          'X-Space-Domain' => @domain,
+          'X-Site-Domain' => @domain,
           'Authorization' => "Api-Key #{@token}"
         }
       }
       @connection ||= Faraday.new(options) do |c|
         c.request :json
-        c.response :json, content_type: /\bjson$/
+        c.response :json, item_type: /\bjson$/
         c.response :raise_error
         c.adapter :net_http
       end

data/lib/middleman_dato/{record.rb → item.rb}

@@ -7,24 +7,24 @@ Dir[File.dirname(__FILE__) + '/field_type/*.rb'].each do |file|
 end
 
 module MiddlemanDato
-  class Record
+  class Item
     extend Forwardable
 
     attr_reader :entity
-    def_delegators :entity, :id, :type, :content_type
+    def_delegators :entity, :id, :type, :item_type
 
-    def initialize(entity, records_repo)
+    def initialize(entity, items_repo)
       @entity = entity
-      @records_repo = records_repo
+      @items_repo = items_repo
     end
 
-    def ==(record)
-      record.is_a?(Record) && record.id == id
+    def ==(item)
+      item.is_a?(Item) && item.id == id
     end
 
     def slug
       if singleton?
-        content_type.api_key.humanize.parameterize
+        item_type.api_key.humanize.parameterize
       elsif title_attribute
         title = send(title_attribute)
         if title
@@ -38,15 +38,16 @@ module MiddlemanDato
     end
 
     def singleton?
-      content_type.singleton
+      item_type.singleton
     end
 
-    def content_type
-      @content_type ||= entity.content_type
+    def item_type
+      @item_type ||= entity.item_type
     end
+    alias_method :content_type, :item_type
 
     def fields
-      @fields ||= content_type.fields.sort_by(&:position)
+      @fields ||= item_type.fields.sort_by(&:position)
     end
 
     def attributes
@@ -66,8 +67,8 @@ module MiddlemanDato
     end
 
     def to_s
-      api_key = content_type.api_key
-      "#<Record id=#{id} content_type=#{api_key} attributes=#{attributes}>"
+      api_key = item_type.api_key
+      "#<Item id=#{id} item_type=#{api_key} attributes=#{attributes}>"
     end
     alias inspect to_s
 
@@ -102,7 +103,7 @@ module MiddlemanDato
                   entity.send(method)
                 end
 
-        value && type_klass.parse(value, @records_repo)
+        value && type_klass.parse(value, @items_repo)
       else
         raise "Cannot convert field `#{method}` of type `#{field_type}`"
       end

data/lib/middleman_dato/{records_repo.rb → items_repo.rb}

@@ -1,20 +1,20 @@
 require 'active_support/core_ext/string'
-require 'middleman_dato/record'
+require 'middleman_dato/item'
 
 module MiddlemanDato
-  class RecordsRepo
+  class ItemsRepo
     attr_reader :entities_repo, :collections_by_type
 
     def initialize(entities_repo)
       @entities_repo = entities_repo
       @collections_by_type = {}
-      @records_by_id = {}
+      @items_by_id = {}
 
       build_cache!
     end
 
     def find(id)
-      @records_by_id[id]
+      @items_by_id[id]
     end
 
     def respond_to?(method, include_private = false)
@@ -27,9 +27,9 @@ module MiddlemanDato
 
     private
 
-    def content_type_key(content_type)
-      api_key = content_type.api_key
-      if content_type.singleton
+    def item_type_key(item_type)
+      api_key = item_type.api_key
+      if item_type.singleton
         [api_key.to_sym, true]
       else
         [api_key.pluralize.to_sym, false]
@@ -37,35 +37,35 @@ module MiddlemanDato
     end
 
     def build_cache!
-      content_type_entities.each do |content_type|
-        key, singleton = content_type_key(content_type)
+      item_type_entities.each do |item_type|
+        key, singleton = item_type_key(item_type)
         @collections_by_type[key] = if singleton
                                       nil
                                     else
-                                      RecordCollection.new
+                                      ItemCollection.new
                                     end
       end
 
-      record_entities.each do |record_entity|
-        record = Record.new(record_entity, self)
+      item_entities.each do |item_entity|
+        item = Item.new(item_entity, self)
 
-        key, singleton = content_type_key(record_entity.content_type)
+        key, singleton = item_type_key(item_entity.item_type)
         if singleton
-          @collections_by_type[key] = record
+          @collections_by_type[key] = item
         else
-          @collections_by_type[key].push record
+          @collections_by_type[key].push item
         end
 
-        @records_by_id[record.id] = record
+        @items_by_id[item.id] = item
       end
     end
 
-    def content_type_entities
-      entities_repo.find_entities_of_type('content_type')
+    def item_type_entities
+      entities_repo.find_entities_of_type('item_type')
     end
 
-    def record_entities
-      entities_repo.find_entities_of_type('record')
+    def item_entities
+      entities_repo.find_entities_of_type('item')
     end
 
     def method_missing(method, *arguments, &block)
@@ -76,11 +76,11 @@ module MiddlemanDato
       end
     end
 
-    class RecordCollection < Array
+    class ItemCollection < Array
       def each(&block)
         if block && block.arity == 2
-          each_with_object({}) do |record, acc|
-            acc[record.id] = record
+          each_with_object({}) do |item, acc|
+            acc[item.id] = item
           end.each(&block)
         else
           super(&block)
@@ -89,7 +89,7 @@ module MiddlemanDato
 
       def [](id)
         if id.is_a? String
-          find { |record| record.id == id }
+          find { |item| item.id == id }
         else
           super(id)
         end

data/lib/middleman_dato/meta_tags/article_modified_time.rb

@@ -5,7 +5,7 @@ module MiddlemanDato
   module MetaTags
     class ArticleModifiedTime < OgMetaTag
       def buildable?
-        record && !record.singleton?
+        item && !item.singleton?
       end
 
       def name
@@ -13,7 +13,7 @@ module MiddlemanDato
       end
 
       def value
-        record.updated_at.iso8601
+        item.updated_at.iso8601
       end
     end
   end

data/lib/middleman_dato/meta_tags/article_publisher.rb

@@ -5,7 +5,7 @@ module MiddlemanDato
   module MetaTags
     class ArticlePublisher < OgMetaTag
       def buildable?
-        record && !record.singleton? &&
+        item && !item.singleton? &&
           global_seo_field(:facebook_page_url).present?
       end
 

data/lib/middleman_dato/meta_tags/base.rb

@@ -4,17 +4,17 @@ require 'middleman_dato/field_type/seo'
 module MiddlemanDato
   module MetaTags
     class Base
-      attr_reader :builder, :base_url, :space, :content_type, :record
+      attr_reader :builder, :base_url, :site, :item_type, :item
 
-      def initialize(builder, base_url, space, record)
-        @space = space
+      def initialize(builder, base_url, site, item)
+        @site = site
         @base_url = base_url
-        @record = record
+        @item = item
         @builder = builder
       end
 
       def seo_field_with_fallback(attribute, alternative = nil, &block)
-        seo = first_record_field_of_type(:seo)
+        seo = first_item_field_of_type(:seo)
 
         alternatives = []
 
@@ -33,21 +33,21 @@ module MiddlemanDato
       end
 
       def no_index?
-        space && space.no_index
+        site && site.no_index
       end
 
       def global_seo_field(attribute)
         global_seo[attribute] if global_seo
       end
 
-      def first_record_field_of_type(type)
-        return nil unless record
+      def first_item_field_of_type(type)
+        return nil unless item
 
-        field = record.fields.detect do |f|
+        field = item.fields.detect do |f|
           f.field_type == type.to_s
         end
 
-        record.send(field.api_key) if field
+        item.send(field.api_key) if field
       end
 
       def fallback_seo
@@ -58,9 +58,9 @@ module MiddlemanDato
 
       def global_seo
         @global_seo ||= begin
-          if space && space.global_seo
-            global_seo = space.global_seo
-            if space.locales.size > 1
+          if site && site.global_seo
+            global_seo = site.global_seo
+            if site.locales.size > 1
               global_seo[I18n.locale]
             else
               global_seo

data/lib/middleman_dato/meta_tags/image.rb

@@ -15,7 +15,7 @@ module MiddlemanDato
       def image
         image = seo_field_with_fallback(
           :image,
-          first_record_field_of_type(:image)
+          first_item_field_of_type(:image)
         ) do |i|
           i.width >= 200 && i.height >= 200
         end

data/lib/middleman_dato/meta_tags/og_type.rb

@@ -12,9 +12,9 @@ module MiddlemanDato
       end
 
       def value
-        if !record
+        if !item
           'website'
-        elsif record.singleton?
+        elsif item.singleton?
           'website'
         else
           'article'

data/lib/middleman_dato/meta_tags/title.rb

@@ -16,8 +16,8 @@ module MiddlemanDato
       def title
         @title ||= seo_field_with_fallback(
           :title,
-          record && record.title_attribute &&
-            record.send(record.title_attribute)
+          item && item.title_attribute &&
+            item.send(item.title_attribute)
         )
       end
 

data/lib/middleman_dato/middleman_extension.rb

@@ -2,16 +2,16 @@ require 'middleman-core'
 require 'middleman-core/version'
 require 'semantic'
 require 'middleman_dato/meta_tags_builder'
-require 'middleman_dato/space'
+require 'middleman_dato/site'
 require 'middleman_dato/meta_tags/favicon'
 
 module MiddlemanDato
   class MiddlemanExtension < ::Middleman::Extension
-    attr_reader :space
+    attr_reader :site
 
-    option :domain, nil, 'Space domain'
-    option :token, nil, 'Space API token'
-    option :api_host, 'http://api.datocms.com', 'Space API token'
+    option :domain, nil, 'Site domain'
+    option :token, nil, 'Site API token'
+    option :api_host, 'http://site-api.datocms.com', 'Site API host'
     option :base_url, nil, 'Website base URL'
 
     if Semantic::Version.new(Middleman::VERSION).major >= 4
@@ -21,11 +21,11 @@ module MiddlemanDato
     def initialize(app, options_hash = {}, &block)
       super
 
-      @space = space = MiddlemanDato::Space.new(options)
-      @space.refresh!
+      @site = site = MiddlemanDato::Site.new(options)
+      @site.refresh!
 
       app.before do
-        space.refresh! if !build? && !ENV.fetch('DISABLE_DATO_REFRESH', false)
+        site.refresh! if !build? && !ENV.fetch('DISABLE_DATO_REFRESH', false)
         true
       end
 
@@ -35,26 +35,26 @@ module MiddlemanDato
     end
 
     def dato
-      space.records_repo
+      site.items_repo
     end
 
     module InstanceMethods
       def dato
-        extensions[:dato].space.records_repo
+        extensions[:dato].site.items_repo
       end
     end
 
     helpers do
       def dato
-        extensions[:dato].space.records_repo
+        extensions[:dato].site.items_repo
       end
 
-      def dato_meta_tags(record)
+      def dato_meta_tags(item)
         builder = MetaTagsBuilder.new(
           self,
           extensions[:dato].options[:base_url],
-          extensions[:dato].space.entity,
-          record
+          extensions[:dato].site.entity,
+          item
         )
         builder.meta_tags
       end
@@ -64,7 +64,7 @@ module MiddlemanDato
         options[:app_name] ||= ''
         favicon_builder = MetaTags::Favicon.new(
           self,
-          extensions[:dato].space.entity,
+          extensions[:dato].site.entity,
           options[:theme_color]
         )
         favicon_builder.build

data/lib/middleman_dato/{space.rb → site.rb}

@@ -1,27 +1,27 @@
 # coding: utf-8
 require 'middleman_dato/client'
 require 'middleman_dato/entities_repo'
-require 'middleman_dato/records_repo'
+require 'middleman_dato/items_repo'
 
 module MiddlemanDato
-  class Space
+  class Site
     attr_reader :options
     attr_reader :entities_repo
-    attr_reader :records_repo
+    attr_reader :items_repo
 
     def initialize(options)
       @options = options
       @entities_repo = EntitiesRepo.new
-      @records_repo = RecordsRepo.new(@entities_repo)
+      @items_repo = ItemsRepo.new(@entities_repo)
     end
 
     def refresh!
-      @entities_repo = EntitiesRepo.new(client.space, client.records)
-      @records_repo = RecordsRepo.new(@entities_repo)
+      @entities_repo = EntitiesRepo.new(client.site, client.items)
+      @items_repo = ItemsRepo.new(@entities_repo)
     end
 
     def entity
-      @entities_repo.find_entities_of_type('space').first
+      @entities_repo.find_entities_of_type('site').first
     end
 
     private

data/lib/middleman_dato/version.rb

@@ -1,4 +1,4 @@
 module MiddlemanDato
-  VERSION = '0.5.12'
+  VERSION = '0.5.13'
 end
 

data/middleman-dato.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.authors = ['Stefano Verna']
   s.email = ['s.verna@cantierecreativo.net']
   s.homepage = 'http://cantierecreativo.net'
-  s.summary = 'Fetches data from a Dato space'
-  s.description = 'Fetches data from a Dato space'
+  s.summary = 'Fetches data from a Dato site'
+  s.description = 'Fetches data from a Dato site'
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/middleman_dato/entities_repo_spec.rb

@@ -8,32 +8,32 @@ module MiddlemanDato
       context 'a payload with a data key' do
         context 'object' do
           let(:payload) do
-            { data: { id: 'bar', type: 'record' } }
+            { data: { id: 'bar', type: 'item' } }
           end
 
           it 'inserts the object into entities' do
-            expect(source.entities['record']['bar']).to be_a JsonApiEntity
+            expect(source.entities['item']['bar']).to be_a JsonApiEntity
           end
         end
 
         context 'array' do
           let(:payload) do
-            { data: [{ id: 'bar', type: 'record' }] }
+            { data: [{ id: 'bar', type: 'item' }] }
           end
 
           it 'inserts the objects into entities' do
-            expect(source.entities['record']['bar']).to be_a JsonApiEntity
+            expect(source.entities['item']['bar']).to be_a JsonApiEntity
           end
         end
       end
 
       context 'a payload with an included key' do
         let(:payload) do
-          { included: [{ id: 'bar', type: 'record' }] }
+          { included: [{ id: 'bar', type: 'item' }] }
         end
 
         it 'inserts the objects into entities' do
-          expect(source.entities['record']['bar']).to be_a JsonApiEntity
+          expect(source.entities['item']['bar']).to be_a JsonApiEntity
         end
       end
     end

data/spec/middleman_dato/{record_spec.rb → item_spec.rb}

@@ -1,11 +1,11 @@
 module MiddlemanDato
-  RSpec.describe Record do
-    subject(:record) { described_class.new(entity, repo) }
+  RSpec.describe Item do
+    subject(:item) { described_class.new(entity, repo) }
     let(:entity) do
       double(
-        'MiddlemanDato::JsonApiEntity(Record)',
+        'MiddlemanDato::JsonApiEntity(Item)',
         id: '14',
-        content_type: content_type,
+        item_type: item_type,
         title: "My titlè with àccents",
         body: 'Hi there',
         position: 2,
@@ -13,9 +13,9 @@ module MiddlemanDato
       )
     end
     let(:repo) do
-      instance_double('MiddlemanDato::RecordsRepo')
+      instance_double('MiddlemanDato::ItemsRepo')
     end
-    let(:content_type) do
+    let(:item_type) do
       double(
         'MiddlemanDato::JsonApiEntity(Content Type)',
         singleton: is_singleton,
@@ -50,7 +50,7 @@ module MiddlemanDato
         let(:is_singleton) { true }
 
         it 'returns the parameterized content type api key' do
-          expect(record.slug).to eq 'work-item'
+          expect(item.slug).to eq 'work-item'
         end
       end
 
@@ -58,13 +58,13 @@ module MiddlemanDato
         let(:fields) { [] }
 
         it 'returns the ID' do
-          expect(record.slug).to eq '14'
+          expect(item.slug).to eq '14'
         end
       end
 
       context 'non singleton, title field' do
         it 'returns the ID + title' do
-          expect(record.slug).to eq '14-my-title-with-accents'
+          expect(item.slug).to eq '14-my-title-with-accents'
         end
       end
     end
@@ -75,35 +75,35 @@ module MiddlemanDato
           'title' => "My titlè with àccents",
           'body' => 'Hi there'
         }
-        expect(record.attributes).to eq expected_attributes
+        expect(item.attributes).to eq expected_attributes
       end
     end
 
     describe 'position' do
       it 'returns the entity position field' do
-        expect(record.position).to eq 2
+        expect(item.position).to eq 2
       end
     end
 
     describe 'updated_at' do
       it 'returns the entity updated_at field' do
-        expect(record.updated_at).to be_a Time
+        expect(item.updated_at).to be_a Time
       end
     end
 
     describe 'dynamic methods' do
       context 'existing field' do
         it 'returns the field value' do
-          expect(record.respond_to?(:body)).to be_truthy
-          expect(record.body).to eq 'Hi there'
+          expect(item.respond_to?(:body)).to be_truthy
+          expect(item.body).to eq 'Hi there'
         end
 
         context 'localized field' do
           let(:entity) do
             double(
-              'MiddlemanDato::JsonApiEntity(Record)',
+              'MiddlemanDato::JsonApiEntity(Item)',
               id: '14',
-              content_type: content_type,
+              item_type: item_type,
               title: { it: 'Foo', en: 'Bar' }
             )
           end
@@ -123,14 +123,14 @@ module MiddlemanDato
 
           it 'returns the value for the current locale' do
             I18n.with_locale(:it) do
-              expect(record.title).to eq 'Foo'
+              expect(item.title).to eq 'Foo'
             end
           end
 
           context 'non existing value' do
             it 'raises nil' do
               I18n.with_locale(:ru) do
-                expect(record.title).to eq nil
+                expect(item.title).to eq nil
               end
             end
           end
@@ -139,8 +139,8 @@ module MiddlemanDato
 
       context 'non existing field' do
         it 'raises NoMethodError' do
-          expect(record.respond_to?(:qux)).to be_falsy
-          expect { record.qux }.to raise_error NoMethodError
+          expect(item.respond_to?(:qux)).to be_falsy
+          expect { item.qux }.to raise_error NoMethodError
         end
       end
 
@@ -158,30 +158,30 @@ module MiddlemanDato
         end
 
         it 'raises RuntimeError' do
-          expect { record.title }.to raise_error RuntimeError
+          expect { item.title }.to raise_error RuntimeError
         end
       end
     end
 
     context 'equality' do
-      subject(:same_record) { described_class.new(entity, repo) }
+      subject(:same_item) { described_class.new(entity, repo) }
 
-      subject(:another_record) { described_class.new(another_entity, repo) }
+      subject(:another_item) { described_class.new(another_entity, repo) }
       let(:another_entity) do
         double(
-          'MiddlemanDato::JsonApiEntity(Record)',
+          'MiddlemanDato::JsonApiEntity(Item)',
           id: '15'
         )
       end
 
 
-      it 'two records are equal if their id is the same' do
-        expect(record).to eq same_record
+      it 'two items are equal if their id is the same' do
+        expect(item).to eq same_item
       end
 
       it 'else they\'re not' do
-        expect(record).not_to eq another_record
-        expect(record).not_to eq "foobar"
+        expect(item).not_to eq another_item
+        expect(item).not_to eq "foobar"
       end
     end
   end

data/spec/middleman_dato/{records_repo_spec.rb → items_repo_spec.rb}

@@ -1,67 +1,67 @@
-require 'middleman_dato/records_repo'
+require 'middleman_dato/items_repo'
 
 module MiddlemanDato
-  RSpec.describe RecordsRepo do
+  RSpec.describe ItemsRepo do
     subject(:repo) { described_class.new(entities_repo) }
     let(:entities_repo) do
       instance_double('MiddlemanDato::EntitiesRepo')
     end
-    let(:content_type) do
+    let(:item_type) do
       double('MiddlemanDato::JsonApiEntity', api_key: 'post', singleton: false)
     end
-    let(:singleton_content_type) do
+    let(:singleton_item_type) do
       double('MiddlemanDato::JsonApiEntity', api_key: 'homepage', singleton: true)
     end
-    let(:record_entity) do
-      double('MiddlemanDato::JsonApiEntity', content_type: content_type)
+    let(:item_entity) do
+      double('MiddlemanDato::JsonApiEntity', item_type: item_type)
     end
-    let(:singleton_record_entity) do
-      double('MiddlemanDato::JsonApiEntity', content_type: singleton_content_type)
+    let(:singleton_item_entity) do
+      double('MiddlemanDato::JsonApiEntity', item_type: singleton_item_type)
     end
-    let(:record) do
-      instance_double('MiddlemanDato::Record', id: '14')
+    let(:item) do
+      instance_double('MiddlemanDato::Item', id: '14')
     end
-    let(:singleton_record) do
-      instance_double('MiddlemanDato::Record', id: '22')
+    let(:singleton_item) do
+      instance_double('MiddlemanDato::Item', id: '22')
     end
 
     before do
-      allow(entities_repo).to receive(:find_entities_of_type).with('content_type') do
-        [content_type, singleton_content_type]
+      allow(entities_repo).to receive(:find_entities_of_type).with('item_type') do
+        [item_type, singleton_item_type]
       end
 
-      allow(entities_repo).to receive(:find_entities_of_type).with('record') do
-        [record_entity, singleton_record_entity]
+      allow(entities_repo).to receive(:find_entities_of_type).with('item') do
+        [item_entity, singleton_item_entity]
       end
 
-      allow(Record).to receive(:new).with(record_entity, anything) do
-        record
+      allow(Item).to receive(:new).with(item_entity, anything) do
+        item
       end
 
-      allow(Record).to receive(:new).with(singleton_record_entity, anything) do
-        singleton_record
+      allow(Item).to receive(:new).with(singleton_item_entity, anything) do
+        singleton_item
       end
     end
 
     describe '#find' do
-      it 'returns the specified record' do
-        expect(repo.find('14')).to eq record
-        expect(repo.find('22')).to eq singleton_record
+      it 'returns the specified item' do
+        expect(repo.find('14')).to eq item
+        expect(repo.find('22')).to eq singleton_item
       end
     end
 
-    describe 'content_types' do
+    describe 'item_types' do
       describe 'singleton' do
-        it 'returns the associated record' do
+        it 'returns the associated item' do
           expect(repo.respond_to?(:homepage)).to be_truthy
-          expect(repo.homepage).to eq singleton_record
+          expect(repo.homepage).to eq singleton_item
         end
       end
 
       describe 'non-singleton' do
-        it 'returns the associated records' do
+        it 'returns the associated items' do
           expect(repo.respond_to?(:posts)).to be_truthy
-          expect(repo.posts).to eq [record]
+          expect(repo.posts).to eq [item]
         end
       end
 
@@ -73,16 +73,16 @@ module MiddlemanDato
       end
     end
 
-    describe RecordsRepo::RecordCollection do
+    describe ItemsRepo::ItemCollection do
       subject(:collection) { described_class.new(items) }
       let(:items) do
         [foo]
       end
 
-      let(:foo) { double('MiddlemanDato::Record', id: '1', name: 'Foo') }
+      let(:foo) { double('MiddlemanDato::Item', id: '1', name: 'Foo') }
 
       describe '#[]' do
-        it 'returns the record with the specified id or index' do
+        it 'returns the item with the specified id or index' do
           expect(collection['1']).to eq foo
           expect(collection[0]).to eq foo
         end
@@ -96,7 +96,7 @@ module MiddlemanDato
 
       describe '#each' do
         context 'with arity == 2' do
-          it 'iterates with id and record' do
+          it 'iterates with id and item' do
             collection.each do |a, b|
               expect(a).to eq '1'
               expect(b).to eq foo

data/spec/middleman_dato/meta_tags/article_modified_time_spec.rb

@@ -3,16 +3,16 @@ require 'spec_helper'
 module MiddlemanDato
   module MetaTags
     RSpec.describe ArticleModifiedTime do
-      subject(:meta_tag) { described_class.new(builder, base_url, space, record) }
+      subject(:meta_tag) { described_class.new(builder, base_url, site, item) }
       let(:builder) { ::MockBuilder.new }
       let(:base_url) { nil }
-      let(:space) { nil }
-      let(:record) do
-        double('Record', updated_at: Time.now, singleton?: false)
+      let(:site) { nil }
+      let(:item) do
+        double('Item', updated_at: Time.now, singleton?: false)
       end
 
       describe '.value' do
-        context 'if record is not singleton' do
+        context 'if item is not singleton' do
           it 'returns an ISO 8601 time representation' do
             expect(meta_tag.value).not_to be_nil
           end

data/spec/middleman_dato/meta_tags/image_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 module MiddlemanDato
   module MetaTags
     RSpec.describe Image do
-      subject(:meta_tag) { described_class.new(builder, base_url, space, record) }
+      subject(:meta_tag) { described_class.new(builder, base_url, site, item) }
       let(:builder) { ::MockBuilder.new }
       let(:base_url) { nil }
-      let(:space) { nil }
-      let(:record) do
+      let(:site) { nil }
+      let(:item) do
         double(
-          'MiddlemanDato::Record',
+          'MiddlemanDato::Item',
           fields: [double('MiddlemanDato::JsonApiEntity', api_key: 'foo', field_type: 'image')],
           foo: image,
           singleton?: false

data/spec/middleman_dato/meta_tags/og_locale_spec.rb

@@ -3,11 +3,11 @@ require 'spec_helper'
 module MiddlemanDato
   module MetaTags
     RSpec.describe OgLocale do
-      subject(:meta_tag) { described_class.new(builder, base_url, space, record) }
+      subject(:meta_tag) { described_class.new(builder, base_url, site, item) }
       let(:builder) { ::MockBuilder.new }
       let(:base_url) { nil }
-      let(:space) { nil }
-      let(:record) { nil }
+      let(:site) { nil }
+      let(:item) { nil }
 
       describe '#value' do
         it 'returns the current locale' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-dato
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Stefano Verna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Fetches data from a Dato space
+description: Fetches data from a Dato site
 email:
 - s.verna@cantierecreativo.net
 executables: []
@@ -125,6 +125,8 @@ files:
 - lib/middleman_dato/field_type/string.rb
 - lib/middleman_dato/field_type/text.rb
 - lib/middleman_dato/field_type/video.rb
+- lib/middleman_dato/item.rb
+- lib/middleman_dato/items_repo.rb
 - lib/middleman_dato/json_api_entity.rb
 - lib/middleman_dato/meta_tags/article_modified_time.rb
 - lib/middleman_dato/meta_tags/article_publisher.rb
@@ -144,9 +146,7 @@ files:
 - lib/middleman_dato/meta_tags/url.rb
 - lib/middleman_dato/meta_tags_builder.rb
 - lib/middleman_dato/middleman_extension.rb
-- lib/middleman_dato/record.rb
-- lib/middleman_dato/records_repo.rb
-- lib/middleman_dato/space.rb
+- lib/middleman_dato/site.rb
 - lib/middleman_dato/version.rb
 - middleman-dato.gemspec
 - spec/middleman_dato/entities_repo_spec.rb
@@ -155,13 +155,13 @@ files:
 - spec/middleman_dato/field_type/lat_lon_spec.rb
 - spec/middleman_dato/field_type/seo_spec.rb
 - spec/middleman_dato/field_type/video_spec.rb
+- spec/middleman_dato/item_spec.rb
+- spec/middleman_dato/items_repo_spec.rb
 - spec/middleman_dato/json_api_entity_spec.rb
 - spec/middleman_dato/meta_tags/article_modified_time_spec.rb
 - spec/middleman_dato/meta_tags/favicon_spec.rb
 - spec/middleman_dato/meta_tags/image_spec.rb
 - spec/middleman_dato/meta_tags/og_locale_spec.rb
-- spec/middleman_dato/record_spec.rb
-- spec/middleman_dato/records_repo_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock_builder.rb
 homepage: http://cantierecreativo.net
@@ -186,7 +186,7 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Fetches data from a Dato space
+summary: Fetches data from a Dato site
 test_files:
 - spec/middleman_dato/entities_repo_spec.rb
 - spec/middleman_dato/field_type/file_spec.rb
@@ -194,13 +194,13 @@ test_files:
 - spec/middleman_dato/field_type/lat_lon_spec.rb
 - spec/middleman_dato/field_type/seo_spec.rb
 - spec/middleman_dato/field_type/video_spec.rb
+- spec/middleman_dato/item_spec.rb
+- spec/middleman_dato/items_repo_spec.rb
 - spec/middleman_dato/json_api_entity_spec.rb
 - spec/middleman_dato/meta_tags/article_modified_time_spec.rb
 - spec/middleman_dato/meta_tags/favicon_spec.rb
 - spec/middleman_dato/meta_tags/image_spec.rb
 - spec/middleman_dato/meta_tags/og_locale_spec.rb
-- spec/middleman_dato/record_spec.rb
-- spec/middleman_dato/records_repo_spec.rb
 - spec/spec_helper.rb
 - spec/support/mock_builder.rb
 has_rdoc: