pr 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55484a6b05a98ec13a14b2fd4379d5f4929d9c81
-  data.tar.gz: 042c0a68883e6c1806719b8b96feabdbad4028f1
+  metadata.gz: dabd9d8c21b3c850b57cde93687b312cba5e9946
+  data.tar.gz: 5e58afda498dd0c2c8f64d44800ebf6ef6610884
 SHA512:
-  metadata.gz: dc15a38ecd36986d79e554857e00873441faee6a18bb1001839895cdd2de46e77da8359df747e4b1675737e18ea1b2a60f592ebb0d34904f4ed974cf1eaebbe9
-  data.tar.gz: 030d6e9830aa1d40a8ef2f08be50b83a0d76bbedd89ff978cba16f37989007f890e86385c27fd96da46f43b6d77a253708cb524c5500b5ac490e64907f3062b9
+  metadata.gz: ac666293f13a93bf37b9c89f0fb582567d9a707633040384ada6fbc872ca6e2e981a9b706326a31424bed48f20c49a548c07a7ae0b3aeea1425e163938531728
+  data.tar.gz: fe28ee1ca371b167ebcec05173608ea68e0193d7b7538cb5a9e9235ce5ac7bc956ec4224c6bde457c6a0f9858a432878b05aee322abd90e3c7340dd65deb7c90

data/features/building_forms_from_hashes.feature

@@ -55,3 +55,34 @@ Feature: Building a form from a hash
       """
     Then my form should have a event_name of "Mien Event"
     Then my form should have a start_date of "31/03/2013"
+
+  @form @macro @hash @args
+  Scenario: Basic Form built using macro with arguments
+    Given I have a form defined as:
+      """Ruby
+        class MyForm
+          include PR::Form
+
+          def initialize argument
+            @my_argument = argument
+          end
+          attr_reader :my_argument
+
+          field :event_name, :string
+          field :start_date, :date
+
+        end
+      """
+    And I have a hash:
+      """Ruby
+        {
+          "event_name" => "Mien Event",
+          "start_date" => "31/03/2013"
+        }
+      """
+      When I build my form using the macro:
+      """Ruby
+        @form = MyForm.from_hash @hash, "An argument"
+      """
+    Then my form should have a my_argument of "An argument"
+

data/features/support/dsl.rb

@@ -1,19 +1,17 @@
-module DSL
-
-  class World
-    require 'pr'
-
-    def run code
-      eval code
-    end
-  end
+require 'pr'
 
+module DSL
 
   def run_test code
     world.run code
   end
-  alias define_field run_test
-  alias define_form  run_test
+
+  def setup_test code
+    world.load code
+  end
+
+  alias define_field setup_test
+  alias define_form  setup_test
   alias define_model run_test
 
   def define_hash code
@@ -29,7 +27,19 @@ module DSL
   end
 
   def world
-    @world ||= Class.new(World).new
+    @world ||= world_klass.new
+  end
+
+  def world_klass
+    Class.new do
+      def load code
+        self.class.class_eval code
+      end
+
+      def run code
+        self.instance_eval code
+      end
+    end
   end
 
   def set thing, attribute, value

data/lib/pr/form.rb

@@ -10,8 +10,8 @@ module PR
       def field name, type, options = {}
         PR::DefineAndRegister[ self, name, type, options ]
       end
-      def from_hash hash
-        form = new
+      def from_hash hash, *args
+        form = new *args
         PR::BuildFromHash[ form, hash ]
         form
       end

data/lib/pr/version.rb

@@ -1,3 +1,3 @@
 module PR
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pr
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jon Rowe
@@ -29,7 +29,7 @@ cert_chain:
   2feWfO4gCNmvfFjULOAYHq9JHEjN5SLSXvj5HdSnDcCyIfJKn5Ya3JahWQaWIsXf
   /NPE/mB57TOwj+d7XUa2NC4HUadF8R51IYEcIB0PpIEzJlKtfXFcOZxO
   -----END CERTIFICATE-----
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake