dci-ruby 2.1.2 → 2.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dci-ruby (2.1.1)
+    dci-ruby (2.1.2)
 
 GEM
   remote: http://rubygems.org/

data/lib/dci-ruby/dci/context.rb

@@ -15,6 +15,11 @@ module DCI
         end
       end
 
+      # A short way for ContextSubclass.new(players_and_extra_args).run(extra_args)
+      def [](*args)
+        new(*args).run
+      end
+
 
       private
 
@@ -83,8 +88,10 @@ module DCI
     private
 
       # Private access to the extra args received in the instantiation.
-      def settings(key)
-        @settings[key]
+      def settings(*keys)
+        return @settings.dup if keys.empty?
+        entries = @settings.reject {|k, v| !keys.include?(k)}
+        keys.size == 1 ? entries.values.first : entries
       end
 
       # Checks there is a player for each role.

data/lib/dci-ruby/dci/role.rb

@@ -84,5 +84,10 @@ module DCI
         @player
       end
 
+      # The role definition code also have private access to the extra args given in the context instantiation.
+      def settings(*keys)
+        @context.send(:settings, *keys)
+      end
+
   end
 end

data/lib/dci-ruby/version.rb

@@ -1,3 +1,3 @@
 module DCI
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

data/spec/context_spec.rb

@@ -53,15 +53,22 @@ describe DCI::Context do
       before(:all) do
         class TestingUseContext < DCI::Context
           role :role1 do
+            def role1_method
+              :role1_method
+            end
           end
           role :role2 do
           end
 
-          def interaction1
-            role1
+          def run
+            role1.role1_method
           end
 
           def interaction2
+            role1
+          end
+
+          def interaction3
             role1.object_id - role2.object_id
           end
         end
@@ -70,7 +77,9 @@ describe DCI::Context do
         @context_instance_2 = TestingUseContext.new(:role1 => @player1, :role2 => @player2, :extra_arg => :extra)
       end
 
-      it("...instanciate it from its correspondig DCI::Context subclass...") {@context_instance_1.should be_a(TestingUseContext)}
+      it("...instanciate it from its correspondig DCI::Context subclass as usual...") do
+        @context_instance_1.should be_a(TestingUseContext)
+      end
       it("...providing pairs of type :rolekey1 => player1 as arguments...") do
         expect {TestingUseContext.new(@player1, @player2)}.to raise_error
       end
@@ -85,13 +94,20 @@ describe DCI::Context do
         expect {TestingUseContext.new(:role1 => @player1, :role2 => @player2, :extra_arg => :extra)}.not_to raise_error
       end
 
+      it("An shorter way to instantiate a context is through the class method []...") do
+        expect {TestingUseContext[:role1 => @player1, :role2 => @player2, :extra_arg => :extra]}.not_to raise_error
+      end
+      it("...which is equivalent to create a new instance and call #run on it.") do
+        TestingUseContext[:role1 => @player1, :role2 => @player2].should be(:role1_method)
+      end
+
 
       it("Once instanciated...") {@context_instance_1.should be_a(TestingUseContext)}
       it("...you call an interaction (instance method) on it") do
-        @context_instance_1.should respond_to(:interaction1)
+        @context_instance_1.should respond_to(:interaction2)
       end
       it("...to start interaction among roleplayers inside the context.") do
-        @context_instance_1.interaction2.should be_instance_of(Fixnum)
+        @context_instance_1.interaction3.should be_instance_of(Fixnum)
       end
 
     end

data/spec/interaction_spec.rb

@@ -15,7 +15,11 @@ describe 'Interaction:' do
         end
       end
       @player1, @player2 = Object.new, Object.new
-      @test_interactions_context = TestingInteractionsContext.new(:role1 => @player1, :role2 => @player2, :setting1 => :one)
+      @test_interactions_context = TestingInteractionsContext.new(:role1 => @player1,
+                                                                  :role2 => @player2,
+                                                                  :setting1 => :one,
+                                                                  :setting2 => :two,
+                                                                  :setting3 => :three)
     end
 
     it("...the developer has access to all the roleplayers...") do
@@ -29,8 +33,14 @@ describe 'Interaction:' do
     it("He also have private access to extra args received in the instantiation of its context...") do
       @test_interactions_context.private_methods.should include('settings')
     end
-    it("...calling #settings(key)") do
-      @test_interactions_context.send(:settings, :setting1).should be(:one)
+    it("...calling #settings that returns a hash with all the extra args...") do
+      @test_interactions_context.send(:settings).should eq({:setting1 => :one, :setting2 => :two, :setting3 => :three})
+    end
+    it("...or #settings(key) that returns the value of the given extra arg...") do
+      @test_interactions_context.send(:settings, :setting2).should be(:two)
+    end
+    it("...or #settings(key1, key2, ...) that returns a hash with the given extra args.") do
+      @test_interactions_context.send(:settings, :setting1, :setting3).should eq({:setting1 => :one, :setting3 => :three})
     end
   end
 

data/spec/roleplayers_spec.rb

@@ -33,7 +33,11 @@ describe 'RolePlayers' do
         end
       end
       @player1, @player2 = OpenStruct.new(:name => 'player1'), OpenStruct.new(:name => 'player2')
-      @testing_roleplayers_context = TestingRoleplayersContext.new(:role1 => @player1, :role2 => @player2)
+      @testing_roleplayers_context = TestingRoleplayersContext.new(:role1    => @player1,
+                                                                   :role2    => @player2,
+                                                                   :setting1 => :one,
+                                                                   :setting2 => :two,
+                                                                   :setting3 => :three)
     end
 
     it("...each one instance of the class defined after the role he plays...") do
@@ -72,6 +76,20 @@ describe 'RolePlayers' do
       @testing_roleplayers_context.send(:role2).instance_variables.should include('@context')
       @testing_roleplayers_context.send(:role2).instance_variable_get(:@context).should be(@testing_roleplayers_context)
     end
+
+    it("They also have private access to extra args received in the instantiation of its context...") do
+      @testing_roleplayers_context.private_methods.should include('settings')
+    end
+    it("...calling #settings that returns a hash with all the extra args...") do
+      @testing_roleplayers_context.send(:settings).should eq({:setting1 => :one, :setting2 => :two, :setting3 => :three})
+    end
+    it("...or #settings(key) that returns the value of the given extra arg...") do
+      @testing_roleplayers_context.send(:settings, :setting2).should be(:two)
+    end
+    it("...or #settings(key1, key2, ...) that returns a hash with the given extra args.") do
+      @testing_roleplayers_context.send(:settings, :setting1, :setting3).should eq({:setting1 => :one, :setting3 => :three})
+    end
+
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dci-ruby
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 7
   prerelease: 
   segments: 
   - 2
-  - 1
   - 2
-  version: 2.1.2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors: 
 - Lorenzo Tello
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-11-12 00:00:00 Z
+date: 2013-11-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec