compendium 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDMzZWY3N2Y4MWU5MGUxODg2YzFjZWY2ZDgzNzE0ZTU0MmNkN2IyYw==
+    Y2ExNjQ1Y2U2ZjhiZTQ4ZDg4NjI1MmU5NmYxODFmNDYzMDI2MzI0Yw==
   data.tar.gz: !binary |-
-    ZDBjNTEwN2NjNGNlZWIxMzhiMWQ5MGRmMzg0NmY4NGQyNTlhYTAwNA==
+    OTFhMGQ1Y2U0ZGE5YzM4YWQ0NDg3ODlmZDgwYjU3YmFiYjY0MmNjNA==
 SHA512:
   metadata.gz: !binary |-
-    MDQ1M2YwZDVjMWEyN2M2NjM4ZDYxOGY4ZTEwOTQ0M2Y0MWIzM2UxNDM2MGVm
-    YzIwMDFkYzM1ZjliNDUxMjBjNzQxNDkyMTIzYzlhNWQyNjViYTMwYmRhYmUy
-    ODBiODRhZjRkOGQ0MWVjNDdiNjE4MmE3MjM2OGNkNDZlZTE0NDk=
+    YzExMTE2ZjI3ZmZiZGM0OTgyMjQ5NWRmN2I4M2U3YTU1ZTI5OTlkZDhlZGJk
+    Y2Y5YTRmYWI2ZGRlM2JiYTY1MWIxNGNlZDMwZDNmMGRlNGZmZmU5MjNjNjU3
+    OGJkYTQ3MWRmMzQxZWEyNGY2NTcwMTZjNDhlYzgwNzJmN2UwMzc=
   data.tar.gz: !binary |-
-    NjIzZGIwNWY1NTU3MzViOTU5Njc3MzFiNTdiYzdhZWViYjIwOGVlYzZmMDhm
-    NWI5NzkwNDJjYTUzYjIwNDg4ZjZkZDJhYzE5MDE0ZGQyM2U0Y2JlMGIzNThk
-    ODY0NDFkY2NhMDg1MWZkYmU3MjlmNjdhMzIxZWUzYWFjNjIyMzU=
+    NGNmMWQ3YzllM2E2MDBjZTY3MWI3YTEzZTY3NGRkNDA5MzdjNzk5Y2U5MjRm
+    MWM2OWZiZGJjZjljNjc1NWIzYTcxODBmMDk2NWRkNTc1NmM5NmJmZmVhMzEx
+    YzQyNDE0Nzk2MWNjM2U0MzY4NjdjZjdlOTgyYWE3NmU2Y2VmNDI=

data/app/classes/compendium/presenters/option.rb

@@ -48,15 +48,15 @@ module Compendium::Presenters
           out << date_field(form)
 
         when :dropdown
-          raise ArgumentError, MISSING_CHOICES_ERROR unless option.choices?
+          raise ArgumentError, MISSING_CHOICES_ERROR unless option.choices
 
-          options = option.choices
-          options = ctx.instance_exec(&options) if options.respond_to?(:call)
-          out << dropdown(form, options)
+          choices = option.choices
+          choices = ctx.instance_exec(&choices) if choices.respond_to?(:call)
+          out << dropdown(form, choices, option.options)
 
         when :boolean, :radio
           choices = if option.radio?
-            raise ArgumentError, MISSING_CHOICES_ERROR unless option.choices?
+            raise ArgumentError, MISSING_CHOICES_ERROR unless option.choices
             option.choices
           else
             %w(true false)
@@ -80,9 +80,9 @@ module Compendium::Presenters
       end
     end
 
-    def dropdown(form, choices = {})
+    def dropdown(form, choices = {}, options = {})
       content_tag('div', class: 'option-dropdown') do
-        form.select option.name, choices
+        form.select option.name, choices, options.symbolize_keys
       end
     end
 

data/app/classes/compendium/presenters/settings/table.rb

@@ -7,8 +7,16 @@ module Compendium::Presenters::Settings
       @headings = Hash[headings.zip(headings)].with_indifferent_access
     end
 
-    def override_heading(col, label)
-      @headings[col] = label
+    def override_heading(*args, &block)
+      if block_given?
+        @headings.each do |key, val|
+          res = yield val
+          @headings[key] = res if res
+        end
+      else
+        col, label = args
+        @headings[col] = label
+      end
     end
 
     def format(column, &block)

data/app/controllers/compendium/reports_controller.rb

@@ -1,12 +1,13 @@
 module Compendium
   class ReportsController < ::ApplicationController
     helper Compendium::ReportsHelper
+    include Compendium::ReportsHelper
 
     before_filter :find_report
     before_filter :run_report, only: :run
 
     def setup
-      render locals: { report: setup_report, prefix: @prefix }
+      render_setup
     end
 
     def run
@@ -14,7 +15,7 @@ module Compendium
       render action: template, locals: { report: @report }
     end
 
-    private
+  private
 
     def find_report
       @prefix = params[:report_name]
@@ -29,6 +30,11 @@ module Compendium
       end
     end
 
+    def render_setup(opts = {})
+      locals = { report: setup_report, prefix: @prefix }
+      render_if_exists(opts.merge(locals: locals)) || render(locals: locals)
+    end
+
     def setup_report
       @report_class.new(params[:report] || {})
     end

data/app/helpers/compendium/reports_helper.rb

@@ -14,7 +14,7 @@ module Compendium
 
     def render_if_exists(options = {})
       if lookup_context.template_exists?(options[:partial] || options[:template], options[:path], options.key?(:partial))
-        render options
+        render(options)
       end
     end
   end

data/lib/compendium/option.rb

@@ -5,7 +5,7 @@ require 'active_support/core_ext/module/delegation'
 
 module Compendium
   class Option
-    attr_reader :name, :type, :default, :options
+    attr_reader :name, :type, :default, :choices, :options
 
     delegate :boolean?, :date?, :dropdown?, :radio?, :text?, to: :type
     delegate :merge, :merge!, :[], to: :@options
@@ -15,6 +15,7 @@ module Compendium
 
       @name = hash.delete(:name).to_sym
       @default = hash.delete(:default)
+      @choices = hash.delete(:choices)
       self.type = hash.delete(:type)
       @options = hash.with_indifferent_access
     end

data/lib/compendium/params.rb

@@ -20,7 +20,7 @@ module Compendium
       options.each do |option_name, metadata|
         begin
           klass = "Compendium::#{"#{metadata.type}Param".classify}".constantize
-          params[option_name] = klass.new(get_default_value(params[option_name], metadata.default), metadata[:choices])
+          params[option_name] = klass.new(get_default_value(params[option_name], metadata.default), metadata.choices)
         rescue IndexError
           raise IndexError, "invalid index for #{option_name}"
         end

data/lib/compendium/version.rb

@@ -1,3 +1,3 @@
 module Compendium
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compendium
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Daniel Vandersluis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime