zelda 1.0.0 → 1.1.0

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.1.0 (Aug 11, 2011)
+
+Bugfixes:
+
+  - Return nil for attributes that exist, but have nil value
+  - Made the base class slimmer
+  - Shared examples for the base class are now less brittle
+
+
 ## 1.0.0 (Aug 11, 2011)
 
 Features:
@@ -52,4 +61,4 @@ Features:
 
 Features:
 
-  - Initial version
+  - Initial version

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zelda (0.1.0)
+    zelda (1.0.0)
       httparty
 
 GEM

data/lib/zelda/base.rb

@@ -1,21 +1,23 @@
 module Zelda
   # Abstract base class to provide common functionality of Zelda importer classes.
-  # including method_missing magic to turn an @attrs hash into getters.
+  # including method_missing magic to turn an @attributes hash into getters.
   class Base
-    def initialize(attrs={})
-      @attrs = attrs
+    def initialize(attributes={})
+      @attributes = {}
+      
+      attributes.each do |key, value|
+        @attributes[key.to_sym] = value
+      end
     end
-
-    def attributes
-      @attrs
-    end    
+    
+    attr_reader :attributes
 
     # Try both string keys and symbol keys in that order.
     def method_missing(method, *args, &block)
-      if @attrs[method.to_s]
-        return @attrs[method.to_s]
-      elsif @attrs[method]
-        return @attrs[method]
+      if @attributes[method]
+        return @attributes[method]
+      elsif @attributes.key?(method)
+        return nil
       else
         super(method, *args, &block)
       end

data/lib/zelda/version.rb

@@ -1,3 +1,3 @@
 module Zelda
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/zelda/zender.rb

@@ -12,11 +12,11 @@ module Zelda
     end
     
     def name
-      @attrs["zender"]["name"]
+      attributes[:zender]["name"]
     end
   
     def code
-      @attrs["zender"]["code"]
+      attributes[:zender]["code"]
     end
 
     # Return all Series for this Zender.

data/spec/support/shared_examples.rb

@@ -1,9 +1,13 @@
 shared_examples_for "a zelda base model" do
   it "should respond to the attributes set in the constructor" do
-    @model.foo.should == 'bar'
+    described_class.new(:foo => 'bar').foo.should eq('bar')
+  end
+  
+  it "should return nil for an attribute set to nil" do
+    described_class.new(:foo => nil).foo.should be_nil
   end
   
   it "should not respond to attributes not set in the constructor" do
-    lambda { @model.no_not_here_nope }.should raise_error(NoMethodError)
+    lambda { subject.no_not_here_nope }.should raise_error(NoMethodError)
   end
 end

data/spec/zelda/aflevering_spec.rb

@@ -1,10 +1,7 @@
 require 'spec_helper'
 
 describe Zelda::Aflevering do
-  before do
-    @model = Zelda::Aflevering.new(:foo => "bar")
-  end
-  
+
   it_should_behave_like 'a zelda base model'
   
   it "should accept attributes when being initialized" do

data/spec/zelda/omroep_spec.rb

@@ -1,10 +1,7 @@
 require 'spec_helper'
 
 describe Zelda::Omroep do
-  before do
-    @model = Zelda::Omroep.new(:foo => "bar")
-  end
-  
+
   it_should_behave_like 'a zelda base model'
 
   describe "when retrieving a list of omroepen" do

data/spec/zelda/serie_spec.rb

@@ -1,28 +1,30 @@
 require 'spec_helper'
 
 describe Zelda::Serie do
+  it_should_behave_like 'a zelda base model'
+
   describe "current series" do
     it "calls Zelda with the correct url" do
-      Zelda::Request.should_receive(:get).with("current_series").and_return({'series' => ['serie']})
+      Zelda::Request.should_receive(:get).with("current_series").and_return({'series' => [{'titel' => 'Titeuf'}]})
       Zelda::Serie.stub(:new).and_return('serie')
       Zelda::Serie.current.should == ['serie']
     end
     
     it "should return an array of series" do
-      Zelda::Request.should_receive(:get).with("series").and_return({ 'series' => ['serie'] })
-      Zelda::Serie.all.first.should be_a(Zelda::Serie)
+      Zelda::Request.should_receive(:get).with("current_series").and_return({ 'series' => [{'titel' => 'Titeuf'}] })
+      Zelda::Serie.current.first.should be_a(Zelda::Serie)
     end
   end
   
   describe "when retrieving a list of series" do
     it "should call Zelda with the correct url" do
-      Zelda::Request.should_receive(:get).with("series").and_return({ 'series' => ['serie'] })
+      Zelda::Request.should_receive(:get).with("series").and_return({ 'series' => [{'titel' => 'Titeuf'}] })
       Zelda::Serie.stub!(:new).and_return 'serie'
       Zelda::Serie.all.should == ['serie']
     end
     
     it "should return an array of series" do
-      Zelda::Request.should_receive(:get).with("series").and_return({ 'series' => ['serie'] })
+      Zelda::Request.should_receive(:get).with("series").and_return({ 'series' => [{'titel' => 'Titeuf'}] })
       Zelda::Serie.all.first.should be_a(Zelda::Serie)
     end
   end

data/spec/zelda/zender_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Zelda::Zender do
+  it_should_behave_like 'a zelda base model'
+
   describe "when retrieving a list of zenders" do
     it "should call Zelda with the correct url" do
       Zelda::Request.should_receive(:get).with("zenders")

metadata

@@ -2,7 +2,7 @@
 name: zelda
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Joost Baaij