her 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3f3ebeacfc88f8ba6fbb3dc98cb7527975c8531
-  data.tar.gz: c96e0c1b82ef1528529ac806a3d1b71e7e1aa434
+  metadata.gz: 87aaa3745246a66aad1a02e08921a10a4ffbd3af
+  data.tar.gz: ecd7f1c297037dabdb587d44c5fb002ab2445f09
 SHA512:
-  metadata.gz: 71d3c48cf6fc0aa560e5349d695cc234d981602d721e9c6d59e3ce64ab2b4916af39ff360c691c5e1a3f341381d6d4fc158b19d17cacb6ea0fc7310f18fe9d70
-  data.tar.gz: fdda014a8f9c66bf5f9f99b013022be531a798912a8e856d1b098fc846017e181237813849ebad7961d206ad799ab08948f47d64591a0b1955f3a9d3ff3cd476
+  metadata.gz: 5f794411479dbb0a4de3fb3d7fc7c33f916282c6d1b48cb463aa8ff2e12a58e421f06ab81377893958c4a5921a4f98a17952f2efd06a4529f070889903c4f05f
+  data.tar.gz: 410c1ac5f07cc3879a8b57c3674906a28ad57bd52a2beb5fb4b2c1470dada40171dac78c78fb41e0e8224a3a5ed2525029e1ba2659957706174c673316152be0

data/.travis.yml

@@ -1,20 +1,15 @@
 language: ruby
 
+sudo: false
+
 rvm:
   - 2.0.0
   - 1.9.3
-  - 1.9.2
 
 gemfile:
+  - gemfiles/Gemfile.activemodel-4.2
   - gemfiles/Gemfile.activemodel-4.1
   - gemfiles/Gemfile.activemodel-4.0
   - gemfiles/Gemfile.activemodel-3.2.x
 
-matrix:
-  exclude:
-  - rvm: 1.9.2
-    gemfile: gemfiles/Gemfile.activemodel-4.0
-  - rvm: 1.9.2
-    gemfile: gemfiles/Gemfile.activemodel-4.1
-
 script: "echo 'COME ON!' && bundle exec rake spec"

data/README.md

@@ -476,6 +476,8 @@ end
 @user.changes # => {}
 ```
 
+To update only the modified attributes specify `:send_only_modified_attributes => true` in the setup.
+
 ### Callbacks
 
 You can add *before* and *after* callbacks to your models that are triggered on specific actions. You can use symbols or blocks.
@@ -947,6 +949,7 @@ Most projects I know that use Her are internal or private projects but here’s
 * [crowdher](https://github.com/simonprev/crowdher)
 * [vodka](https://github.com/magnolia-fan/vodka)
 * [webistrano_cli](https://github.com/chytreg/webistrano_cli)
+* [ASMALLWORLD](https://www.asmallworld.com)
 
 ## History
 

data/gemfiles/Gemfile.activemodel-4.2

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

data/her.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "fivemat", "~> 1.2"
   s.add_development_dependency "json", "~> 1.8"
 
-  s.add_runtime_dependency "activemodel", ">= 3.0.0", "< 4.2"
-  s.add_runtime_dependency "activesupport", ">= 3.0.0", "< 4.2"
+  s.add_runtime_dependency "activemodel", ">= 3.0.0", "<= 4.2"
+  s.add_runtime_dependency "activesupport", ">= 3.0.0", "<= 4.2"
   s.add_runtime_dependency "faraday", ">= 0.8", "< 1.0"
   s.add_runtime_dependency "multi_json", "~> 1.7"
 end

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

@@ -47,11 +47,12 @@ module Her
           attribute_value = @parent.attributes[@name]
           return @opts[:default].try(:dup) if @parent.attributes.include?(@name) && (attribute_value.nil? || !attribute_value.nil? && attribute_value.empty?) && @params.empty?
 
-          if @parent.attributes[@name].blank? || @params.any?
-            path = build_association_path lambda { "#{@parent.request_path(@params)}#{@opts[:path]}" }
-            @klass.get(path, @params)
-          else
-            @parent.attributes[@name]
+          return @cached_result unless @params.any? || @cached_result.nil?
+          return @parent.attributes[@name] unless @params.any? || @parent.attributes[@name].blank?
+
+          path = build_association_path lambda { "#{@parent.request_path(@params)}#{@opts[:path]}" }
+          @klass.get(path, @params).tap do |result|
+            @cached_result = result unless @params.any?
           end
         end
 

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

@@ -76,12 +76,13 @@ module Her
           data_key_value = @parent.attributes[@opts[:data_key].to_sym]
           return @opts[:default].try(:dup) if (@parent.attributes.include?(@name) && @parent.attributes[@name].nil? && @params.empty?) || (@parent.persisted? && foreign_key_value.blank? && data_key_value.blank?)
 
-          if @parent.attributes[@name].blank? || @params.any?
-            path_params = @parent.attributes.merge(@params.merge(@klass.primary_key => foreign_key_value))
-            path = build_association_path lambda { @klass.build_request_path(path_params) }
-            @klass.get(path, @params)
-          else
-            @parent.attributes[@name]
+          return @cached_result unless @params.any? || @cached_result.nil?
+          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 lambda { @klass.build_request_path(path_params) }
+          @klass.get(path, @params).tap do |result|
+            @cached_result = result if @params.blank?
           end
         end
 

data/lib/her/model.rb

@@ -43,8 +43,6 @@ module Her
     include ActiveModel::Validations::Callbacks
     include ActiveModel::Conversion
     include ActiveModel::Dirty
-    include ActiveModel::Naming
-    include ActiveModel::Translation
 
     # Class methods
     included do
@@ -63,6 +61,9 @@ module Her
       store_response_errors :response_errors
       store_metadata :metadata
 
+      # Include ActiveModel naming methods
+      extend ActiveModel::Translation
+
       # Configure ActiveModel callbacks
       extend ActiveModel::Callbacks
       define_model_callbacks :create, :update, :save, :find, :destroy, :initialize

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/spec/model/associations_spec.rb

@@ -137,6 +137,7 @@ describe Her::Model::Associations do
     let(:user_with_included_data_after_create) { Foo::User.create }
     let(:user_with_included_data_after_save_existing) { Foo::User.save_existing(5, :name => "Clancy Brown") }
     let(:user_with_included_data_after_destroy) { Foo::User.new(:id => 5).destroy }
+    let(:comment_without_included_parent_data) { Foo::Comment.new(:id => 7, :user_id => 1) }
 
     it "maps an array of included data through has_many" do
       @user_with_included_data.comments.first.should be_a(Foo::Comment)
@@ -149,6 +150,14 @@ describe Her::Model::Associations do
       @user_with_included_data.comments.first.user.object_id.should == @user_with_included_data.object_id
     end
 
+    it "does fetch the parent models data only once" do
+      comment_without_included_parent_data.user.object_id.should == comment_without_included_parent_data.user.object_id
+    end
+
+    it "does fetch the parent models data that was cached if called with parameters" do
+      comment_without_included_parent_data.user.object_id.should_not == comment_without_included_parent_data.user.where(:a => 2).object_id
+    end
+
     it "uses the given inverse_of key to set the parent model" do
       @user_with_included_data.posts.first.admin.object_id.should == @user_with_included_data.object_id
     end
@@ -164,6 +173,14 @@ describe Her::Model::Associations do
       @user_with_included_data.comments.where(:foo_id => 1).length.should == 1
     end
 
+    it "fetches data that was not included through has_many only once" do
+      @user_without_included_data.comments.first.object_id.should == @user_without_included_data.comments.first.object_id
+    end
+
+    it "fetches data that was cached through has_many if called with parameters" do
+      @user_without_included_data.comments.first.object_id.should_not == @user_without_included_data.comments.where(:foo_id => 1).first.object_id
+    end
+
     it "maps an array of included data through has_one" do
       @user_with_included_data.role.should be_a(Foo::Role)
       @user_with_included_data.role.object_id.should == @user_with_included_data.role.object_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,7 +87,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
@@ -97,7 +97,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
@@ -107,7 +107,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :runtime
@@ -117,7 +117,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "<"
+    - - "<="
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
@@ -174,6 +174,7 @@ files:
 - gemfiles/Gemfile.activemodel-3.2.x
 - gemfiles/Gemfile.activemodel-4.0
 - gemfiles/Gemfile.activemodel-4.1
+- gemfiles/Gemfile.activemodel-4.2
 - her.gemspec
 - lib/her.rb
 - lib/her/api.rb