smooth_operator 1.2.9 → 1.3.0

data/lib/smooth_operator.rb

@@ -1,24 +1,29 @@
+require "smooth_operator/schema"
 require "smooth_operator/version"
 require "smooth_operator/helpers"
 require "smooth_operator/operator"
 require "smooth_operator/persistence"
 require "smooth_operator/translation"
 require "smooth_operator/open_struct"
+require "smooth_operator/http_methods"
+require "smooth_operator/associations"
 require "smooth_operator/finder_methods"
-require "smooth_operator/relation/associations"
 
 module SmoothOperator
-  class Base < OpenStruct::Base
+  class Base < OpenStruct
 
+    extend Schema
+    extend HttpMethods
+    extend Associations
     extend FinderMethods
-    extend Relation::Associations
     extend Translation if defined? I18n
 
     include Operator
+    include HttpMethods
     include Persistence
     include FinderMethods
 
-    self.strict_behaviour = true
+    options strict_behaviour: true
 
     def self.smooth_operator?
       true
@@ -33,12 +38,57 @@ module SmoothOperator
       include ActiveModel::Validations::Callbacks
       include ActiveModel::Conversion
 
+      options unknown_hash_class: SmoothOperator::OpenStruct
+
+      validate :validate_induced_errors, :validate_nested_objects
+
       def column_for_attribute(attribute_name)
-        type = get_attribute_type(attribute_name)
+        type = self.class.attribute_type(attribute_name)
 
         ActiveRecord::ConnectionAdapters::Column.new(attribute_name.to_sym, type, type)
       end
 
+      def save(relative_path = nil, data = {}, options = {})
+        return false unless before_save
+
+        clear_induced_errors
+
+        save_result = valid? ? super : false
+
+        after_save if valid? && save_result
+
+        save_result
+      end
+
+      def before_save
+        true
+      end
+
+      def after_save; end
+
+      def self.model_name
+        smooth_model_name
+      end
+
+      protected ################# PROTECTED ###################
+
+      def validate_induced_errors
+        induced_errors.each do |key, value|
+          [*value].each do |_value|
+            self.errors.add(key, _value) unless self.errors.added?(key, _value)
+          end
+        end
+
+        Helpers.blank?(induced_errors)
+      end
+
+      def validate_nested_objects
+        all_nested_objects = self.class.reflections.keys
+          .map { |association| send(association) }.flatten.compact
+
+        all_nested_objects.map { |nested_object| nested_object.valid? }.all?
+      end
+
     end
   end
 end

data/smooth_operator.gemspec

@@ -20,12 +20,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  
+
   spec.add_development_dependency "bundler", "~> 1.3"
-  
-  spec.add_dependency "json"
-  spec.add_dependency "faraday", "~> 0.8.9"
-  spec.add_dependency "typhoeus", "~> 0.6.8"
+
+  spec.add_dependency "json", '~> 1.5'
+  spec.add_dependency "faraday", "~> 0.8"
+  spec.add_dependency "typhoeus", "~> 0.6"
 
   # this is necessary if you want to typhoeus to correctly encode arrays
   # spec.add_dependency "ethon", :git => 'https://github.com/goncalvesjoao/ethon'

data/spec/smooth_operator/attribute_assignment_spec.rb

@@ -8,15 +8,6 @@ describe SmoothOperator::AttributeAssignment do
     describe "receiving data from server" do
       subject { User::Base.new }
 
-      context "when receiving the option 'from_server = true'" do
-        before { subject.assign_attributes({}, from_server: true) }
-
-        it "#has_data_from_server and #from_server should return true" do
-          expect(subject.has_data_from_server).to be true
-          expect(subject.from_server).to be true
-        end
-      end
-
       context "when receiving a Hash with meta_data on it" do
         before { subject.assign_attributes({ user: attributes_for(:user), status: 1 }) }
 
@@ -84,21 +75,21 @@ describe SmoothOperator::AttributeAssignment do
         end
       end
 
-      context "when the .unknown_hash_class is set to SmoothOperator::OpenStruct::Base" do
+      context "when the .unknown_hash_class is set to SmoothOperator::OpenStruct" do
         subject { User::UnknownHashClass::OpenStructBase.new(address: { street: 'something', postal_code: { code: '123' } }) }
 
-        it "a new instance of SmoothOperator::OpenStruct::Base will be initialized with that hash" do
+        it "a new instance of SmoothOperator::OpenStruct will be initialized with that hash" do
           address = subject.address
 
-          expect(address).to be_instance_of(SmoothOperator::OpenStruct::Base)
+          expect(address).to be_instance_of(SmoothOperator::OpenStruct)
           expect(address.street).to eq('something')
 
-          expect(address.postal_code).to be_instance_of(SmoothOperator::OpenStruct::Base)
+          expect(address.postal_code).to be_instance_of(SmoothOperator::OpenStruct)
           expect(address.postal_code.code).to eq('123')
         end
       end
 
-      context "when the .unknown_hash_class is set to :none" do
+      context "when the .unknown_hash_class is set to nil" do
         subject { User::UnknownHashClass::None.new(creator: { first_name: 'admin', address: { street: 'something' } }) }
 
         it "the hash will be copied as it is" do

data/spec/smooth_operator/finder_methods_spec.rb

