rb-lomo 0.0.1 → 0.0.2

data/.gitignore

@@ -1,5 +1,4 @@
 *.gem
-*.gemspec
 *.rbc
 .bundle
 .config

data/README.md

@@ -48,9 +48,15 @@ client.popular_film_photos(871911028).last
 
 client.recent_film_photos(871911028).last
 
-## Todo
+## Testing
+
+I've wrote up some tests using MiniTest.
+Currently, you need to stick your API key into each test class as a
+request is made to the api each time.
+This could probably be mocked but I tend to prefer making the actual
+request if its only for a small amount of times.
 
-Write some tests,.... preferable using MiniTest.
+## Todo
 
 Build a sample application to show the gem usage.
 

data/lib/rb-lomo/version.rb

@@ -1,5 +1,5 @@
 module Rb
   module Lomo
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/rb-lomo.rb

@@ -19,74 +19,61 @@ module Rb
         @api_key = api_key
       end
 
-      def photos_from url
+      def data_from url, type='photos'
         resp = RestClient.get("#{API_BASE}/#{url}", params: { api_key: @api_key})
         json = JSON.parse resp
 
         retval = []
-        json['photos'].each {|p| retval << Photo.new(p)}
-
-        retval
-      end
-
-      def cameras_from url
-        resp = RestClient.get("#{API_BASE}/#{url}", params: { api_key: @api_key})
-        json = JSON.parse resp
-
-        retval = []
-        json['cameras'].each {|c| retval << Camera.new(c)}
-
-        retval
-      end
-
-      def films_from url
-        resp = RestClient.get("#{API_BASE}/#{url}", params: { api_key: @api_key})
-        json = JSON.parse resp
-
-        retval = []
-        json['films'].each {|f| retval << Film.new(f)}
+        case type
+        when 'photos'
+          json['photos'].each {|p| retval << Photo.new(p)}
+        when 'cameras'
+          json['cameras'].each {|c| retval << Camera.new(c)}
+        when 'films'
+          json['films'].each {|f| retval << Film.new(f)}
+        end
 
         retval
       end
 
       def popular_photos
-        photos_from '/photos/popular'
+        data_from '/photos/popular'
       end
 
       def recent_photos
-        photos_from '/photos/recent'
+        data_from '/photos/recent'
       end
 
       def selected_photos
-        photos_from 'photos/selected'
+        data_from 'photos/selected'
       end
 
       def cameras
-        cameras_from '/cameras'
+        data_from '/cameras', 'cameras'
       end
 
       def camera id
-        cameras_from "/cameras/#{id}"
+        data_from "/cameras/#{id}", 'cameras'
       end
 
       def popular_camera_photos id
-        photos_from "/cameras/#{id}/photos/popular"
+        data_from "/cameras/#{id}/photos/popular"
       end
 
       def recent_camera_photos id
-        photos_from "/cameras/#{id}/photos/recent"
+        data_from "/cameras/#{id}/photos/recent"
       end
 
       def films
-        films_from '/films'
+        data_from '/films', 'films'
       end
 
       def popular_film_photos id
-        photos_from "/films/#{id}/photos/popular"
+        data_from "/films/#{id}/photos/popular"
       end
 
       def recent_film_photos id
-        photos_from "/films/#{id}/photos/recent"
+        data_from "/films/#{id}/photos/recent"
       end
     end
   end

data/rb-lomo.gemspec

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/rb-lomo/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Gary Rafferty"]
+  gem.email         = ["gary.rafferty@gmail.com"]
+  gem.description   = %q{Ruby library for the Lomography API}
+  gem.summary       = %q{This gem covers most of the functionality from the Lomography API}
+  gem.homepage      = "https://github.com/gary-rafferty/Rb-Lomo"
+
+  gem.add_dependency 'rest-client'
+  gem.add_dependency 'json'
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "rb-lomo"
+  gem.require_paths = ["lib"]
+  gem.version       = Rb::Lomo::VERSION
+end

data/test/unit/camera.rb

@@ -4,5 +4,16 @@ require 'minitest/autorun'
 require 'rb-lomo'
 
 class CameraTest < MiniTest::Unit::TestCase
-  #TODO
+  def setup
+    @client = Rb::Lomo::Client.new('API-KEY');
+    @camera = @client.cameras.sample
+  end
+
+  def test_that_camera_has_an_id
+    refute_nil @camera.id
+  end
+
+  def test_that_camera_has_a_name
+    refute_nil @camera.name
+  end
 end

data/test/unit/client.rb

@@ -0,0 +1,66 @@
+$:.unshift(File.join(File.dirname(__FILE__),'..','..','lib'))
+
+require 'minitest/autorun'
+require 'rb-lomo'
+
+class Client < MiniTest::Unit::TestCase
+  def setup
+    @client = Rb::Lomo::Client.new('API-KEY')
+  end
+
+  def test_popular_photos
+    @photos = @client.popular_photos
+    refute_empty @photos
+    assert_instance_of Array, @photos
+    assert_instance_of Rb::Lomo::Photo, @photos.sample
+  end
+
+  def test_selected_photos
+    @photos = @client.selected_photos
+    refute_empty @photos
+    assert_instance_of Array, @photos
+    assert_instance_of Rb::Lomo::Photo, @photos.sample
+  end
+
+  def test_cameras
+    @cameras = @client.cameras
+    refute_empty @cameras
+    assert_instance_of Array, @cameras
+    assert_instance_of Rb::Lomo::Camera, @cameras.sample
+  end
+
+  def test_popular_camera_photos
+    @photos = @client.popular_camera_photos '3314883'
+    refute_empty @photos
+    assert_instance_of Array, @photos
+    assert_instance_of Rb::Lomo::Photo, @photos.sample
+  end
+
+  def test_recent_camera_photos
+    @photos = @client.recent_camera_photos '3314883'
+    refute_empty @photos
+    assert_instance_of Array, @photos
+    assert_instance_of Rb::Lomo::Photo, @photos.sample
+  end
+
+  def test_films
+    @films = @client.films
+    refute_empty @films
+    assert_instance_of Array, @films
+    assert_instance_of Rb::Lomo::Film, @films.sample
+  end
+
+  def test_popular_film_photos
+    @photos = @client.popular_film_photos '871911028'
+    refute_empty @photos
+    assert_instance_of Array, @photos
+    assert_instance_of Rb::Lomo::Photo, @photos.sample
+  end
+
+  def test_recent_film_photos
+    @photos = @client.recent_film_photos '871911028'
+    refute_empty @photos
+    assert_instance_of Array, @photos
+    assert_instance_of Rb::Lomo::Photo, @photos.sample
+  end
+end

data/test/unit/film.rb

@@ -4,5 +4,16 @@ require 'minitest/autorun'
 require 'rb-lomo'
 
 class FilmTest < MiniTest::Unit::TestCase
-  #TODO:
+  def setup
+    @client = Rb::Lomo::Client.new('API-KEY');
+    @film = @client.films.sample
+  end
+
+  def test_that_film_has_an_id
+    refute_nil @film.id
+  end
+
+  def test_that_film_has_a_name
+    refute_nil @film.name
+  end
 end

data/test/unit/photo.rb

@@ -8,5 +8,30 @@ class Photo < MiniTest::Unit::TestCase
     @client = Rb::Lomo::Client.new('API-KEY')
     @photo  = @client.popular_photos.sample
   end
-  #TODO:
+
+  def test_that_photo_has_an_id
+    refute_nil @photo.id
+  end
+
+  def test_that_photo_has_a_url
+    refute_nil @photo.url
+  end
+
+  def test_that_photo_returns_a_camera_object_if_data_available
+    if @photo.camera
+      assert_instance_of Rb::Lomo::Camera, @photo.camera
+    end
+  end
+
+  def test_that_photo_returns_a_film_object_if_data_available
+    if @photo.film
+      assert_instance_of Rb::Lomo::Film, @photo.film
+    end
+  end
+
+  def test_that_photo_returns_a_user_object_if_data_available
+    if @photo.user
+      assert_instance_of Rb::Lomo::User, @photo.user
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rb-lomo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-11 00:00:00.000000000 Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &10138300 !ruby/object:Gem::Requirement
+  requirement: &18121240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10138300
+  version_requirements: *18121240
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &10137860 !ruby/object:Gem::Requirement
+  requirement: &18146580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10137860
+  version_requirements: *18146580
 description: Ruby library for the Lomography API
 email:
 - gary.rafferty@gmail.com
@@ -51,7 +51,9 @@ files:
 - lib/rb-lomo/photo.rb
 - lib/rb-lomo/user.rb
 - lib/rb-lomo/version.rb
+- rb-lomo.gemspec
 - test/unit/camera.rb
+- test/unit/client.rb
 - test/unit/film.rb
 - test/unit/photo.rb
 homepage: https://github.com/gary-rafferty/Rb-Lomo
@@ -80,5 +82,6 @@ specification_version: 3
 summary: This gem covers most of the functionality from the Lomography API
 test_files:
 - test/unit/camera.rb
+- test/unit/client.rb
 - test/unit/film.rb
 - test/unit/photo.rb