zelda 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.2.1 (Aug 24, 2011)
+
+Bugfixes:
+
+  - Fixed a serious bug with successive object initialization
+
+Features:
+
+  - Useful to_s for every object
+
+
 ## 1.2.0 (Aug 15, 2011)
 
 Bugfixes:

data/lib/zelda/aflevering.rb

@@ -6,5 +6,9 @@ module Zelda
         attrs ? new(attrs) : nil
       end  
     end
+    
+    def to_s
+      "#{titel} #{start_tijd}-#{eind_tijd} (pepeid #{pepeid})"
+    end
   end
 end

data/lib/zelda/base.rb

@@ -3,9 +3,11 @@ module Zelda
   # Every key in the hash is turned into a method, returning the value.
   class Base
     def initialize(attributes={})
-      attributes.each_pair do |key, value|
+      @attributes = attributes
+      
+      @attributes.each_pair do |key, value|
         self.class.send(:define_method, key) do
-          value
+          @attributes[key]
         end
       end
     end

data/lib/zelda/omroep.rb

@@ -13,6 +13,10 @@ module Zelda
       end
     end
     
+    def to_s
+      name
+    end
+    
     # Return all Series for this Omroep.
     def series
       Zelda::Request.get("omroepen/#{slug}/series")['omroep']['series']['serie'].map do |attrs|

data/lib/zelda/serie.rb

@@ -30,6 +30,10 @@ module Zelda
         series
       end
     end
+    
+    def to_s
+      "#{titel} (serieid #{serie_id_nebo})"
+    end
   
     def afleveringen(van=nil, tot=nil)
       get_afleveringen(:van => van, :tot => tot)

data/lib/zelda/version.rb

@@ -1,3 +1,3 @@
 module Zelda
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/lib/zelda/zender.rb

@@ -13,6 +13,10 @@ module Zelda
       end
     end
     
+    def to_s
+      name
+    end
+
     # Return all Series for this Zender.
     def series
       Zelda::Request.get("zenders/#{id}/series")['zender']['series']['serie'].map do |attrs|
@@ -25,6 +29,6 @@ module Zelda
       Zelda::Request.get("zenders/#{id}/current_series")['zender']['series']['serie'].map do |attrs|
         Zelda::Serie.new(attrs)
       end
-    end
+    end  
   end
 end

data/spec/support/shared_examples.rb

@@ -10,4 +10,13 @@ shared_examples_for "a zelda base model" do
   it "should not respond to attributes not set in the constructor" do
     lambda { subject.no_not_here_nope }.should raise_error(NoMethodError)
   end
+  
+  it "allows successive initialization" do
+    list = []
+    list << described_class.new(:foo => 'bar')
+    list << described_class.new(:foo => 'baz')
+    
+    list[0].foo.should eq('bar')
+    list[1].foo.should eq('baz')
+  end
 end

data/spec/zelda/aflevering_spec.rb

@@ -6,7 +6,12 @@ describe Zelda::Aflevering do
   
   it "should accept attributes when being initialized" do
     Zelda::Aflevering.new(:foo => "bar").should be_a(Zelda::Aflevering)
-  end  
+  end
+  
+  it "has a useful to_s" do
+    a = Zelda::Aflevering.new(:titel => "Pippi", :start_tijd => 'start', :eind_tijd => 'eind', :pepeid => 219660617)
+    a.to_s.should eq("Pippi start-eind (pepeid 219660617)")
+  end
   
   it "should find an aflevering in Zelda correctly" do
     afl_attrs = { "aflevering" => {"afleveringid" => "POW_00243538", "name" => "3 op reis"} }

data/spec/zelda/omroep_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 
 describe Zelda::Omroep do
   it_should_behave_like 'a zelda base model'
+  
+  it "has a useful to_s" do
+    omroep = Zelda::Omroep.new :name => 'TROS'
+    omroep.to_s.should eq('TROS')
+  end
 
   describe "when retrieving a list of omroepen" do
     it "should call Zelda with the correct url" do

data/spec/zelda/serie_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 
 describe Zelda::Serie do
   it_should_behave_like 'a zelda base model'
+  
+  it "has a useful to_s" do
+    serie = Zelda::Serie.new :titel => 'Abi', :serie_id_nebo => 6305
+    serie.to_s.should eq("Abi (serieid 6305)")
+  end
 
   describe "current series" do
     it "calls Zelda with the correct url" do

data/spec/zelda/zender_spec.rb

@@ -2,6 +2,11 @@ require 'spec_helper'
 
 describe Zelda::Zender do
   it_should_behave_like 'a zelda base model'
+  
+  it "has a useful to_s" do
+    zender = Zelda::Zender.new :name => "Nederland 1"
+    zender.to_s.should eq('Nederland 1')
+  end
 
   describe "when retrieving a list of zenders" do
     it "should call Zelda with the correct url" do

metadata

@@ -1,39 +1,34 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: zelda
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.2.1
   prerelease: 
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Joost Baaij
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-15 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-24 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2164269260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *2164269260
 description: If you don't know what this is, you probably don't need it
-email: 
+email:
 - joost@spacebabies.nl
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - CHANGELOG.md
@@ -59,35 +54,31 @@ files:
 - spec/zelda/serie_spec.rb
 - spec/zelda/zender_spec.rb
 - zelda.gemspec
-has_rdoc: true
 homepage: https://github.com/tilsammans/zelda
 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 
-      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 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: zelda
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: If you don't know what this is, you probably don't need it
-test_files: 
+test_files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb