her 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c00165db5b5d258d664ab7dffad4fda96fa46632
-  data.tar.gz: c44e14e767f426d53cc324a17231f2d43a69eed4
+  metadata.gz: 18b4493b9a94d75fb08c9df34781081f9c23af85
+  data.tar.gz: d5fd8f8dc913f127c274be1902103f592574049d
 SHA512:
-  metadata.gz: b5e658e48405aa84f6c7ca27dd35e4ede6e207d4ac251cd53a6cb7950c94fc59bf924c631c8068d96ab55a37adb4b7a118bba4a11831d84d4f037511965e3d68
-  data.tar.gz: 966310b9e4d9b99c36d25101c7668af2276d8a806d04b00be0a0b952ab52e579618f4e3750f234da92c5e14f3ea988fde431a9d2d215d0771cb6f3a45baaa956
+  metadata.gz: d824a80974f8ab9b67d35e41473ad5f034fbd6756e007a03b407906865de41dd9dfe76273910affcb6bec4926ad38ad846915e489225a11cdc569919659ccd31
+  data.tar.gz: 86425b035982382401b6ecec423402760d40cbbbb238eb04673b796d9c73676b12f4b65bf64215e391f2c551ccc03da7005b0ad30ee9d33a871b74eebe7f0bf1

data/.travis.yml

@@ -3,6 +3,8 @@ language: ruby
 sudo: false
 
 rvm:
+  - 2.2.2
+  - 2.1.6
   - 2.0.0
   - 1.9.3
 

data/README.md

@@ -757,7 +757,7 @@ Just like with ActiveRecord, you can define named scopes for your models. Scopes
 class User
   include Her::Model
 
-  scope :by_role, -> { |role| where(role: role) }
+  scope :by_role, ->(role) { where(role: role) }
   scope :admins, -> { by_role('admin') }
   scope :active, -> { where(active: 1) }
 end
@@ -779,7 +779,7 @@ class User
   include Her::Model
 
   collection_path "organizations/:organization_id/users"
-  scope :for_organization, -> { |id| where(organization_id: id) }
+  scope :for_organization, ->(id) { where(organization_id: id) }
 end
 
 @user = User.for_organization(3).find(2)

data/lib/her/api.rb

@@ -10,8 +10,7 @@ module Her
 
     # Setup a default API connection. Accepted arguments and options are the same as {API#setup}.
     def self.setup(opts={}, &block)
-      @default_api = new
-      @default_api.setup(opts, &block)
+      @default_api = new(opts, &block)
     end
 
     # Create a new API object. This is useful to create multiple APIs and use them with the `uses_api` method.
@@ -27,14 +26,14 @@ module Her
     #     uses_api api
     #   end
     def initialize(*args, &blk)
-      self.setup(*args, &blk)
+      setup(*args, &blk)
     end
 
     # Setup the API connection.
     #
     # @param [Hash] opts the Faraday options
     # @option opts [String] :url The main HTTP API root (eg. `https://api.example.com`)
-    # @option opts [String] :ssl A hash containing [SSL options](https://github.com/technoweenie/faraday/wiki/Setting-up-SSL-certificates)
+    # @option opts [String] :ssl A hash containing [SSL options](https://github.com/lostisland/faraday/wiki/Setting-up-SSL-certificates)
     #
     # @return Faraday::Connection
     #

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

@@ -8,7 +8,7 @@ module Her
           names.each do |name|
             module_eval <<-RUBY, __FILE__, __LINE__ + 1
               def #{name}(*args, &block)
-                #{target_name}.#{name}(*args, &block)
+                #{target_name}.send(#{name.inspect}, *args, &block)
               end
             RUBY
           end

data/lib/her/model/attributes.rb

@@ -187,17 +187,15 @@ module Her
           define_attribute_methods attributes
 
           attributes.each do |attribute|
-            attribute = attribute.to_sym
-
-            unless instance_methods.include?(:"#{attribute}=")
+            unless method_defined?(:"#{attribute}=")
               define_method("#{attribute}=") do |value|
                 @attributes[:"#{attribute}"] = nil unless @attributes.include?(:"#{attribute}")
