osc-ruby 0.7.0 → 1.0.0

data/Rakefile

@@ -1,15 +1,13 @@
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
 task :default => :spec
 
-Spec::Rake::SpecTask.new do |t|
-  t.libs << 'lib'
-  t.warning = false
+RSpec::Core::RakeTask.new do |t|
   t.rcov = false
-  t.spec_opts = ["--colour"]
+  t.rspec_opts = ["--colour"]
 end
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION')
     version = File.read('VERSION')
@@ -22,32 +20,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-
-### Task: gem
-gemspec = Gem::Specification.new do |gem|
-  gem.name = "osc-ruby"
-  gem.version   = File.read('VERSION')
-
-  gem.summary = "a ruby client for the OSC protocol"
-  gem.description = "This OSC gem originally created by Tadayoshi Funaba has been updated for ruby 1.9/JRuby compatibility"
-
-  gem.authors = "Colin Harris"
-  gem.email = "qzzzq1@gmail.com"
-  gem.homepage = "http://github.com/aberant/osc-ruby"
-
-  gem.has_rdoc = true
-
-  gem.files = FileList['Rakefile', 'VERSION', 'LICENSE', 'examples/**/*', 'lib/**/*'].to_a
-  gem.test_files = FileList['spec/**/*.rb']
-end
-
-Rake::GemPackageTask.new( gemspec ) do |task|
-  task.gem_spec = gemspec
-  task.need_tar = false
-  task.need_tar_gz = true
-  task.need_tar_bz2 = true
-  task.need_zip = true
-end

data/VERSION

@@ -1 +1 @@
-0.7.0
+1.0.0

data/examples/classic_server_ip_info.rb

@@ -0,0 +1,18 @@
+# compatible with ruby 1.8
+$:.unshift File.join( File.dirname( __FILE__ ), '..', 'lib')
+require 'osc-ruby'
+
+@server = OSC::Server.new( 3333 )
+@client = OSC::Client.new( 'localhost', 3333 )
+
+@server.add_method '/greeting' do | message |
+  puts message.ip_address + ":" + message.ip_port.to_s + " -- " + message.address + " -- " + message.to_a.to_s
+end
+
+Thread.new do
+  @server.run
+end
+
+@client.send( OSC::Message.new( "/greeting", "hullo!" ))
+
+sleep( 3 )

data/examples/ip_info.rb

@@ -0,0 +1,22 @@
+# compatible with ruby 1.8, 1.9, and jruby
+$:.unshift File.join( File.dirname( __FILE__ ), '..', 'lib')
+require 'osc-ruby'
+
+require 'rubygems'
+require 'eventmachine'
+require 'osc-ruby/em_server'
+
+@server = OSC::EMServer.new( 3333 )
+@client = OSC::Client.new( 'localhost', 3333 )
+
+@server.add_method '/greeting' do | message |
+  puts message.ip_address + ":" + message.ip_port.to_s + " -- " + message.address + " -- " + message.to_a.to_s
+end
+
+Thread.new do
+  @server.run
+end
+
+@client.send( OSC::Message.new( "/greeting" , "hullo!" ))
+
+sleep( 3 )

data/lib/osc-ruby/em_server.rb

@@ -5,7 +5,8 @@ module OSC
 
   class Connection < EventMachine::Connection
     def receive_data data
-     Channel << OSC::OSCPacket.messages_from_network( data )
+     ip_info = get_peername[2,6].unpack "nC4"  
+     Channel << OSC::OSCPacket.messages_from_network( data, ip_info )
     end
   end
 

data/lib/osc-ruby/message.rb

@@ -2,6 +2,8 @@ module OSC
   class Message
     attr_accessor :address
     attr_accessor :time
+    attr_accessor :ip_address
+    attr_accessor :ip_port
 
     def self.new_with_time( address, time, tags=nil, *args )
       message = new( address, tags, *args )

data/lib/osc-ruby/osc_packet.rb

@@ -4,7 +4,7 @@ require 'ostruct'
 module OSC
   class OSCPacket
 
-    def self.messages_from_network( string )
+    def self.messages_from_network( string, ip_info=nil )
       messages = []
       osc = new( string )
 
@@ -13,11 +13,23 @@ module OSC
         time = osc.get_timestamp
 
         osc.get_bundle_messages.each do | message |
-          messages << decode_simple_message( time, OSCPacket.new( message ) )
+          msg = decode_simple_message( time, OSCPacket.new( message ) )
+          if ip_info
+            # Append info for the ip address
+            msg.ip_address = ip_info[1].to_s + "." + ip_info[2].to_s + "." + ip_info[3].to_s + "." + ip_info[4].to_s
+            msg.ip_port = ip_info[0]
+          end
+          messages << msg
         end
 
       else
-        messages << decode_simple_message( time, osc )
+        msg = decode_simple_message( time, osc )
+        if ip_info
+          # Append info for the ip address
+          msg.ip_address = ip_info[1].to_s + "." + ip_info[2].to_s + "." + ip_info[3].to_s + "." + ip_info[4].to_s
+          msg.ip_port = ip_info[0]
+        end
+        messages << msg
       end
 
       return messages

data/lib/osc-ruby/server.rb

@@ -1,6 +1,5 @@
 module OSC
   class  Server
-
     def initialize( port )
       @socket = UDPSocket.new
       @socket.bind( '', port )
@@ -77,8 +76,10 @@ private
       loop do
 	      osc_data, network = @socket.recvfrom( 16384 )
 	      begin
-
-	        OSCPacket.messages_from_network( osc_data ).each do |message|
+          ip_info = Array.new
+          ip_info << network[1]
+          ip_info.concat(network[2].split('.'))
+	        OSCPacket.messages_from_network( osc_data, ip_info ).each do |message|
 	          @queue.push(message)
           end
 

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'osc-ruby'
-require 'spec'
+require 'rspec'
 
 require 'builders/message_builder'
-

data/spec/unit/osc_simple_packets_spec.rb

@@ -6,102 +6,102 @@ describe OSC::OSCPacket do
     @address = "/hi"
     @first_int = 42
     @second_int = 33
-    
+
     @first_float = 42.01
     @second_float = 33.01
-    
+
     @first_string = "greetings"
     @second_string = "how are you?"
-    
+
     @first_blob = "this is a fake blob"
     @second_blob = "tis another fake blob"
-    
+
     @builder = MessageBuilder.new
     @builder.with_address( @address )
   end
-  
+
   it "should decode the address of a simple message from the network data" do
     sent_msg = @builder.build
-    
+
     msg = OSC::OSCPacket.messages_from_network( sent_msg.encode )
-    
+
     msg.first.address.should == @address
   end
-  
+
   it "should decode the int arg of a simple message from the network data" do
     sent_msg = @builder.with_int( @first_int ).build
-    
+
     msg = OSC::OSCPacket.messages_from_network( sent_msg.encode )
-    
+
     msg.first.to_a.should == [@first_int]
   end
-  
+
   it "should decode two int args" do
     sent_msg = @builder.with_int( @first_int ).with_int( @second_int ).build
-    
+
     msg = OSC::OSCPacket.messages_from_network( sent_msg.encode )
-    
+
     msg.first.to_a.should == [@first_int, @second_int]
   end
-  
+
   it "shold decode address with float arg" do
     sent_msg = @builder.with_float( @first_float ).build
-    
+
     msg = OSC::OSCPacket.messages_from_network( sent_msg.encode )
-    
-    msg.first.to_a[0].should be_close( @first_float, 0.001 )
+
+    msg.first.to_a[0].should be_within( 0.001 ).of( @first_float )
   end
