conglomerate 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79cf2a21f974567cdf55b0a1e273292306c96140
-  data.tar.gz: 882941211d941acbd16c88eefb0e51c0fad474bc
+  metadata.gz: 9da3788aca18b7373349738518eb060890f2bc0b
+  data.tar.gz: 13ce8616d35fa4e79621b924bc58d3444cbd0fcb
 SHA512:
-  metadata.gz: 57d389ee559e86c32166f58fc6efbcc9a23d57a5c3dbadca1318ef0735ae366f46cea65ddc2f62bbf97014ee5bc363c21b6a107a6118e8e25d30a12676d4903f
-  data.tar.gz: 568b17ac4a3c9bb36ec93aa8133926d6d42f39c0407351692eaa5b3a458682067fd7d5e514f337e74f350ec501a09c3db0fca35293ded8bf99a670ab2fe73226
+  metadata.gz: b82efadf83f9b16cb46617c81995e7e5b1df6e9706c08406aa0c33e0a2d45b9a10cb5fe2bfca3d62606409743da4ce329b1869ccf53f4cb0dd2e35f12673832c
+  data.tar.gz: 2647c169ae848cc2a0bfdd319b35e1dd2db0c30a2929ee1107f0a7e9bb9dec3b480fb35a9f8c63a740bb584859bf14ccd5fd25fc320659b7dacf3dbaaf0c1d53

data/Gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
 gem "coveralls", :require => false
+gem "pry", :require => false
 
 gemspec

data/lib/conglomerate/serializer.rb

@@ -42,8 +42,11 @@ module Conglomerate
     end
 
     def apply_data(collection, data: [], object: nil)
-      data = data.map do |name|
-        {"name" => name.to_s, "value" => object.nil? ? "" : object.send(name)}
+      data = data.map do |datum|
+        name = datum[:name]
+        value = object.nil? ? "" : object.send(name)
+
+        {"name" => name.to_s, datum.fetch(:type, "value").to_s => value}
       end
 
       if data.empty?
@@ -75,8 +78,8 @@ module Conglomerate
           )
         end
 
-        names = self.class._attributes.map { |attr| attr[:name] }
-        item = apply_data(item, :data => names, :object => object)
+        attributes = self.class._attributes
+        item = apply_data(item, :data => attributes, :object => object)
 
         links = self.class._attributes
           .select { |attr| attr[:block] }
@@ -98,7 +101,6 @@ module Conglomerate
     def apply_template(collection)
       attrs = self.class._attributes
         .select { |attr| attr[:template] }
-        .map { |attr| attr[:name] }
 
       if attrs.empty?
         collection
@@ -173,14 +175,17 @@ module Conglomerate
       end
 
       def query(rel, data: [], &block)
+        data = [*data]
+        data = data.map { |datum| {:name => datum} }
         self._queries = self._queries << {
-          :rel => rel, :data => [*data], :block => block
+          :rel => rel, :data => data, :block => block
         }
       end
 
-      def attribute(name, template: false, rel: nil, &block)
+      def attribute(name, template: false, rel: nil, type: :value, &block)
         self._attributes = self._attributes << {
-          :name => name, :template => template, :rel => rel, :block => block
+          :name => name, :template => template, :rel => rel, :type => type,
+          :block => block
         }
       end
 

data/lib/conglomerate/version.rb

@@ -1,3 +1,3 @@
 module Conglomerate
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/conglomerate_spec.rb

@@ -15,7 +15,7 @@ class ConglomerateTestSerializer
   attribute :roster_id, :rel => :roster do |item|
     roster_url(item.roster_id)
   end
-  attribute :team_ids, :rel => :teams do |item|
+  attribute :team_ids, :rel => :teams, :type => :array do |item|
     team_url(item.team_ids.join(","))
   end
   attribute :user_ids, :rel => :users do |item|
@@ -156,7 +156,7 @@ describe Conglomerate do
                 {"name" => "id", "value" => 1},
                 {"name" => "event_id", "value" => 2},
                 {"name" => "roster_id", "value" => nil},
-                {"name" => "team_ids", "value" => [1,2]},
+                {"name" => "team_ids", "array" => [1,2]},
                 {"name" => "user_ids", "value" => []}
               ],
               "links" => [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conglomerate
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-07 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler