conglomerate 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f564a0e23c117dfe212bb5a136d668606a6c592
-  data.tar.gz: 6038e2c8efe86229bcaa20bd5cea02d84bd296bf
+  metadata.gz: ff30998d5c96dd7899c51a61714276433c03fbcf
+  data.tar.gz: 77853ae3ece6ad3a195617acbdd6a7d5fd928f53
 SHA512:
-  metadata.gz: e3821f96da8584b43ce4ff3bb2c4fba46112424caef5b712b6e8b3e9421e5afe710a32d53068e31be361f95f53d64eeb3c60f385c10345bfc62b543545e1a3cc
-  data.tar.gz: 749621d6332ba6c70bc06b356e6094440d824c860c34dc12b164a37d4baf0714e00ed65c777fe001b4556f2b132d933dc423a176161f46d2cbd9024bcc4885b3
+  metadata.gz: 00690b70700b303ff36cc1685530ac273c1867b4bec6e5e9c74ef00122a2700e930fd02e5f25af79ae3c7e41bc0f64b4b67d79c59f0d77b0959a3e84924efce1
+  data.tar.gz: 839679dd34e8bd09a179574000c7b56bc90ba8b11bdcb36cbb0511cf615706523bff82cfc67c5c104a1db7a84742ccdba626547aab7cbae43660971b364b91fe

data/lib/conglomerate/serializer.rb

@@ -92,6 +92,7 @@ module Conglomerate
 
         links = self.class._attributes
           .select { |attr| attr[:block] }
+        links += self.class._item_links
 
         if links.empty?
           item.empty? ? nil : item
@@ -128,7 +129,7 @@ module Conglomerate
     def apply_links(collection, links: self.class._links, object: nil)
       if object && !links.empty?
         links = links.map do |link|
-          if present?(object.send(link[:name]))
+          if !link.has_key?(:name) || present?(object.send(link[:name]))
             build_item_link(
               link[:rel], :proc => link[:block], :object => object
             )
@@ -231,6 +232,12 @@ module Conglomerate
         }
       end
 
+      def item_link(rel, &block)
+        self._item_links = self._item_links << {
+          :rel => rel, :block => block
+        }
+      end
+
       def template(name, type: :value, prompt: nil)
         self._templates = self._templates << {
           :name => name, :type => type, :prompt => prompt, :template => true
@@ -238,7 +245,7 @@ module Conglomerate
       end
 
       attr_writer :_href, :_item_href, :_queries, :_attributes, :_links,
-        :_templates
+        :_item_links, :_templates
 
       def _href
         @_href || nil
@@ -260,6 +267,10 @@ module Conglomerate
         @_links || []
       end
 
+      def _item_links
+        @_item_links || []
+      end
+
       def _templates
         @_templates || []
       end

data/lib/conglomerate/version.rb

@@ -1,3 +1,3 @@
 module Conglomerate
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/spec/conglomerate_spec.rb

@@ -18,8 +18,8 @@ class ConglomerateTestSerializer
   attribute :team_ids, :rel => :teams, :type => :array do |item|
     team_url(item.team_ids.join(","))
   end
-  attribute :user_ids, :rel => :users, :type => :array do |item|
-    user_url(item.user_ids.join(","))
+  item_link :users do |item|
+    users_search_url :object_id => item.id
   end
   attribute :is_available
 
@@ -78,6 +78,9 @@ describe Conglomerate do
         "https://example.com/teams/1,2"
       }
       allow(context).to receive(:test_url) { "abc" }
+      allow(context).to receive(:users_search_url).with(:object_id => 1) {
+        "def"
+      }
     end
   end
 
@@ -161,12 +164,12 @@ describe Conglomerate do
                 {"name" => "event_id", "value" => 2},
                 {"name" => "roster_id", "value" => nil},
                 {"name" => "team_ids", "array" => [1,2]},
-                {"name" => "user_ids", "array" => []},
                 {"name" => "is_available", "value" => false}
               ],
               "links" => [
                 {"rel" => "event", "href" => "https://example.com/events/2"},
-                {"rel" => "teams", "href" => "https://example.com/teams/1,2"}
+                {"rel" => "teams", "href" => "https://example.com/teams/1,2"},
+                {"rel" => "users", "href" => "def"}
               ]
             }
           ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conglomerate
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler