version-one 0.0.7 → 0.0.8

data/.ruby-version

@@ -1 +1 @@
-1.9.2-p484
+1.9.3-p0

data/lib/version-one/asset.rb

@@ -273,45 +273,37 @@ module VersionOne
     def init_attribute_value(el)
       attr_name = el.attributes['name']
 
-      children = el.children
-      child_count = children.size
-      first = children[0]
-
-      if true #child_count > 0
-
-        case el.name
-          when 'Attribute'
-            val = case
-                    when child_count == 0
-                      nil
-                    when first.name == 'Value'
-                      children.map(&:content)
-                    else
-                      el.content
-                    end
-
-            #DEBUG puts "Setting #{attr_name} to #{val.inspect}"
-
-            if @setters[attr_name]
-              send(@setters[attr_name], val)
-            else
-              add_simple_attribute(attr_name, String, readonly: true)
-              @attributes[attr_name] = val
-            end
-
-          when 'Relation'
-            val = children.map{|v| (v.name == 'Asset') ? AssetRef.new(v) : nil}.compact
-            unless @setters[attr_name]
-              add_relation_attribute(attr_name, readonly: true)
-            end
+      # If no children (text or elements) then treat as nil value
+      # If has Value or Asset children then default to multivalue array
+      is_nil        = el.children.size == 0
+      val           = nil if is_nil
+      children      = is_nil ? [] : el.find('Value|Asset').to_a
+      is_multivalue = children.size > 0
+
+      case el.name
+        when 'Attribute'
+          val = is_multivalue ? children.map(&:content) : el.content unless is_nil
+
+          if @setters[attr_name]
             send(@setters[attr_name], val)
-            @attributes[attr_name].unchanged! if @attributes[attr_name].respond_to?(:unchanged!)
-
           else
-            # Ignore
-        end
+            add_simple_attribute(attr_name, String, readonly: true, multivalue: is_multivalue)
+            @attributes[attr_name] = val
+          end
 
+        when 'Relation'
+          val = children.map{|v| AssetRef.new(v)} unless is_nil
+
+          unless @setters[attr_name]
+            add_relation_attribute(attr_name, readonly: true, multivalue: is_multivalue)
+          end
+          send(@setters[attr_name], val)
+          @attributes[attr_name].unchanged! if @attributes[attr_name].respond_to?(:unchanged!)
+
+        else
+          # Ignore
       end
+
     end
 
     def add_generic_attribute(attr_name, options={})
@@ -359,9 +351,9 @@ end
       @setters[attr_name] = "#{ruby_name}="
     end
 
-    def add_simple_attribute(attr_name, native_type, options={})
+    def add_simple_attribute(_attr_name, native_type, _options={})
 
