growthforecast 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 835154447cfabc62d3169a9ebe8a230b4ebb8130
-  data.tar.gz: d5a728b0343028f389b9a026550e691e0e49492a
+  metadata.gz: cd4d2486476e9ed650b734bbe5653a290bf72108
+  data.tar.gz: bd028f62e1d7a2097336c3556a5f90728b19eef1
 SHA512:
-  metadata.gz: d05c911e8a90f067d8b38d77c94696dcd9efea2df360159d648726c73974f698218239a7a9382c5a252457b499d70330b11fff984b68403d7c3e70e526706979
-  data.tar.gz: 341c831d83339bead3ddf2ea28b1390c23b12f6955b8a782304dce36f27870c416cc8c5c7aa8c43284edd7855a513d66d641a64dface2614ad81ed1d0b102451
+  metadata.gz: 719e13e6aa5186cb4cd208b00771c2415b0d9ef0cce71e045c063fd2357cfbadcceb27e2a25d1a3996e35a356dca48bf6ff3640edb2877801ebc0add40edea1a
+  data.tar.gz: 73146d1d2e92d20f2fbc223506e3c14ca4042cfeda2698538dd81f184403cb26a7ddd8a960ab569f4ba47eaa22917df1fce29da651ebeb1bd7fe58bd09582117

data/lib/growthforecast/spec.rb

@@ -126,39 +126,42 @@ class GrowthForecast::Spec
 
       #path
       unless specitem['path']
-        errors.push("data[#{index}]: path missing")
+        errors.push("data: path missing")
         next
       end
       replaced_path = replace_keywords(specitem['path'])
       path_element = replaced_path.split('/')
       unless path_element.size == 3
-        errors.push("data[#{index}]: path is not like SERVICE/SECTION/GRAPH")
+        errors.push("data: path is not like SERVICE/SECTION/GRAPH")
+        next
       end
       specitem_graph = cache.get(*path_element)
       unless specitem_graph
-        errors.push("data[#{index}]: specified graph '#{replaced_path}' not found")
-      end
-
-      #data(sub graph) size
-      unless target_data[index]
-        errors.push("data[#{index}]: graph member missing")
+        errors.push("data: specified graph '#{replaced_path}' not found")
         next
       end
 
+      current_target = target_data.select { |data| data.graph_id.to_i == specitem_graph.id.to_i }
       #data graph_id
-      if specitem_graph.id.to_i != target_data[index].graph_id.to_i
-        errors.push("data[#{index}]: mismatch, spec '#{replaced_path}'(graph id #{specitem_graph.id}) but id '#{target_data[index].graph_id}'")
+      if current_target.size.zero?
+        errors.push("data mismatch, spec '#{replaced_path}'(graph id #{specitem_graph.id}) does not include in complex graph.")
+        next
+      end
+      if current_target.size > 1
+        errors.push("data mismatch, spec '#{replaced_path}'(graph id #{specitem_graph.id}) found more than one.")
+        next
       end
+      current_target = current_target.first
       #gmode, type
-      if specitem.has_key?('gmode') && specitem['gmode'] != target_data[index].gmode
-        errors.push("data[#{index}]: gmode mismatch, spec '#{specitem['gmode']}' but '#{target_data[index].gmode}'")
+      if specitem.has_key?('gmode') && specitem['gmode'] != current_target.gmode
+        errors.push("data: gmode mismatch, spec '#{specitem['gmode']}' but '#{current_target.gmode}'")
       end
-      if specitem.has_key?('type') && specitem['type'] != target_data[index].type
-        errors.push("data[#{index}]: type mismatch, spec '#{specitem['type']}' but '#{target_data[index].type}'")
+      if specitem.has_key?('type') && specitem['type'] != current_target.type
+        errors.push("data: type mismatch, spec '#{specitem['type']}' but '#{current_target.type}'")
       end
       #stack: stack of first data item is nonsense
-      if index > 0 && specitem.has_key?('stack') && specitem['stack'] != target_data[index].stack
-        errors.push("data[#{index}]: stack mismatch, spec '#{specitem['stack']}' but '#{target_data[index].stack}'")
+      if index > 0 && specitem.has_key?('stack') && specitem['stack'] != current_target.stack
+        errors.push("data: stack mismatch, spec '#{specitem['stack']}' but '#{current_target.stack}'")
       end
     end
 

data/lib/growthforecast/version.rb

@@ -1,3 +1,3 @@
 class GrowthForecast
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: growthforecast
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-11 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resolve-hostname
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Client library and tool to update values, create/edit/delete graphs of
@@ -33,7 +33,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
@@ -61,19 +61,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A client library for GrowthForecast
 test_files: []
-has_rdoc: