openagent 0.9.0 → 0.9.1

data/lib/openagent/agent.rb

@@ -19,6 +19,7 @@ module OpenAgent
     attribute :publish_delete,  Array[String]
     attribute :request,         Array[String]
     attribute :respond,         Array[String]
+    attribute :conditions,      Hash
 
   end
 end

data/lib/openagent/message_builder.rb

@@ -24,8 +24,41 @@ module OpenAgent
         )
       )
     end
+    def condition(cond={})
+        SIF::Infra::Common::Condition.new(
+            :element => cond['element'],
+            :value => cond['value'],
+            :operator => cond['operator']
+        )
+    end
+
+    def conditions(condition_arr={})
+      return false if condition_arr.count == 0
+      condition_arr.map do |c|
+#        require 'pry' ; binding.pry
+        SIF::Infra::Common::Conditions.new(
+            :type => c['cond_type'],
+            :condition => condition(c)
+        )
+      end
+    end
+    def conditions_group(condition_arr={})
+      return false if condition_arr.nil? || condition_arr['conditions'].count == 0
+      if condition_arr['conditions'].count == 1
+        SIF::Infra::Common::ConditionGroup.new(
+          :type => 'None',
+          :conditions => conditions(condition_arr['conditions'])
+          )
+      else
+        SIF::Infra::Common::ConditionGroup.new(
+          :type => condition_arr['group_type'],
+          :conditions => conditions(condition_arr['conditions'])
+          )
+      end
+    end
+    #Condition_hash should = {:type=>"None", :conditions=>[{:type=>"None", :element=>"@SchoolYear", :value=>"2014", :operator=>"EQ"}]}
 
-    def request(object_name, condition_group=nil)
+    def request(object_name, condition_arr={})
       SIF::Infra::Common::Message.new(
         :version => @agent.msg_version,
         :xmlns => @agent.msg_xmlns,
@@ -37,7 +70,7 @@ module OpenAgent
             :query_object => SIF::Infra::Common::QueryObject.new(
               :object_name => object_name
             ),
-            :condition_group => condition_group
+            :condition_group => conditions_group(condition_arr)
           )
         )
       )

data/lib/openagent/version.rb

@@ -1,3 +1,3 @@
 module OpenAgent
-  VERSION = '0.9.0' unless defined?(OpenAgent::VERSION)
+  VERSION = '0.9.1' unless defined?(OpenAgent::VERSION)
 end

data/lib/openagent/zone.rb

@@ -12,7 +12,7 @@ module OpenAgent
     include Virtus.model
 
     attribute :uri
-    attribute :timeout,      Float, :default => 60
+    attribute :timeout,      Float, :default => 120
     attribute :open_timeout, Float, :default => 30
     attribute :ssl, SSLConfig
   

data/lib/sif/infra/common/condition_group.rb

@@ -1,4 +1,4 @@
-require_relative 'condition'
+require_relative 'conditions'
 
 module SIF
   module Infra
@@ -7,7 +7,13 @@ module SIF
         include Virtus.model
         
         attribute :type,       String
-        attribute :conditions, Array[Condition]
+        attribute :conditions, Array[Conditions]
+
+        def empty?
+          return true if conditions.nil?
+          return true if conditions.empty?
+          return false
+        end
       end
     end
   end

data/lib/sif/infra/common/conditions.rb

@@ -0,0 +1,13 @@
+module SIF
+  module Infra
+    module Common
+      class Conditions
+        include Virtus.model
+
+        attribute :type,     String
+        attribute :condition, Array[Condition]
+
+      end
+    end
+  end
+end

data/lib/sif/models/groups/sis/section_info.rb

@@ -34,7 +34,7 @@ module SIF
           end
 
           def teacher
-            first_schedule_info.first_teacher
+            first_schedule_info.first_teacher if first_schedule_info.first_teacher
           end
         end
       end

data/lib/sif/models/groups/sis/sis_representer.rb

@@ -5,12 +5,12 @@ module SIF
         module SISRepresenter
           include Virtus.model
 
-          attribute :extended_elements, Array[MODEL_COMMON::ExtendedElement]
+          attribute :extended_elements, Array[MODEL_COMMON::ExtendedElement], :default => []
           attribute :metadata, String
           attribute :ref_id, String
 
           def find_element(name)
-            return if extended_elements.nil?
+            return nil if extended_elements.nil?
             el = extended_elements.find{ |e| e.name == name }
             el ? el.value : nil
           end

data/lib/sif/models/groups/sis/student_section_enrollment.rb

@@ -14,8 +14,8 @@ module SIF
           attribute :schedule_info_overrides, Array[Common::ScheduleInfoOverride]
           attribute :credits_attempted, Common::CreditsAttempted
           
-          def status(as_of=Date.today)
-            if as_of >= entry_date && as_of < exit_date
+          def status
+            if entry_date.past? && exit_date.future?
               'active'
             else
               'deleted'

data/lib/sif/representations/infra/common/condition_group.rb

@@ -9,8 +9,9 @@ module SIF
           property :type, :as => 'Type', :attribute => true
 
           collection :conditions, :as => 'SIF_Conditions',
-                     :class => SIF::Infra::Common::Condition,
-                     :decorator => Condition
+                     :class => SIF::Infra::Common::Conditions,
+                     :decorator => Conditions
+
         end
       end
     end

data/lib/sif/representations/infra/common/conditions.rb

@@ -0,0 +1,18 @@
+module SIF
+  module Representation
+    module Infra
+      module Common
+        class Conditions < SIF::Represent
+
+          self.representation_wrap = 'SIF_Conditions'
+
+          property :type, :as => 'Type', :attribute => true
+
+          collection :condition, :as => 'SIF_Condition',
+                     :class => SIF::Infra::Common::Condition,
+                     :decorator => Condition
+        end
+      end
+    end
+  end
+end

data/lib/sif/representations/infra/common/query.rb

@@ -14,7 +14,8 @@ module SIF
                    :decorator => QueryObject
           property :condition_group, :as => 'SIF_ConditionGroup',
                    :class => SIF::Infra::Common::ConditionGroup,
-                   :decorator => ConditionGroup
+                   :decorator => ConditionGroup,
+                   :if => lambda { !condition_group.empty? }
 
           property :example, :as => 'SIF_Example'
         end

data/lib/sif/sif.rb

@@ -13,6 +13,7 @@ module SIF
     module Common
       autoload :Application, 'sif/infra/common/application'
       autoload :Condition, 'sif/infra/common/condition'
+      autoload :Conditions, 'sif/infra/common/conditions'
       autoload :ConditionGroup, 'sif/infra/common/condition_group'
       autoload :Data, 'sif/infra/common/data'
       autoload :Error, 'sif/infra/common/error'
@@ -137,6 +138,7 @@ module SIF
       module Common
         autoload :Application, 'sif/representations/infra/common/application'
         autoload :Condition, 'sif/representations/infra/common/condition'
+        autoload :Conditions, 'sif/representations/infra/common/conditions'
         autoload :ConditionGroup, 'sif/representations/infra/common/condition_group'
         autoload :Data, 'sif/representations/infra/common/data'
         autoload :Error, 'sif/representations/infra/common/error'

data/spec/fixtures/agent.yaml

@@ -28,4 +28,12 @@ request:
 - StudentPersonal
 - StaffPersonal
 - StudentSectionInfo
-respond:
+respond:
+conditions:
+  conditions:
+    -
+      cond_type: None
+      element: "@SchoolYear"
+      operator: EQ
+      value: 2014
+  group_type: None

data/spec/message_builder_spec.rb

@@ -2,6 +2,7 @@ require_relative 'spec_helper'
 require "openagent/message_builder"
 require "openagent/agent"
 require "openagent/zone"
+require "openagent"
 
 describe OpenAgent::MessageBuilder do
 
@@ -24,7 +25,7 @@ describe OpenAgent::MessageBuilder do
   end
 
   def represent(msg)
-    SIF::Representation::Infra::Common::Message.new(msg)
+    SIF.repr(msg)
   end
 
   it "registers" do
@@ -38,8 +39,15 @@ describe OpenAgent::MessageBuilder do
   end
 
 
-  it "requests" do
-    header_checks_out{ builder.request("StudentPersonal", nil) }
+  it "requests without conditions" do
+    msg = header_checks_out{ builder.request("StudentPersonal", nil) }
+    represent(msg).to_xml.should == "<SIF_Message xmlns=\"http://www.sifinfo.org/infrastructure/2.x\" Version=\"2.0r1\">\n  <SIF_Request>\n    <SIF_Header>\n      <SIF_MsgId>GUUID</SIF_MsgId>\n      <SIF_Timestamp>TIME</SIF_Timestamp>\n      <SIF_SourceId>canvas</SIF_SourceId>\n    </SIF_Header>\n    <SIF_Version>2.0r1</SIF_Version>\n    <SIF_MaxBufferSize>64000</SIF_MaxBufferSize>\n    <SIF_Query>\n      <SIF_QueryObject ObjectName=\"StudentPersonal\"/>\n    </SIF_Query>\n  </SIF_Request>\n</SIF_Message>"
+  end
+
+  it "requests with conditions" do
+    conditions_arr = agent.conditions
+    msg = header_checks_out{ builder.request("StudentPersonal", conditions_arr) }
+    represent(msg).to_xml.should == "<SIF_Message xmlns=\"http://www.sifinfo.org/infrastructure/2.x\" Version=\"2.0r1\">\n  <SIF_Request>\n    <SIF_Header>\n      <SIF_MsgId>GUUID</SIF_MsgId>\n      <SIF_Timestamp>TIME</SIF_Timestamp>\n      <SIF_SourceId>canvas</SIF_SourceId>\n    </SIF_Header>\n    <SIF_Version>2.0r1</SIF_Version>\n    <SIF_MaxBufferSize>64000</SIF_MaxBufferSize>\n    <SIF_Query>\n      <SIF_QueryObject ObjectName=\"StudentPersonal\"/>\n      <SIF_ConditionGroup Type=\"None\">\n        <SIF_Conditions Type=\"None\">\n          <SIF_Condition>\n            <SIF_Element>@SchoolYear</SIF_Element>\n            <SIF_Operator>EQ</SIF_Operator>\n            <SIF_Value>2014</SIF_Value>\n          </SIF_Condition>\n        </SIF_Conditions>\n      </SIF_ConditionGroup>\n    </SIF_Query>\n  </SIF_Request>\n</SIF_Message>"
   end
 
   it "pings" do
@@ -73,9 +81,4 @@ describe OpenAgent::MessageBuilder do
     msg = header_checks_out{builder.provision}
     represent(msg).to_xml.should == "<SIF_Message xmlns=\"http://www.sifinfo.org/infrastructure/2.x\" Version=\"2.0r1\">\n  <SIF_Provision>\n    <SIF_Header>\n      <SIF_MsgId>GUUID</SIF_MsgId>\n      <SIF_Timestamp>TIME</SIF_Timestamp>\n      <SIF_SourceId>canvas</SIF_SourceId>\n    </SIF_Header>\n    <SIF_ProvideObjects/>\n    <SIF_SubscribeObjects>\n      <SIF_Object ObjectName=\"LEAInfo\"/>\n      <SIF_Object ObjectName=\"SchoolInfo\"/>\n      <SIF_Object ObjectName=\"TermInfo\"/>\n      <SIF_Object ObjectName=\"SchoolCourseInfo\"/>\n      <SIF_Object ObjectName=\"SectionInfo\"/>\n      <SIF_Object ObjectName=\"StudentPersonal\"/>\n      <SIF_Object ObjectName=\"StaffPersonal\"/>\n      <SIF_Object ObjectName=\"StudentSectionInfo\"/>\n    </SIF_SubscribeObjects>\n    <SIF_PublishAddObjects/>\n    <SIF_PublishChangeObjects/>\n    <SIF_PublishDeleteObjects/>\n    <SIF_RequestObjects>\n      <SIF_Object ObjectName=\"LEAInfo\"/>\n      <SIF_Object ObjectName=\"SchoolInfo\"/>\n      <SIF_Object ObjectName=\"TermInfo\"/>\n      <SIF_Object ObjectName=\"SchoolCourseInfo\"/>\n      <SIF_Object ObjectName=\"SectionInfo\"/>\n      <SIF_Object ObjectName=\"StudentPersonal\"/>\n      <SIF_Object ObjectName=\"StaffPersonal\"/>\n      <SIF_Object ObjectName=\"StudentSectionInfo\"/>\n    </SIF_RequestObjects>\n    <SIF_RespondObjects/>\n  </SIF_Provision>\n</SIF_Message>"
   end
-
-  it "requests" do
-    msg = header_checks_out{builder.request("StudentPersonal")}
-    represent(msg).to_xml.should == "<SIF_Message xmlns=\"http://www.sifinfo.org/infrastructure/2.x\" Version=\"2.0r1\">\n  <SIF_Request>\n    <SIF_Header>\n      <SIF_MsgId>GUUID</SIF_MsgId>\n      <SIF_Timestamp>TIME</SIF_Timestamp>\n      <SIF_SourceId>canvas</SIF_SourceId>\n    </SIF_Header>\n    <SIF_Version>2.0r1</SIF_Version>\n    <SIF_MaxBufferSize>64000</SIF_MaxBufferSize>\n    <SIF_Query>\n      <SIF_QueryObject ObjectName=\"StudentPersonal\"/>\n    </SIF_Query>\n  </SIF_Request>\n</SIF_Message>"
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openagent
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -197,6 +197,7 @@ files:
 - lib/sif/infra/common/application.rb
 - lib/sif/infra/common/condition.rb
 - lib/sif/infra/common/condition_group.rb
+- lib/sif/infra/common/conditions.rb
 - lib/sif/infra/common/data.rb
 - lib/sif/infra/common/error.rb
 - lib/sif/infra/common/event.rb
@@ -296,6 +297,7 @@ files:
 - lib/sif/representations/infra/common/application.rb
 - lib/sif/representations/infra/common/condition.rb
 - lib/sif/representations/infra/common/condition_group.rb
+- lib/sif/representations/infra/common/conditions.rb
 - lib/sif/representations/infra/common/data.rb
 - lib/sif/representations/infra/common/error.rb
 - lib/sif/representations/infra/common/event.rb