smooth_operator 1.20.9 → 1.20.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDBhM2U5NjlkNjVmMzk4MGQxNTVkNTBiZDBhODI5NDlkMjRkZGQ2OQ==
+    NWVmZWM5OGI3M2I3NmM1MDA1NmQ4ODIzYTRlYzU1NjIzZDBiZDI1ZQ==
   data.tar.gz: !binary |-
-    ZTg1N2IwOTY0ZDlmMmVjMTVjNGFmMzNjM2YxZjE5MGFlMTNiMDk3Mg==
+    ZjUxMTRlMDk0NDE1ZWI1ZWUwYTZhZWJhYWE3NzFmMmY0ZWEzYmQ2ZA==
 SHA512:
   metadata.gz: !binary |-
-    MWQzYjFkMGNmNDY2NmU2MzFjOThjMWQzYWZjMjNiNjNjYTQwZDZkNGVlYzdm
-    YzIxODAyNWI4YTZiNjVhYjk2NzgzMGNjYjc1MGVhNWY0ZGRiNWNiZDQ5MGFl
-    Y2E3NGM2ZDNiNWFiYTg2YjMzNTVhMmNkODM0MTYxZTg2YzBmMTU=
+    YTFlYWU5MzJhMzZjZjk1MDdiOTlmNGYxNTkxMTJiOWJlYjg4MmZlMjVlYjU5
+    MDdhMGVjYjU2NDVjNWNkOTgzMjIwYzZhYzQ0ZGM2ZTQyYTY4ZDhmNmJmMTNm
+    MmFkNTBlMWM5MTBmZDU2Mjc2M2U1MWI0OTBhYmZmOTY2MWFkM2Q=
   data.tar.gz: !binary |-
-    OGYwYjBiY2U2NWUzMThhZGIwOTZiOWMzOWZkYzM2NDZiODE4NmFkYWJmNzhj
-    NTI3MWU4NDVjOTU0ZTdkNTU1MWRiOTk3NzRmYmFjOGJkNjgyNzhlOTFjMzMx
-    NTgxNzUzZjQ1MDQ3MzNkNTJiYzNlM2E2NjUyN2ZiZWI3YjRmMmQ=
+    YWI0ZTIxYjY5NjJhYThhYWEyZmJmZTQ1ZmQyMDJhMDY0NTUxNDc3ODkyMGI3
+    MzZiY2I2YjMzNGFjMzZmMDdkYmM2YTY0NWE1Mjg2ODYyY2RiMDc4YjY0ODM3
+    YjY1MTM1OGQ1MWE0OTA5NzBjMjA3OWRjMmQ1YmM5OTQyOTkwOWY=

data/lib/smooth_operator/attribute_methods.rb

@@ -1,6 +1,24 @@
 module SmoothOperator
   module AttributeMethods
 
+    module ClassMethods
+      def known_attributes
+        Helpers.get_instance_variable(self, :known_attributes, Set.new)
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    def known_attribute?(attribute)
+      known_attributes.include?(attribute.to_s)
+    end
+
+    def known_attributes
+      @known_attributes ||= self.class.known_attributes.dup
+    end
+
     def internal_data
       @internal_data ||= {}
     end
@@ -17,10 +35,6 @@ module SmoothOperator
       end
     end
 
-    def get_attribute_type(attribute)
-      self.class.internal_structure[attribute.to_s]
-    end
-
     def push_to_internal_data(attribute_name, attribute_value)
       attribute_name = attribute_name.to_s
 

data/lib/smooth_operator/model_name.rb

@@ -0,0 +1,50 @@
+module SmoothOperator
+  module ModelName
+
+    def resources_name(default_bypass = nil)
+      return @resources_name if defined?(@resources_name)
+
+      (Helpers.super_method(self, :resources_name, true) || (default_bypass ? nil : self.resource_name.pluralize))
+    end
+
+    attr_writer :resources_name
+
+    def resource_name(default_bypass = nil)
+      return @resource_name if defined?(@resource_name)
+
+      (Helpers.super_method(self, :resource_name, true) || (default_bypass ? nil : self.model_name.to_s.underscore))
+    end
+
+    attr_writer :resource_name
+
+    def model_name
+      return '' if @_model_name == :none
+
+      if defined? ActiveModel
+        rails_model_name_method
+      else
+        @_model_name ||= name.split('::').last.underscore.capitalize
+      end
+    end
+
+    def model_name=(name)
+      @_model_name = name
+    end
+
+    protected ############## PROTECTED #############
+
+    def rails_model_name_method
+      @model_name ||= begin
+        namespace ||= self.parents.detect do |n|
+          n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
+        end
+
+        ActiveModel::Name.new(self, namespace, @_model_name).tap do |model_name|
+          def model_name.human(options = {}); @klass.send(:_translate, "models.#{i18n_key}", options); end
+        end
+      end
+    end
+
+  end
+
+end

data/lib/smooth_operator/open_struct.rb

@@ -1,6 +1,6 @@
+require "smooth_operator/model_name"
 require "smooth_operator/delegation"
 require "smooth_operator/validations"
-require "smooth_operator/model_schema"
 require "smooth_operator/serialization"
 require "smooth_operator/attribute_methods"
 require "smooth_operator/attribute_assignment"
@@ -10,9 +10,10 @@ module SmoothOperator
 
     class Base
 
+      extend ModelName
+
       include Delegation
       include Validations
-      include ModelSchema
       include Serialization
       include AttributeMethods
       include AttributeAssignment

data/lib/smooth_operator/schema.rb

@@ -0,0 +1,33 @@
+module SmoothOperator
+  module Schema
+
+    def known_by_schema?(attribute)
+      self.class.internal_structure.include?(attribute.to_s)
+    end
+
+    def get_attribute_type(attribute)
+      self.class.internal_structure[attribute.to_s]
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+
+      attr_writer :resource_name
+
+      def schema(structure)
+        internal_structure.merge! Helpers.stringify_keys(structure)
+
+        known_attributes.merge internal_structure.keys
+      end
+
+      def internal_structure
+        Helpers.get_instance_variable(self, :internal_structure, { "errors" => nil, primary_key => nil, destroy_key => nil })
+      end
+
+    end
+
+  end
+end

data/lib/smooth_operator/version.rb

@@ -1,3 +1,3 @@
 module SmoothOperator
-  VERSION = "1.20.9"
+  VERSION = "1.20.10"
 end

data/lib/smooth_operator.rb

@@ -1,3 +1,4 @@
+require "smooth_operator/schema"
 require "smooth_operator/version"
 require "smooth_operator/helpers"
 require "smooth_operator/operator"
@@ -14,6 +15,7 @@ module SmoothOperator
     extend Relation::Associations
     extend Translation if defined? I18n
 
+    include Schema
     include Operator
     include Persistence
     include FinderMethods

data/spec/smooth_operator/{model_schema_spec.rb → model_name_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe SmoothOperator::ModelSchema do
+describe SmoothOperator::ModelName do
 
   describe "#known_attributes" do
     let(:initial_attributes_keys) { attributes_for(:user).keys.map(&:to_s) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smooth_operator
 version: !ruby/object:Gem::Version
-  version: 1.20.9
+  version: 1.20.10
 platform: ruby
 authors:
 - João Gonçalves
@@ -91,7 +91,7 @@ files:
 - lib/smooth_operator/delegation.rb
 - lib/smooth_operator/finder_methods.rb
 - lib/smooth_operator/helpers.rb
-- lib/smooth_operator/model_schema.rb
+- lib/smooth_operator/model_name.rb
 - lib/smooth_operator/open_struct.rb
 - lib/smooth_operator/operator.rb
 - lib/smooth_operator/operators/faraday.rb
@@ -106,6 +106,7 @@ files:
 - lib/smooth_operator/remote_call/errors/timeout.rb
 - lib/smooth_operator/remote_call/faraday.rb
 - lib/smooth_operator/remote_call/typhoeus.rb
+- lib/smooth_operator/schema.rb
 - lib/smooth_operator/serialization.rb
 - lib/smooth_operator/translation.rb
 - lib/smooth_operator/validations.rb
@@ -117,7 +118,7 @@ files:
 - spec/smooth_operator/attributes_dirty_spec.rb
 - spec/smooth_operator/delegation_spec.rb
 - spec/smooth_operator/finder_methods_spec.rb
-- spec/smooth_operator/model_schema_spec.rb
+- spec/smooth_operator/model_name_spec.rb
 - spec/smooth_operator/operator_spec.rb
 - spec/smooth_operator/persistence_spec.rb
 - spec/smooth_operator/remote_call_spec.rb
@@ -164,7 +165,7 @@ test_files:
 - spec/smooth_operator/attributes_dirty_spec.rb
 - spec/smooth_operator/delegation_spec.rb
 - spec/smooth_operator/finder_methods_spec.rb
-- spec/smooth_operator/model_schema_spec.rb
+- spec/smooth_operator/model_name_spec.rb
 - spec/smooth_operator/operator_spec.rb
 - spec/smooth_operator/persistence_spec.rb
 - spec/smooth_operator/remote_call_spec.rb

data/lib/smooth_operator/model_schema.rb

@@ -1,81 +0,0 @@
-module SmoothOperator
-  module ModelSchema
-
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
-
-    def known_attribute?(attribute)
-      known_attributes.include?(attribute.to_s)
-    end
-
-    def known_by_schema?(attribute)
-      self.class.internal_structure.include?(attribute.to_s)
-    end
-
-    def known_attributes
-      @known_attributes ||= self.class.known_attributes.dup
-    end
-
-    module ClassMethods
-
-      def resources_name(default_bypass = nil)
-        return @resources_name if defined?(@resources_name)
-
-        (Helpers.super_method(self, :resources_name, true) || (default_bypass ? nil : self.resource_name.pluralize))
-      end
-      attr_writer :resources_name
-
-      def resource_name(default_bypass = nil)
-        return @resource_name if defined?(@resource_name)
-
-        (Helpers.super_method(self, :resource_name, true) || (default_bypass ? nil : self.model_name.to_s.underscore))
-      end
-      attr_writer :resource_name
-
-      def schema(structure)
-        internal_structure.merge! Helpers.stringify_keys(structure)
-
-        known_attributes.merge internal_structure.keys
-      end
-
-      def internal_structure
-        Helpers.get_instance_variable(self, :internal_structure, { "errors" => nil })
-      end
-
-      def known_attributes
-        Helpers.get_instance_variable(self, :known_attributes, Set.new)
-      end
-
-      def model_name
-        return '' if @_model_name == :none
-
-        if defined? ActiveModel
-          rails_model_name_method
-        else
-          @_model_name ||= name.split('::').last.underscore.capitalize
-        end
-      end
-
-      def model_name=(name)
-        @_model_name = name
-      end
-
-      protected ############## PROTECTED #############
-
-      def rails_model_name_method
-        @model_name ||= begin
-          namespace ||= self.parents.detect do |n|
-            n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
-          end
-
-          ActiveModel::Name.new(self, namespace, @_model_name).tap do |model_name|
-            def model_name.human(options = {}); @klass.send(:_translate, "models.#{i18n_key}", options); end
-          end
-        end
-      end
-
-    end
-
-  end
-end