Merge remote-tracking branch 'origin/master'

Conflicts:
	models/audioformat.rb
	models/show.rb

.ruby-version

@@ -1 +1 @@
-2.0.0-p195
+2.0.0-p247

Gemfile

@@ -6,7 +6,7 @@ gem 'sinatra', :require => 'sinatra/base'
 gem 'sinatra-assetpack', :require => 'sinatra/assetpack'
 gem 'sinatra-contrib'
 gem 'puma'
-gem 'json'
+gem 'settingslogic'
 
 # Templating
 gem 'redcarpet'
@@ -16,20 +16,25 @@ gem 'therubyracer'
 gem 'builder'
 
 # Data
-gem 'scrivener'
-
-# Queue
-gem 'sidekiq'
-gem 'redis'
+gem 'mlk', :git => 'https://github.com/pfleidi/mlk.git'
 
 # Mail
 gem 'pony'
 
 # Debugging
 group :development, :test do
+  gem 'rake'
   gem 'pry'
-  gem 'pry-debugger'
+  gem 'pry-byebug'
   gem 'mocha'
   gem 'shotgun'
   gem 'w3c_validators'
 end
+
+# Localisation
+
+gem 'i18n'
+
+# CLI
+
+gem 'thor'

Gemfile.lock

@@ -1,94 +1,91 @@
+GIT
+  remote: https://github.com/pfleidi/mlk.git
+  revision: 1117bae620dc114a3839d897758f7177686fc56e
+  specs:
+    mlk (0.0.1)
+      scrivener
+
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (3.3.1)
+    backports (3.3.5)
     builder (3.2.2)
-    celluloid (0.14.1)
-      timers (>= 1.0.0)
+    byebug (2.3.1)
+      columnize (~> 0.3.6)
+      debugger-linecache (~> 1.2.0)
     coderay (1.0.9)
     columnize (0.3.6)
-    commonjs (0.2.6)
-    connection_pool (1.1.0)
-    debugger (1.6.0)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.1)
+    commonjs (0.2.7)
     debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.2)
-    eventmachine (1.0.3)
+    i18n (0.6.5)
     jsmin (1.0.1)
-    json (1.8.0)
-    less (2.3.2)
-      commonjs (~> 0.2.6)
-    libv8 (3.11.8.17)
+    json (1.8.1)
+    less (2.4.0)
+      commonjs (~> 0.2.7)
+    libv8 (3.16.14.3)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    method_source (0.8.1)
-    mime-types (1.23)
+    method_source (0.8.2)
+    mime-types (1.25)
+    mini_portile (0.5.2)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    nokogiri (1.5.10)
+    multi_json (1.8.2)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     polyglot (0.3.3)
-    pony (1.4.1)
-      mail (> 2.0)
+    pony (1.5.1)
+      mail (>= 2.0)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
-      pry (~> 0.9.10)
-    puma (2.0.1)
+    pry-byebug (1.2.0)
+      byebug (~> 2.2)
+      pry (~> 0.9.12)
+    puma (2.6.0)
       rack (>= 1.1, < 2.0)
     rack (1.5.2)
-    rack-protection (1.5.0)
+    rack-protection (1.5.1)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    redcarpet (2.3.0)
-    redis (3.0.4)
-    redis-namespace (1.3.0)
-      redis (~> 3.0.0)
+    rake (10.1.0)
+    redcarpet (3.0.0)
     ref (1.0.5)
     scrivener (0.2.0)
+    settingslogic (2.0.9)
     shotgun (0.9)
       rack (>= 1.0)
-    sidekiq (2.12.1)
-      celluloid (>= 0.14.1)
-      connection_pool (>= 1.0.0)
-      json
-      redis (>= 3.0)
-      redis-namespace
-    sinatra (1.4.3)
+    sinatra (1.4.4)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sinatra-assetpack (0.2.3)
-      backports
+    sinatra-assetpack (0.3.1)
       jsmin
       rack-test
       sinatra
       tilt (>= 1.3.0)
-    sinatra-contrib (1.4.0)
+    sinatra-contrib (1.4.1)
       backports (>= 2.0)
-      eventmachine
+      multi_json
       rack-protection
       rack-test
-      sinatra (~> 1.4.2)
+      sinatra (~> 1.4.0)
       tilt (~> 1.3)
-    slim (2.0.0)
-      temple (~> 0.6.5)
-      tilt (~> 1.3, >= 1.3.3)
-    slop (3.4.5)
-    temple (0.6.5)
-    therubyracer (0.11.4)
-      libv8 (~> 3.11.8.12)
+    slim (2.0.2)
+      temple (~> 0.6.6)
+      tilt (>= 1.3.3, < 2.1)
+    slop (3.4.6)
+    temple (0.6.7)
+    therubyracer (0.12.0)
+      libv8 (~> 3.16.14.0)
       ref
+    thor (0.18.1)
     tilt (1.4.1)
-    timers (1.1.0)
-    treetop (1.4.14)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
     w3c_validators (1.2)
@@ -100,22 +97,23 @@ PLATFORMS
 
 DEPENDENCIES
   builder
-  json
+  i18n
   less
+  mlk!
   mocha
   pony
   pry
-  pry-debugger
+  pry-byebug
   puma
   rack
+  rake
   redcarpet
-  redis
-  scrivener
+  settingslogic
   shotgun
-  sidekiq
   sinatra
   sinatra-assetpack
   sinatra-contrib
   slim
   therubyracer
+  thor
   w3c_validators

