lib/hammer_cli/apipie/options.rb in hammer_cli-0.0.4 vs lib/hammer_cli/apipie/options.rb in hammer_cli-0.0.5

@@ -6,18 +6,18 @@
     def self.included(base)
       base.extend(ClassMethods)
     end
 
     def all_method_options
-      method_options_for_params(self.class.method_doc["params"], true)
+      method_options_for_params(resource.docs_for(action)["params"], true)
     end
 
     def method_options
-      method_options_for_params(self.class.method_doc["params"], false)
+      method_options_for_params(resource.docs_for(action)["params"], false)
     end
 
-    def method_options_for_params params, include_nil=true
+    def method_options_for_params(params, include_nil=true)
       opts = {}
       params.each do |p|
         if p["expected_type"] == "hash"
           opts[p["name"]] = method_options_for_params(p["params"], include_nil)
         elsif respond_to?(p["name"], true)
@@ -30,62 +30,62 @@
       opts
     end
 
     module ClassMethods
 
-      def apipie_options options={}
+      def apipie_options(options={})
         raise "Specify apipie resource first." unless resource_defined?
 
         filter = options[:without] || []
         filter = Array(filter)
 
-        options_for_params(method_doc["params"], filter)
+        options_for_params(resource.docs_for(action)["params"], filter)
       end
 
       protected
 
-      def options_for_params params, filter
+      def options_for_params(params, filter)
         params.each do |p|
           next if filter.include? p["name"].to_s or filter.include? p["name"].to_sym
           if p["expected_type"] == "hash"
             options_for_params(p["params"], filter)
           else
             create_option p
           end
         end
       end
 
-      def create_option param
+      def create_option(param)
         option(
           option_switches(param),
           option_type(param),
           option_desc(param),
           option_opts(param),
           &option_formatter(param)
         )
       end
 
-      def option_switches param
+      def option_switches(param)
         '--' + param["name"].gsub('_', '-')
       end
 
-      def option_type param
+      def option_type(param)
         param["name"].upcase.gsub('-', '_')
       end
 
-      def option_desc param
+      def option_desc(param)
         desc = param["description"].gsub(/<\/?[^>]+?>/, "")
         return " " if desc.empty?
         return desc
       end
 
-      def option_opts param
+      def option_opts(param)
         opts = {}
         opts[:required] = true if param["required"]
         return opts
       end
 
-      def option_formatter param
+      def option_formatter(param)
         # FIXME: There is a bug in apipie, it does not produce correct expected type for Arrays
         # When it's fixed, we should test param["expected_type"] == "array"
         if param["validator"].include? "Array"
           HammerCLI::OptionFormatters.method(:list)
         end