dato 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9a4f4edd88febcd394e74c7e0d3da7be4b36ae4
-  data.tar.gz: daed03a684e4d497f9096ba0d9815ea6b81abd01
+  metadata.gz: 8ca87da24b5ba4828b5cc9b96045bed562e57f79
+  data.tar.gz: 07687fceac70df85b38e917b1d00ef4810a112cb
 SHA512:
-  metadata.gz: 90e12d686cd45a8f4dfe874ca6f2af7892e407c945ad6054518d8f655d3cdbb4edd738bc8104f84d1420318c150c9312edecea3e528f55889def3c14d599f40d
-  data.tar.gz: ba8fe3950475b56b40c6c41e05335bc23cc13302f7fd034e2f7c403714549701f24503d53c03f9ce70d04fb854c98844fada1b49b4922a0e38dd5cacee24f124
+  metadata.gz: 90da28a4087d9bbaaa9e29fcc31bafcff7b757b282372949de1fd58bdac8f6b5c94f088b1c28da541ca54ab6cb7e7fbdc07dfe73d14e755baa5f8ea8e9a4ea25
+  data.tar.gz: 44f2d443e6d49df140c6532173f1d66e0881d30ea1723bb970ed5c90ff74c67618594870402e02ea6a04796471941c2b2c8b991f08f12782e7ab7762a02b8f98

data/lib/dato/local/item.rb

@@ -117,6 +117,14 @@ module Dato
         else
           super
         end
+      rescue NoMethodError
+        message = []
+        message << "Undefined method `#{method}`"
+        message << 'Available fields for this DatoCMS item:'
+        message += fields.map do |f|
+          "* .#{f.api_key}"
+        end
+        raise NoMethodError, message.join("\n")
       end
     end
   end

data/lib/dato/local/items_repo.rb

@@ -5,12 +5,13 @@ require 'dato/local/item'
 module Dato
   module Local
     class ItemsRepo
-      attr_reader :entities_repo, :collections_by_type
+      attr_reader :entities_repo, :collections_by_type, :item_type_methods
 
       def initialize(entities_repo)
         @entities_repo = entities_repo
         @collections_by_type = {}
         @items_by_id = {}
+        @item_type_methods = {}
 
         build_cache!
       end
@@ -29,19 +30,39 @@ module Dato
 
       private
 
-      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]
+      def build_cache!
+        build_item_type_methods!
+        build_collections_by_type!
+      end
+
+      def build_item_type_methods!
+        @item_type_methods = {}
+
+        singleton_keys = singleton_item_type_entities.map(&:api_key)
+        collection_keys = collection_item_type_entities.map(&:api_key)
+                                                       .map(&:pluralize)
+
+        clashing_keys = singleton_keys & collection_keys
+
+        item_type_entities.each do |item_type|
+          singleton = item_type.singleton
+          pluralized_api_key = item_type.api_key.pluralize
+          method = singleton ? item_type.api_key : pluralized_api_key
+
+          if clashing_keys.include?(pluralized_api_key)
+            suffix = singleton ? 'instance' : 'collection'
+            method = "#{method}_#{suffix}"
+          end
+
+          @item_type_methods[item_type] = [method.to_sym, singleton]
         end
       end
 
-      def build_cache!
+      def build_collections_by_type!
         item_type_entities.each do |item_type|
-          key, singleton = item_type_key(item_type)
-          @collections_by_type[key] = if singleton
+          method, singleton = item_type_methods[item_type]
+
+          @collections_by_type[method] = if singleton
                                         nil
                                       else
                                         ItemCollection.new
@@ -50,12 +71,12 @@ module Dato
 
         item_entities.each do |item_entity|
           item = Item.new(item_entity, self)
+          method, singleton = item_type_methods[item_entity.item_type]
 
-          key, singleton = item_type_key(item_entity.item_type)
           if singleton
-            @collections_by_type[key] = item
+            @collections_by_type[method] = item
           else
-            @collections_by_type[key].push item
+            @collections_by_type[method].push item
           end
 
           @items_by_id[item.id] = item
@@ -70,12 +91,28 @@ module Dato
         entities_repo.find_entities_of_type('item')
       end
 
+      def singleton_item_type_entities
+        item_type_entities.select(&:singleton)
+      end
+
+      def collection_item_type_entities
+        item_type_entities - singleton_item_type_entities
+      end
+
       def method_missing(method, *arguments, &block)
         if collections_by_type.key?(method) && arguments.empty?
           collections_by_type[method]
         else
           super
         end
+      rescue NoMethodError
+        message = []
+        message << "Undefined method `#{method}`"
+        message << 'Available DatoCMS collections/items:'
+        message += collections_by_type.map do |key, _value|
+          "* .#{key}"
+        end
+        raise NoMethodError, message.join("\n")
       end
 
       class ItemCollection < Array

data/lib/dato/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Dato
-  VERSION = '0.1.17'
+  VERSION = '0.1.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dato
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Stefano Verna