openagent 0.9.4 → 0.9.5

data/lib/openagent/message_builder.rb

@@ -24,39 +24,44 @@ module OpenAgent
         )
       )
     end
+
     def condition(cond={})
         SIF::Infra::Common::Condition.new(
-            :element => cond['element'],
-            :value => cond['value'],
+            :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
+    def conditions(conds={})
+      return false if conds.empty?
+      conds.map do |c|
         SIF::Infra::Common::Conditions.new(
-            :type => c['cond_type'],
+            :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
+
+    def conditions_group(conds={})
+      return false if conds.nil? || conds['conditions'].nil?
+
+      case conds['conditions'].size
+      when 0
+        return false
+      when 1
         SIF::Infra::Common::ConditionGroup.new(
-          :type => 'None',
-          :conditions => conditions(condition_arr['conditions'])
+          :type       => 'None',
+          :conditions => conditions(conds['conditions'])
           )
       else
         SIF::Infra::Common::ConditionGroup.new(
-          :type => condition_arr['group_type'],
-          :conditions => conditions(condition_arr['conditions'])
+          :type       => conds['group_type'],
+          :conditions => conditions(conds['conditions'])
           )
       end
     end
-    #Condition_hash should = {:type=>"None", :conditions=>[{:type=>"None", :element=>"@SchoolYear", :value=>"2014", :operator=>"EQ"}]}
+    # conds should = {:type=>"None", :conditions=>[{:type=>"None", :element=>"@SchoolYear", :value=>"2014", :operator=>"EQ"}]}
 
     def request(object_name, condition_arr={})
       SIF::Infra::Common::Message.new(

data/lib/openagent/version.rb

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

data/openagent.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "debugger"
   gem.add_development_dependency "pry"
 
-  gem.add_dependency "uuid"
+  gem.add_dependency "uuid", "2.3.7"
+  gem.add_dependency "macaddr", "1.6.1"
   gem.add_dependency "representable", "~> 1.7.3"
   gem.add_dependency "virtus", "~> 1.0.0"
   gem.add_dependency "activesupport"

data/spec/event_spec.rb

@@ -5,9 +5,9 @@ require "openagent"
 
 describe OpenAgent::Client do
   let(:message) { SIF::Infra::Common::Message.new }
-  let(:grading_assignment_xml) {File.read('./spec/fixtures/sif/grading_assignment.xml')}
-  let(:grading_assignment_score_xml) {File.read('./spec/fixtures/sif/grading_assignment_score.xml')}
-  let(:grading_category_xml) {File.read('./spec/fixtures/sif/grading_category.xml')}
+  let(:grading_assignment_xml) {File.read(fixture('sif/grading_assignment.xml'))}
+  let(:grading_assignment_score_xml) {File.read(fixture('sif/grading_assignment_score.xml'))}
+  let(:grading_category_xml) {File.read(fixture('sif/grading_category.xml'))}
   let(:agent) { OpenAgent::Agent.new(YAML::load(File.read(fixture("agent.yaml")))) }
   let(:zone) { OpenAgent::Zone.new(YAML::load(File.read(fixture("zone.yaml")))) }
 

data/spec/response_spec.rb

@@ -3,7 +3,7 @@ require "openagent/client"
 
 describe OpenAgent::Client do
   let(:response) { SIF::Infra::Common::Message.new }
-  let(:xml) {File.read('./spec/fixtures/sif/stu_pers_resp.xml')}
+  let(:xml) { File.read(fixture('sif/stu_pers_resp.xml')) }
 
   before do
     representer = SIF::Representation::Infra::Common::Message

data/spec/sif/representations/xml/message_spec.rb

@@ -13,9 +13,4 @@ describe SIF::Representation::Infra::Common::Message do
     message.version.should == "2.0r1"
   end
 
-  it "converts to json" do
-    rep
-    rep.to_json
-  end
-
 end

data/spec/sif/representations/xml/request_spec.rb

@@ -12,6 +12,5 @@ describe SIF::Representation::Infra::Message::Request do
     request.version.should == "2.*"
     request.max_buffer_size.should == 1048576
     request.query.query_object.object_name.should == "LibraryPatronStatus"
-    request.query.condition_group.conditions.size.should == 1
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openagent
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,17 +114,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.7
+- !ruby/object:Gem::Dependency
+  name: macaddr
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement