yampla 0.0.2 → 0.0.3

data/bin/yampla

@@ -25,8 +25,8 @@ class OptionParser
         EOS
 
       opt :yaml, "Set data YAML file", :type => :string
-      opt :index, "Set index template file", :default => "index_template.html"
-      opt :item, "Set item template file", :default => "item_template.html"
+      opt :index, "Set index template file", :type => :string
+      opt :item, "Set item template file", :type => :string
       opt :out, "Output files", :default => 'all' # :index or :items
       opt :dir, "Output directory", :default => 'out'
     end
@@ -37,21 +37,25 @@ opts = OptionParser.parse!
 files = Dir['*']
 
 yaml = opts[:yaml] || files.detect { |f| f.match /\w+\.(yaml|yml)$/ }
+abort "YAML file not found." unless yaml
 
-abort "YAML file not found" unless yaml
+index = opts[:index] || files.detect { |f| f.match /^index_template/ }
+item = opts[:item] || files.detect { |f| f.match /^item_template/ }
 
 ya = Yampla::Build.new(yaml)
-ya.set_template(:index, opts[:index])
-ya.set_template(:items, opts[:item])
 
-case opts[:out]
-when 'all'
+case 
+when [index, item].all? && opts[:out] == 'all'
+  ya.set_template(:index, index)
+  ya.set_template(:items, item)
   ya.save(:index, dir:opts[:dir])
   ya.save(:items, dir:opts[:dir])
-when 'index'
+when index && %w(all index).include?(opts[:out])
+  ya.set_template(:index, index)
   ya.save(:index, dir:opts[:dir])
-when 'items'
+when item && %w(all item).include?(opts[:out])
+  ya.set_template(:items, item)
   ya.save(:items, dir:opts[:dir])
 else
-  STDERR.puts "'out' option is wrong. 'all', 'index', 'items' are acceptable."
+  abort "Any template file not found."
 end

data/lib/yampla/build.rb

@@ -3,6 +3,7 @@ require "hashie"
 require "liquid"
 
 class Yampla::Build
+  class TemplateError < StandardError; end
   attr_reader :data
   def initialize(yaml)
     @template = {}
@@ -30,10 +31,12 @@ class Yampla::Build
   end
 
   def build_index(template, name=nil)
+    raise TemplateError, 'Template for index not set.' unless template
     Liquid::Template.parse(template).render("#{name || 'items'}" => @data)
   end
 
   def build_items(template, name=nil)
+    raise TemplateError, 'Template for items not set.' unless template
     @data.each_with_object({}) do |item, h|
       h[item.id] = Liquid::Template.parse(template).render("#{name || 'item'}" => item)
     end

data/lib/yampla/version.rb

@@ -1,3 +1,3 @@
 module Yampla
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/build_spec.rb

@@ -61,7 +61,9 @@ describe Yampla::Build do
     context "for index" do
       context "w/o template" do
         subject { Yampla::Build.new(@yml).run(:index) }
-        it { should eq "" }
+        it "raise no template error" do
+          expect { should }.to raise_error(Yampla::Build::TemplateError)
+        end
       end
       context "w/ simple template" do
         subject { Yampla::Build.new(@yml).run(:index, template:~<<-EOS) }
@@ -93,7 +95,9 @@ describe Yampla::Build do
     context "for each item" do
       context "w/o template" do
         subject { Yampla::Build.new(@yml).run(:items) }
-        it { should == {'item1' => "", 'item2' => ""} }
+        it "raise no template error" do
+          expect { should }.to raise_error(Yampla::Build::TemplateError)
+        end
       end
       context "w/ simple template" do
         subject { Yampla::Build.new(@yml).run(:items, template:~<<-EOS) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yampla
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: