less_interactions 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34aa2f840ecab85c20a3a6a75f1758bc3734eb5e
-  data.tar.gz: 23a353b9e6d5441145c9efc4509cde3d9c1293c3
+  metadata.gz: 80d11c1484566f3f643bb2825130f84eceff5ecf
+  data.tar.gz: 330847040474b05548a2e6c52a42365d5d30bc2d
 SHA512:
-  metadata.gz: f9eca2a62694b726972bfcba44bcdd781117001e7a60080ba7c578ba2c50cdc98fba76034f30fec035546caa40c6eae6761be6634ac31a5dde14b692c1b67e88
-  data.tar.gz: 70780de5e069055e1f326db722efb00fda2573b5fbe35d7780bab70ff80e17e55bfadc66baa100a0863b90c9c474b7b4405ab99a6013438ffbb79e5c6148d037
+  metadata.gz: 2c61d1c2d65b49fa9a7cd3b0383f7adec2ba90bedb68f69126fb9b261ab426f613052e6cca9a18c76b92dbb5ec59d26d411f38b0762ff711f953ff2d223b4b58
+  data.tar.gz: 01ddf8061f5eeed178d44e30e174f9cd1654a50179d32a70fb610d21e82d16ae838ba2010afbcb7c2003352dd524b72fd6ffb731299e3a4c8cea649e9157887b

data/README.rdoc

@@ -19,7 +19,7 @@ Rails is great, but if you build a rails app of any size you start running into
 * What are all the side effects of calling this method?
 
 
-== Dear jesus and baby jesus, what do I do?!
+== What do I do?!
 
 Less::Interactions are a place to put all of your business logic and still get all the rails goodness you love.
 
@@ -79,6 +79,8 @@ After:
     expects :some_other_thing_the_interaction_needs, allow_nil: true
     expects :business
     expects :user
+    #only one of these is required
+    expects_any :need_this, :or, :this
 
     # method chain in use case is easy to see.
     def run

data/less_interactions.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less_interactions}
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eugen Minciu", "Steven Bristol"]

data/lib/less_interactions/interaction.rb

@@ -18,6 +18,8 @@ module Less
       n.each do |name, val|
         nils[name] = nil
       end
+      self.class.any_expectations.flatten.each {|e| nils[e] = nil}
+
       nils.merge(options).each do |name, value|
         instance_variable_set "@#{name}", value
         if respond_to?( "#{name}=" ) && !value.nil?
@@ -32,7 +34,7 @@ module Less
     #
     # The default implementation raises an {InvalidInteractionError}
     def run
-      raise InvalidInteractionError, "You most override the run instance method in #{self.class}"
+      raise InvalidInteractionError, "You must override the run instance method in #{self.class}"
     end
 
     def init
@@ -46,7 +48,7 @@ module Less
     def self.run(context = {}, options = {})
       me = new(context, options)
       me.init
-      raise MissingParameterError unless me.send :expectations_met?
+      me.send :expectations_met?
       me.run
     end
 
@@ -64,27 +66,61 @@ module Less
       else
         options = {}
       end
-      parameters.each do |param|
-        methods = (self.instance_methods + self.private_instance_methods)
-        self.send(:attr_reader, param.to_sym) unless methods.member?(param.to_sym)
-        add_expectation(param, options)
+      __setup_expecations parameters do |parameter|
+        add_expectation(parameter, options)
+      end
+    end
+
+    def self.expects_any *parameters
+      __setup_expecations parameters do |parameter|
       end
+      add_any_expectation(parameters)
     end
 
 
 
     private
 
+    def self.__setup_expecations parameters
+      parameters.each do |param|
+        methods = (self.instance_methods + self.private_instance_methods)
+        self.send(:attr_reader, param.to_sym) unless methods.member?(param.to_sym)
+        yield param if block_given?
+      end
+    end
+
     def self.add_expectation(parameter, options)
       expectations[parameter] = options
     end
 
+    def self.add_any_expectation(parameters)
+      any_expectations << parameters
+    end
+
     def expectations_met?
+      __expects_mets? && __expects_any_mets?
+    end
+
+    def __expects_any_mets?
+      self.class.any_expectations.each do |any_set|
+        if any_set.all? {|e| instance_variable_get("@#{e}").nil?}
+          raise MissingParameterError, "Parameters empty   :#{any_set.to_s} (At least one of these must not be nil)"
+        end
+      end
+      true
+    end
+
+    def __expects_mets?
       self.class.expectations.each do |param, param_options|
         unless param_options[:allow_nil]
           raise MissingParameterError, "Parameter empty   :#{param.to_s}" if instance_variable_get("@#{param}").nil?
         end
       end
+      true
+    end
+
+    def self.any_expectations
+      @any_expectations ||= []
     end
 
     def self.expectations

data/test/interaction_test.rb

@@ -182,4 +182,22 @@ class InteractionTest < Test::Unit::TestCase
      x = OverrideIt.new(int: 1).run
      assert_equal "1", x.send(:int)
    end
+
+
+   should "fail if all expects_any parameters are nil" do
+     class AnyInteractionWithAllNilParameters < Less::Interaction
+       expects_any :title, :a, :b
+       def run; end
+     end
+     assert_raise(MissingParameterError) { AnyInteractionWithAllNilParameters.run() }
+   end
+
+   should "pass if any expects_any parameters is not nil" do
+     class AnyInteractionWithOneNonNilParameter < Less::Interaction
+       expects_any :title, :a, :b
+       def run; true; end
+     end
+     assert AnyInteractionWithOneNonNilParameter.run(:b => 1)
+   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: less_interactions
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Eugen Minciu