zelda 1.1.1 → 1.2.0

data/CHANGELOG.md

@@ -1,9 +1,15 @@
-## 1.1.1 (Aug 15, 2011)
+## 1.2.0 (Aug 15, 2011)
 
 Bugfixes:
 
   - Fix the response hash key, since it is named after the resource
-  
+  - Zender find works using the code field, not the id.
+  - Replaced method_missing with define_method.
+
+Features:
+
+  - Now tested with Travis
+
 
 ## 1.1.0 (Aug 11, 2011)
 

data/Gemfile

@@ -2,5 +2,6 @@ source "http://rubygems.org"
 
 gemspec
 
+gem 'rake'
 gem 'httparty'
-gem 'rspec'
+gem 'rspec'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zelda (1.1.0)
+    zelda (1.2.0)
       httparty
 
 GEM
@@ -11,6 +11,7 @@ GEM
     diff-lcs (1.1.2)
     httparty (0.7.8)
       crack (= 0.1.8)
+    rake (0.9.2)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -25,5 +26,6 @@ PLATFORMS
 
 DEPENDENCIES
   httparty
+  rake
   rspec
   zelda!

data/lib/zelda/base.rb

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

data/lib/zelda/omroep.rb

@@ -1,11 +1,13 @@
 module Zelda
   class Omroep < Zelda::Base
     class << self
+      # Find an omroep by slug, such as +kro+.
       def find(slug)
         attrs = Request.get("omroepen/#{slug}")['omroep'] rescue nil
         attrs ? new(attrs) : nil
       end
       
+      # Find all omroepen.
       def all
         Request.get("omroepen")['omroepen']
       end

data/lib/zelda/version.rb

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

data/lib/zelda/zender.rb

@@ -1,24 +1,18 @@
 module Zelda
   class Zender < Zelda::Base
     class << self
-      def find(id)
-        attrs = Request.get("zenders/#{id}")
+      # Find a Zender by code, such as +NL1+ or +101+.
+      def find(code)
+        attrs = Request.get("zenders/#{code}")['zender'] rescue nil
         attrs ? new(attrs) : nil
       end
       
+      # Find all Zenders.
       def all
-        Request.get("zenders")
+        Request.get("zenders")['zenders']
       end
     end
     
-    def name
-      attributes[:zender]["name"]
-    end
-  
-    def code
-      attributes[:zender]["code"]
-    end
-
     # Return all Series for this Zender.
     def series
       Zelda::Request.get("zenders/#{id}/series")['zender']['series']['serie'].map do |attrs|

data/spec/zelda/omroep_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Zelda::Omroep do
-
   it_should_behave_like 'a zelda base model'
 
   describe "when retrieving a list of omroepen" do

data/spec/zelda/zender_spec.rb

@@ -5,23 +5,23 @@ describe Zelda::Zender do
 
   describe "when retrieving a list of zenders" do
     it "should call Zelda with the correct url" do
-      Zelda::Request.should_receive(:get).with("zenders")
-      Zelda::Zender.all
+      Zelda::Request.should_receive(:get).with("zenders").and_return('zenders' => ['zender'])
+      Zelda::Zender.all.should == ['zender']
     end
   end
   
   describe "when retrieving a specific zender" do
     before(:each) do
       zender_attrs = { "zender" => {"code" => "NL1", "name" => "Nederland 1"} }
-      Zelda::Request.stub!(:get).with("zenders/1").and_return zender_attrs
+      Zelda::Request.stub!(:get).with("zenders/NL1").and_return zender_attrs
     end
     
     def find_zender
-      Zelda::Zender.find(1)
+      Zelda::Zender.find('NL1')
     end
     
     it "should call Zelda with the correct url" do
-      Zelda::Request.should_receive(:get).with("zenders/1")
+      Zelda::Request.should_receive(:get).with("zenders/NL1")
       find_zender
     end
     

metadata

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