youroom_api 0.1.3 → 0.1.4

data/lib/youroom_api/request.rb

@@ -77,7 +77,7 @@ module Youroom
       GetUserList.new(access_token, billing_id, url).get
     end
 
-    def get_picture(room_id, participation_id)
+    def get_picture(room_id, participation_id=nil)
       Picture.new(access_token, room_id, participation_id, url).get(false)
    end
 

data/lib/youroom_api/request/get_picture.rb

@@ -2,14 +2,18 @@ module Youroom
   class Picture < Request
     attr_reader :room_id, :participation_id
 
-    def initialize(access_token, room_id, participation_id,  url=BASE_URL)
-      [room_id, participation_id].each {|arg| required_structure(arg, String, Integer) }
+    def initialize(access_token, room_id, participation_id=nil,  url=BASE_URL)
+      required_structure(room_id, String, Integer)
       @room_id, @participation_id = room_id, participation_id
       super(access_token, url)
     end
 
     def path
-      File.join(url, "r", room_id, "participations", participation_id, "picture.image")
+      if participation_id
+        File.join(url, "r", room_id, "participations", participation_id, "picture.image")
+      else
+        File.join(url, "r", room_id, "picture.image")
+      end
     end
   end
 end

data/lib/youroom_api/version.rb

@@ -1,4 +1,4 @@
 module Youroom
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end
 

data/spec/youroom_api/picture_spec.rb

@@ -4,18 +4,12 @@ describe Youroom::Picture do
   describe "#initialize" do
     context "when can not create instanse" do
       before do
-        @error_data1 = ["hoge", nil]
-        @error_data2 = [nil, "hoge"]
+        @error_data = [nil, "hoge"]
       end
 
       it do
-        lambda { Youroom::Picture.new(*@error_data1) }.should raise_exception(ArgumentError)
+        lambda { Youroom::Picture.new(*@error_data) }.should raise_exception(ArgumentError)
       end
-
-      it do
-        lambda { Youroom::Picture.new(*@error_data2) }.should raise_exception(ArgumentError)
-      end
-
     end
 
     context "when can create user instance" do
@@ -25,14 +19,33 @@ describe Youroom::Picture do
       its(:room_id) { should == "room_id" }
       its(:participation_id) { should == "participation_id" }
     end
+
+    context "when participation_id is nil" do
+      subject { Youroom::Picture.new(access_token, "room_id") }
+      it { should be_a(Youroom::Picture) }
+      its(:url) { should == Youroom::BASE_URL }
+      its(:room_id) { should == "room_id" }
+      its(:participation_id) { should == nil }
+    end
   end
 
   describe "#path" do
-    before do
-      @picture = Youroom::Picture.new(access_token, "room_id", "participation_id", WW_URL)
+    context "when instance has participation_id" do
+      before do
+        @picture = Youroom::Picture.new(access_token, "room_id", "participation_id", WW_URL)
+      end
+
+      subject { @picture.path }
+      it { should == File.join(WW_URL, 'r', 'room_id', 'participations', 'participation_id', 'picture.image') }
     end
 
-    subject { @picture.path }
-    it { should == File.join(WW_URL, 'r', 'room_id', 'participations', 'participation_id', 'picture.image') }
+    context "when instance has not participation_id" do
+      before do
+        @picture = Youroom::Picture.new(access_token, "room_id", nil, WW_URL)
+      end
+
+      subject { @picture.path }
+      it { should == File.join(WW_URL, 'r', 'room_id', 'picture.image') }
+    end
   end
 end

data/youroom_api.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'youroom_api'
-  s.version = '0.1.3'
+  s.version = '0.1.4'
 
   s.authors = ['pochi']
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - pochi