bartzon-zelda 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/zelda.rb

@@ -1,17 +1,22 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-require 'httparty'
+begin
+  require 'httparty'
+rescue LoadError
+  require 'rubygems' unless ENV['NO_RUBYGEMS']
+  gem 'httparty', '>= 0.4.4'
+  require 'httparty'
+end
 
-require 'zelda/base'
-require 'zelda/object'
 require 'zelda/request'
 require 'zelda/zender'
 require 'zelda/serie'
+require 'zelda/aflevering'
 
 module Zelda
-  VERSION = "0.0.1"
-  
+  VERSION = "0.0.2"
+
   class ZeldaError < StandardError;        end
   class ZeldaCollectionError < ZeldaError; end
 end

data/lib/zelda/aflevering.rb

@@ -0,0 +1,15 @@
+module Zelda
+  class Aflevering
+    def initialize(vars={})
+      @attrs = vars
+    end
+    
+    def method_missing(method, *args, &block)
+      if @attrs[method]
+        return @attrs[method]
+      else
+        super(method, *args, &block)
+      end
+    end
+  end
+end

data/lib/zelda/request.rb

@@ -5,6 +5,7 @@ module Zelda
     end
     
     def self.parse_url(*args)
+      raise "No Zelda::API_KEY specified" unless defined?(Zelda::API_KEY)
       "http://zelda.omroep.nl/#{ Zelda::API_KEY }/#{ args.join('/') }"
     end
   end

data/lib/zelda/serie.rb

@@ -1,25 +1,52 @@
-class Zelda::Serie < Zelda::Object
-  def self.url(id=false)
-    id ? "series/#{id}" : "series"
-  end
+module Zelda
+  class Serie
+    class << self
+      def search(query)
+        Request.get("series/search/#{query}")['series']
+      end
+      
+      def find(id)
+        new Request.get("series/#{id}")
+      end
+      
+      def all
+        Request.get("series")
+      end
+    end
   
-  def name
-    @attrs["serie"]["name"]
-  end
+    def initialize(attrs={})
+      @attrs = attrs
+    end
+    
+    def name
+      @attrs["serie"]["name"]
+    end
   
-  def serieid
-    @attrs["serie"]["serieid"]
-  end
+    def serieid
+      @attrs["serie"]["serieid"]
+    end
   
-  def afleveringen
-    @afleveringen ||= Zelda::Request.get("series/#{serieid}/afleveringen")["afleveringen"]
-  end
+    def afleveringen
+      @afleveringen ||= get_afleveringen()
+    end
 
-  def upcoming_afleveringen
-    @upcoming_afleveringen ||= Zelda::Request.get("series/#{serieid}/afleveringen/upcoming")["afleveringen"]
-  end
+    def upcoming_afleveringen
+      @upcoming_afleveringen ||= get_afleveringen("upcoming")
+    end
+  
+    def past_afleveringen
+      @past_afleveringen ||= get_afleveringen("past")
+    end
   
-  def past_afleveringen
-    @past_afleveringen ||= Zelda::Request.get("series/#{serieid}/afleveringen/past")["afleveringen"]
+    private
+      def get_afleveringen(timestamp=nil)
+        url = [ "series", serieid, "afleveringen", timestamp ].join("/")
+
+        objects = []
+        Request.get(url)["afleveringen"].each do |vars|
+          objects << Zelda::Aflevering.new(vars)
+        end
+        objects
+      end
   end
-end
+end

data/lib/zelda/zender.rb

@@ -1,13 +1,25 @@
-class Zelda::Zender < Zelda::Object
-  def self.url(code=false)
-    code ? "zenders/#{code}" : "zenders"
-  end
-
-  def name
-    @attrs["zender"]["name"]
-  end
+module Zelda
+  class Zender
+    class << self
+      def find(id)
+        new Request.get("zenders/#{id}")
+      end
+      
+      def all
+        Request.get("zenders")
+      end
+    end
+    
+    def initialize(attrs={})
+      @attrs = attrs
+    end
+    
+    def name
+      @attrs["zender"]["name"]
+    end
   
-  def code
-    @attrs["zender"]["code"]
+    def code
+      @attrs["zender"]["code"]
+    end
   end
-end
+end

data/spec/spec_helper.rb

@@ -9,4 +9,7 @@ end
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 
 require 'zelda'
-Zelda::API_KEY = '12345'
+
+module Zelda
+  API_KEY = '12345' unless defined?(API_KEY)
+end

data/spec/zelda/aflevering_spec.rb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Zelda::Aflevering do
+  it "should accept attributes when being initialized" do
+    Zelda::Aflevering.new(:foo => "bar").should be_a(Zelda::Aflevering)
+  end
+  
+  it "should respond to the attributes set in the constructor" do
+    afl = Zelda::Aflevering.new(:foo => "bar")
+    afl.foo.should == 'bar'
+  end
+  
+  it "should not respond to attributes not set in the constructor" do
+    afl = Zelda::Aflevering.new(:foo => "bar")
+    lambda { afl.bar }.should raise_error(NoMethodError)
+  end
+end

data/spec/zelda/request_spec.rb

@@ -5,6 +5,12 @@ describe Zelda::Request do
     HTTParty.should_receive(:get).with("http://zelda.omroep.nl/12345/foo")
     Zelda::Request.get('foo')
   end
+
+  it "should raise an error without an API key" do
+    api_key = Zelda.send(:remove_const, :API_KEY)
+    lambda { Zelda::Request.get('foo') }.should raise_error("No Zelda::API_KEY specified")
+    Zelda::API_KEY = api_key
+  end
   
   describe "when returning an url" do
     it "should be correct with 1 args" do

data/spec/zelda/serie_spec.rb

@@ -12,6 +12,9 @@ describe Zelda::Serie do
     before(:each) do
       serie_attrs = { "serie" => {"serieid" => "POW_00243538", "name" => "3 op reis"} }
       Zelda::Request.stub!(:get).with("series/1").and_return serie_attrs
+      
+      @aflevering = mock("Aflevering")
+      Zelda::Aflevering.stub!(:new).and_return @aflevering
     end
     
     def find_serie
@@ -29,20 +32,25 @@ describe Zelda::Serie do
     
     it "should send the correct request when asked for afleveringen" do
       serie = find_serie
-      Zelda::Request.should_receive(:get).with("series/POW_00243538/afleveringen").and_return("afleveringen" => ["foo"])
-      serie.afleveringen.should == ["foo"]
+      Zelda::Request.should_receive(:get).with("series/POW_00243538/afleveringen/").and_return("afleveringen" => ["foo"])
+      serie.afleveringen.should == [@aflevering]
     end
 
     it "should send the correct request when asked for upcoming afleveringen" do
       serie = find_serie
       Zelda::Request.should_receive(:get).with("series/POW_00243538/afleveringen/upcoming").and_return("afleveringen" => ["foo"])
-      serie.upcoming_afleveringen.should == ["foo"]
+      serie.upcoming_afleveringen.should == [@aflevering]
     end
 
     it "should send the correct request when asked for past afleveringen" do
       serie = find_serie
       Zelda::Request.should_receive(:get).with("series/POW_00243538/afleveringen/past").and_return("afleveringen" => ["foo"])
-      serie.past_afleveringen.should == ["foo"]
+      serie.past_afleveringen.should == [@aflevering]
     end
   end
+  
+  it "should send the correct request when searching for series" do
+    Zelda::Request.should_receive(:get).with("series/search/foo").and_return("series" => ["foo"])
+    Zelda::Serie.search("foo").should == ["foo"]
+  end
 end

data/spec/zelda/zender_spec.rb

@@ -30,9 +30,5 @@ describe Zelda::Zender do
     it "should return the correct name" do
       find_zender.name.should == "Nederland 1"
     end
-    
-    it "should raise the correct error for an undefined attribute" do
-      lambda { find_zender.foo }.should raise_error(NoMethodError)
-    end
   end
 end

data/spec/zelda_spec.rb

@@ -0,0 +1,4 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe Zelda do
+end

data/zelda.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zelda}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bart Zonneveld"]
-  s.date = %q{2009-08-13}
+  s.date = %q{2009-08-26}
   s.description = %q{ }
   s.email = %q{loop@superinfinite.com}
   s.extra_rdoc_files = [
@@ -25,8 +25,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/zelda.rb",
-     "lib/zelda/base.rb",
-     "lib/zelda/object.rb",
+     "lib/zelda/aflevering.rb",
      "lib/zelda/request.rb",
      "lib/zelda/serie.rb",
      "lib/zelda/zender.rb",
@@ -35,10 +34,11 @@ Gem::Specification.new do |s|
      "script/generate",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/zelda/base_spec.rb",
+     "spec/zelda/aflevering_spec.rb",
      "spec/zelda/request_spec.rb",
      "spec/zelda/serie_spec.rb",
      "spec/zelda/zender_spec.rb",
+     "spec/zelda_spec.rb",
      "tasks/rspec.rake",
      "zelda.gemspec"
   ]
@@ -47,13 +47,14 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{zelda}
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{ }
+  s.summary = %q{}
   s.test_files = [
     "spec/spec_helper.rb",
-     "spec/zelda/base_spec.rb",
+     "spec/zelda/aflevering_spec.rb",
      "spec/zelda/request_spec.rb",
      "spec/zelda/serie_spec.rb",
-     "spec/zelda/zender_spec.rb"
+     "spec/zelda/zender_spec.rb",
+     "spec/zelda_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bartzon-zelda
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Bart Zonneveld
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-13 00:00:00 -07:00
+date: 2009-08-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,8 +40,7 @@ files:
 - Rakefile
 - VERSION
 - lib/zelda.rb
-- lib/zelda/base.rb
-- lib/zelda/object.rb
+- lib/zelda/aflevering.rb
 - lib/zelda/request.rb
 - lib/zelda/serie.rb
 - lib/zelda/zender.rb
@@ -50,15 +49,15 @@ files:
 - script/generate
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/zelda/base_spec.rb
+- spec/zelda/aflevering_spec.rb
 - spec/zelda/request_spec.rb
 - spec/zelda/serie_spec.rb
 - spec/zelda/zender_spec.rb
+- spec/zelda_spec.rb
 - tasks/rspec.rake
 - zelda.gemspec
 has_rdoc: false
 homepage: http://github.com/bartzon/zelda
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -79,13 +78,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: zelda
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: ""
 test_files: 
 - spec/spec_helper.rb
-- spec/zelda/base_spec.rb
+- spec/zelda/aflevering_spec.rb
 - spec/zelda/request_spec.rb
 - spec/zelda/serie_spec.rb
 - spec/zelda/zender_spec.rb
+- spec/zelda_spec.rb

data/lib/zelda/base.rb

@@ -1,4 +0,0 @@
-module Zelda
-  class Base
-  end
-end

data/lib/zelda/object.rb

@@ -1,17 +0,0 @@
-module Zelda
-  class Object
-    class << self
-      def all
-        Zelda::Request.get(url)
-      end
-      
-      def find(id)
-        new Zelda::Request.get(url(id))
-      end
-    end
-    
-    def initialize(attrs={})
-      @attrs = attrs
-    end
-  end
-end

data/spec/zelda/base_spec.rb

@@ -1,4 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Zelda::Base do
-end