Rakefile

@@ -1,17 +1,18 @@
 require 'rake/testtask'
 
-require_relative 'lib/podding'
-require_relative 'models/init'
-
-source_dir = File.dirname(__FILE__) + '/source'
-FileStorage.base_path = source_dir
-Model.storage_engine = FileStorage
-
 # Model stuff
 
 desc 'Validate all entries of all models'
 task :model_validate do
-  Model.defined_models.each do |model|
+  require 'mlk'
+  require 'mlk/storage_engines/file_storage'
+  require_relative 'lib/podding'
+  require_relative 'models/init'
+
+  source_dir = File.dirname(__FILE__) + '/source'
+  Mlk::FileStorage.base_path = source_dir
+  Mlk::Model.storage_engine = Mlk::FileStorage
+  Mlk::Model.defined_models.each do |model|
     model.all.each do |entry|
       unless entry.valid?
         puts "Found invalid data in #{ model.name }: #{ entry.path } (#{ entry.errors.inspect })"
@@ -24,14 +25,21 @@ end
 
 # Tests
 
+desc 'Execute all the tests'
+task :test do
+  Rake::Task["unit"].invoke
+  Rake::Task["integration"].invoke
+end
+
 Rake::TestTask.new do |t|
-  t.name = 'test'
-  t.pattern = 'test/integration/**/test_*.rb'
+  t.name = 'integration'
+  t.pattern = 'spec/integration/**/test_*.rb'
   t.verbose = true
 end
 
 Rake::TestTask.new do |t|
-  t.name = 'spec'
-  t.pattern = 'test/spec/**/test_*.rb'
+  t.name = 'unit'
+  t.pattern = 'spec/unit/**/test_*.rb'
   t.verbose = true
 end
+

app.rb

@@ -16,6 +16,10 @@
 require 'net/http'
 require 'net/https'
 require 'json'
+require 'i18n'
+
+require 'mlk'
+require 'mlk/storage_engines/file_storage'
 
 require_relative 'lib/podding'
 
@@ -33,16 +37,16 @@ class Podding < Sinatra::Base
   set :public_folder, source_dir + '/assets'
   set :views, source_dir + '/templates'
 
-  FileStorage.base_path = source_dir
-  Model.storage_engine = FileStorage
+  Mlk::FileStorage.base_path = source_dir
+  Mlk::Model.storage_engine = Mlk::FileStorage
 
   configure :production do
     # ...
   end
 
   configure :development do
     require 'pry'
-    require 'pry-debugger'
+    require 'pry-byebug'
   end
 
   helpers do
@@ -53,13 +57,23 @@ class Podding < Sinatra::Base
   require_relative 'controllers/init'
   require_relative 'models/init'
   require_relative 'helpers/init'
+  require_relative 'filters/init'
 
   Less.paths << source_dir + "/css"
 
   assets do
-    serve '/js',     from: 'source/js'
+    # serve '/js',     from: 'source/javascript'
     serve '/css',    from: 'source/css'
-    serve '/images', from: 'source/images'
+    serve '/images', from: 'source/assets/images'
+  end
+
+  # Configure localisation
+
+  I18n.load_path += Dir[File.join(source_dir, 'locales', '*.yml').to_s]
+  if Settings["language"]
+    I18n.locale = Settings.language
+  else
+    I18n.locale = "en"
   end
 
   # Load all helpers

controllers/archive.rb

@@ -5,7 +5,7 @@ class Podding < Sinatra::Base
   get "/archive" do
     @page = Page.first(name: "archive")
 
-    # workaround until the finding engine is properly implemented
+    # TODO: Use real finding engine
     all_episodes = Episode.all
     episodes = []
     for episode in all_episodes
@@ -14,9 +14,8 @@ class Podding < Sinatra::Base
       end
     end
 
-    episodes.sort!{ |first, second| first.date <=> second.date }.reverse! # sort newest episodes first
-    @episodes = episodes.group_by{ |episode| episode.date.year } # group them in a hash by year
-
+    episodes.sort!{ |first, second| first.date <=> second.date }.reverse!
+    @episodes = episodes.group_by{ |episode| episode.date.year }
 
     slim :archive
 

controllers/feed.rb

@@ -1,17 +1,27 @@
 #encoding: utf-8
 
 class Podding < Sinatra::Base
-  get "/feed/:show_name/:audio_format/feed.xml" do |show_name, audio_format|
-    @episodes = Episode.find_match(show: show_name)
+  get "/feed/:show_name/:audio_format/feed" do |show_name, audio_format|
+    @episodes = []
+    Episode.all.each do |episode|
+      @episodes << episode if episode.audioformats.include?(audio_format) and episode.show.name == show_name
+    end
     @show = Show.first(name: show_name)
-    @audio_format = audio_format
-    builder :atom
+    @audioformat = Audioformat.first(name: audio_format)
+    builder :rss
   end
 
-  get "/feed/:audio_format/feed.xml" do |audio_format|
-    @episodes = Episode.find_match(:audioformats => audio_format)
-    @audio_format = audio_format
+  get "/feed/:audio_format/feed" do |audio_format|
+    @episodes = []
+    Episode.all.each do |episode|
+      @episodes << episode if episode.audioformats.include?(audio_format)
+    end
+    @audioformat = Audioformat.first(name: audio_format)
     @episodes.inspect.to_s
-    builder :atom
+    builder :rss
   end
-end
+
+  get "feed/itunes" do
+    redirect "feed/aac/feed"
+  end
+end