-      add_generic_attribute(attr_name, options) do |attr_name, options|
+      add_generic_attribute(_attr_name, _options) do |attr_name, options|
         convert = "convert_to_#{native_type}"
         if options[:multivalue]
           setter = %{
@@ -435,6 +427,10 @@ end
       VersionOne.s_to_time(val, utc: !!(name.match(/utc$/i)))
     end
 
+    def convert_to_Float(name, val)
+      Float(val)
+    end
+
     def save_url
       if @href
         @href

data/lib/version-one/client.rb

@@ -120,7 +120,7 @@ module VersionOne
       request_path = uri.path
       request_path += '?' + uri.query if uri.query
 
-      result = http.start do
+      http.start do
         klass = case type
                   when :get
                     Net::HTTP::Get

data/lib/version-one/query.rb

@@ -26,7 +26,7 @@ module VersionOne
         end
       end
 
-      q.instance_eval &block
+      q.instance_eval(&block)
       q
     end
 

data/lib/version-one/relation_multi_value.rb

@@ -4,6 +4,8 @@ module VersionOne
   class RelationMultiValue
 
     def initialize(val = nil)
+      @assets = {}
+      @original_assets = {}
       set(val)
     end
 
@@ -15,7 +17,11 @@ module VersionOne
     def set(val)
       val ||= []
       val = [val] unless val.is_a?(Array)
-      @assets = val.map{|v| AssetRef.for(v) }.index_by(&:id)
+      @assets = {}
+      val.each do |v|
+        v = AssetRef.for(v)
+        @assets[v.id] = v
+      end
       @original_assets ||= @assets.dup
       self
     end

data/lib/version-one/version.rb

@@ -1,3 +1,3 @@
 module VersionOne
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/fixtures/expression_results.xml

@@ -0,0 +1,54 @@
+<Assets total="2" pageSize="2147483647" pageStart="0">
+  <Asset href="/Bogus/rest-1.v1/Data/Expression/74458" id="Expression:74458">
+    <Attribute name="AssetType">Expression</Attribute>
+    <Relation name="Mentions">
+      <Asset href="/Bogus/rest-1.v1/Data/Member/1008" idref="Member:1008"/>
+      <Asset href="/Bogus/rest-1.v1/Data/Member/1010" idref="Member:1010"/>
+      <Asset href="/Bogus/rest-1.v1/Data/Member/1120" idref="Member:1120"/>
+    </Relation>
+    <Attribute name="Mentions.Name">
+      <Value>Bob One</Value>
+      <Value>Bob Two</Value>
+      <Value>Bob Three</Value>
+    </Attribute>
+    <Relation name="InReplyTo.Mentions">
+      <Asset href="/Bogus/rest-1.v1/Data/Member/1008" idref="Member:1008"/>
+      <Asset href="/Bogus/rest-1.v1/Data/Member/1120" idref="Member:1120"/>
+      <Asset href="/Bogus/rest-1.v1/Data/Member/8050" idref="Member:8050"/>
+      <Asset href="/Bogus/rest-1.v1/Data/Member/14494" idref="Member:14494"/>
+      <Asset href="/Bogus/rest-1.v1/Data/Defect/72081" idref="Defect:72081"/>
+    </Relation>
+    <Attribute name="InReplyTo.Mentions.Name">
+      <Value>Bob One</Value>
+      <Value>Bob Two</Value>
+      <Value>Bob Three</Value>
+      <Value>Bob Four</Value>
+      <Value>Some bug in the product</Value>
+    </Attribute>
+    <Attribute name="SomeThing.SingleValue">Expected Value</Attribute>
+    <Relation name="SomeThing.SingleRelation"><Asset href="/Bogus/rest-1.v1/Data/Member/14494" idref="Member:14494"/></Relation>
+  </Asset>
+  <Asset href="/Bogus/rest-1.v1/Data/Expression/74463" id="Expression:74463">
+    <Attribute name="AssetType">Expression</Attribute>
+    <Relation name="Mentions">
+      <Asset href="/Bogus/rest-1.v1/Data/Member/51082" idref="Member:51082"/>
+      <Asset href="/Bogus/rest-1.v1/Data/Member/1008" idref="Member:1008"/>
+      <Asset href="/Bogus/rest-1.v1/Data/Member/1010" idref="Member:1010"/>
+      <Asset href="/Bogus/rest-1.v1/Data/Member/1120" idref="Member:1120"/>
+    </Relation>
+    <Attribute name="Mentions.Name">
+      <Value>Bob One</Value>
+      <Value>Bob Two</Value>
+      <Value>Bob Three</Value>
+      <Value>Bob Four</Value>
+    </Attribute>
+    <Relation name="InReplyTo.Mentions">
+      <Asset href="/Bogus/rest-1.v1/Data/Defect/45128" idref="Defect:45128"/>
+    </Relation>
+    <Attribute name="InReplyTo.Mentions.Name">
+      <Value>
+        Some other problem with the product
+      </Value>
+    </Attribute>
+  </Asset>
+</Assets>

data/spec/fixtures/story.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Asset href="/Ooyala/rest-1.v1/Data/Story/1816" id="Story:1816">
+<Asset href="/Bogus/rest-1.v1/Data/Story/1816" id="Story:1816">
   <Attribute name="AssetType">Story</Attribute>
   <Attribute name="Benefits"/>
   <Relation name="SplitFrom"/>
   <Relation name="SecurityScope">
-    <Asset href="/Ooyala/rest-1.v1/Data/Scope/4322" idref="Scope:4322"/>
+    <Asset href="/Bogus/rest-1.v1/Data/Scope/4322" idref="Scope:4322"/>
   </Relation>
   <Relation name="Super"/>
   <Relation name="Team"/>
   <Relation name="IdentifiedIn"/>
   <Relation name="Parent">
-    <Asset href="/Ooyala/rest-1.v1/Data/Theme/4853" idref="Theme:4853"/>
+    <Asset href="/Bogus/rest-1.v1/Data/Theme/4853" idref="Theme:4853"/>
   </Relation>
   <Relation name="Category"/>
   <Relation name="Risk"/>

data/spec/lib/asset_spec.rb

@@ -41,21 +41,56 @@ describe VersionOne::Asset do
   end
 
   describe 'new from xml' do
-    subject { described_class.from_xml(load_xml('story')) }
+    context 'with a single result' do
+      subject { described_class.from_xml(load_xml('story')) }
 
-    include_examples 'new'
+      include_examples 'new'
 
-    it 'should set attribute values from xml' do
-      expect(subject.number).to eq 'B-01027'
-      expect(subject.order).to eq -1071957351
-    end
+      it 'should set attribute values from xml' do
+        expect(subject.number).to eq 'B-01027'
+        expect(subject.order).to eq -1071957351
+      end
 
-    it 'should provide attribute readers for queried attributes' do
-      expect(subject).to respond_to :security_scope_name
+      it 'should provide attribute readers for queried attributes' do
+        expect(subject).to respond_to :security_scope_name
+      end
     end
 
+    context 'with multiple results' do
+      subject { described_class.from_xml(load_xml('expression_results')) }
+
+      it 'should return an array of assets' do
+        expect(subject).to be_a Array
+        expect(subject.size).to eq 2
+      end
+
+      describe 'should populate indirectly' do
+
+        it 'single values' do
+          expect(subject[0].some_thing_single_value).to eq 'Expected Value'
+        end
+
+        it 'multiple values' do
+          expect(subject[0].in_reply_to_mentions_name).to eq ['Bob One', 'Bob Two', 'Bob Three', 'Bob Four', 'Some bug in the product']
+        end
+
+        it 'single relations' do
+          expect(subject[0].some_thing_single_relation.size).to be > 0
+          expect(subject[0].some_thing_single_relation.map(&:id)).to eq ['Member:14494']
+        end
+
+        it 'multiple relations' do
+          expect(subject[0].in_reply_to_mentions.size).to be > 0
+          expect(subject[0].in_reply_to_mentions.map(&:id)).to eq %w{Member:1008 Member:1120 Member:8050 Member:14494 Defect:72081}
+        end
+
+      end
+
+    end
   end
 
+
+
   describe 'new' do
     subject { described_class.new(type: 'Story') }
 

data/spec/lib/query_spec.rb

@@ -4,5 +4,5 @@ require 'lib/common'
 describe VersionOne::Query do
   include_context 'configured'
 
-
+  it 'should test something'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: version-one
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
@@ -85,6 +85,7 @@ files:
 - lib/version-one/time.rb
 - lib/version-one/version.rb
 - lib/version-one/version.rb~
+- spec/fixtures/expression_results.xml
 - spec/fixtures/story.xml
 - spec/fixtures/story_meta.xml
 - spec/lib/asset_spec.rb
@@ -120,6 +121,7 @@ signing_key:
 specification_version: 3
 summary: VersionOne integration gem.
 test_files:
+- spec/fixtures/expression_results.xml
 - spec/fixtures/story.xml
 - spec/fixtures/story_meta.xml
 - spec/lib/asset_spec.rb