infopark_reactor 1.26.1 → 1.27.0.rc4

data/lib/reactor/plans/delete_channel.rb

@@ -1,8 +1,6 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/cm/channel'
-require 'reactor/plans/common_channel'
+require "reactor/cm/channel"
+require "reactor/plans/common_channel"
 module Reactor
-
   module Plans
     class DeleteChannel < CommonChannel
       def initialize(*args)
@@ -13,13 +11,12 @@ module Reactor
 
       def prepare!
         error("name is nil") if @name.nil?
-        error("channel #{@name} does not exist") if not Reactor::Cm::Channel.exists?(@name)
+        error("channel #{@name} does not exist") unless Reactor::Cm::Channel.exists?(@name)
       end
 
       def migrate!
         Reactor::Cm::Channel.get(@name).delete!
       end
-
     end
   end
 end

data/lib/reactor/plans/delete_group.rb

@@ -1,19 +1,15 @@
-# -*- encoding : utf-8 -*-
 module Reactor
-
   module Plans
-
     class DeleteGroup < CommonGroup
-
       def initialize(*args)
         super()
 
-        (name, _), options = separate_arguments(*args)
+        (name,), options = separate_arguments(*args)
         @name = name || options[:name]
       end
 
       def prepare!
-        error('name is nil') if @name.nil?
+        error("name is nil") if @name.nil?
         error("group #{@name} does not exist") unless Reactor::Cm::Group.exists?(@name)
       end
 
@@ -21,9 +17,6 @@ module Reactor
         group = Reactor::Cm::Group.get(@name)
         group.delete!
       end
-
     end
-
   end
-
 end

data/lib/reactor/plans/delete_job.rb

@@ -1,6 +1,5 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/cm/job'
-require 'reactor/plans/common_job'
+require "reactor/cm/job"
+require "reactor/plans/common_job"
 
 module Reactor
   module Plans
@@ -13,13 +12,12 @@ module Reactor
 
       def prepare!
         error("name is nil") if @name.nil?
-        error("job #{@name} does not exist") if not Reactor::Cm::Job.exists?(@name)
+        error("job #{@name} does not exist") unless Reactor::Cm::Job.exists?(@name)
       end
 
       def migrate!
         Reactor::Cm::Job.delete!(@name)
       end
-
     end
   end
 end

data/lib/reactor/plans/delete_obj.rb

@@ -1,17 +1,16 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/plans/prepared'
+require "reactor/plans/prepared"
 
 module Reactor
   module Plans
     class DeleteObj
       include Prepared
 
-      def initialize(opts={})
+      def initialize(opts = {})
         @key = opts[:obj_id] || opts[:path]
       end
 
       def prepare!
-        error("object (key=#{@key}) not found") if not Reactor::Cm::Obj.exists?(@key)
+        error("object (key=#{@key}) not found") unless Reactor::Cm::Obj.exists?(@key)
       end
 
       def migrate!

data/lib/reactor/plans/delete_obj_class.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Plans
     class DeleteObjClass < CommonObjClass
@@ -11,7 +10,7 @@ module Reactor
       end
 
       def prepare!
-        error("objClass #{@name} not found") if not Reactor::Cm::ObjClass.exists?(@name)
+        error("objClass #{@name} not found") unless Reactor::Cm::ObjClass.exists?(@name)
       end
 
       def migrate!

data/lib/reactor/plans/prepared.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Plans
     module Prepared
@@ -7,9 +6,9 @@ module Reactor
       end
 
       def separate_arguments(*args)
-        array_args  = args.select {|a| !a.is_a?(Hash) }
-        hash_args   = args.select {|a| a.is_a?(Hash) }.reduce({}, &:merge)
-        return array_args, hash_args
+        array_args  = args.select { |a| !a.is_a?(Hash) }
+        hash_args   = args.select { |a| a.is_a?(Hash) }.reduce({}, &:merge)
+        [array_args, hash_args]
       end
     end
   end

data/lib/reactor/plans/rename_group.rb

@@ -1,10 +1,6 @@
-# -*- encoding : utf-8 -*-
 module Reactor
-
   module Plans
-
     class RenameGroup
-
       include Prepared
 
       def initialize(*args)
@@ -15,19 +11,16 @@ module Reactor
       end
 
       def prepare!
