aina 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1ee20e663d5cd2e08e1c012abeeae4ab9428d4d
-  data.tar.gz: 1cb219d075351636ad8e235e5da73d2335af8e0f
+  metadata.gz: 1f74db6cccb4e55a0dcc50e35ba247f9fc4e334d
+  data.tar.gz: abb397bd128d8c751e025497e7e58e0786f38e0d
 SHA512:
-  metadata.gz: 3bd6f9a5e6709b4e6a32d61ce166509702d1729d87b0728c9abdf290b35b6dad8bc02ea1e89c1fc0579fd59b009ba5aeef748967060b53e50d13e016acffa88b
-  data.tar.gz: eb5a6b60bd5ecfcf1721d15f89b55fa2fc77a6c72a8d3cf949232353d85e309214d71f4108dd9bf4b48c9638b58a732c0ea64032810f55eddebaab3e68c77023
+  metadata.gz: 8a49993a6a3f8b3d8f90b4f7d1f8b2424ccf6c4856f4526ddc826f51ed02dcf72f8a19d175a607f76d9b250d80e3f9e37fa11cf6fa0ab20654eaba33154d9d7e
+  data.tar.gz: 5b3f44b1c3f998457219f1f8a92c7c1b45e8fac61f638d006f751f65da8155a42f067ebd9adc405cf44e465cd138d070b8d4529a33ff4cd6278094e161003565

data/bin/aina

@@ -50,6 +50,10 @@ command [:generate, :g] do |c|
       element = Object.const_get(Generable.class_name_for @type).new(@name, options)
       unless File.exists?(element.file)
         element.generate
+        unless args.empty?
+          add = Addable.new(@name, args)
+          add.add_custom_fields
+        end
       else
         raise Exception, "A #{@type} named #{element.name} already exists. Action aborted."
       end

data/lib/aina/addable.rb

@@ -1,6 +1,8 @@
 class Addable
 	attr_accessor :name, :aina_version, :fields
 
+	VALID_TYPES = %w(text url email textarea datetime datetime-local radio checkbox select)
+
 	def initialize(name, fields = nil)
 		@type = 'post_type'
 		@name = validate_name(name)
@@ -13,8 +15,12 @@ class Addable
 		@fields = Array.new
 		fields.each do |f|
 			a = f.split(':')
-			# TODO: Validate type against a whitelist
-			@fields << {key: a[0], type: a[1]}
+			if ! a[1].nil? and VALID_TYPES.include? a[1]
+				@fields << {key: a[0], type: a[1]}
+			else
+				raise Exception, "Type was missing for #{a[0]}" if a[1].nil?
+				raise Exception, "#{a[1]} is not a valid type. Valid types are #{VALID_TYPES.join(', ')}"
+			end
 		end
 	end
 
@@ -24,7 +30,7 @@ class Addable
 			a += "'#{f[:key]}' => array(\n"
 			a += "  'label'     => '#{f[:key].capitalize}',\n"
 			a += "  'type'      => '#{f[:type]}',\n"
-			a += "  'options' 	=> array('option_1', 'option_2', 'etc'),\n" if %w(radio checkbox select).include?(f[:type])
+			a += "  'options' 	=> array( 'option_1' => __('Option One'), 'option_2' => __('Option One') ),\n" if %w(radio checkbox select).include?(f[:type])
 			a += "),\n"
 		end
 		a

data/lib/aina/version.rb

@@ -1,3 +1,3 @@
 module Aina
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aina
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Carles Jove i Buxeda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake