smooth_operator 1.2.5 → 1.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzk0YmZmM2Q1NDE4YWY5YWYxOTYyZjZkYTk2NjBjNjQ4MjMxNDU4ZQ==
+    OTQyODc3MjY2NmU2MTlkYTU2NzM0MTRjMjUxYTY0MGRlMDEzNjU5NA==
   data.tar.gz: !binary |-
-    OTllZjJjMDgyOGYxY2VkZmM4NWUzN2Y3Y2E5NTgxZjdlMDU5NjE1Ng==
+    MDI2NmM2NTYxODllNzRmOWE0ZTAxZjM5NTYzOGIzNmIxMTg1ZmJiZA==
 SHA512:
   metadata.gz: !binary |-
-    YTgzYjIwYWEyMjE2YmJmZjk2YzllOWQyNWUwOWJjZTBlYjdjZDMxOTIwOWRh
-    NmQ0MTc5NWQ4NDY1ZjMzMWM4MzljODk4OTEwOWM0MjQyN2JjODA2NjYwMGEz
-    OTMzYjZlOTc2ZWY4YzU2ODNjOWE2MWYxMmIyYzJhNjE1ZTU3YTM=
+    YWJlMjY1OGI1NmY2NjJhMmVkNzI4YjNmZjYyZWFhMGM5NDNkZWNiYWVlMWZm
+    Mzg5MjQ4MTIxOTYxZDVhZmQ4OTQzMjc2YzdkOWI3MjhlMzAzZDg4Y2ZjOTdl
+    NDU1MzMyZWY0MWE3N2Q3YzhiNWQ2N2QxNDI5NDNkNWY1NjMwMGU=
   data.tar.gz: !binary |-
-    YmU2NDdkOTY3ZjEwOGFkMzNiMDJiNzAzM2NlYjM4MDc1NTc4MDI0N2JjMDEx
-    YzNkYTRlNWU2MDU4NzJmMjU2N2Q3NDExODkyNTU2YjJkZWFlNmFjOGM0N2Vl
-    ZmUxMTU4YTI2YzFiYTU1YTNlNTNkYjNlYTg0N2U5NThmZDQzZTg=
+    YjU2NTgxMjlhODFhZjUyOWUyM2I0NzZkYmQ1NTgwMjI5ZGJkZDZkZjViYThi
+    YTJjZmZlYjhlZTNiMjA4MzJmMDc2NWE2MWU5NjI4MmQxODdmYzYxMGQ0N2Qz
+    NDZkM2Q2ZWQ1YmNlOGJlM2EyYTVkNTBkZTA1NzljMGU1ZDZiZTY=

data/lib/smooth_operator/delegation.rb

@@ -3,11 +3,7 @@ module SmoothOperator
   module Delegation
 
     def respond_to?(method, include_private = false)
-      if known_attribute?(method)
-        true
-      else
-        self.class.reflect_on_association(method) ? true : super
-      end
+      known_attribute?(method) ? true : super
     end
 
     def method_missing(method, *args, &block)
@@ -21,9 +17,7 @@ module SmoothOperator
       when :setter
         return push_to_internal_data(method_name, args.first)
       else
-        if Helpers.safe_call(self.class, :reflect_on_association, method)
-          return get_relation(method_name)
-        elsif !self.class.strict_behaviour || known_attribute?(method_name)
+        if !self.class.strict_behaviour || known_attribute?(method_name)
           return get_internal_data(method_name)
         end
       end

data/lib/smooth_operator/relation/array_relation.rb

@@ -1,17 +1,33 @@
-require "smooth_operator/relation/single_relation"
-
 module SmoothOperator
   module Relation
-    class ArrayRelation < SingleRelation
+    class ArrayRelation
+
+      attr_reader :object, :association
+
+      def initialize(object, association)
+        @object, @association = object, association
+      end
+
+      def method_missing(method, *args, &block)
+        data.respond_to?(method) ? data.send(method, *args) : super
+      end
 
       def data
-        super || []
+        data = object.get_internal_data(association.to_s)
+
+        data.nil? ? [] : [*data]
       end
 
       def reload
         "TODO"
       end
 
+      def new(attributes = {})
+        object.class.reflect_on_association(association).klass.new(attributes)
+      end
+
+      alias :build :new
+
     end
   end
 end

data/lib/smooth_operator/relation/associations.rb

@@ -5,81 +5,76 @@ module SmoothOperator
   module Relation
     module Associations
 
-      def relations
-        @relations ||= {}
+      def has_many(nested_object_name, options = {})
+        accepts_nested_objects(nested_object_name, :has_many, options)
       end
 
-      def get_relation(relation_name)
-        if relations.include?(relation_name)
-          relations[relation_name]
-        else
-          relations[relation_name] = build_relation(relation_name)
-        end
+      def has_one(nested_object_name, options = {})
+        accepts_nested_objects(nested_object_name, :has_one, options)
       end
 
