whereistand 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+  v0.0.4. revised opinion to support position, taken, narrative
+
   v0.0.3. implemented account, issue, and opinion services, all unit tests succeeding
 
   v0.0.2. revising accessibility and naming conventions 

data/Manifest

@@ -27,3 +27,4 @@ lib/whereistand.rb
 spec/client_accounts_spec.rb
 spec/client_issues_spec.rb
 spec/client_opinions_spec.rb
+whereistand.gemspec

data/lib/dom/account_issues.rb

@@ -18,16 +18,30 @@ class WIS::DOM::AccountIssues < WIS::DOM::Results
 			unless i["Approved"].nil?
 				opinion = WIS::DOM::AccountIssues.convert_hash_to_opinion(i["Approved"])
 				issue_result.approved = WIS::DOM::ApprovedOpinion.new(opinion.account, opinion.issue)
+				issue_result.approved.position = opinion.position
+				issue_result.approved.narrative = opinion.narrative
+				issue_result.approved.taken = opinion.taken
 			end
 			
 			unless i["Unverified"].nil?
 				opinion = WIS::DOM::AccountIssues.convert_hash_to_opinion(i["Unverified"])
 				issue_result.unverified = WIS::DOM::UnverifiedOpinion.new(opinion.account, opinion.issue)
+				issue_result.unverified.position = opinion.position
+				issue_result.approved.narrative = opinion.narrative
+			end
+			
+			unless i["Expressed"].nil?
+				opinion = WIS::DOM::AccountIssues.convert_hash_to_opinion(i["Expressed"])
+				issue_result.expressed = WIS::DOM::ExpressedOpinion.new(opinion.account, opinion.issue)
+				issue_result.expressed.position = opinion.position
+				issue_result.expressed.narrative = opinion.narrative
+				issue_result.expressed.taken = opinion.taken
 			end
 			
 			unless i["Unknown"].nil?
 				opinion = WIS::DOM::AccountIssues.convert_hash_to_opinion(i["Unknown"])
 				issue_result.unknown = WIS::DOM::UnknownOpinion.new(opinion.issue)
+				issue_result.unknown.position = opinion.position
 			end
 			
 			issues << issue_result
@@ -39,6 +53,10 @@ class WIS::DOM::AccountIssues < WIS::DOM::Results
 	def self.convert_hash_to_opinion(hash)
 		account = WIS::DOM::Account.new(hash["Account"]["ID"], hash["Account"]["Name"], hash["Account"]["Description"]) unless hash["Account"].nil?
 		issue = WIS::DOM::Issue.new(hash["Issue"]["ID"], hash["Issue"]["Description"])
-		WIS::DOM::Opinion.new(account, issue)
+		opinion = WIS::DOM::Opinion.new(account, issue)
+		opinion.narrative = hash["Narrative"] unless hash["Narrative"].nil?
+		opinion.taken = hash["Taken"] unless hash["Taken"].nil?
+		opinion.position = hash["Position"] unless hash["Position"].nil?
+		opinion
 	end
 end

data/lib/dom/expressed_opinion.rb

@@ -1,2 +1,2 @@
-class WIS::DOM::ExpressedOpinion < WIS::DOM::Opinion			
+class WIS::DOM::ExpressedOpinion < WIS::DOM::Opinion
 end

data/lib/dom/issue_result.rb

@@ -1,4 +1,4 @@
 class WIS::DOM::IssueResult
-	attr_accessor :issue, :unknown, :unverified, :approved
+	attr_accessor :issue, :unknown, :unverified, :approved, :expressed
 	
 end

data/lib/dom/opinion.rb

@@ -1,5 +1,6 @@
 class WIS::DOM::Opinion
 	attr_reader :account, :issue
+	attr_accessor :taken, :position, :narrative
 	
 	def initialize(account, issue)
 		@account = account
@@ -9,6 +10,10 @@ class WIS::DOM::Opinion
 	def self.adapt_json(data)
 		account = WIS::DOM::Account.new(data["Account"]["ID"], data["Account"]["Name"], data["Account"]["Description"])
 		issue = WIS::DOM::Issue.new(data["Issue"]["ID"], data["Issue"]["Description"])
-		WIS::DOM::Opinion.new(account, issue)
+		opinion = WIS::DOM::Opinion.new(account, issue)
+		opinion.narrative = data["Narrative"] unless data["Narrative"].nil?
+		opinion.taken = data["Taken"] unless data["Taken"].nil?
+		opinion.position = data["Position"] unless data["Position"].nil?
+		opinion
 	end
 end

data/spec/client_opinions_spec.rb

@@ -13,6 +13,10 @@ describe WIS::Client::Opinions do
 		results = WIS::Client::Opinions.search_known_account_by_issue(account, "global warming")
 		results.kind_of?(WIS::DOM::AccountIssues).should be_true
 		results.hits.should > 0
+		
+		results.issues.each do |issue_result|
+			issue_result.kind_of?(WIS::DOM::IssueResult).should be_true
+		end
 	end
 	
 end

data/whereistand.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whereistand}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["whereIstand"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whereistand
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - whereIstand