zelda 0.1.0 → 1.0.0

data/.gitignore

@@ -1,2 +1,2 @@
-pkg
-
+.rvmrc
+*.gem

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/CHANGELOG.md

@@ -0,0 +1,55 @@
+## 1.0.0 (Aug 11, 2011)
+
+Features:
+
+  - Added Zender - Series resource
+  - Added Zender - Current series resource
+  - Added Omroep - Current series resource
+
+## 0.1.0 (Aug 11, 2011)
+
+Bugfixes:
+
+  - Massive cruft extermination
+  - Added httparty as a gem dependency
+
+Features:
+
+  - Use Bundler for development
+  - Use RSpec for development
+
+## 0.0.9 (unreleased)
+
+Bugfixes:
+
+  - Serie now uses nebo id
+
+## 0.0.8 (Oct 7, 2009)
+
+Bugfixes:
+
+  - Serie.all and Serie.search now return arrays
+
+## 0.0.4 (Sep 1, 2009)
+
+Features:
+
+  - Added Omroep
+  - Move shared logic to abstract base class
+
+## 0.0.2 (Aug 26, 2009)
+
+Bugfixes:
+
+  - Gives proper warning when API_KEY is missing
+  
+Features:
+
+  - First gem release
+  - Added aflevering
+
+## 0.0.0 (Aug 12, 2009)
+
+Features:
+
+  - Initial version

data/Gemfile

@@ -1,4 +1,6 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in pleghm.gemspec
 gemspec
+
+gem 'httparty'
+gem 'rspec'

data/Gemfile.lock

@@ -0,0 +1,29 @@
+PATH
+  remote: .
+  specs:
+    zelda (0.1.0)
+      httparty
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    crack (0.1.8)
+    diff-lcs (1.1.2)
+    httparty (0.7.8)
+      crack (= 0.1.8)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  httparty
+  rspec
+  zelda!

data/README.rdoc

@@ -22,4 +22,19 @@ In Gemfile:
 
 Create <tt>config/initializers/zelda.rb</tt>:
 
-  Zelda::API_KEY = 'deadbeef'
+  Zelda::API_KEY = 'deadbeef'
+
+
+== DEVELOPMENT
+
+I am running the specs using RSpec 2. Use <tt>bundle install</tt> to get
+everything you need.
+
+* fork the project in github
+* clone your repo
+* create a branch
+* bundle install
+* hack away, commit early and often
+* run the specs with "rake"
+* push your branch to your fork
+* send a pull request

data/Rakefile

@@ -1 +1,7 @@
 require 'bundler/gem_tasks'
+
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new('spec')
+
+task :default => :spec

data/lib/zelda/omroep.rb

@@ -11,10 +11,18 @@ module Zelda
       end
     end
     
+    # Return all Series for this Omroep.
     def series
       Zelda::Request.get("omroepen/#{slug}/series")['omroep']['series']['serie'].map do |attrs|
         Zelda::Serie.new(attrs)
       end
     end
+    
+    # Return Series for this Omroep that have broadcasts in the future.
+    def current_series
+      Zelda::Request.get("omroepen/#{slug}/current_series")['omroep']['series']['serie'].map do |attrs|
+        Zelda::Serie.new(attrs)
+      end
+    end
   end
 end

data/lib/zelda/serie.rb

@@ -10,7 +10,7 @@ module Zelda
       end
       
       def find(id)
-        attrs = Request.get("series/#{serie_id_nebo}")['serie'] rescue nil
+        attrs = Request.get("series/#{id}")['serie'] rescue nil
         attrs ? new(attrs) : nil
       end
       
@@ -21,6 +21,14 @@ module Zelda
         end
         series
       end
+      
+      def current
+        series = []
+        Request.get("current_series")['series'].each do |attrs|
+          series << Serie.new(attrs)
+        end
+        series
+      end
     end
   
     def afleveringen(van=nil, tot=nil)

data/lib/zelda/version.rb

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

data/lib/zelda/zender.rb

@@ -18,5 +18,19 @@ module Zelda
     def code
       @attrs["zender"]["code"]
     end
+
+    # Return all Series for this Zender.
+    def series
+      Zelda::Request.get("zenders/#{id}/series")['zender']['series']['serie'].map do |attrs|
+        Zelda::Serie.new(attrs)
+      end
+    end
+
+    # Return Series for this Zender that have broadcasts in the future.
+    def current_series
+      Zelda::Request.get("zenders/#{id}/current_series")['zender']['series']['serie'].map do |attrs|
+        Zelda::Serie.new(attrs)
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,19 +1,12 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-  gem 'rspec'
-  require 'spec'
-end
+require 'rubygems'
+require 'bundler/setup'
 
-$:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'zelda'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-require 'zelda'
-
-module Zelda
-  API_KEY = '12345' unless defined?(API_KEY)
-end
+RSpec.configure do |config|
+  # some (optional) config here
+end

data/spec/support/zelda.rb

@@ -0,0 +1 @@
+Zelda::API_KEY = '12345'

data/spec/zelda/aflevering_spec.rb

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

data/spec/zelda/omroep_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Zelda::Omroep do
   before do
@@ -47,7 +47,7 @@ describe Zelda::Omroep do
     end
   end
   
-  describe "when retrieving the series for an omroep" do
+  describe "series" do
     before(:each) do
       @omroep = Zelda::Omroep.new('slug' => 'kro')
       
@@ -67,4 +67,25 @@ describe Zelda::Omroep do
       find_series.first.should be_a(Zelda::Serie)
     end
   end
+  
+  describe "current series" do
+    before(:each) do
+      @omroep = Zelda::Omroep.new('slug' => 'kro')
+      
+      Zelda::Request.stub!(:get).and_return('omroep' => {'series' => {'serie' => [{'foo' => 'bar'}]}})
+    end
+    
+    def find_series
+      @omroep.current_series
+    end
+    
+    it "should call Zelda with the correct url" do
+      Zelda::Request.should_receive(:get).with("omroepen/kro/current_series")
+      find_series
+    end
+    
+    it "should return an array of series" do
+      find_series.first.should be_a(Zelda::Serie)
+    end
+  end
 end

data/spec/zelda/request_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Zelda::Request do
   it "should call HTTParty" do

data/spec/zelda/serie_spec.rb

@@ -1,6 +1,19 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Zelda::Serie do
+  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::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)
+    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'] })

data/spec/zelda/zender_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe Zelda::Zender do
   describe "when retrieving a list of zenders" do
@@ -36,4 +36,46 @@ describe Zelda::Zender do
       find_zender.name.should == "Nederland 1"
     end
   end
+
+  describe "series" do
+    before(:each) do
+      @zender = Zelda::Zender.new('id' => '1')
+      
+      Zelda::Request.stub!(:get).and_return('zender' => {'series' => {'serie' => [{'foo' => 'bar'}]}})
+    end
+    
+    def find_series
+      @zender.series
+    end
+    
+    it "should call Zelda with the correct url" do
+      Zelda::Request.should_receive(:get).with("zenders/1/series")
+      find_series
+    end
+    
+    it "should return an array of series" do
+      find_series.first.should be_a(Zelda::Serie)
+    end
+  end
+
+  describe "current series" do
+    before(:each) do
+      @zender = Zelda::Zender.new('id' => '1')
+      
+      Zelda::Request.stub!(:get).and_return('zender' => {'series' => {'serie' => [{'foo' => 'bar'}]}})
+    end
+    
+    def find_series
+      @zender.current_series
+    end
+    
+    it "should call Zelda with the correct url" do
+      Zelda::Request.should_receive(:get).with("zenders/1/current_series")
+      find_series
+    end
+    
+    it "should return an array of series" do
+      find_series.first.should be_a(Zelda::Serie)
+    end
+  end
 end

data/zelda.gemspec

@@ -17,4 +17,6 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  
+  s.add_dependency 'httparty'
 end

metadata

@@ -2,7 +2,7 @@
 name: zelda
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Joost Baaij
@@ -12,8 +12,18 @@ cert_chain: []
 
 date: 2011-08-11 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: httparty
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
 description: If you don't know what this is, you probably don't need it
 email: 
 - joost@spacebabies.nl
@@ -25,7 +35,10 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .rspec
+- CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - lib/zelda.rb
@@ -39,12 +52,12 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
+- spec/support/zelda.rb
 - spec/zelda/aflevering_spec.rb
 - spec/zelda/omroep_spec.rb
 - spec/zelda/request_spec.rb
 - spec/zelda/serie_spec.rb
 - spec/zelda/zender_spec.rb
-- spec/zelda_spec.rb
 - zelda.gemspec
 has_rdoc: true
 homepage: https://github.com/tilsammans/zelda
@@ -78,9 +91,9 @@ test_files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/shared_examples.rb
+- spec/support/zelda.rb
 - spec/zelda/aflevering_spec.rb
 - spec/zelda/omroep_spec.rb
 - spec/zelda/request_spec.rb
 - spec/zelda/serie_spec.rb
 - spec/zelda/zender_spec.rb
-- spec/zelda_spec.rb

data/spec/zelda_spec.rb

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