conglomerate 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d0e7e24faa2c272101163702c11d4f28af77053
-  data.tar.gz: ad534f262ee4e99463beb4c74b8e04c4c8de09a8
+  metadata.gz: 21eda82883baa92aa51c7c06efb36c93db21d7bc
+  data.tar.gz: 8a87dcb2ae4cab923a71d36d358f4db41f5659cd
 SHA512:
-  metadata.gz: ba39a5727966b540190b98c57712aa09ea6898bd4f6263547bf0b28dbc142ce9f6c14e25dbc6ecef05ed722c6438f698d3ca7017b017cac51b4c2278f5676593
-  data.tar.gz: af8fbe7b953078f89de45f7da8b903c7e244fda34804df3a4d7b4fd52bde202d88a5043fe2c5d0aa505a57bcf4b922682fa659ba210c78897a2eeb12b53aaec7
+  metadata.gz: a832f6a31cdcd9f317dcf03884618f84c69ef04eedd8d7af165ff9162449ae38b41ca27a4a02588617a9ab7b20ccee7d2c90d9255e98c51ad9d05ea3955e42a0
+  data.tar.gz: 34b7ccdee95768b1b11714b0d510ff204e8e96c3aad12781ced3aa69592e8167ea8b5c0168b9d1b4cbd05dd5d2c35f71934a8c5ba7c69d9b6022b13d5da6546b

data/README.md

@@ -127,10 +127,10 @@ end
 }
 ```
 
-## Roadmap
-
-- Use more defaults to simplify the creation of serializers.
+## Collection+JSON Extensions
 
+[Command Templates](https://gist.github.com/semmons99/6280650)
+[Data Properties](https://gist.github.com/semmons99/0e02ece6e079cfac27c0)
 ## Contributing
 
 1. Fork it ( http://github.com/teamsnap/conglomerate/fork )

data/lib/conglomerate/datum.rb

@@ -5,5 +5,6 @@ module Conglomerate
     attribute :name, :type => String, :required => true
     attribute :value, :cull => false
     attribute :prompt, :type => String
+    attribute :type, :type => String
   end
 end

data/lib/conglomerate/datum_builder.rb

@@ -21,5 +21,6 @@ module Conglomerate
     value :name
     value :value
     value :prompt
+    value :type
   end
 end

data/lib/conglomerate/version.rb

@@ -1,3 +1,3 @@
 module Conglomerate
-  VERSION = "0.12.1"
+  VERSION = "0.13.0"
 end

data/spec/datum_spec.rb

@@ -19,5 +19,11 @@ describe Conglomerate::Datum do
       expect(datum).to respond_to(:"prompt=")
       expect { datum.prompt = 3 }.to raise_error
     end
+
+    specify "type" do
+      datum = Conglomerate::Datum.new(:name => "name")
+      expect(datum).to respond_to(:"type=")
+      expect { datum.type = 3 }.to raise_error
+    end
   end
 end

data/spec/particle_builder_spec.rb

@@ -16,9 +16,9 @@ class ConglomerateTestParticleSerializer
       datum :roster_id
       datum :team_ids
 
-      datum :event_date_time
-      datum :event_date
-      datum :event_time
+      datum :event_date_time, :type => "datetime"
+      datum :event_date, :type => "date"
+      datum :event_time, :type => "time"
       datum :alternately_named_event_time, :value => Proc.new{ item.event_time }
 
       datum :is_available
@@ -36,7 +36,7 @@ class ConglomerateTestParticleSerializer
 
     template do
       datum :repeats, :prompt => "true|false"
-      datum :description, :prompt => "awesome"
+      datum :description, :prompt => "awesome", :type => "string"
     end
   end
 end
@@ -216,9 +216,9 @@ describe Conglomerate do
                 {"name" => "event_id", "value" => 2},
                 {"name" => "roster_id", "value" => nil},
                 {"name" => "team_ids", "value" => [1,2]},
-                {"name" => "event_date_time", "value" => "1981-11-28T10:00:00Z"},
-                {"name" => "event_date", "value" => "1981-11-28"},
-                {"name" => "event_time", "value" => "1981-11-28T10:00:00Z"},
+                {"name" => "event_date_time", "value" => "1981-11-28T10:00:00Z", "type" => "datetime"},
+                {"name" => "event_date", "value" => "1981-11-28", "type" => "date"},
+                {"name" => "event_time", "value" => "1981-11-28T10:00:00Z", "type" => "time"},
                 {"name" => "alternately_named_event_time", "value" => "1981-11-28T10:00:00Z"},
                 {"name" => "is_available", "value" => false}
               ],
@@ -255,9 +255,9 @@ describe Conglomerate do
                 {"name" => "event_id", "value" => 2},
                 {"name" => "roster_id", "value" => nil},
                 {"name" => "team_ids", "value" => [1,2]},
-                {"name" => "event_date_time", "value" => "1981-11-28T10:00:00Z"},
-                {"name" => "event_date", "value" => "1981-11-28"},
-                {"name" => "event_time", "value" => "1981-11-28T10:00:00Z"},
+                {"name" => "event_date_time", "value" => "1981-11-28T10:00:00Z", "type" => "datetime"},
+                {"name" => "event_date", "value" => "1981-11-28", "type" => "date"},
+                {"name" => "event_time", "value" => "1981-11-28T10:00:00Z", "type" => "time"},
                 {"name" => "alternately_named_event_time", "value" => "1981-11-28T10:00:00Z"},
                 {"name" => "is_available", "value" => false}
               ],
@@ -275,9 +275,9 @@ describe Conglomerate do
                 {"name" => "event_id", "value" => 3},
                 {"name" => "roster_id", "value" => nil},
                 {"name" => "team_ids", "value" => [3,4]},
-                {"name" => "event_date_time", "value" => "1982-01-22T10:00:00Z"},
-                {"name" => "event_date", "value" => "1981-01-22"},
-                {"name" => "event_time", "value" => "1981-01-22T10:00:00Z"},
+                {"name" => "event_date_time", "value" => "1982-01-22T10:00:00Z", "type" => "datetime"},
+                {"name" => "event_date", "value" => "1981-01-22", "type" => "date"},
+                {"name" => "event_time", "value" => "1981-01-22T10:00:00Z", "type" => "time"},
                 {"name" => "alternately_named_event_time", "value" => "1981-01-22T10:00:00Z"},
                 {"name" => "is_available", "value" => true}
               ],
@@ -300,7 +300,7 @@ describe Conglomerate do
       it "includes a valid template if attributes have them" do
         expect(test_collection["template"]["data"]).to match_array(
           [
-            {"name" => "description", "value" => nil, "prompt" => "awesome"},
+            {"name" => "description", "value" => nil, "prompt" => "awesome", "type" => "string"},
             {"name" => "repeats", "value" => nil, "prompt" => "true|false"}
           ]
         )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conglomerate
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Shane Emmons