-                self.send(:"#{attribute}_will_change!") if @attributes[:'#{attribute}'] != value
+                self.send(:"#{attribute}_will_change!") if @attributes[:"#{attribute}"] != value
                 @attributes[:"#{attribute}"] = value
               end
             end
 
-            unless instance_methods.include?(:"#{attribute}?")
+            unless method_defined?(:"#{attribute}?")
               define_method("#{attribute}?") do
                 @attributes.include?(:"#{attribute}") && @attributes[:"#{attribute}"].present?
               end

data/lib/her/version.rb

@@ -1,3 +1,3 @@
 module Her
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 end

data/spec/model/associations/association_proxy_spec.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe Her::Model::Associations::AssociationProxy do
+  describe "proxy assignment methods" do
+    before do
+      Her::API.setup url: "https://api.example.com" do |builder|
+        builder.use Her::Middleware::FirstLevelParseJSON
+        builder.use Faraday::Request::UrlEncoded
+        builder.adapter :test do |stub|
+          stub.get("/users/1") { |env| [200, {}, { :id => 1, :name => "Tobias Fünke" }.to_json ] }
+          stub.get("/users/1/fish") { |env| [200, {}, { :id => 1, :name => "Tobias's Fish" }.to_json ] }
+        end
+      end
+      spawn_model "User" do
+        has_one :fish
+      end
+      spawn_model "Fish"
+    end
+
+    subject { User.find(1) }
+
+    it "should assign value" do
+      subject.fish.name = "Fishy"
+      expect(subject.fish.name).to eq "Fishy"
+    end
+  end
+end
+
+
+

data/spec/model/attributes_spec.rb

@@ -265,4 +265,39 @@ describe Her::Model::Attributes do
       end
     end
   end
+
+  context "attributes class method" do
+    before do
+      spawn_model 'Foo::User' do
+        attributes :fullname, :document
+      end
+    end
+
+    context "instance" do
+      subject { Foo::User.new }
+
+      it { should respond_to(:fullname) }
+      it { should respond_to(:fullname=) }
+      it { should respond_to(:fullname?) }
+    end
+
+    it "defines setter that affects @attributes" do
+      user = Foo::User.new
+      user.fullname = 'Tobias Fünke'
+      user.attributes[:fullname].should eq('Tobias Fünke')
+    end
+
+    it "defines getter that reads @attributes" do
+      user = Foo::User.new
+      user.assign_attributes(fullname: 'Tobias Fünke')
+      user.fullname.should eq('Tobias Fünke')
+    end
+
+    it "defines predicate that reads @attributes" do
+      user = Foo::User.new
+      user.fullname?.should be_falsey
+      user.assign_attributes(fullname: 'Tobias Fünke')
+      user.fullname?.should be_truthy
+    end
+  end
 end

data/spec/model/dirty_spec.rb

@@ -41,6 +41,11 @@ describe "Her::Model and ActiveModel::Dirty" do
           user.should_not be_changed
         end
 
+        it "tracks only changed dirty attributes" do
+          user.fullname = user.fullname
+          user.fullname_changed?.should be_falsey
+        end
+
         it "tracks previous changes" do
           user.fullname = "Tobias Fünke"
           user.save

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: her
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Rémi Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-26 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -208,6 +208,7 @@ files:
 - spec/middleware/accept_json_spec.rb
 - spec/middleware/first_level_parse_json_spec.rb
 - spec/middleware/second_level_parse_json_spec.rb
+- spec/model/associations/association_proxy_spec.rb
 - spec/model/associations_spec.rb
 - spec/model/attributes_spec.rb
 - spec/model/callbacks_spec.rb
@@ -247,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: A simple Representational State Transfer-based Hypertext Transfer Protocol-powered
@@ -258,6 +259,7 @@ test_files:
 - spec/middleware/accept_json_spec.rb
 - spec/middleware/first_level_parse_json_spec.rb
 - spec/middleware/second_level_parse_json_spec.rb
+- spec/model/associations/association_proxy_spec.rb
 - spec/model/associations_spec.rb
 - spec/model/attributes_spec.rb
 - spec/model/callbacks_spec.rb