access 2.0.43 → 2.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7118f42dc92f32ca1f8a7d784b5794c3767e6e1a
-  data.tar.gz: 8fba22106ef68dc55407be8abe4d8a725aa0b8cd
+  metadata.gz: aa314bee14dfeaec11d67ee2197270aa85d50065
+  data.tar.gz: 4da809cd4aa445c8458724d4b3dc333f83fd3aba
 SHA512:
-  metadata.gz: 4dd5d5d8740fca8f92d8a373282914f65d73532dee676d46be606e5f79e12904ac4fa4c21d26eb24502372d4d8915e07d8ac38b373f690fcf40cad0028e8df97
-  data.tar.gz: 6f9294b3aff2a9c128af05fd46e7b1038e97aa845d03099e9d9be5bb85b12e4b920ba2fa8df3fb1b23cf742c0d5915a5d1756190df969070eac03b9e758461f1
+  metadata.gz: 0f74fb119fbe129152bbde7ef8e38781a70d6b3f91af44091b521ffa8ba497440853588b3bdf0e2d9dfdcbdb233afc38bc5766ddbe548418e742aaf657e67d0b
+  data.tar.gz: f5f4c56917b6ff3b12cc7d3977796302ec7e882947306434ad4838b1117c7663993f77883ffd31cd0c353a4364e54dd9eed9d55ea21d17bef48b25493214374c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    access (2.0.43)
+    access (2.0.44)
       hashie (~> 3.3.1)
       httparty (~> 0.13.3)
 

data/lib/access.rb

@@ -21,6 +21,7 @@ require "access/location"
 require "access/member"
 require "access/oauth_application"
 require "access/offer"
+require "access/organization"
 require "access/program"
 require "access/redeem"
 require "access/redemption"

data/lib/access/member.rb

@@ -6,10 +6,13 @@ module Access
     end
 
     def initialize(values)
-      self.class.class_eval {attr_reader *values.keys }
+      self.class.class_eval {attr_reader *values.keys + [:user] }
       values.each do |attribute_name, attribute_value|
         self.instance_variable_set("@#{attribute_name}", attribute_value)
       end
+      @user  =  @user ? Access::User.new(@user) : nil
+      @program = Access::Program.new(@program) if @program
+      @organization = Access::Organization.new(@organization) if @organization
     end
 
     def self.show(member_key, options = {})

data/lib/access/organization.rb

@@ -0,0 +1,12 @@
+module Access
+  class Organization
+
+    def initialize(values)
+      self.class.class_eval {attr_reader *values.keys }
+      values.each do |attribute_name, attribute_value|
+        self.instance_variable_set("@#{attribute_name}", attribute_value)
+      end
+    end
+
+  end
+end

data/lib/access/request.rb

@@ -2,14 +2,14 @@ module Access
   class Request
     include HTTParty
 
-    attr_reader :url, :headers, :timeout, :return_json, :use_hasify
+    attr_reader :url, :headers, :timeout, :return_json, :use_hashify
 
     def base_setup(path, api_type, options)
       @url = set_base(path, api_type, options.delete(:api_environment))
       @headers = set_headers options.delete(:access_token)
       @timeout = options.delete(:access_timeout) || Access.config.access_timeout
       @return_json = should_return_json?(options.delete(:return_json))
-      @use_hasify = hashify_results?(options.delete(:hashify))
+      @use_hashify = hashify_results?(options.delete(:hashify))
       @debug_output = options.delete(:access_debug_output) || Access.config.access_debug_output
     end
 
@@ -17,7 +17,7 @@ module Access
       base_setup(path, api_type, options)
       results = self.class.get(url, headers: headers, query: options, timeout: timeout, debug_output: (@debug_output == 'true' ? $stdout : nil))
       if return_json
-        use_hasify ? results.hashify : results
+        use_hashify ? results.hashify : results
       else
         block.call results
       end
@@ -31,7 +31,7 @@ module Access
       base_setup(path, api_type, options)
       results = self.class.put(url, headers: headers, body: options.to_json, timeout: timeout, debug_output: (@debug_output == 'true' ? $stdout : nil))
       if return_json
-        use_hasify ? results.hashify : results
+        use_hashify ? results.hashify : results
       else
         block.call results
       end
@@ -45,7 +45,7 @@ module Access
       base_setup(path, api_type, options)
       results = self.class.post(url, headers: headers, body: options.to_json, timeout: timeout, debug_output: (@debug_output == 'true' ? $stdout : nil))
       if return_json
-        use_hasify ? results.hashify : results
+        use_hashify ? results.hashify : results
       else
         block.call results
       end
@@ -59,7 +59,7 @@ module Access
       base_setup(path, api_type, options)
       results = self.class.delete(url, headers: headers, body: options.to_json, timeout: timeout, debug_output: (@debug_output == 'true' ? $stdout : nil))
       if return_json
-        use_hasify ? results.hashify : results
+        use_hashify ? results.hashify : results
       else
         block.call results
       end
@@ -73,7 +73,7 @@ module Access
       base_setup(path, api_type, options)
       results = self.class.post(url, headers: headers, body: filter, timeout: timeout, debug_output: (@debug_output == 'true' ? $stdout : nil))
       if return_json
-        use_hasify ? results.hashify : results
+        use_hashify ? results.hashify : results
       else
         block.call results
       end

data/lib/access/response.rb

@@ -139,7 +139,10 @@ module Access
 
   class UserResponse < Response
     def process_data
-      @users = Access::User.process_batch(@users) if @users
+      if @members
+        @members = Access::Member.process_batch(@members)
+        @users = @members.map {|x| x if x.user }.compact
+      end
     end
   end
 

data/lib/access/version.rb

@@ -1,4 +1,4 @@
 module Access
-  VERSION = "2.0.43"
+  VERSION = "2.0.44"
 end
 

data/test/access/campaign_test.rb

@@ -37,7 +37,6 @@ class CampaignTest < Minitest::Test
       base_attributes.each do |att|
         assert campaigns_response.respond_to?(att), "#{att} not found"
       end
-      binding.pry
       assert_kind_of Array, campaigns_response.spot_list
       assert_kind_of Access::Spot, campaigns_response.spot_list.first
       assert_kind_of Access::Link, campaigns_response.spot_list.first.links.first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: access
 version: !ruby/object:Gem::Version
-  version: 2.0.43
+  version: 2.0.44
 platform: ruby
 authors:
 - Ben Eggett
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -237,6 +237,7 @@ files:
 - lib/access/member.rb
 - lib/access/oauth_application.rb
 - lib/access/offer.rb
+- lib/access/organization.rb
 - lib/access/program.rb
 - lib/access/redeem.rb
 - lib/access/redemption.rb