usine 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03d1e6d91e2856f9104d7a7c7b6907988674cdf8
-  data.tar.gz: 7573d835285b97a7243304ab437bd43ae425e150
+  metadata.gz: eaad719cc82acb28815b5fa2c44d87090e0da112
+  data.tar.gz: 830b358673b045e8cdab22ec8a3d41d8336267c7
 SHA512:
-  metadata.gz: fcc0c03dff27f57b4a1d63eda0c11803ee7bb8fee770b8eb9fa2378fe0851b65fa6eddee7003741d89a8a15351b49585fe1ba013603e9332eb26387fc4537028
-  data.tar.gz: df77515eb45fe2bec61f553fa20c7e696beb544ca93a753895bbf28f4772bd17fec5fa7ae59219d03d30e710648017ca0480eef1343dc3288705e2a73f21436e
+  metadata.gz: 89def5419457b5f8540c6c25827857d9dd4490dfea2479f5a5da243a2dcd40ee8ed96c37b1086ebdb000938d3488d46f13ee2142053e910c602c7be8180674f4
+  data.tar.gz: fae70b6f13e72fc8a90ff42c206ab6964774caa4922f7ef277e5f84da82a3465ab19c8e6e1b2d088391a4fdb898e2becfd1426dbdfc30c70cbf214e1415b8a7f

data/README.md

@@ -77,7 +77,7 @@ end
 
 ### Writing a test with Usine
 
-```
+```ruby
 # Without Usine
 let(:item) {
   Item::Create.({
@@ -99,12 +99,20 @@ FactoryGirl.define do
   end
 end
 
+Usine.operation(User::Create) do
+  user
+end
+
 Usine.operation(Item::Create) do
   item
-  current_user :user
+  current_user User::Create #operation used as factory, will return its model
 end
 
 let(:item) { Usine.(Item::Create).model }
+
+# note that you can also give attributes when an Operation is used as factory
+# this will assign User::Create.(email: "my_mail@example.com").model to current_user key
+let(:item) { Usine.(Item::Create, current_user: {email: "my_email@example.com"}).model }
 ```
 
 The second example might look more verbose, but you only have to define factories/operations one time.

data/lib/usine/operation_factory.rb

@@ -1,31 +1,11 @@
 module Usine
   class OperationFactory
     attr_reader :operation_class
+    attr_reader :block
 
     def initialize(operation_class, &block)
       @operation_class = operation_class
       @block = block
-      @attributes = {}
-    end
-
-    def process
-      self.instance_eval(&@block)
-      @attributes
-    end
-
-    def method_missing(method_symbol, factory_name = nil, &block)
-      if factory_name
-        @attributes[method_symbol] = attributes_for_factory_name(factory_name)
-      else
-        @attributes[method_symbol] = attributes_for_factory_name(method_symbol)
-      end
-    end
-
-    protected
-
-    def attributes_for_factory_name(name)
-      factory = FactoryGirl.factory_by_name(name)
-      factory.run(FactoryGirl::Strategy::AttributesFor, {})
     end
   end
 end

data/lib/usine/operation_wrapper.rb

@@ -5,6 +5,7 @@ module Usine
       @operation = operation
       @operation_factory = find_operation_factory(operation)
       @attributes = attributes
+      @factory_attributes = {}
     end
 
     def operations=(operations)
@@ -21,13 +22,32 @@ module Usine
     end
 
     def process
-      factory_attributes = @operation_factory.process
-      merged_attributes = Utils.merge_hashes(factory_attributes, @attributes)
+      self.instance_eval(&@operation_factory.block)
+      merged_attributes = Utils.merge_hashes(@factory_attributes, @attributes)
       @operation.send(@mode, merged_attributes)
     end
 
+    def method_missing(method_symbol, factory_name = nil, attributes = {}, &block)
+      if factory_name
+        case factory_name
+        when Symbol, String
+          @factory_attributes[method_symbol] = attributes_for_factory_name(factory_name)
+        else
+          merged_attributes = Utils.merge_hashes(attributes, @attributes)
+          @factory_attributes[method_symbol] = factory_name.call(merged_attributes).model
+        end
+      else
+        @factory_attributes[method_symbol] = attributes_for_factory_name(method_symbol)
+      end
+    end
+
     protected
 
+    def attributes_for_factory_name(name)
+      factory = FactoryGirl.factory_by_name(name)
+      factory.run(FactoryGirl::Strategy::AttributesFor, {})
+    end
+
     def find_operation_factory(operation_class)
       operation_factory = operations.detect do |op|
         op.operation_class == operation_class
@@ -40,7 +60,7 @@ Couldn’t find an operation factory for: #{operation_class}
 Please define it with:
 Usine.operation(#{operation_class}) {}
 MSG
-        raise(ArgumentError, message)
+        raise(ArgumentError::NotFoundOperationFactory, message)
       end
 
       operation_factory

data/lib/usine/utils.rb

@@ -4,6 +4,10 @@ module Usine
       b.each_pair do |current_key, other_value|
         this_value = a[current_key]
 
+        next if !this_value.nil? &&
+                !other_value.nil? &&
+                other_value.class != this_value.class
+
         a[current_key] = if this_value.is_a?(Hash) && other_value.is_a?(Hash)
           Usine::Utils.merge_hashes(this_value, other_value)
         else

data/lib/usine/version.rb

@@ -1,3 +1,3 @@
 module Usine
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/usine.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["j.jaffeux@gmail.com"]
 
   spec.summary       = %q{Factories for Trailblazer’s operations}
-  spec.description   = %q{Usine (french word for factory) is a small gem aiming to bring a limited feature set of factory_girl when using Trailblazer’s operations.}
+  spec.description   = %q{Usine (french word for factory) is a wrapper around factory_girl for Trailblazer’s operations.}
   spec.homepage      = "https://github.com/jjaffeux/usine"
   spec.license       = "MIT"
 
@@ -22,8 +22,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency             "uber"
   spec.add_dependency             "factory_girl"
 
+  spec.add_development_dependency "trailblazer", "~> 1.1"
+  spec.add_development_dependency "reform"
+  spec.add_development_dependency "activemodel"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "trailblazer", "~> 1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usine
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Joffrey JAFFEUX
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-23 00:00:00.000000000 Z
+date: 2016-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
@@ -39,63 +39,91 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: trailblazer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: reform
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: trailblazer
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-description: Usine (french word for factory) is a small gem aiming to bring a limited
-  feature set of factory_girl when using Trailblazer’s operations.
+        version: '5.0'
+description: Usine (french word for factory) is a wrapper around factory_girl for
+  Trailblazer’s operations.
 email:
 - j.jaffeux@gmail.com
 executables: []