boundio 0.0.4 → 0.0.5

data/README.md

@@ -1,5 +1,5 @@
 # boundio
 
-[![Build Status](https://secure.travis-ci.org/[YOUR_GITHUB_USERNAME]/[YOUR_PROJECT_NAME].png)](http://travis-ci.org/pwim/boundio)
+[![Build Status](https://secure.travis-ci.org/pwim/boundio.png?branch=master)](http://travis-ci.org/pwim/boundio)
 
 Alpha-version of the beta-api for Boundio.  See [the documentation](http://www.doorkeeperhq.com/developer/boundio-ruby-gem) for details.

data/lib/boundio.rb

@@ -5,7 +5,7 @@ require "thor"
 require "active_support/core_ext/string/inflections"
 
 module Boundio
-  %w[audio_file application call exception resource tel_status version].each do |s|
+  %w[audio_file application call cast exception resource tel_status version].each do |s|
     autoload s.camelize.to_sym, "boundio/#{s}"
   end
 end

data/lib/boundio/application.rb

@@ -3,8 +3,7 @@ module Boundio
     desc "call", "Call the specified number with the specified cast"
     method_options :tel_to => :string, :cast => :string
     def call
-      call = Call.new(options)
-      call.save
+      call = Call.create(options)
       puts call.id
     end
 
@@ -21,8 +20,7 @@ module Boundio
     desc "file", "Create a file for use with boundio"
     method_options :convtext => :string, :file => :string
     def file
-      file = AudioFile.new(options[:file] ? {:file => File.new(options[:file], "rb")} : options)
-      file.save
+      file = AudioFile.create(options[:file] ? {:file => File.new(options[:file], "rb")} : options)
       puts file.id
     end
 

data/lib/boundio/audio_file.rb

@@ -7,7 +7,7 @@ module Boundio
     end
 
     def self.exceptions
-      super.merge(2 => ArgumentError.new("insufficient parameters or file to big"))
+      super.merge(2 => InsufficientParametersOrTooBigFile, 6 => VoiceConversionError)
     end
 
     def save
@@ -20,5 +20,12 @@ module Boundio
       self.id = res["fileid"]
       true
     end
+
+    def +(file)
+      Boundio::Cast.new(self, file)
+    end
+
+    class InsufficientParametersOrTooBigFile < Boundio::Exception; end
+    class VoiceConversionError < Boundio::Exception; end
   end
 end

data/lib/boundio/call.rb

@@ -11,6 +11,10 @@ module Boundio
       true
     end
 
+    def status
+      TelStatus.find(id)
+    end
+
     class NotEnoughPoints < Boundio::Exception; end
     class NoVoiceFile < Boundio::Exception; end
   end

data/lib/boundio/cast.rb

@@ -0,0 +1,21 @@
+module Boundio
+  class Cast
+    attr_reader :files
+
+    def initialize(*files)
+      @files = files
+    end
+
+    def +(file)
+      self.class.new(*(files + [file]))
+    end
+
+    def to_s
+      files.map {|f| "file(#{f.id})" }.join("%%")
+    end
+
+    def ==(other)
+      other.is_a?(self.class) ? files == other.files : super
+    end
+  end
+end

data/lib/boundio/resource.rb

@@ -1,6 +1,12 @@
 module Boundio
   class Resource
     class << self
+      def create(args)
+        o = new(args)
+        o.save
+        o
+      end
+
       def api_version
         "vd1"
       end
@@ -30,7 +36,7 @@ module Boundio
       end
     end
 
-    def initialize(args)
+    def initialize(args = {})
       args.each {|k,v| send("#{k}=", v) }
     end
 

data/lib/boundio/tel_status.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 module Boundio
   class TelStatus < Resource
     attr_accessor :id, :from, :to, :start, :end, :duration, :status
@@ -19,6 +20,10 @@ module Boundio
       end
     end
 
+    def processing?
+      status == "架電待機"
+    end
+
     def to_s
       "TelStatus (#{id}): #{from} -> #{to}, #{start} - #{self.end}, #{status}"
     end

data/lib/boundio/version.rb

@@ -1,3 +1,3 @@
 module Boundio
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/test/test_audio_file.rb

@@ -8,4 +8,12 @@ class TestAudioFile < BoundioTest
     file.save
     assert_equal 5, file.id
   end
+
+  def test_combining_files
+    f1 = Boundio::AudioFile.new
+    f2 = Boundio::AudioFile.new
+    cast = f1 + f2
+    assert_instance_of Boundio::Cast, cast
+    assert_equal [f1, f2], cast.instance_variable_get(:@files)
+  end
 end

data/test/test_cast.rb

@@ -0,0 +1,16 @@
+require "test_helper"
+
+class TestCast < BoundioTest
+  def test_combining
+    f1 = Boundio::AudioFile.new(:id => '000001')
+    f2 = Boundio::AudioFile.new(:id => '000002')
+    cast = Boundio::Cast.new(f1)
+    assert_equal Boundio::Cast.new(f1,f2), cast + f2
+  end
+  def test_to_s
+    f1 = Boundio::AudioFile.new(:id => '000001')
+    f2 = Boundio::AudioFile.new(:id => '000002')
+    cast = Boundio::Cast.new(f1, f2)
+    assert_equal 'file(000001)%%file(000002)', cast.to_s
+  end
+end

data/test/test_tel_status.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require "test_helper"
 
 class TestTelStatus < BoundioTest
@@ -6,4 +7,9 @@ class TestTelStatus < BoundioTest
     call_status = Boundio::TelStatus.find(5)
     assert_equal 5, call_status.id
   end
+
+  def test_status
+    assert Boundio::TelStatus.new(:status => "架電待機").processing?
+    assert !Boundio::TelStatus.new(:status => "不在").processing?
+  end
 end

metadata

@@ -1,130 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: boundio
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.0.5
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Paul McMahon
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2157474300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2157474300
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2157473880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2157473880
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &2157473460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2157473460
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2157473040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2157473040
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2157472620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2157472620
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &2157472200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2157472200
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &2157471780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *2157471780
 description: Boundio is KDDI's telephony API. This is a simple wrapper for it.
-email: 
+email:
 - paul@mobalean.com
-executables: 
+executables:
 - boundio
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -137,6 +108,7 @@ files:
 - lib/boundio/application.rb
 - lib/boundio/audio_file.rb
 - lib/boundio/call.rb
+- lib/boundio/cast.rb
 - lib/boundio/exception.rb
 - lib/boundio/resource.rb
 - lib/boundio/tel_status.rb
@@ -144,40 +116,37 @@ files:
 - test/test_application.rb
 - test/test_audio_file.rb
 - test/test_call.rb
+- test/test_cast.rb
 - test/test_helper.rb
 - test/test_tel_status.rb
 homepage: http://boundio.jp
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: boundio
-rubygems_version: 1.8.17
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Wrapper for Boundio API
-test_files: []
-
+test_files:
+- test/test_application.rb
+- test/test_audio_file.rb
+- test/test_call.rb
+- test/test_cast.rb
+- test/test_helper.rb
+- test/test_tel_status.rb