-  
-  
+
+
   it "shold decode address with two float args" do
     sent_msg = @builder.with_float( @first_float ).with_float( @second_float).build
-    
+
     msg = OSC::OSCPacket.messages_from_network( sent_msg.encode )
-    
+
     args = msg.first.to_a
-    args.first.should be_close( @first_float, 0.001 )
-    args[1].should be_close( @second_float, 0.0001 )
+    args.first.should be_within( 0.001 ).of( @first_float )
+    args[1].should be_within( 0.001 ).of( @second_float )
   end
-  
+
   it "should decode address with string arg" do
     sent_msg = @builder.with_string( @first_string ).build
-  
+
     msg = OSC::OSCPacket.messages_from_network( sent_msg.encode )
-    
+
     msg.first.to_a.should == [@first_string]
   end
-  
+
   it "should decode address with multiple string args" do
     sent_msg = @builder.with_string( @first_string ).with_string( @second_string).build
     msg = OSC::OSCPacket.messages_from_network( sent_msg.encode )
-    
+
     args = msg.first.to_a
-    args[0].should == @first_string
-    args[1].should == @second_string
+    args[0].should eql @first_string
+    args[1].should eql @second_string
   end
-  
-  
+
+
   it "should decode messages with three different types of args" do
     sent_msg = @builder.with_int( @first_int ).
                         with_float( @second_float ).
                         with_string( @first_string ).
                         build
-    
+
     msg = OSC::OSCPacket.messages_from_network( sent_msg.encode )
-    
+
     args = msg.first.to_a
-    
+
     args[0].should eql( @first_int )
-    args[1].should be_close( @second_float, 0.0001 )
+    args[1].should be_within( 0.001 ).of( @second_float )
     args[2].should eql( @first_string )
   end
-  
+
   it "should decode messages with blobs" do
     sent_msg = @builder.with_blob( @first_blob ).build
-    
-    
+
+
     msg = OSC::OSCPacket.messages_from_network( sent_msg.encode )
-    
+
     args = msg.first.to_a
     args.first.should eql( @first_blob )
   end

metadata

@@ -1,37 +1,30 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: osc-ruby
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 7
-  - 0
-  version: 0.7.0
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Colin Harris
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-08-15 00:00:00 -05:00
-default_executable: 
+date: 2012-10-28 00:00:00.000000000 Z
 dependencies: []
-
-description: This OSC gem originally created by Tadayoshi Funaba has been updated for ruby 1.9/JRuby compatibility
+description: This OSC gem originally created by Tadayoshi Funaba has been updated
+  for ruby 1.9/JRuby compatibility
 email: qzzzq1@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - VERSION
 - LICENSE
 - examples/classic_server.rb
+- examples/classic_server_ip_info.rb
 - examples/event_machine_server.rb
+- examples/ip_info.rb
 - lib/osc-ruby/address_pattern.rb
 - lib/osc-ruby/bundle.rb
 - lib/osc-ruby/client.rb
@@ -45,37 +38,42 @@ files:
 - lib/osc-ruby/osc_types.rb
 - lib/osc-ruby/server.rb
 - lib/osc-ruby.rb
-has_rdoc: true
+- spec/builders/message_builder.rb
+- spec/spec_helper.rb
+- spec/unit/address_pattern_spec.rb
+- spec/unit/message_builder_spec.rb
+- spec/unit/message_bundle_spec.rb
+- spec/unit/message_spec.rb
+- spec/unit/network_packet_spec.rb
+- spec/unit/osc_argument_spec.rb
+- spec/unit/osc_complex_packets_spec.rb
+- spec/unit/osc_simple_packets_spec.rb
+- spec/unit/osc_types_spec.rb
 homepage: http://github.com/aberant/osc-ruby
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: a ruby client for the OSC protocol
-test_files: 
+test_files:
 - spec/builders/message_builder.rb
 - spec/spec_helper.rb
 - spec/unit/address_pattern_spec.rb