her 0.10.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98705b664b962e3d5edb1a1762bbbba49b9562d7
-  data.tar.gz: e96212e3b5c29c4e2af4bf4680065f8dd87d3692
+  metadata.gz: 72114f9b29011146dffc658a0e7d4e4982ded486
+  data.tar.gz: c2118def58a8024890fba2115b921adeee329783
 SHA512:
-  metadata.gz: a393eb7b400fa99287eb4e1acc0a37b5858bd82ff632651458aa2b2fc8dbde102b76fba8c557f5fc4a43276628b513b27fc0a0299899a0701f8729d96e9b9bd4
-  data.tar.gz: ea27adf4fd43563df33b34070d7c7dc4964adb840f3a9270d3db03bd64fcb90dd8d503a70d612343305106131d9f9090fc2e0e0cb457d5e0b0e8f9af1bde3af8
+  metadata.gz: 110eb7da65e83503c0922e787999ea4125886d105ea0e70f23abed9539ea6342f288953c69445b1664b7680c2e96884777ef2aaf5af1bbfda9b629c67fa557ea
+  data.tar.gz: 39020447959095c9b29b270102f64648b272520e4d88f7e2e3f4ae7e3f8212b74c07e323b44b8702272d79237d20f3a5386e8436d5a367bfa9f87f7d830f0bb7

data/.travis.yml

@@ -3,18 +3,39 @@ language: ruby
 sudo: false
 
 rvm:
-  - 2.4.2
-  - 2.3.5
-  - 2.2.8
-  - 2.1.6
-  - 2.0.0
   - 1.9.3
+  - 2.0.0
+  - 2.1.6
+  - 2.2.8
+  - 2.3.5
+  - 2.4.2
 
 gemfile:
   - gemfiles/Gemfile.activemodel-4.2
-  - gemfiles/Gemfile.activemodel-4.1
-  - gemfiles/Gemfile.activemodel-4.0
-  - gemfiles/Gemfile.activemodel-3.2.x
+  - gemfiles/Gemfile.activemodel-5.0
+  - gemfiles/Gemfile.activemodel-5.1
+  - gemfiles/Gemfile.activemodel-5.2
+
+matrix:
+  exclude:
+    - gemfile: gemfiles/Gemfile.activemodel-5.0
+      rvm: 1.9.3
+    - gemfile: gemfiles/Gemfile.activemodel-5.0
+      rvm: 2.0.0
+    - gemfile: gemfiles/Gemfile.activemodel-5.0
+      rvm: 2.1.6
+    - gemfile: gemfiles/Gemfile.activemodel-5.1
+      rvm: 1.9.3
+    - gemfile: gemfiles/Gemfile.activemodel-5.1
+      rvm: 2.0.0
+    - gemfile: gemfiles/Gemfile.activemodel-5.1
+      rvm: 2.1.6
+    - gemfile: gemfiles/Gemfile.activemodel-5.2
+      rvm: 1.9.3
+    - gemfile: gemfiles/Gemfile.activemodel-5.2
+      rvm: 2.0.0
+    - gemfile: gemfiles/Gemfile.activemodel-5.2
+      rvm: 2.1.6
 
 before_install:
   - gem install bundler

data/gemfiles/Gemfile.activemodel-4.2

@@ -3,5 +3,4 @@ source "https://rubygems.org"
 gemspec :path => "../"
 
 gem 'activemodel', '~> 4.2.0'
-gem 'activesupport', '~> 4.2.0'
 gem 'faraday', '~> 0.8.9'

data/gemfiles/{Gemfile.activemodel-3.2.x → Gemfile.activemodel-5.0}

@@ -2,6 +2,5 @@ source "https://rubygems.org"
 
 gemspec :path => "../"
 
-gem 'activemodel', '~> 3.2.0'
-gem 'activesupport', '~> 3.2.0'
+gem 'activemodel', '~> 5.0.0'
 gem 'faraday', '~> 0.8.9'

data/gemfiles/{Gemfile.activemodel-4.0 → Gemfile.activemodel-5.1}

@@ -2,6 +2,5 @@ source "https://rubygems.org"
 
 gemspec :path => "../"
 
-gem 'activemodel', '~> 4.0.0'
-gem 'activesupport', '~> 4.0.0'
+gem 'activemodel', '~> 5.1.0'
 gem 'faraday', '~> 0.8.9'

data/gemfiles/{Gemfile.activemodel-4.1 → Gemfile.activemodel-5.2}

@@ -2,6 +2,5 @@ source "https://rubygems.org"
 
 gemspec :path => "../"
 
-gem 'activemodel', '~> 4.1.0'
-gem 'activesupport', '~> 4.1.0'
+gem 'activemodel', '~> 5.2.0'
 gem 'faraday', '~> 0.8.9'

data/her.gemspec

@@ -21,8 +21,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec", "~> 3.5"
   s.add_development_dependency "json", "~> 1.8"
 
-  s.add_runtime_dependency "activemodel", ">= 3.0.0", "< 5.2.0"
-  s.add_runtime_dependency "activesupport", ">= 3.0.0", "< 5.2.0"
+  s.add_runtime_dependency "activemodel", ">= 4.2.1"
   s.add_runtime_dependency "faraday", ">= 0.8", "< 1.0"
   s.add_runtime_dependency "multi_json", "~> 1.7"
 end

data/lib/her/model/associations/belongs_to_association.rb

@@ -80,7 +80,7 @@ module Her
           return @parent.attributes[@name] unless @params.any? || @parent.attributes[@name].blank?
 
           path_params = @parent.attributes.merge(@params.merge(@klass.primary_key => foreign_key_value))
-          path = build_association_path -> { @klass.build_request_path(@opts[:path], path_params) }
+          path = build_association_path lambda { @klass.build_request_path(path_params) }
           @klass.get_resource(path, @params).tap do |result|
             @cached_result = result if @params.blank?
           end

data/lib/her/model/attributes.rb

@@ -162,7 +162,7 @@ module Her
             attributes = klass.parse(record).merge(_metadata: parsed_data[:metadata],
                                                    _errors: parsed_data[:errors])
             klass.new(attributes).tap do |record|
-              record.instance_variable_set(:@changed_attributes, {})
+              record.send :clear_changes_information
               record.run_callbacks :find
             end
           end

data/lib/her/model/orm.rb

@@ -44,10 +44,7 @@ module Her
             self.class.request(to_params.merge(:_method => method, :_path => request_path)) do |parsed_data, response|
               load_from_parsed_data(parsed_data)
               return false if !response.success? || @response_errors.any?
-              if self.changed_attributes.present?
-                @previously_changed = self.changes.clone
-                self.changed_attributes.clear
-              end
+              changes_applied
             end
           end
         end

data/lib/her/model/parse.rb

@@ -145,8 +145,7 @@ module Her
 
         # @private
         def root_element_included?(data)
-          element = data[parsed_root_element]
-          element.is_a?(Hash) || element.is_a?(Array)
+          data.keys.to_s.include? @_her_root_element.to_s
         end
 
         # @private

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.10.4"
+  VERSION = "1.0.0"
 end

data/spec/model/associations_spec.rb

@@ -661,7 +661,8 @@ describe Her::Model::Associations do
           builder.adapter :test do |stub|
             stub.get("/users/1") { [200, {}, { id: 1, name: "Tobias Fünke", organization: { id: 1, name: "Bluth Company Inc." }, organization_id: 1 }.to_json] }
             stub.get("/users/4") { [200, {}, { id: 1, name: "Tobias Fünke", organization: { id: 1, name: "Bluth Company Inc." } }.to_json] }
-            stub.get("/users/3") { [200, {}, { id: 2, name: "Lindsay Fünke", organization: nil }.to_json] }
+            stub.get("/users/3") { [200, {}, { id: 2, name: "Lindsay Fünke", company: nil }.to_json] }
+            stub.get("/companies/1") { [200, {}, { id: 1, name: "Bluth Company" }.to_json] }
           end
         end
       end
@@ -698,7 +699,7 @@ describe Her::Model::Associations do
           builder.use Faraday::Request::UrlEncoded
           builder.adapter :test do |stub|
             stub.get("/users/2") { [200, {}, { id: 2, name: "Lindsay Fünke", organization_id: 1 }.to_json] }
-            stub.get("/organizations/1") { [200, {}, { id: 1, name: "Bluth Company" }.to_json] }
+            stub.get("/companies/1") { [200, {}, { id: 1, name: "Bluth Company" }.to_json] }
           end
         end
       end

data/spec/model/attributes_spec.rb

@@ -310,10 +310,16 @@ describe Her::Model::Attributes do
     context "when attribute methods are already defined" do
       before do
         class AbstractUser
-          attr_accessor :fullname
+          def fullname
+            raise NotImplementedError
+          end
+
+          def fullname=(value)
+            raise NotImplementedError
+          end
 
           def fullname?
-            @fullname.present?
+            raise NotImplementedError
           end
         end
         @spawned_models << :AbstractUser
@@ -324,72 +330,18 @@ describe Her::Model::Attributes do
       end
 
       it "overrides getter method" do
-        expect(Foo::User.generated_attribute_methods.instance_methods).to include(:fullname)
-      end
-
-      it "overrides setter method" do
-        expect(Foo::User.generated_attribute_methods.instance_methods).to include(:fullname=)
-      end
-
-      it "overrides predicate method" do
-        expect(Foo::User.generated_attribute_methods.instance_methods).to include(:fullname?)
-      end
-
-      it "defines setter that affects attributes" do
         user = Foo::User.new
-        user.fullname = "Tobias Fünke"
-        expect(user.attributes[:fullname]).to eq("Tobias Fünke")
+        expect { user.fullname }.to_not raise_error(NotImplementedError)
       end
 
-      it "defines getter that reads attributes" do
+      it "overrides setter method" do
         user = Foo::User.new
-        user.attributes[:fullname] = "Tobias Fünke"
-        expect(user.fullname).to eq("Tobias Fünke")
+        expect { user.fullname = "foo" }.to_not raise_error(NotImplementedError)
       end
 
-      it "defines predicate that reads attributes" do
+      it "overrides predicate method" do
         user = Foo::User.new
-        expect(user.fullname?).to be_falsey
-        user.attributes[:fullname] = "Tobias Fünke"
-        expect(user.fullname?).to be_truthy
-      end
-    end
-
-    if ActiveModel::VERSION::MAJOR < 4
-      it "creates a new mutex" do
-        expect(Mutex).to receive(:new).once.and_call_original
-        spawn_model "Foo::User" do
-          attributes :fullname
-        end
-        expect(Foo::User.attribute_methods_mutex).not_to eq(Foo::User.generated_attribute_methods)
-      end
-
-      it "works well with Module#synchronize monkey patched by ActiveSupport" do
-        Module.class_eval do
-          def synchronize(*_args)
-            raise "gotcha!"
-          end
-        end
-        expect(Mutex).to receive(:new).once.and_call_original
-        spawn_model "Foo::User" do
-          attributes :fullname
-        end
-        expect(Foo::User.attribute_methods_mutex).not_to eq(Foo::User.generated_attribute_methods)
-        Module.class_eval do
-          undef :synchronize
-        end
-      end
-    else
-      it "uses ActiveModel's mutex" do
-        expect(Foo::User.attribute_methods_mutex).to eq(Foo::User.generated_attribute_methods)
-      end
-    end
-
-    it "uses a mutex" do
-      spawn_model "Foo::User"
-      expect(Foo::User.attribute_methods_mutex).to receive(:synchronize).once.and_call_original
-      Foo::User.class_eval do
-        attributes :fullname, :documents
+        expect { user.fullname? }.to_not raise_error(NotImplementedError)
       end
     end
   end

data/spec/model/parse_spec.rb

@@ -251,7 +251,6 @@ describe Her::Model::Parse do
 
       it "parse the data with the symbol" do
         @new_user = Foo::User.create(fullname: "Lindsay Fünke")
-        expect(@new_user.id).to eq(1)
         expect(@new_user.fullname).to eq("Lindsay Fünke")
       end
     end
@@ -494,25 +493,4 @@ describe Her::Model::Parse do
       expect(user.to_params).to eq(model: { name: 'foo' })
     end
   end
-
-  context "when attribute uses the same name as root element" do
-    before do
-      Her::API.setup url: "https://api.example.com" do |builder|
-        builder.use Her::Middleware::FirstLevelParseJSON
-        builder.use Faraday::Request::UrlEncoded
-      end
-
-      Her::API.default_api.connection.adapter :test do |stub|
-        stub.post("/users") { |env| [200, {}, { user: "foobar", id: 1, fullname: params(env)[:fullname] }.to_json] }
-      end
-
-      spawn_model "Foo::User"
-    end
-
-    it "parses as attribute instead of root element" do
-      user = Foo::User.create(fullname: "barfoo")
-      expect(user.fullname).to eq "barfoo"
-      expect(user.user).to eq "foobar"
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 1.0.0
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-18 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,40 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -144,10 +118,10 @@ files:
 - README.md
 - Rakefile
 - UPGRADE.md
-- gemfiles/Gemfile.activemodel-3.2.x
-- gemfiles/Gemfile.activemodel-4.0
-- gemfiles/Gemfile.activemodel-4.1
 - gemfiles/Gemfile.activemodel-4.2
+- gemfiles/Gemfile.activemodel-5.0
+- gemfiles/Gemfile.activemodel-5.1
+- gemfiles/Gemfile.activemodel-5.2
 - her.gemspec
 - lib/her.rb
 - lib/her/api.rb