clear-election-sdk 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c2f64455ee4387de1eb977fc25515c9b2dbb7a7
-  data.tar.gz: c00208f338e024f01314fafeaf78a05235e1b51b
+  metadata.gz: e304320e6664ae5f0b56944eda5209ae7eda87d4
+  data.tar.gz: 344e5b381317c69805c682453f4d11d84a553ca3
 SHA512:
-  metadata.gz: ce8dd25dc21cd37f839deff1a143f0ad554fa704085909f480ed456992e5212d967a1211a863e7a8a05dce13b2244012664c867d49313df97e63b8175252edc2
-  data.tar.gz: d58995616559a3434fd00af7152f850cab8363f21858e3e8734c9f5b7dc7a04bce5e4bb23c572b1e97bfb5e6b6ad5b19de2a8e8956a6032837e9ae345d33c121
+  metadata.gz: 4b078c52a8326387f4212edcd2f2de3fc36ff55e9cf2ec0fad132b9e6c90be3d8a633562f1cb2e5b90f1f28d83bdf7a08857950fc1d03752a32834c16dafb09a
+  data.tar.gz: 971f9d2b3cebcfeda1a420b6d089569c4bc3ea4776c87008da8db42a6e780c55b624110b8539553e8ffcf1d7c55e101dd3d357159673640c72e16ffd994b0afb

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.5
+ruby-2.2.2

data/Gemfile

@@ -4,7 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'coveralls', require: false
-
-# for now use my forks in which warnings have been eliminated
-gem "timecop", git: 'https://github.com/ronen/timecop.git'          # PR is in https://github.com/travisjeffery/timecop/pull/131
-gem "addressable", git: 'https://github.com/ronen/addressable.git', branch: "patch-1"
+gem 'byebug'

data/README.md

@@ -48,6 +48,13 @@ Or install it yourself as:
 
     $ gem install clear_election
 
+## History
+
+* 0.1.2 Bug fix: schema expansion
+* 0.1.1 Dependency fix
+* 0.1.0 Results, json roundtrip
+* 0.0.1 Initial release
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/clear_election/fork )

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

@@ -11,7 +11,7 @@ module ClearElection
     end
 
     def self.from_json(data)
-      errors = JSON::Validator.fully_validate(schema, data, insert_defaults: true, errors_as_objects: true)
+      errors = ClearElection::Schema.validate(schema, data, insert_defaults: true)
       return self.new(ballotId: nil, uniquifier: nil, contests: [], errors: errors) unless errors.empty?
 
       self.new(
@@ -51,7 +51,7 @@ module ClearElection
         "contests" => @contests.map(&:as_json),
       }
       data["demographic"] = @demographic if @demographic
-      JSON::Validator.validate!(Ballot.schema, data)
+      ClearElection::Schema.validate!(Ballot.schema, data)
       data
     end
 

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

@@ -23,7 +23,7 @@ module ClearElection
     end
 
     def self.from_json(data, uri: nil)
-      JSON::Validator.validate!(schema, data, insert_defaults: true)
+      ClearElection::Schema.validate!(schema, data, insert_defaults: true)
       self.new(
         name: data["name"],
         signin: Agent.from_json(data["agents"]["signin"]),
@@ -55,7 +55,7 @@ module ClearElection
         "voters" => @voters,
         "ballots" => @ballots.map(&:as_json)
       }
-      JSON::Validator.validate!(Election.schema, data)
+      ClearElection::Schema.validate!(Election.schema, data)
       data
     end
 
@@ -86,7 +86,7 @@ module ClearElection
       attr_reader :uri
 
       def initialize(uri:)
-        @uri = URI(uri)
+        @uri = Addressable::URI.parse(uri)
       end
 
       def self.from_json(data)

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

@@ -6,12 +6,6 @@ module ClearElection
       @root ||= Pathname.new(__FILE__).dirname.parent.parent + "schemas"
     end
 
-    def _get(group:nil, item:, version:, expand: false)
-      JSON.parse(File.read(root + (group||"") + "#{item}-#{version}.schema.json")).tap { |json|
-        expand_refs!(json) if expand
-      }
-    end
-
     def election(version: ELECTION_SCHEMA_VERSION)
       _get(item: "election", version: version)
     end
@@ -20,20 +14,45 @@ module ClearElection
       _get(item: "ballot", version: version)
     end
 
+    def validate!(*args, **kwd)
+      validate(*args, **kwd.merge(raise_on_error: true))
+    end
+
+    def validate(schema, data, insert_defaults: nil, raise_on_error: false)
+      errors = []
+      Dir.chdir root do
+        args = { insert_defaults: insert_defaults }
+        if raise_on_error
+          method = :validate!
+        else
+          method = :fully_validate
+          args[:errors_as_objects] = true
+        end
+        errors = JSON::Validator.send method, schema, data, **args
+      end
+      errors
+    end
+
+    def _get(group:nil, item:, version:, expand: false)
+      JSON.parse(File.read(root + (group||"") + "#{item}-#{version}.schema.json")).tap { |json|
+        _expand_refs!(json) if expand
+      }
+    end
+
     def api(agent, version:)
       _get(group: "api", item: agent, version: version, expand: true)
     end
 
-    def expand_refs!(json)
+    def _expand_refs!(json)
       json.tap {
         JSON.recurse_proc json do |item|
           if Hash === item and uri = item['$ref']
-            uri = URI.parse(uri)
+            uri = Addressable::URI.parse(uri)
             if uri.scheme
               source = uri
               source = ClearElection::Schema.root.join uri.path.sub(%r{^/}, '') if uri.scheme == 'file'
               item.delete '$ref'
-              item.merge! expand_refs! JSON.parse source.read
+              item.merge! _expand_refs! JSON.parse source.read
             end
           end
         end

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

@@ -1,3 +1,3 @@
 module ClearElection
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/schemas/election-0.0.schema.json

@@ -67,7 +67,7 @@
       },
       "required": ["uri"]
     },
-    "ballot": { "$ref": "file:schemas/ballot-0.0.schema.json" }
+    "ballot": { "$ref": "file:ballot-0.0.schema.json" }
   }
 }
 

data/spec/election_spec.rb

@@ -57,12 +57,22 @@ describe ClearElection::Election do
       roundtrip ClearElection::Factory.election(returns: true)
     end
 
+    it "works in arbitrary directory" do
+      election = ClearElection::Factory.election
+      Dir.chdir Dir.mktmpdir do |dir|
+        expect{ election.as_json }.to_not raise_error
+      end
+    end
+
+    private
+
     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.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2015-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby SDK for working with ClearElection data