clear-election-sdk 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35f1b77def83bb18cbc429b636a9bdcd1683ea30
-  data.tar.gz: 9f6136cec7c9af255eb48b92a36af5d16050957c
+  metadata.gz: 9f7ae5f65a76e6af6f6be8c8cc86fb7bd506d309
+  data.tar.gz: 3a7bf5ab2eb535819a4b734cec6b660664cc9e6b
 SHA512:
-  metadata.gz: 0200ddc2529f35c99c1b47e165fa3653ee70904208f3f2e3da9416c8fdf0e4473d268e4d798411582c36e965de0dba497c220851a50dee3b7bf7182a43d53d43
-  data.tar.gz: c49ca30e6358a306db28619e82d4cf4b50061ae1785fb7b8b2434fafd0ea7d697a3077773560ea40bbef8f2bc9ab439defc9b722ff2673efbaa0b0c7701056dc
+  metadata.gz: 93536a99c4d22e7969b0b0f9a9623e38ccd87b78a14e2ebab6d79313b21c753e845c38dd6e90f679c3d58e587c7595cadfb9aeb0b3b7fefdcd3e707fc46acb4b
+  data.tar.gz: 9320bacb18a27ecf46d2d5d2a83b1fa8e34a3014a92065231040e230c632a2be6473b7ab9d45feac0ceb56c732ad9f94663dbe7aba4b882392c3bd7ce8fa7510

data/lib/clear-election-sdk/election.rb

@@ -4,13 +4,13 @@ module ClearElection
 
     SCHEMA_VERSION = 0.0
 
-    attr_reader :signin, :booth, :pollsOpen, :pollsClose, :contests, :uri
+    attr_reader :signin, :booth, :pollsOpen, :pollsClose, :contests, :uri, :voters, :ballots
 
     def self.schema
       ClearElection::Schema.election(version: SCHEMA_VERSION)
     end
 
-    def initialize(name:, signin:, booth:, contests:, pollsOpen:, pollsClose:, uri:nil)
+    def initialize(name:, signin:, booth:, contests:, pollsOpen:, pollsClose:, uri:nil, voters:nil, ballots:nil)
       @name = name
       @signin = signin
       @booth = booth
@@ -18,6 +18,8 @@ module ClearElection
       @pollsOpen = pollsOpen
       @pollsClose = pollsClose
       @uri = uri
+      @voters = voters || []
+      @ballots = ballots || []
     end
 
     def self.from_json(data, uri: nil)
@@ -29,13 +31,15 @@ module ClearElection
         contests: data["contests"].map {|data| Contest.from_json(data) },
         pollsOpen: DateTime.rfc3339(data["schedule"]["pollsOpen"]),
         pollsClose: DateTime.rfc3339(data["schedule"]["pollsClose"]),
-        uri: uri
+        uri: uri,
+        voters: data["returns"]["voters"],
+        ballots: data["returns"]["ballots"].map { |data| Ballot.from_json(data) }
       )
     end
 
     def as_json()
       data = {
-        "version" => "0.0",
+        "clearelection" => "0.0",
         "name" => @name,
         "agents" => {
           "signin" => @signin.as_json,
@@ -47,10 +51,19 @@ module ClearElection
         },
         "contests" => @contests.map(&:as_json)
       }
+      data["returns"] = {
+        "voters" => @voters,
+        "ballots" => @ballots.map(&:as_json)
+      }
       JSON::Validator.validate!(Election.schema, data)
       data
     end
 
+    def set_returns(voters:, ballots:)
+      @voters = voters
+      @ballots = ballots
+    end
+
     # utilities
     def polls_have_not_opened?
       DateTime.now < pollsOpen

data/lib/clear-election-sdk/factory.rb

@@ -18,7 +18,8 @@ module ClearElection
       booth: nil,
       pollsOpen: nil,
       pollsClose: nil,
-      writeIn: true
+      writeIn: true,
+      returns: false
     )
       one_month = 60*60*24*30
       Election.new(
@@ -31,7 +32,14 @@ module ClearElection
           Factory.contest(ranked: true, multiplicity: 3, writeIn: writeIn, ncandidates: 3),
           Factory.contest(ncandidates: 2)
         ]
-      )
+      ).tap { |election|
+        if returns
+          election.set_returns(
+            voters: 10.times.map{ { "name" => seq("Voter") } }.sort_by { |v| v[:name] },
+            ballots: 10.times.map{ Factory.ballot(election) }.sort
+          )
+        end
+      }
     end
 
     def self.contest(ranked: nil, multiplicity: nil, writeIn: nil, ncandidates: 3)

data/lib/clear-election-sdk/version.rb

@@ -1,3 +1,3 @@
 module ClearElection
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/schemas/election-0.0.schema.json

@@ -4,7 +4,7 @@
   "description": "ClearElection Election definition, v0.0",
   "type": "object",
   "properties": {
-    "version": { "enum": ["0.0"] },
+    "clearelection": { "enum": ["0.0"] },
     "name": { "type": "string" },
     "agents": {
       "type": "object",
@@ -44,9 +44,21 @@
         },
         "required": ["contestId", "name", "candidates"]
       }
+    },
+    "results": {
+        "type": "object",
+        "properties": {
+            "ballots": {
+                "type": "array",
+                "items": { "$ref": "#/definitions/ballot" }
+            },
+            "voters": {
+                "type": "object"
+            }
+        }
     }
   },
-  "required": ["version", "name", "agents", "schedule", "contests"],
+  "required": ["clearelection", "name", "schedule", "contests"],
   "definitions": {
     "agent": {
       "type": "object",
@@ -54,7 +66,8 @@
         "uri": { "type": "string", "format": "uri" }
       },
       "required": ["uri"]
-    }
+    },
+    "ballot": { "$ref": "file:schemas/ballot-0.0.schema.json" }
   }
 }
 

data/spec/election_spec.rb

@@ -46,4 +46,23 @@ describe ClearElection::Election do
       end
     end
   end
+
+  describe "json" do
+
+    it "makes round trip without returns" do
+      roundtrip ClearElection::Factory.election(returns: false)
+    end
+
+    it "makes round trip with returns" do
+      roundtrip ClearElection::Factory.election(returns: true)
+    end
+
+    def roundtrip(election)
+      original_json = JSON.generate election.as_json
+      final_json = JSON.generate ClearElection::Election.from_json(JSON.parse original_json).as_json
+      expect(final_json).to eq original_json
+    end
+
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clear-election-sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2014-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday