granicus-platform-api 0.1.0 → 0.1.1

data/lib/granicus-platform-api.rb

@@ -1,3 +1,4 @@
+require 'granicus-platform-api/entities'
 require 'granicus-platform-api/client'
 require 'granicus-platform-api/version'
 

data/lib/granicus-platform-api/client.rb

@@ -4,7 +4,44 @@ require 'multi_xml'
 
 module GranicusPlatformAPI
   class Client
+    
+    # mappings between soap types and our complex types
+    # this area should be rewritten to auto-generate data sets properly
+    # and refactored to separate standard xsd types from custom types in class 
+    # map
+    def self.typegenerators
+      @@typegenerators
+    end
+
+    def self.typegenerators=(obj)
+      @@typegenerators = obj
+    end
+
+    self.typegenerators = {}
+    
+    self.typegenerators["CameraData"] = lambda { CameraData.new }
+    self.typegenerators["EventData"] = lambda { EventData.new }
+    self.typegenerators["Attendee"] = lambda { Attendee.new }
+    
+    # classmap for generating proper attributes! hash within savon calls
+    def self.classmap
+      @@classmap
+    end
 
+    def self.classmap=(obj)
+      @@classmap = obj
+    end
+
+    self.classmap = {}
+    self.classmap['Fixnum'] = "xsd:int"
+    self.classmap['String'] = "xsd:string"
+    self.classmap['TrueClass'] = 'xsd:boolean'
+    self.classmap['FalseClass'] = 'xsd:boolean'
+    self.classmap['Time'] = 'xsd:dateTime'
+    self.classmap['CameraData'] = 'granicus:CameraData'
+    self.classmap['EventData'] = 'granicus:EventData'
+    self.classmap['Attendee'] = 'granicus:Attendee'
+    
     # create a connected client
     def initialize(granicus_site,username,password,options={})
       # set things up
@@ -18,213 +55,175 @@ module GranicusPlatformAPI
       @client = Savon::Client.new do |wsdl, http|
         wsdl.document = File.expand_path("../granicus-platform-api.xml", __FILE__)
         wsdl.endpoint = "http://#{granicus_site}/SDK/User/index.php" 
-        http.proxy = "http://localhost:8888"
-
+        http.proxy = options[:proxy]
       end
 
       # call login
-      @client.request :wsdl, :login do
-        soap.body = { :username => username, :password => password }
-      end
-
+      call_soap_method(:login,'//ns4:LoginResponse/return',{:username => username, :password => password})
     end
 
     # return the current logged on user name
     def get_current_user_logon
-      response = @client.request :wsdl, :get_current_user_logon
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns4:GetCurrentUserLogonResponse/Logon', doc.root.namespaces)[0]
+      call_soap_method(:get_current_user_logon,'//ns4:GetCurrentUserLogonResponse/Logon')
     end
 
     # logout
     def logout
-      response = @client.request :wsdl, :logout
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns4:LogoutResponse', doc.root.namespaces)[0]
+      call_soap_method(:logout,'//ns4:LogoutResponse')
     end
 
     # return all of the cameras
     def get_cameras
-      response = @client.request :wsdl, :get_cameras
-
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns5:GetCamerasResponse/cameras', doc.root.namespaces)[0]
+      call_soap_method(:get_cameras,'//ns5:GetCamerasResponse/cameras')
     end
     
     # return the requested event
     def get_camera(camera_id)
-      response = @client.request :wsdl, :get_camera do
-        soap.body = { :camera_id => camera_id, :attributes! => {:camera_id => {"xsi:type" => "xsd:int"}} }
-      end
-
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns5:GetCameraResponse/camera', doc.root.namespaces)[0]
+      call_soap_method(:get_camera,'//ns5:GetCameraResponse/camera',{ :camera_id => camera_id })
     end
 
     # return all of the events
     def get_events
-      response = @client.request :wsdl, :get_events
-
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns5:GetEventsResponse/events', doc.root.namespaces)[0]
+      call_soap_method(:get_events,'//ns5:GetEventsResponse/events')
     end
     
     # return all of the events with matching foreign id
     def get_events_by_foreign_id(foreign_id)
-      response = @client.request :wsdl, :get_events_by_foreign_id do
-        soap.body = { :foreign_id => foreign_id, :attributes! => {:foreign_id => {"xsi:type" => "xsd:int"}} }
-      end
-
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns5:GetEventsByForeignIDResponse/events', doc.root.namespaces)[0]
+      call_soap_method(:get_events_by_foreign_id,'//ns5:GetEventsByForeignIDResponse/events',{ :foreign_id => foreign_id })
     end
     
     # return the requested event
     def get_event(event_id)
-      response = @client.request :wsdl, :get_event do
-        soap.body = { :event_id => event_id, :attributes! => {:event_id => {"xsi:type" => "xsd:int"}} }
-      end
-
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns5:GetEventResponse/event', doc.root.namespaces)[0]
+      call_soap_method(:get_event,'//ns5:GetEventResponse/event',{ :event_id => event_id })
+    end
+    
+    # update an event
+    def update_event(event)
+      call_soap_method(:update_event,'//ns4:UpdateEventResponse',{ :event => event })
     end
 
     # return all of the event meta data
     def get_event_meta_data(event_id)
-      response = @client.request :wsdl, :get_event_meta_data do
-        soap.body = { :event_id => event_id, :attributes! => {:event_id => {"xsi:type" => "xsd:int"}} }
-      end
-
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns5:GetEventMetaDataResponse/metadata', doc.root.namespaces)[0]
+      call_soap_method(:get_event_meta_data,'//ns5:GetEventMetaDataResponse/metadata',{ :event_id => event_id })
     end
     
     # set the event agenda url
     def set_event_agenda_url(event_id,url)
-      response = @client.request :wsdl, :set_event_agenda_url do
-        soap.body = { :event_id => event_id, 
-                      :url => url, 
-                      :attributes! => {:event_id => {"xsi:type" => "xsd:int"}, :url => {"xsi:type" => "xsd:string"}} }
-      end
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns4:SetEventAgendaURLResponse', doc.root.namespaces)[0]
+      call_soap_method(:set_event_agenda_url,'//ns4:SetEventAgendaURLResponse',{ :event_id => event_id,  :url => url })
     end
     
     # return all of the clip meta data
     def get_clip_meta_data(clip_id)
-      response = @client.request :wsdl, :get_clip_meta_data do
-        soap.body = { :clip_id => clip_id, :attributes! => {:clip_id => {"xsi:type" => "xsd:int"}} }
-      end
-
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns5:GetClipMetaDataResponse/metadata', doc.root.namespaces)[0]
+      call_soap_method(:get_clip_meta_data,'//ns5:GetClipMetaDataResponse/metadata',{ :clip_id => clip_id })
     end
 
     # return all of the folders
     def get_folders
-      response = @client.request :wsdl, :get_folders
-
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns5:GetFoldersResponse/folders', doc.root.namespaces)[0]
+      call_soap_method(:get_folders,'//ns5:GetFoldersResponse/folders')
     end
 
     # return all of the clips
     def get_clips(folder_id)
-      response = @client.request :wsdl, :get_clips do
-        soap.body = { :folder_id => folder_id, :attributes! => {:folder_id => {"xsi:type" => "xsd:int"}} }
-      end
-
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns5:GetClipsResponse/clips', doc.root.namespaces)[0]
+      call_soap_method(:get_clips,'//ns5:GetClipsResponse/clips',{ :folder_id => folder_id })
     end
     
     # return all of the clips with matching foreign id
     def get_clips_by_foreign_id(foreign_id)
-      response = @client.request :wsdl, :get_clips_by_foreign_id do
-        soap.body = { :foreign_id => foreign_id, :attributes! => {:foreign_id => {"xsi:type" => "xsd:int"}} }
-      end
-
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns5:GetClipsByForeignIDResponse/clips', doc.root.namespaces)[0]
+      call_soap_method(:get_clips_by_foreign_id,'//ns5:GetClipsByForeignIDResponse/clips',{ :foreign_id => foreign_id })
     end
     
     # return the requested clip
     def get_clip(clip_id)
-      response = @client.request :wsdl, :get_clip do
-        soap.body = { :clip_id => clip_id, :attributes! => {:clip_id => {"xsi:type" => "xsd:int"}} }
-      end
-
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns5:GetClipResponse/clip', doc.root.namespaces)[0]
+      call_soap_method(:get_clip,'//ns5:GetClipResponse/clip',{ :clip_id => clip_id })
     end
     
     # return the requested clip
     def get_clip_by_uid(clip_uid)
-      response = @client.request :wsdl, :get_clip_by_uid do
-        soap.body = { :clip_uid => clip_uid, :attributes! => {:clip_uid => {"xsi:type" => "xsd:string"}} }
-      end
-
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns5:GetClipByUIDResponse/clip', doc.root.namespaces)[0]
+      call_soap_method(:get_clip_by_uid,'//ns5:GetClipByUIDResponse/clip',{ :clip_uid => clip_uid })
     end
 
     # get servers
     def get_servers
-      response = @client.request :wsdl, :get_servers
-      
-      doc = Nokogiri::XML(response.to_xml) do |config|
-        config.noblanks
-      end
-      typecast_value_node doc.xpath('//ns5:GetServersResponse/servers', doc.root.namespaces)[0]
+      call_soap_method(:get_servers,'//ns5:GetServersResponse/servers')
     end
     
     # return the requested server
     def get_server(server_id)
-      response = @client.request :wsdl, :get_server do
-        soap.body = { :server_id => server_id, :attributes! => {:server_id => {"xsi:type" => "xsd:int"}} }
+      call_soap_method(:get_server,'//ns5:GetServerResponse/server',{ :server_id => server_id })
+    end
+
+    private
+    
+    def call_soap_method(method,returnfilter,args={},debug=false)
+      response = @client.request :wsdl, method do
+        soap.namespaces['xmlns:granicus'] = "http://granicus.com/xsd"
+        soap.namespaces['xmlns:SOAP-ENC'] = "http://schemas.xmlsoap.org/soap/encoding/"
+        soap.body = prepare_request args
+        if debug then
+          puts soap.body
+        end
       end
 
       doc = Nokogiri::XML(response.to_xml) do |config|
         config.noblanks
       end
-      typecast_value_node doc.xpath('//ns5:GetServerResponse/server', doc.root.namespaces)[0]
+      response = handle_response(doc.xpath(returnfilter, doc.root.namespaces)[0])
+      if debug
+        puts response
+      end
+      response
+    end
+    
+    def prepare_request(hash={})
+      attributes = {}
+      hash.each do |key,value|
+        case value.class.to_s
+        when 'Hashie::Mash', /GranicusPlatformAPI::/, 'Hash'
+          hash[key] = prepare_request value
+        when 'Array'
+          hash[key] = prepare_array value
+        end
+        attributes[key] = attribute_of value
+      end
+      hash.merge!({ :attributes! => attributes })
+    end
+    
+    def prepare_array(array)
+      array.each_index do |index|
+        case array[index].class.to_s
+        when 'Hashie::Mash', /GranicusPlatformAPI::/, 'Hash'
+          array[index] = prepare_request array[index]
+        end
+      end
+      { "item" => array, :attributes! => { "item" => attribute_of(array[0]) } }
+    end
+    
+    def attribute_of(value) 
+      case value.class.to_s
+      when 'Hashie::Mash','Hash'
+        nil
+      when 'Array'
+        xsd_type = self.class.classmap[value[0].class.to_s.split('::').last]
+        if xsd_type.nil? 
+          puts "Couldn't get xsd:type for #{value.class}"
+          {"xsi:type" => 'SOAP-ENC:Array'}
+        else
+          {"xsi:type" => 'SOAP-ENC:Array', "SOAP-ENC:arrayType" => "#{xsd_type}[#{value.count}]"}
+        end
+      else
+        xsd_type = self.class.classmap[value.class.to_s.split('::').last]
+        if xsd_type.nil? 
+          puts "Couldn't get xsd:type for #{value.class}"
+          nil
+        else
+          {"xsi:type" => xsd_type }
+        end
+      end
     end
 
-    private
-
-    def typecast_value_node(node)
+    def handle_response(node)
       if node.is_a? Nokogiri::XML::NodeSet or node.is_a? Array then
-        return node.map {|el| typecast_value_node el } 
+        return node.map {|el| handle_response el } 
       end
       return node.to_s unless node['type'] 
       typespace,type = node['type'].split(':')
@@ -239,16 +238,23 @@ module GranicusPlatformAPI
         end
       when 'SOAP-ENC'
         if type == 'Array' then
-          node.children.map {|element| typecast_value_node element }
+          node.children.map {|element| handle_response element }
         else
           puts "Unknown SOAP-ENC:type: #{type}"
           node.to_s
         end
       else
         # we have a custom type, make it hashie since we don't want true static typing
-        value = ::Hashie::Mash.new
+        proc = self.class.typegenerators[type]
+        value = {}
+        unless proc.nil?
+          value = proc.call
+        else
+          puts "Unknown custom type: #{type}"
+          value = ::Hashie::Mash.new
+        end
         node.children.each do |value_node|
-          value[value_node.name.snakecase] = typecast_value_node value_node
+          value[value_node.name] = handle_response value_node
         end
         value
       end
@@ -263,14 +269,6 @@ module GranicusPlatformAPI
       @@typecasts = obj
     end
 
-    def self.available_typecasts
-      @@available_typecasts
-    end
-
-    def self.available_typecasts=(obj)
-      @@available_typecasts = obj
-    end
-
     self.typecasts = {}
     self.typecasts["int"] = lambda { |v| v.nil? ? nil : v.to_i }
     self.typecasts["boolean"] = lambda { |v| v.nil? ? nil : (v.strip != "false") }
@@ -284,8 +282,5 @@ module GranicusPlatformAPI
     self.typecasts["string"] = lambda { |v| v.to_s }
     self.typecasts["yaml"] = lambda { |v| v.nil? ? nil : YAML.load(v) }
     self.typecasts["base64Binary"] = lambda { |v| v.unpack('m').first }
-
-    self.available_typecasts = self.typecasts.keys
-    
   end
 end

data/lib/granicus-platform-api/entities.rb

@@ -0,0 +1,62 @@
+require 'hashie'
+
+module GranicusPlatformAPI
+  class Attendee < Hashie::Dash
+    property :ID
+    property :Name
+    property :OrderID
+    property :Voting
+    property :Chair
+  end
+  
+  class CameraData < Hashie::Dash
+    property :ID
+    property :Type
+    property :Name
+    property :InternalIP
+    proprety :ExternalIP
+    property :BroadcastPort
+    property :ControlPort
+    property :Identifier
+  end
+  
+  class EventData < Hashie::Dash
+    property :ID
+    property :UID
+    property :ForeignID
+    property :Name
+    property :CameraID
+    property :FolderID
+    property :AgendaType
+    property :AgendaFile
+    property :PlayerTemplateID
+    property :ArchiveStatus
+    property :Duration
+    property :Broadcast
+    property :Record
+    property :AutoStart
+    property :StartTime
+    property :LastModified
+    property :Attendees
+    property :MotionTypes
+    property :Street1
+    property :Street2
+    property :City
+    property :State
+    property :Zip
+    property :AgendaTitle
+    property :MeetingTime
+    property :AgendaPostedDate
+  end
+  
+  class FolderData < Hashie::Dash
+    property :ID
+    property :Name
+    property :Description
+    property :Type
+    property :PlayerTemplateID
+    property :CreatedDate
+    property :Views
+    property :Servers
+  end
+end

data/lib/granicus-platform-api/version.rb

@@ -1,3 +1,3 @@
 module GranicusPlatformAPI
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/fixtures/requests.xml

@@ -0,0 +1,53 @@
+<Attendees xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="granicus:Attendee[4]">
+					<item xsi:type="granicus:Attendee">
+						<ID xsi:type="xsd:int">346</ID>
+						<Name xsi:type="xsd:string">my test</Name>
+						<Voting xsi:type="xsd:boolean">true</Voting>
+						<Chair xsi:type="xsd:boolean">false</Chair>
+						<OrderID xsi:type="xsd:int">1</OrderID>
+					</item>
+					<item xsi:type="granicus:Attendee">
+						<ID xsi:type="xsd:int">347</ID>
+						<Name xsi:type="xsd:string">Foo Fighters</Name>
+						<Voting xsi:type="xsd:boolean">true</Voting>
+						<Chair xsi:type="xsd:boolean">false</Chair>
+						<OrderID xsi:type="xsd:int">2</OrderID>
+					</item>
+					<item xsi:type="granicus:Attendee">
+						<ID xsi:type="xsd:int">348</ID>
+						<Name xsi:type="xsd:string">another test</Name>
+						<Voting xsi:type="xsd:boolean">true</Voting>
+						<Chair xsi:type="xsd:boolean">false</Chair>
+						<OrderID xsi:type="xsd:int">3</OrderID>
+					</item>
+					<item xsi:type="granicus:Attendee">
+						<Name xsi:type="xsd:string">Foo Fighters</Name>
+						<Voting xsi:type="xsd:boolean">true</Voting>
+						<Chair xsi:type="xsd:boolean">true</Chair>
+					</item>
+				</Attendees>
+				
+				
+				<Attendees xsi:type="SOAP-ENC:Array" SOAP-ENC:arrayType="ns4:Attendee[3]" SOAP-ENC:offset="[0]"> 
+									<item xsi:type="ns4:Attendee"> 
+										<ID xsi:type="xsd:int">349</ID> 
+										<Name xsi:type="xsd:string">my test</Name> 
+										<Voting xsi:type="xsd:boolean">true</Voting> 
+										<Chair xsi:type="xsd:boolean">false</Chair> 
+										<OrderID xsi:type="xsd:int">1</OrderID>
+									</item> 
+									<item xsi:type="ns4:Attendee"> 
+										<ID xsi:type="xsd:int">352</ID> 
+										<Name xsi:type="xsd:string">Foo Fighters</Name> 
+										<Voting xsi:type="xsd:boolean">true</Voting> 
+										<Chair xsi:type="xsd:boolean">false</Chair> 
+										<OrderID xsi:type="xsd:int">2</OrderID>
+									</item> 
+									<item xsi:type="ns4:Attendee"> 
+										<ID xsi:type="xsd:int">351</ID> 
+										<Name xsi:type="xsd:string">another test</Name> 
+										<Voting xsi:type="xsd:boolean">true</Voting> 
+										<Chair xsi:type="xsd:boolean">false</Chair> 
+										<OrderID xsi:type="xsd:int">3</OrderID>
+									</item>
+								</Attendees>

data/spec/granicus-platform-api_spec.rb

@@ -6,6 +6,7 @@ GRANICUS_PASSWORD = ENV['PASSWORD']
 CAMERA_ID = 3
 FOLDER_ID = 7
 EVENT_ID = 30
+UPDATE_EVENT_ID = 35
 EVENT_META_ID = 1775
 CLIP_ID = 246
 CLIP_UID = '00000000-0000-0000-0000-000000000000'
@@ -15,7 +16,7 @@ CLIP_FOREIGN_ID = 1
 EVENT_FOREIGN_ID = 1
 SERVER_ID = 2
 
-client = GranicusPlatformAPI::Client.new GRANICUS_SITE, GRANICUS_LOGIN, GRANICUS_PASSWORD 
+client = GranicusPlatformAPI::Client.new GRANICUS_SITE, GRANICUS_LOGIN, GRANICUS_PASSWORD, {:proxy => 'http://localhost:8888'}
 
 # The projects method
 describe GranicusPlatformAPI, "::Client.login" do
@@ -28,7 +29,7 @@ end
 describe GranicusPlatformAPI, "::Client.get_cameras" do
   it "should get my cameras" do
     cameras = client.get_cameras
-    found = cameras.find {|c| c.id == CAMERA_ID } 
+    found = cameras.find {|c| c.ID == CAMERA_ID } 
     found.should_not == nil
   end
 end
@@ -36,14 +37,14 @@ end
 describe GranicusPlatformAPI, "::Client.get_camera" do
   it "should get the requested camera" do
     camera = client.get_camera CAMERA_ID
-    camera.id.should == CAMERA_ID
+    camera.ID.should == CAMERA_ID
   end
 end
 
 describe GranicusPlatformAPI, "::Client.get_events" do
   it "should get my events" do
     events = client.get_events
-    found = events.find {|e| e.id == EVENT_ID } 
+    found = events.find {|e| e.ID == EVENT_ID } 
     found.should_not == nil
   end
 end
@@ -52,7 +53,7 @@ describe GranicusPlatformAPI, "::Client.get_events_by_foreign_id" do
   it "should get all events with matching foreign id" do
     events = client.get_events_by_foreign_id EVENT_FOREIGN_ID
     events.each do |event|
-      event.foreign_id.should == EVENT_FOREIGN_ID
+      event.ForeignID.should == EVENT_FOREIGN_ID
     end
   end
 end
@@ -60,14 +61,37 @@ end
 describe GranicusPlatformAPI, "::Client.get_event" do
   it "should get the requested event" do
     event = client.get_event EVENT_ID
-    event.id.should == EVENT_ID
+    event.ID.should == EVENT_ID
+  end
+end
+
+describe GranicusPlatformAPI, "::Client.update_event" do
+  it "should update a simple property on requested event" do
+    event = client.get_event UPDATE_EVENT_ID
+    event.ID.should == UPDATE_EVENT_ID
+    event.Name = 'my test'
+    client.update_event event
+  end
+
+  it "should add a complex property on requested event" do
+    event = client.get_event UPDATE_EVENT_ID
+    event.ID.should == UPDATE_EVENT_ID
+    event.Attendees << { 'Name' => "Foo Fighters", 'Voting' => true, 'Chair' => true }
+    client.update_event event
+  end
+  
+  it "should update a complex property on requested event" do
+    event = client.get_event UPDATE_EVENT_ID
+    event.ID.should == UPDATE_EVENT_ID
+    event.Attendees[0].Name = 'my test'
+    client.update_event event
   end
 end
 
 describe GranicusPlatformAPI, "::Client.get_event_by_uid" do
   it "should get the requested event" do
     event = client.get_event_by_uid EVENT_UID
-    event.id.should == EVENT_UID
+    event.UID.should == EVENT_UID
   end
 end
 
@@ -80,7 +104,7 @@ end
 describe GranicusPlatformAPI, "::Client.get_folders" do
   it "should get my folders" do
     folders = client.get_folders
-    folders[0].id.should == FOLDER_ID
+    folders[0].ID.should == FOLDER_ID
   end
 end
 
@@ -88,7 +112,7 @@ describe GranicusPlatformAPI, "::Client.get_clips" do
   it "should get clips from the given folder" do
     clips = client.get_clips FOLDER_ID
     clips.each do |clip|
-      clip.folder_id.should == FOLDER_ID
+      clip.FolderID.should == FOLDER_ID
     end
   end
 end
@@ -97,7 +121,7 @@ describe GranicusPlatformAPI, "::Client.get_clips_by_foreign_id" do
   it "should get all clips with matching foreign id" do
     clips = client.get_clips_by_foreign_id CLIP_FOREIGN_ID
     clips.each do |clip|
-      clip.foreign_id.should == CLIP_FOREIGN_ID
+      clip.ForeignID.should == CLIP_FOREIGN_ID
     end
   end
 end
