megam_api 1.5.rc5 → 1.5.rc7

data/lib/megam/core/assemblies.rb

@@ -1,19 +1,3 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 module Megam
     class Assemblies < Megam::RestAdapter
         def initialize(o)

data/lib/megam/core/assemblies_collection.rb

@@ -1,137 +1,122 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 module Megam
-  class AssembliesCollection
-    include Enumerable
-
-    attr_reader :iterator
-    def initialize
-      @assemblies = Array.new
-      @assemblies_by_name = Hash.new
-      @insert_after_idx = nil
-    end
+    class AssembliesCollection
+        include Enumerable
+
+        attr_reader :iterator
+        def initialize
+            @assemblies = Array.new
+            @assemblies_by_name = Hash.new
+            @insert_after_idx = nil
+        end
 
-    def all_assemblies
-      @assemblies
-    end
+        def all_assemblies
+            @assemblies
+        end
 
-    def [](index)
-      @assemblies[index]
-    end
+        def [](index)
+            @assemblies[index]
+        end
 
-    def []=(index, arg)
-      is_megam_assemblies(arg)
-      @assemblies[index] = arg
-      @assemblies_by_name[arg.assembies_name] = index
-    end
+        def []=(index, arg)
+            is_megam_assemblies(arg)
+            @assemblies[index] = arg
+            @assemblies_by_name[arg.assembies_name] = index
+        end
 
-    def <<(*args)
-      args.flatten.each do |a|
-        is_megam_assemblies(a)
-        @assemblies << a
-        @assemblies_by_name[a.name] = @assemblies.length - 1
-      end
-      self
-    end
+        def <<(*args)
+            args.flatten.each do |a|
+                is_megam_assemblies(a)
+                @assemblies << a
+                @assemblies_by_name[a.name] = @assemblies.length - 1
+            end
+            self
+        end
 
-    # 'push' is an alias method to <<
-    alias_method :push, :<<
-
-    def insert(assemblies)
-      is_megam_assemblies(assemblies)
-      if @insert_after_idx
-        # in the middle of executing a run, so any nodes inserted now should
-        # be placed after the most recent addition done by the currently executing
-        # node
-        @assemblies.insert(@insert_after_idx + 1, assemblies)
-        # update name -> location mappings and register new node
-        @assemblies_by_name.each_key do |key|
-        @assemblies_by_name[key] += 1 if @assemblies_by_name[key] > @insert_after_idx
+        # 'push' is an alias method to <<
+        alias_method :push, :<<
+
+        def insert(assemblies)
+            is_megam_assemblies(assemblies)
+            if @insert_after_idx
+                # in the middle of executing a run, so any nodes inserted now should
+                # be placed after the most recent addition done by the currently executing
+                # node
+                @assemblies.insert(@insert_after_idx + 1, assemblies)
+                # update name -> location mappings and register new node
+                @assemblies_by_name.each_key do |key|
+                    @assemblies_by_name[key] += 1 if @assemblies_by_name[key] > @insert_after_idx
+                end
+                @assemblies_by_name[assemblies.name] = @insert_after_idx + 1
+                @insert_after_idx += 1
+            else
+                @assemblies << assemblies
+                @assemblies_by_name[assemblies.name] = @assemblies.length - 1
+            end
         end
-        @assemblies_by_name[assemblies.name] = @insert_after_idx + 1
-        @insert_after_idx += 1
-      else
-      @assemblies << assemblies
-      @assemblies_by_name[assemblies.name] = @assemblies.length - 1
-      end
-    end
 
-    def each
-      @assemblies.each do |assemblies|
-        yield assemblies
-      end
-    end
+        def each
+            @assemblies.each do |assemblies|
+                yield assemblies
+            end
+        end
 
-    def each_index
-      @assemblies.each_index do |i|
-        yield i
-      end
-    end
+        def each_index
+            @assemblies.each_index do |i|
+                yield i
+            end
+        end
 
-    def empty?
-      @assemblies.empty?
-    end
+        def empty?
+            @assemblies.empty?
+        end
 