-      def self.included(base)
-        base.extend(ClassMethods)
+      def belongs_to(nested_object_name, options = {})
+        accepts_nested_objects(nested_object_name, :belongs_to, options)
       end
 
-      protected ################### PROTECTED ###################
+      def reflections
+        Helpers.get_instance_variable(self, :reflections, {})
+      end
 
-      def build_relation(relation_name)
-        if self.class.reflect_on_association(relation_name.to_sym).has_many?
-          ArrayRelation.new(self, relation_name)
-        elsif Helpers.present? get_internal_data(relation_name)
-          SingleRelation.new(self, relation_name)
-        else
-          nil
-        end
+      def reflect_on_association(association)
+        reflections[association]
       end
 
-      module ClassMethods
+      def reflect_on_all_associations(macro = nil)
+        macro ? reflections.values.select { |reflection| reflection.macro == macro } : reflections.values
+      end
 
-        def has_many(nested_object_name, options = {})
-          accepts_nested_objects(nested_object_name, :has_many, options)
-        end
+      protected ###################### PROTECTED ###################
 
-        def has_one(nested_object_name, options = {})
-          accepts_nested_objects(nested_object_name, :has_one, options)
-        end
+      def accepts_nested_objects(association, macro, options = {})
+        options = parse_options(options, { macro: macro })
 
-        def belongs_to(nested_object_name, options = {})
-          accepts_nested_objects(nested_object_name, :belongs_to, options)
-        end
+        reflection = AssociationReflection.new(association, Reflection.new(name, {}), options)
 
-        def reflections
-          Helpers.get_instance_variable(self, :reflections, {})
-        end
+        schema(association => reflection.klass)
 
-        def reflect_on_association(association)
-          reflections[association]
-        end
+        reflections.merge!(association => reflection)
 
-        def reflect_on_all_associations(macro = nil)
-          macro ? reflections.values.select { |reflection| reflection.macro == macro } : reflections.values
+        if reflection.has_many?
+          define_has_many_association_method(reflection, association)
+        else
+          define_single_association_method(reflection, association)
         end
+      end
 
-        protected ###################### PROTECTED ###################
+      private ####################### PRIVATE ######################
 
-        def accepts_nested_objects(nested_object_name, macro, options = {})
-          options = parse_options(options, { macro: macro })
+      def define_has_many_association_method(reflection, association)
+        define_method(association) do
+          array_relation = instance_variable_get("@#{association}")
 
-          reflection = AssociationReflection.new(nested_object_name, Reflection.new(name, {}), options)
+          if array_relation.nil?
+            array_relation = ArrayRelation.new(self, association)
 
-          reflections.merge!(nested_object_name => reflection)
+            instance_variable_set("@#{association}", array_relation)
+          end
 
-          schema(nested_object_name => reflection.klass)
+          array_relation
         end
+      end
 
-        private ####################### PRIVATE ######################
+      def define_single_association_method(reflection, association)
+        define_method(association) { get_internal_data(association.to_s) }
 
-        def parse_options(options, default_options)
-          options = options.is_a?(Hash) ? options.merge(default_options) : default_options
+        define_method("build_#{reflection.single_name}") { |attributes = {}| reflection.klass.new(attributes) }
+      end
 
-          Helpers.symbolyze_keys(options)
-        end
+      def parse_options(options, default_options)
+        options = options.is_a?(Hash) ? options.merge(default_options) : default_options
 
+        Helpers.symbolyze_keys(options)
       end
+
     end
   end
 end

data/lib/smooth_operator/version.rb

@@ -1,3 +1,3 @@
 module SmoothOperator
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

data/lib/smooth_operator.rb

@@ -11,12 +11,12 @@ module SmoothOperator
   class Base < OpenStruct::Base
 
     extend FinderMethods
+    extend Relation::Associations
     extend Translation if defined? I18n
 
     include Operator
     include Persistence
     include FinderMethods
-    include Relation::Associations
 
     self.strict_behaviour = true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smooth_operator
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - João Gonçalves
@@ -100,7 +100,6 @@ files:
 - lib/smooth_operator/relation/association_reflection.rb
 - lib/smooth_operator/relation/associations.rb
 - lib/smooth_operator/relation/reflection.rb
-- lib/smooth_operator/relation/single_relation.rb
 - lib/smooth_operator/remote_call/base.rb
 - lib/smooth_operator/remote_call/errors/connection_failed.rb
 - lib/smooth_operator/remote_call/errors/timeout.rb

data/lib/smooth_operator/relation/single_relation.rb

@@ -1,21 +0,0 @@
-module SmoothOperator
-  module Relation
-    class SingleRelation
-
-      attr_reader :object, :relation_name
-
-      def initialize(object, relation_name)
-        @object, @relation_name = object, relation_name
-      end
-
-      def method_missing(method, *args, &block)
-        data.respond_to?(method) ? data.send(method, *args) : super
-      end
-
-      def data
-        object.get_internal_data(relation_name)
-      end
-
-    end
-  end
-end