aptible-gridiron 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3194ca3112f7c2c9adcd06904ad681ca00ced37c
-  data.tar.gz: f31fa4fda6c721aafae9f42de9a9edcc76a865e7
+  metadata.gz: f127554a7074b9d3669b9579f7e76430cc28fc3f
+  data.tar.gz: 2c5581ada148a2f8d2c25c76fcbb3ae5f1eafcac
 SHA512:
-  metadata.gz: 0ae03ee9ed2f392c72910a473f1fbca5d82dbffa48dd9089b0119c98562ad1c954596736008b49fadfe46ef455d1a1de2fc48dd7378adb82a24fb78427fc0240
-  data.tar.gz: 4147963ff65de92ed65d4e4e7d9a36f916fa8e633ba98ae9f9107c2449c7163a1fa1ebd8cbc4ed6dee7798fddeea5f86a4f11322f5df918e2e01ba96b6f4dd06
+  metadata.gz: 809629814ec53416b4e33a3b8e62519751111c9027449e81ccd08d627e4d66ef379b542dbc3855d3d41d6ad53aada82db95d6cd81dc9261f9493ac11265ea277
+  data.tar.gz: 39a634672142fcd716411176b46a3d55e07cd39d361191550fb41187150bd80369f34276ed465a2c8b2b826d53bcb166bf4378505cc97edd3f776cae73be434b

data/README.md

@@ -1,6 +1,6 @@
 # ![](https://raw.github.com/aptible/straptible/master/lib/straptible/rails/templates/public.api/icon-60px.png) Aptible::Gridiron
 
-[![Gem Version](https://badge.fury.io/rb/gridiron.png)](https://rubygems.org/gems/gridiron)
+[![Gem Version](https://badge.fury.io/rb/aptible-gridiron.png)](https://rubygems.org/gems/aptible-gridiron)
 [![Build Status](https://travis-ci.org/aptible/gridiron-ruby.png?branch=master)](https://travis-ci.org/aptible/gridiron-ruby)
 [![Dependency Status](https://gemnasium.com/aptible/gridiron-ruby.png)](https://gemnasium.com/aptible/gridiron-ruby)
 
@@ -38,15 +38,11 @@ criterion.name
 # => "Policy Manual"
 ```
 
-To work with organization-specific evidence (i.e., documents and events), you may set the `Aptible::Gridiron.configuration.organization` variable. For example:
+To work with organization-specific evidence (i.e., documents and events), you may pass `:organization` as a parameter in any initializer. For example:
 
 ```ruby
 organization = Aptible::Auth::Organization.all(token: token).first
-Aptible::Gridiron.configure do |config|
-  config.organization = organization
-end
-
-gridiron = Aptible::Gridiron::Agent.new(token: token)
+gridiron = Aptible::Gridiron::Agent.new(token: token, organization: organization)
 criterion = gridiron.protocols.first.procedures.first.criteria.first
 criterion.documents.count
 # => 1
@@ -64,7 +60,6 @@ document.expires_at
 | Parameter | Description | Default |
 | --------- | ----------- | --------------- |
 | `root_url` | Root URL of the Gridiron server | `ENV['GRIDIRON_ROOT_URL']` or [https://gridiron.aptible.com](https://gridiron.aptible.com) |
-| `organization` | `Aptible::Auth::Organization` instance to be used for all documents/events | `nil` |
 
 To point the client at a different server (e.g., during development), add the following to your application's initializers (or set the `GRIDIRON_ROOT_URL` environment variable):
 

data/lib/aptible/gridiron.rb

@@ -13,9 +13,6 @@ module Aptible
       has :root_url,
           classes: [String],
           default: ENV['GRIDIRON_ROOT_URL'] || 'https://gridiron.aptible.com'
-      has :organization,
-          classes: [Aptible::Auth::Organization, NilClass],
-          default: nil
     end
   end
 end

data/lib/aptible/gridiron/criterion.rb

@@ -11,6 +11,26 @@ module Aptible
       field :evidence_type
       field :scope
       field :default_expiry
+
+      def documents
+        evidence_type == 'document' ? super : []
+      end
+
+      def events
+        evidence_type == 'event' ? super : []
+      end
+
+      def status
+        green? ? 'green' : 'red'
+      end
+
+      # TODO: Move to Gridiron, or fix logic
+      def green?
+        return true if evidence_type == 'event'
+
+        return false unless documents.first
+        documents.first.expires_at > Time.now
+      end
     end
   end
 end

data/lib/aptible/gridiron/evidence.rb

@@ -5,6 +5,7 @@ module Aptible
 
       field :id
       field :data
+      field :created_at, type: Time
 
       def organization
         auth = Aptible::Auth::Organization.new(token: token, headers: headers)

data/lib/aptible/gridiron/resource.rb

@@ -3,21 +3,24 @@ require 'aptible/resource'
 module Aptible
   module Gridiron
     class Resource < Aptible::Resource::Base
-      def self.normalize_params(params = {})
-        # TODO: Figure out a more natural solution than this monkey patch
-        if (organization = Aptible::Gridiron.configuration.organization)
-          params.merge!(organization: organization.href)
-        end
+      def outgoing_uri_filter(params)
+        params.merge!(organization: organization) if organization
+      end
 
-        super(params)
+      def organization
+        # TODO: Is there another way to persist organization across children
+        headers['X-Aptible-Organization']
       end
 
-      def outgoing_uri_filter(params)
-        if (organization = Aptible::Gridiron.configuration.organization)
-          params.merge!(organization: organization.href)
+      def initialize(options = {})
+        if options.is_a?(Hash) && options[:organization]
+          options[:headers] ||= {}
+          options[:headers].merge!(
+            'X-Aptible-Organization' => options[:organization].href
+          )
         end
 
-        params
+        super(options)
       end
 
       def namespace

data/lib/aptible/gridiron/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module Gridiron
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-gridiron
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-resource