-    def lookup(assemblies)
-      lookup_by = nil
-      if assemblies.kind_of?(Megam::Assemblies)
-      lookup_by = assemblies.name
-      elsif assemblies.kind_of?(String)
-      lookup_by = assemblies
-      else
-        raise ArgumentError, "Must pass a Megam::Assemblies or String to lookup"
-      end
-      res = @assemblies_by_name[lookup_by]
-      unless res
-        raise ArgumentError, "Cannot find a node matching #{lookup_by} (did you define it first?)"
-      end
-      @assemblies[res]
-    end
+        def lookup(assemblies)
+            lookup_by = nil
+            if assemblies.kind_of?(Megam::Assemblies)
+                lookup_by = assemblies.name
+            elsif assemblies.kind_of?(String)
+                lookup_by = assemblies
+            else
+                raise ArgumentError, "Must pass a Megam::Assemblies or String to lookup"
+            end
+            res = @assemblies_by_name[lookup_by]
+            unless res
+                raise ArgumentError, "Cannot find a node matching #{lookup_by} (did you define it first?)"
+            end
+            @assemblies[res]
+        end
 
-    def to_s
-        @assemblies.join(", ")
-    end
+        def to_s
+            @assemblies.join(", ")
+        end
 
-    def for_json
-        to_a.map { |item| item.to_s }
-    end
+        def for_json
+            to_a.map { |item| item.to_s }
+        end
 
-    def to_json(*a)
-        Megam::JSONCompat.to_json(for_json, *a)
-    end
+        def to_json(*a)
+            Megam::JSONCompat.to_json(for_json, *a)
+        end
 
-    def self.json_create(o)
-      collection = self.new()
-      o["results"].each do |assemblies_list|
-        assemblies_array = assemblies_list.kind_of?(Array) ? assemblies_list : [ assemblies_list ]
-        assemblies_array.each do |assemblies|
-          collection.insert(assemblies)
+        def self.json_create(o)
+            collection = self.new()
+            o["results"].each do |assemblies_list|
+                assemblies_array = assemblies_list.kind_of?(Array) ? assemblies_list : [ assemblies_list ]
+                assemblies_array.each do |assemblies|
+                    collection.insert(assemblies)
 
+                end
+            end
+            collection
         end
-      end
-      collection
-    end
 
-    private
+        private
 
-    def is_megam_assemblies(arg)
-      unless arg.kind_of?(Megam::Assemblies)
-        raise ArgumentError, "Members must be Megam::Assemblies's"
-      end
-      true
+        def is_megam_assemblies(arg)
+            unless arg.kind_of?(Megam::Assemblies)
+                raise ArgumentError, "Members must be Megam::Assemblies's"
+            end
+            true
+        end
     end
-  end
 end

data/lib/megam/core/assembly.rb

