brief 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b51f1b01a40cf21a7cbe99d0c90bf6275ccacb3
-  data.tar.gz: df60ebe9cb374863ecd6b3c7df5f066c08e32910
+  metadata.gz: f76fe6d3f07ffe657ecf1457f3b3895a882b5e7c
+  data.tar.gz: 7721891fd080e174065958f0112757506c31fe1c
 SHA512:
-  metadata.gz: cef0b7d00b3c7fd405f6bcc3fce826078eb9889d18993e826844e5bfa7ed9caf26933f35fb243703eabc1958a16d398dca723682d40055d9b29e971a3e3a2486
-  data.tar.gz: 6aeb9e3cb3f3dd1bdc7ca24d4a956bd18d24ffe0bd5012bd6ad275df99d4f977dc34867b89ff420cc1d116e427859f8a01c1cc5f69c9ea2dbce6dfe8439b4c31
+  metadata.gz: 64c0b59e9917dec20b4affbe230e358418af652b47b16a8ca56f5789c2b44463291883e08ca60c9ff6db12f05f7aad24c84f4063764ea7c5d79ba99efb415eaf
+  data.tar.gz: 677548043e04af7deddf8a30211b939101265587620a280c5987351c8728311091c41274c1203419029013f670a42b73b646fa2e2ed454953e9299a48e4f3891

data/lib/brief/dsl.rb

@@ -7,9 +7,28 @@ module Brief
     end
 
     def define(*args, &block)
-      definition = Brief::Model::Definition.new(args.first, args.extract_options!)
-      definition.instance_eval(&block) if block_given?
-      definition.validate!
+      options     = args.dup.extract_options!
+      name        = args.first
+      type_alias  = options.fetch(:type_alias) { name.downcase.parameterize.gsub(/-/, '_') }
+
+      namespace = Brief.configuration.model_namespace || Brief::Model
+
+      klass = namespace.const_get(type_alias.camelize) rescue nil
+
+      if klass
+        # raise class already defined
+      end
+
+      klass ||= namespace.const_set(type_alias.camelize, Class.new).tap do |k|
+        k.send(:include, Brief::Model)
+        k.definition ||= Brief::Model::Definition.new(args.first, args.extract_options!)
+        k.name ||= name
+        k.type_alias ||= type_alias
+        Brief::Model.classes << k
+      end
+
+      klass.definition.instance_eval(&block) if block_given?
+      klass.definition.validate!
     end
 
     # defines a method on the model instance named after the identifier

data/lib/brief/model/definition.rb

@@ -6,6 +6,7 @@ module Brief
                   :content_schema,
                   :options,
                   :defined_helpers,
+                  :defined_actions,
                   :section_mappings,
                   :template_body,
                   :example_body
@@ -25,20 +26,7 @@ module Brief
     end
 
     def validate!
-      definition = self
-
       if valid?
-        create_model_class.tap do |k|
-          k.send(:include, Brief::Model)
-
-          k.definition ||= definition
-
-          k.name ||= name
-          k.type_alias ||= type_alias
-
-          Brief::Model.classes << k
-        end
-
         apply_config
       end
     end
@@ -56,16 +44,13 @@ module Brief
       end
 
       # defined helpers adds an anonymous module include
-      Array(defined_helpers).each { |mod| model_class.send(:include, mod) }
+      Array(self.defined_helpers).each { |mod| model_class.send(:include, mod) }
 
-      model_class.defined_actions += Array(defined_actions)
       true
     end
 
-    def create_model_class
-      unless (model_namespace.const_get(type_alias.camelize) rescue nil)
-        model_namespace.const_set(type_alias.camelize, Class.new)
-      end
+    def defined_helper_methods
+      defined_helpers.map(&:instance_methods).flatten
     end
 
     def model_class
@@ -103,24 +88,27 @@ module Brief
     end
 
     def has_actions?
-      !@defined_actions.empty?
+      self.defined_actions.empty?
     end
 
     def actions(&block)
-      helpers(&block)
-    end
-
-    def defined_actions
-      Array(defined_helpers).map(&:instance_methods).flatten
+      self.defined_actions ||= []
+      helpers(true, &block)
     end
 
-    def helpers(&block)
+    def helpers(include_in_command_list=false, &block)
       self.defined_helpers ||= []
 
       if block
         mod = Module.new
         mod.module_eval(&block)
 
+        if include_in_command_list
+          self.defined_actions ||= []
+          self.defined_actions += mod.instance_methods
+          self.defined_actions.uniq!
+        end
+
         self.defined_helpers << mod
       end
     end

data/lib/brief/model.rb

@@ -13,10 +13,9 @@ module Brief
       include AccessorMethods
       include Persistence
 
-      class_attribute :models, :after_initialization_hooks, :defined_actions
+      class_attribute :models, :after_initialization_hooks
 
       self.models = Array(models).to_set
-      self.defined_actions = Array(defined_actions).to_set
 
       class << self
         include Enumerable
@@ -94,6 +93,10 @@ module Brief
         definition.has_actions?
       end
 
+      def defined_actions
+        definition.defined_actions ||= []
+      end
+
       def finalize
         klass = self
 
@@ -182,6 +185,8 @@ module Brief
         if %w(meta content template example actions helpers).include?(meth.to_s)
           definition.send(meth, *args, &block)
           finalize
+        elsif %w(defined_helper_methods defined_actions).include?(meth.to_s)
+          definition.send(meth)
         elsif meth.to_s.match(/^on_(.*)_change$/)
           create_change_handler(Regexp.last_match[1], *args, &block)
         else

data/lib/brief/version.rb

@@ -1,3 +1,3 @@
 module Brief
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/spec/lib/brief/dsl_spec.rb

@@ -7,4 +7,13 @@ describe "The Configuration DSL" do
   it "can create methods on our models" do
     expect(briefcase.user_stories.first.defined_helper_method).to eq(true)
   end
+
+  it "treats actions as available commands" do
+    expect(Brief::Epic.defined_actions).to include(:custom_action)
+  end
+
+  it "doesnt treat helpers as available commands" do
+    expect(Brief::Epic.defined_helper_methods).to include(:user_stories)
+    expect(Brief::Epic.defined_actions).not_to include(:user_stories)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brief
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Jonathan Soeder