@@ -8,11 +8,6 @@ shared_examples_for "finder method" do
   it "the instance class should be populated with the returned hash" do
     expect(user.attributes).to eq(attributes_for(:user_with_address_and_posts))
   end
-
-  it "#has_data_from_server and #from_server should return true" do
-    expect(user.has_data_from_server).to be true
-    expect(user.from_server).to be true
-  end
 end
 
 describe SmoothOperator::FinderMethods do
@@ -39,13 +34,13 @@ describe SmoothOperator::FinderMethods do
 
   describe ".find" do
     context "when the server returns a single hash" do
-      let(:user) { subject.find(5).object }
+      let(:user) { subject.find(5).data }
 
       it_behaves_like "finder method"
     end
 
     context "when the server returns a hash with meta_data" do
-      let(:user) { subject.find("5/with_metadata").object }
+      let(:user) { subject.find("5/with_metadata").data }
 
       it_behaves_like "finder method"
 
@@ -61,7 +56,7 @@ describe SmoothOperator::FinderMethods do
     context "when the server returns an array" do
       it "it should return a RemoteCall instance an array that contains a subject's class instance, one for every array's entry" do
         remote_call = subject.find(:all)
-        users = remote_call.objects
+        users = remote_call.data
 
         expect(users).to be_instance_of(Array)
         expect(users[0]).to be_instance_of(subject)
@@ -70,7 +65,7 @@ describe SmoothOperator::FinderMethods do
 
       it "if any of the array entries is not a hash, it shall not be converted or alteread" do
         remote_call = subject.find('misc_array')
-        users = remote_call.objects
+        users = remote_call.data
 
         expect(users).to be_instance_of(Array)
         expect(users[0]).to be_instance_of(subject)

data/spec/smooth_operator/persistence_spec.rb

@@ -23,7 +23,12 @@ shared_examples_for "persistent remote call" do
     let(:method_arguments) { ['', { status: 200 }] }
 
     it "it should return true" do
-      execute_method
+      result = execute_method
+
+      if !(method_to_execute.to_s =~ /create/)
+        expect(result).to be true
+      end
+
       expect(subject.last_remote_call.ok?).to be true
       expect(subject.last_remote_call.status).to be true
     end
@@ -40,7 +45,12 @@ shared_examples_for "persistent remote call" do
     let(:method_arguments) { ['', { status: 422 }] }
 
     it "it should return false" do
-      execute_method
+      result = execute_method
+
+      if !(method_to_execute.to_s =~ /create/)
+        expect(result).to be false
+      end
+
       expect(subject.last_remote_call.not_processed?).to be true
       expect(subject.last_remote_call.status).to be false
     end
@@ -57,7 +67,12 @@ shared_examples_for "persistent remote call" do
     let(:method_arguments) { ['', { status: 404 }] }
 
     it "it should return nil" do
-      execute_method
+      result = execute_method
+
+      if !(method_to_execute.to_s =~ /create/)
+        expect(result).to be nil
+      end
+
       expect(subject.last_remote_call.client_error?).to be true
       expect(subject.last_remote_call.error?).to be true
       expect(subject.last_remote_call.status).to be nil
@@ -73,7 +88,12 @@ shared_examples_for "persistent remote call" do
     let(:method_arguments) { ['', { status: 500 }] }
 
     it "it should return nil" do
-      execute_method
+      result = execute_method
+
+      if !(method_to_execute.to_s =~ /create/)
+        expect(result).to be nil
+      end
+
       expect(subject.last_remote_call.server_error?).to be true
       expect(subject.last_remote_call.error?).to be true
       expect(subject.last_remote_call.status).to be_nil
@@ -133,13 +153,6 @@ describe SmoothOperator::Persistence, helpers: :persistence do
     subject { new_user }
     let(:method_to_execute) { :reload }
 
-    context "before calling #reload" do
-      it "#has_data_from_server and #from_server should return false" do
-        expect(subject.from_server).to be_falsey
-        expect(subject.has_data_from_server).to be_falsey
-      end
-    end
-
     context "when subject doesn't has an id" do
       it "it should raise 'UnknownPath'" do
         expect{ subject.reload }.to raise_error 'UnknownPath'
@@ -155,11 +168,6 @@ describe SmoothOperator::Persistence, helpers: :persistence do
       it "it should fetch server data" do
         expect(subject.attributes).to eq(attributes_for(:user_with_address_and_posts))
       end
-
-      it "#has_data_from_server and #from_server should return true" do
-        expect(subject.from_server).to be true
-        expect(subject.has_data_from_server).to be true
-      end
     end
 
     context "when calling #reload on a nested object" do
@@ -194,7 +202,7 @@ describe SmoothOperator::Persistence, helpers: :persistence do
   end
 
   describe ".create" do
-    
+
     subject { created_subject }
     let(:method_arguments) { [] }
 
@@ -263,7 +271,7 @@ describe SmoothOperator::Persistence, helpers: :persistence do
         expect(subject.destroyed?).to be(true)
       end
     end
-  
+
     context "after a failed execution of #destroy" do
       subject { existing_user }
       before  { subject.destroy('', { status: 422 }) }
@@ -387,7 +395,7 @@ describe SmoothOperator::Persistence, helpers: :persistence do
   end
 
   describe "#destroy" do
-    
+
     let(:method_to_execute) { :destroy }
     let(:method_arguments) { [] }