@@ -1,221 +1,204 @@
-# Copyright:: Copyright (c) 2013-2016 Megam Systems
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 module Megam
-  class Assembly < Megam::RestAdapter
-    def initialize(o)
-      @id = nil
-      @asms_id = nil
-      @name = nil
-      @components = []
-      @tosca_type = nil
-      @policies = []
-      @inputs = []
-      @outputs = []
-      @status = nil
-      @created_at = nil
-
-      super(o)
-    end
-
-    def assembly
-      self
-    end
-
-    def id(arg = nil)
-      if !arg.nil?
-        @id = arg
-      else
-        @id
-      end
-    end
-
-    def asms_id(arg=nil)
-      if arg != nil
-        @asms_id = arg
-      else
-      @asms_id
-      end
-    end
-
-    def name(arg = nil)
-      if !arg.nil?
-        @name = arg
-      else
-        @name
-      end
-    end
-
-    def tosca_type(arg = nil)
-      if !arg.nil?
-        @tosca_type = arg
-      else
-        @tosca_type
-      end
-    end
-
-    def components(arg = [])
-      if arg != []
-        @components = arg
-      else
-        @components
-      end
-    end
-
-    def policies(arg = [])
-      if arg != []
-        @policies = arg
-      else
-        @policies
-      end
-    end
-
-    def inputs(arg = [])
-      if arg != []
-        @inputs = arg
-      else
-        @inputs
-      end
-    end
-
-    def outputs(arg = [])
-      if arg != []
-        @outputs = arg
-      else
-        @outputs
-      end
-    end
-
-    def status(arg = nil)
-      if !arg.nil?
-        @status = arg
-      else
-        @status
-      end
-    end
-
-    def created_at(arg = nil)
-      if !arg.nil?
-        @created_at = arg
-      else
-        @created_at
-       end
-      end
-
-    def error?
-      crocked = true if some_msg.key?(:msg_type) && some_msg[:msg_type] == 'error'
-    end
-
-    # Transform the ruby obj ->  to a Hash
-    def to_hash
-      index_hash = {}
-      index_hash['json_claz'] = self.class.name
-      index_hash['id'] = id
-      index_hash["asms_id"] = asms_id
-      index_hash['name'] = name
-      index_hash['components'] = components
-      index_hash['tosca_type'] = tosca_type
-      index_hash['policies'] = policies
-      index_hash['inputs'] = inputs
-      index_hash['outputs'] = outputs
-      index_hash['status'] = status
-      index_hash['created_at'] = created_at
-      index_hash
-    end
-
-    # Serialize this object as a hash: called from JsonCompat.
-    # Verify if this called from JsonCompat during testing.
-    def to_json(*a)
-      for_json.to_json(*a)
-    end
-
-    def for_json
-      result = {
-        'id' => id,
-        'name' => name,
-        'components' => components,
-        'tosca_type' => tosca_type,
-        'policies' => policies,
-        'inputs' => inputs,
-        'outputs' => outputs,
-        'status' => status,
-        'created_at' => created_at
-      }
-
-      result
-    end
-
-    def self.json_create(o)
-      asm = new({})
-      asm.id(o['id']) if o.key?('id')
-      asm.asms_id(o["asms_id"]) if o.has_key?("asms_id")
-      asm.name(o['name']) if o.key?('name')
-      asm.components(o['components']) if o.key?('components')
-      asm.tosca_type(o['tosca_type']) if o.key?('tosca_type')
-      asm.policies(o['policies']) if o.key?('policies') # this will be an array? can hash store array?
-      asm.inputs(o['inputs']) if o.key?('inputs')
-      asm.outputs(o['outputs']) if o.key?('outputs')
-      asm.status(o['status']) if o.key?('status')
-      asm.created_at(o['created_at']) if o.key?('created_at')
-      asm
-    end
-
-    def self.from_hash(o)
-      asm = new(o)
-      asm.from_hash(o)
-      asm
-    end
-
-    def from_hash(o)
-      @id                = o['id'] if o.key?('id')
-      @asms_id           = o["asms_id"] if o.has_key?("asms_id")
-      @name              = o['name'] if o.key?('name')
-      @components        = o['components'] if o.key?('components')
-      @tosca_type        = o['tosca_type'] if o.key?('tosca_type')
-      @policies          = o['policies'] if o.key?('policies')
-      @inputs            = o['inputs'] if o.key?('inputs')
-      @outputs           = o['outputs'] if o.key?('outputs')
-      @status            = o['status'] if o.key?('status')
-      @created_at        = o['created_at'] if o.key?('created_at')
-      self
+    class Assembly < Megam::RestAdapter
+        def initialize(o)
+            @id = nil
+            @asms_id = nil
+            @name = nil
+            @components = []
+            @tosca_type = nil
+            @policies = []
+            @inputs = []
+            @outputs = []
+            @status = nil
+            @created_at = nil
+
+            super(o)
+        end
+
+        def assembly
+            self
+        end
+
+        def id(arg = nil)
+            if !arg.nil?
+                @id = arg
+            else
+                @id
+            end
+        end
+
+        def asms_id(arg=nil)
+            if arg != nil
+                @asms_id = arg
+            else
+                @asms_id
+            end
+        end
+
+        def name(arg = nil)
+            if !arg.nil?
+                @name = arg
+            else
+                @name
+            end
+        end
+
+        def tosca_type(arg = nil)
+            if !arg.nil?
+                @tosca_type = arg
+            else
+                @tosca_type
+            end
+        end
+
+        def components(arg = [])
+            if arg != []
+                @components = arg
+            else
+                @components
+            end
+        end
+
+        def policies(arg = [])
+            if arg != []
+                @policies = arg
+            else
+                @policies
+            end
+        end
+
+        def inputs(arg = [])
+            if arg != []
+                @inputs = arg
+            else
+                @inputs
+            end
+        end
+
+        def outputs(arg = [])
+            if arg != []
+                @outputs = arg
+            else
+                @outputs
+            end
+        end
+
+        def status(arg = nil)
+            if !arg.nil?
+                @status = arg
+            else
+                @status
+            end
+        end
+
+        def created_at(arg = nil)
+            if !arg.nil?
+                @created_at = arg
+            else
+                @created_at
+            end
+        end
+
+        def error?
+            crocked = true if some_msg.key?(:msg_type) && some_msg[:msg_type] == 'error'
+        end
+
+        # Transform the ruby obj ->  to a Hash
+        def to_hash
+            index_hash = {}
+            index_hash['json_claz'] = self.class.name
+            index_hash['id'] = id
+            index_hash["asms_id"] = asms_id
+            index_hash['name'] = name
+            index_hash['components'] = components
+            index_hash['tosca_type'] = tosca_type
+            index_hash['policies'] = policies
+            index_hash['inputs'] = inputs
+            index_hash['outputs'] = outputs
+            index_hash['status'] = status
+            index_hash['created_at'] = created_at
+            index_hash
+        end
+
+        # Serialize this object as a hash: called from JsonCompat.
+        # Verify if this called from JsonCompat during testing.
+        def to_json(*a)
+            for_json.to_json(*a)
+        end
+
+        def for_json
+            result = {
+                'id' => id,
+                'name' => name,
+                'components' => components,
+                'tosca_type' => tosca_type,
+                'policies' => policies,
+                'inputs' => inputs,
+                'outputs' => outputs,
+                'status' => status,
+                'created_at' => created_at
+            }
+
+            result
+        end
+
+        def self.json_create(o)
+            asm = new({})
+            asm.id(o['id']) if o.key?('id')
+            asm.asms_id(o["asms_id"]) if o.has_key?("asms_id")
+            asm.name(o['name']) if o.key?('name')
+            asm.components(o['components']) if o.key?('components')
+            asm.tosca_type(o['tosca_type']) if o.key?('tosca_type')
+            asm.policies(o['policies']) if o.key?('policies') # this will be an array? can hash store array?
+            asm.inputs(o['inputs']) if o.key?('inputs')
+            asm.outputs(o['outputs']) if o.key?('outputs')
+            asm.status(o['status']) if o.key?('status')
+            asm.created_at(o['created_at']) if o.key?('created_at')
+            asm
+        end
+
+        def self.from_hash(o)
+            asm = new(o)
+            asm.from_hash(o)
+            asm
+        end
+
+        def from_hash(o)
+            @id                = o['id'] if o.key?('id')
+            @asms_id           = o["asms_id"] if o.has_key?("asms_id")
+            @name              = o['name'] if o.key?('name')
+            @components        = o['components'] if o.key?('components')
+            @tosca_type        = o['tosca_type'] if o.key?('tosca_type')
+            @policies          = o['policies'] if o.key?('policies')
+            @inputs            = o['inputs'] if o.key?('inputs')
+            @outputs           = o['outputs'] if o.key?('outputs')
+            @status            = o['status'] if o.key?('status')
+            @created_at        = o['created_at'] if o.key?('created_at')
+            self
+        end
+
+        def self.show(params)
+            asm = new(params)
+            asm.megam_rest.get_one_assembly(params['id'])
+        end
+
+        def self.update(params)
+            asm = from_hash(params)
+            asm.update
+        end
+
+        def self.upgrade(params)
+            asm = from_hash(params)
+            asm.megam_rest.upgrade_assembly(params['id'])
+        end
+
+        # Create the node via the REST API
+        def update
+            megam_rest.update_assembly(to_hash)
+        end
+
+        def to_s
+            Megam::Stuff.styled_hash(to_hash)
+        end
     end
-
-    def self.show(params)
-      asm = new(params)
-      asm.megam_rest.get_one_assembly(params['id'])
-    end
-
-    def self.update(params)
-      asm = from_hash(params)
-      asm.update
-   end
-
-   def self.upgrade(params)
-     asm = from_hash(params)
-     asm.megam_rest.upgrade_assembly(params['id'])
-   end
-
-    # Create the node via the REST API
-    def update
-      megam_rest.update_assembly(to_hash)
-    end   
-
-    def to_s
-      Megam::Stuff.styled_hash(to_hash)
-    end
-  end
 end
-