-        error('from is nil') if @from.nil?
-        error('to is nil') if @to.nil?
-        error('from does not exist') unless Reactor::Cm::Group.exists?(@from)
-        error('to does exist') if Reactor::Cm::Group.exists?(@to)
+        error("from is nil") if @from.nil?
+        error("to is nil") if @to.nil?
+        error("from does not exist") unless Reactor::Cm::Group.exists?(@from)
+        error("to does exist") if Reactor::Cm::Group.exists?(@to)
       end
 
       def migrate!
         group = Reactor::Cm::Group.get(@from)
         group.rename!(@to)
       end
-
     end
-
   end
-
 end

data/lib/reactor/plans/rename_obj_class.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Plans
     class RenameObjClass
@@ -13,7 +12,7 @@ module Reactor
       def prepare!
         error("from is nil") if @from.nil?
         error("to is nil") if @to.nil?
-        error("from does not exist") if not Reactor::Cm::ObjClass.exists?(@from)
+        error("from does not exist") unless Reactor::Cm::ObjClass.exists?(@from)
         error("to does exist") if Reactor::Cm::ObjClass.exists?(@to)
       end
 

data/lib/reactor/plans/update_attribute.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Plans
     class UpdateAttribute < CommonAttribute
@@ -10,7 +9,7 @@ module Reactor
 
       def prepapre!
         error("name is nil") if @name.nil?
-        error("attribute #{@name} not found") if not Reactor::Cm::Attribute.exists?(@name)
+        error("attribute #{@name} not found") unless Reactor::Cm::Attribute.exists?(@name)
         prepare_params!(nil)
       end
 
@@ -18,7 +17,6 @@ module Reactor
         attrib = Reactor::Cm::Attribute.get(@name)
         migrate_params!(attrib)
       end
-
     end
   end
 end

data/lib/reactor/plans/update_attribute_group.rb

@@ -1,5 +1,4 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/plans/common_attribute_group'
+require "reactor/plans/common_attribute_group"
 
 module Reactor
   module Plans
@@ -15,7 +14,7 @@ module Reactor
       def prepapre!
         error("name ist nil") if @name.nil?
         error("obj_class is nil") if @obj_class.nil?
-        error("attribute group #{@pk} does not exist") if not Reactor::Cm::AttributeGroup.exists?(ok)
+        error("attribute group #{@pk} does not exist") unless Reactor::Cm::AttributeGroup.exists?(ok)
         prepare_params!(nil)
       end
 
@@ -23,7 +22,6 @@ module Reactor
         attrib = Reactor::Cm::AttributeGroup.get(@pk)
         migrate_params!(attrib)
       end
-
     end
   end
 end

data/lib/reactor/plans/update_group.rb

@@ -1,19 +1,15 @@
-# -*- encoding : utf-8 -*-
 module Reactor
-
   module Plans
-
     class UpdateGroup < CommonGroup
-
       def initialize(*args)
         super()
 
-        (name, _), options = separate_arguments(*args)
+        (name,), options = separate_arguments(*args)
         @name = name || options[:name]
       end
 
       def prepapre!
-        error('name is nil') if @name.nil?
+        error("name is nil") if @name.nil?
         error("group #{@name} not found") unless Reactor::Cm::Group.exists?(@name)
 
         prepare_params!(nil)
@@ -23,9 +19,6 @@ module Reactor
         group = Reactor::Cm::Group.get(@name)
         migrate_params!(group)
       end
-
     end
-
   end
-
 end

data/lib/reactor/plans/update_job.rb

@@ -1,6 +1,5 @@
-# -*- encoding : utf-8 -*-
-require 'reactor/cm/job'
-require 'reactor/plans/common_job'
+require "reactor/cm/job"
+require "reactor/plans/common_job"
 
 module Reactor
   module Plans
@@ -8,12 +7,12 @@ module Reactor
       def initialize(*args)
         super()
 
-        (name, _), options = separate_arguments(*args)
+        (name,), options = separate_arguments(*args)
         @name = name || options[:name]
       end
 
       def prepapre!
-        error('name is nil') if @name.nil?
+        error("name is nil") if @name.nil?
         error("job #{@name} not found") unless Reactor::Cm::Job.exists?(@name)
 
         prepare_params!(nil)
@@ -23,9 +22,6 @@ module Reactor
         job = Reactor::Cm::Job.get(@name)
         migrate_params!(job)
       end
-
     end
-
   end
-
 end

data/lib/reactor/plans/update_obj.rb

@@ -1,10 +1,9 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Plans
     class UpdateObj
       include Prepared
 
-      def initialize(opts={})
+      def initialize(opts = {})
         @key = opts[:obj_id] || opts[:path]
         @attrs = {}
       end
@@ -14,14 +13,14 @@ module Reactor
       end
 
       def prepare!
-        error("object (key=#{@key}) not found") if not Reactor::Cm::Obj.exists?(@key)
-        #TODO: attribute check
+        error("object (key=#{@key}) not found") unless Reactor::Cm::Obj.exists?(@key)
+        # TODO: attribute check
       end
 
       def migrate!
-        obj = Reactor::Cm::Obj.get(@key)
-        @attrs.each do |key,value|
-          @obj.set(key,value)
+        Reactor::Cm::Obj.get(@key)
+        @attrs.each do |key, value|
+          @obj.set(key, value)
         end
         @obj.save!
         @obj.release!

data/lib/reactor/plans/update_obj_class.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module Plans
     class UpdateObjClass < CommonObjClass
@@ -21,7 +20,6 @@ module Reactor
         migrate_attrs!(@klass)
         migrate_params!(@klass)
       end
-
     end
   end
 end

data/lib/reactor/rc_independent.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 module Reactor
   module RcIndependent
     module Base

data/lib/reactor/session.rb

@@ -1,33 +1,32 @@
-# -*- encoding : utf-8 -*-
-require 'observer'
+require "observer"
 
-require 'reactor/cm/bridge'
-require 'reactor/cache/user'
-require 'reactor/session/observers'
+require "reactor/cm/bridge"
+require "reactor/cache/user"
+require "reactor/session/observers"
 
 class Reactor::Session
   include Observable
 
   class State < Struct.new(:user_name, :session_id)
     def serialize
-      [self.user_name, self.session_id]
+      [user_name, session_id]
     end
 
     def self.deserialize(array)
-      self.new(*array)
+      new(*array)
     end
   end
 
-  def initialize(state=State.new)
-    self.initialize_and_notify(state)
+  def initialize(state = State.new)
+    initialize_and_notify(state)
   end
 
   def user_name
-    self.state.user_name
+    state.user_name
   end
 
   def session_id
-    self.state.session_id
+    state.session_id
   end
 
   def self.instance
@@ -35,13 +34,11 @@ class Reactor::Session
   end
 
   def self.for(user_name)
-    self.new(State.new(user_name, nil))
+    new(State.new(user_name, nil))
   end
 
   def login(session_id)
-    if !logged_in?(session_id)
-      self.user_name = authenticate(session_id)
-    end
+    self.user_name = authenticate(session_id) unless logged_in?(session_id)
   end
 
   def destroy
@@ -49,37 +46,38 @@ class Reactor::Session
   end
 
   def logged_in?(session_id)
-    self.session_id.present? && self.user? && self.session_id == session_id
+    self.session_id.present? && user? && self.session_id == session_id
   end
 
   def user?
-    self.user_name.present?
+    user_name.present?
   end
 
   def user
-    Reactor::Cache::User.instance.get(self.user_name)
+    Reactor::Cache::User.instance.get(user_name)
   end
 
   def user_name=(new_user_name)
-    self.state.user_name = new_user_name
-    self.proper_notify_observers(new_user_name, true)
-    new_user_name
+    state.user_name = new_user_name
+    proper_notify_observers(new_user_name, true)
   end
 
   def marshal_dump
-    self.state.serialize
+    state.serialize
   end
 
   def marshal_load(array)
-    self.initialize_and_notify(State.deserialize(array))
+    initialize_and_notify(State.deserialize(array))
   end
 
   protected
+
   attr_accessor :state
+
   def initialize_and_notify(state)
     self.state = state
-    self.add_observers
-    self.proper_notify_observers(self.user_name, false)
+    add_observers
+    proper_notify_observers(user_name, false)
   end
 
   def authenticate(session_id)
@@ -90,18 +88,16 @@ class Reactor::Session
   def add_observers
     Observers.constants.each do |possible_observer_name|
       possible_observer = Observers.const_get(possible_observer_name)
-      if possible_observer.method_defined?(:update)
-        self.add_observer(possible_observer.new)
-      end
+      add_observer(possible_observer.new) if possible_observer.method_defined?(:update)
     end
   end
 
   def proper_notify_observers(*args)
-    self.changed(true)
-    self.notify_observers(*args)
+    changed(true)
+    notify_observers(*args)
   end
 
   def session_id=(new_session_id)
-    self.state.session_id = new_session_id
+    state.session_id = new_session_id
   end
 end