@@ -105,21 +129,21 @@ end
 describe GranicusPlatformAPI, "::Client.get_clip" do
   it "should get the requested clip" do
     clip = client.get_clip CLIP_ID
-    clip.id.should == CLIP_ID
+    clip.ID.should == CLIP_ID
   end
 end
 
 describe GranicusPlatformAPI, "::Client.get_clip_by_uid" do
   it "should get the requested clip" do
     clip = client.get_clip_by_uid CLIP_UID
-    clip.id.should == CLIP_UID
+    clip.ID.should == CLIP_UID
   end
 end
 
 describe GranicusPlatformAPI, "::Client.get_event_meta_data" do
   it "should get my event meta data" do
     metadata = client.get_event_meta_data EVENT_ID
-    found = metadata.find {|m| m.id == EVENT_META_ID } 
+    found = metadata.find {|m| m.ID == EVENT_META_ID } 
     found.should_not == nil
   end
 end
@@ -127,7 +151,7 @@ end
 describe GranicusPlatformAPI, "::Client.get_clip_meta_data" do
   it "should get my clip meta data" do
     metadata = client.get_clip_meta_data CLIP_ID
-    found = metadata.find {|m| m.id == CLIP_META_ID } 
+    found = metadata.find {|m| m.ID == CLIP_META_ID } 
     found.should_not == nil
   end
 end
@@ -135,7 +159,7 @@ end
 describe GranicusPlatformAPI, "::Client.get_servers" do
   it "should get all servers" do
     servers = client.get_servers
-    found = servers.find {|s| s.id == SERVER_ID } 
+    found = servers.find {|s| s.ID == SERVER_ID } 
     found.should_not == nil
   end
 end
@@ -143,7 +167,7 @@ end
 describe GranicusPlatformAPI, "::Client.get_server" do
   it "should get the requested server" do
     server = client.get_server SERVER_ID
-    server.id.should == SERVER_D
+    server.ID.should == SERVER_D
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: granicus-platform-api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-26 00:00:00.000000000Z
+date: 2011-06-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161339560 !ruby/object:Gem::Requirement
+  requirement: &2152688320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *2161339560
+  version_requirements: *2152688320
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2161339060 !ruby/object:Gem::Requirement
+  requirement: &2152687820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2161339060
+  version_requirements: *2152687820
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &2161338600 !ruby/object:Gem::Requirement
+  requirement: &2156842740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2161338600
+  version_requirements: *2156842740
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &2161338140 !ruby/object:Gem::Requirement
+  requirement: &2156842280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.2.2
   type: :development
   prerelease: false
-  version_requirements: *2161338140
+  version_requirements: *2156842280
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &2164389960 !ruby/object:Gem::Requirement
+  requirement: &2156841820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2164389960
+  version_requirements: *2156841820
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &2164389500 !ruby/object:Gem::Requirement
+  requirement: &2156841360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164389500
+  version_requirements: *2156841360
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &2164389040 !ruby/object:Gem::Requirement
+  requirement: &2156840900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,7 +87,7 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2164389040
+  version_requirements: *2156840900
 description: Wrapper for the Granicus Open Platform API v1.x
 email: javier@granicus.com
 executables: []
@@ -104,8 +104,10 @@ files:
 - granicus-platform-api.gemspec
 - lib/granicus-platform-api.rb
 - lib/granicus-platform-api/client.rb
+- lib/granicus-platform-api/entities.rb
 - lib/granicus-platform-api/granicus-platform-api.xml
 - lib/granicus-platform-api/version.rb
+- spec/fixtures/requests.xml
 - spec/granicus-platform-api_spec.rb
 - spec/helper.rb
 homepage: http://github.com/gov20cto/granicus-platform-api
@@ -133,5 +135,6 @@ signing_key:
 specification_version: 3
 summary: Granicus Open Platform API 1.x Wrapper
 test_files:
+- spec/fixtures/requests.xml
 - spec/granicus-platform-api_spec.rb
 - spec/helper.rb