has_attributes 0.0.2 → 0.0.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YzJlODZkMGM5MTI5NWFiYzM5YTE3NDYxNzgxODg2MjA3MGJlZTIyZg==
+  data.tar.gz: !binary |-
+    MjNmNTRkYTMwNTVkMzg4YTBkNzVmOGU3ODA4ODRiNjNhNmIwMjhjMQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZjVlNmUyNTlkMWViMzEzZDE1YzI3NzkwN2Q1YmU5ZDJmYjFiYmE4ZWQyMDUy
+    ZDJmNzMzNzc1YzVmNTk1MzQwYmMwMDcwZmIzYzgyNDQ2NTUwMzBhMzI0Zjhj
+    NWZlMzNkZmQ4OTU5ZWViN2YzMTQwNDQyNDZiMDViZDFhMDg4ZGE=
+  data.tar.gz: !binary |-
+    NmQxZGFjMWY1YzQ1M2VkZTMwYTcwNjdjNGY0MmZkMTNhNGY4ODVhNWI0OTk1
+    YmFhNmEwNzE3NTQwMjEyMTk2NDI2NWU5OGQzZjc3MGNjM2M2OTVhNTY4OGM3
+    OWJmOTA4YzA2NGE2NmUwNTQzNDEwNDBjZDIzODAzYTNhNDlmMGQ=

data/History.md

@@ -1,4 +1,12 @@
-0.0.2 / 2014-02-03
+0.0.3 / 2014-02-08
+==================
+
+* Set model_attributes to an empty set in included hook
+* Filter out nils from #attributes calls
+* Update readme
+
+
+0.0.2 / 2014-02-07
 ==================
 
 * Use public_send for public instance methods

data/README.md

@@ -12,15 +12,15 @@ has_attributes delivers the following class and instance methods:
 
 #### .model_attributes() → Set
 
-An attribute accessor on the class that contains a set of attributes specified with `has_attributes`
+An attribute accessor on the class that contains a set of attributes specified with `has_attributes`. It is added to the class via the included hook when `include`ing the module. If there is no call to `has_attributes`, then calling `model_attributes` on the class will be `nil`.
 
 #### .has_attributes(*args) → nil
 
-Takes any number of symbols or strings and defines attribute accessors for those attributes. It also defines a `model_attributes` method on the class which will return the set of attributes. `has_attributes` will attempt to copy any existing attributes from the parent class unless the last argument is a `Hash` and contains an `inherit` key set to `false`.
+Takes any number of symbols or strings and defines attribute accessors for those attributes. `has_attributes` will attempt to copy any existing attributes from the parent class unless the last argument is a `Hash` and contains an `inherit` key set to `false`.
 
 #### #attributes() → Hash
 
-Returns a hash whose keys are all the attributes declared `has_attributes` and the values are their corresponding values. If the values have not been set, the key will still be present in the hash but with a value of `nil`.
+Returns a hash whose keys are the attributes set with `has_attributes`. Only the keys whose values are non `nil` will be returned.
 
 #### #attributes=(attrs) → Hash
 

data/has_attributes.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rake", "~> 10.1"
+  spec.add_development_dependency "rspec", "~> 2.14"
 end

data/lib/has_attributes/version.rb

@@ -1,3 +1,3 @@
 module HasAttributes
-  VERSION = "0.0.2"
+  VERSION = "0.0.4"
 end

data/lib/has_attributes.rb

@@ -1,9 +1,10 @@
-require "has_attributes/version"
+require 'has_attributes/version'
 require "set"
 
 module HasAttributes
   def self.included(base)
     base.class.send(:attr_accessor, :model_attributes)
+    base.send(:model_attributes=, Set.new)
     base.extend(ClassMethods)
   end
 
@@ -18,7 +19,7 @@ module HasAttributes
         Set.new
       end
 
-      attrs = (model_attributes || Set.new).merge(attrs.map(&:to_sym))
+      attrs = model_attributes.merge(attrs.map(&:to_sym))
 
       if inherit_parent_attributes
         attrs = parent_attributes.merge(attrs)
@@ -38,13 +39,17 @@ module HasAttributes
   end
 
   def attributes=(attrs)
-    self.class.model_attributes.each {|attr| public_send((attr.to_s << "=").to_sym, attrs[attr])}
-    attributes
+    self.class.model_attributes.each do |attr|
+      public_send((attr.to_s << "=").to_sym, attrs[attr])
+    end
   end
 
   def attributes
     self.class.model_attributes.reduce({}) do |memo, attr|
-      memo.merge(attr => public_send(attr))
+      unless (value = public_send(attr)).nil?
+        memo[attr] = value
+      end
+      memo
     end
   end
 end

data/spec/has_attributes_spec.rb

@@ -78,6 +78,13 @@ describe HasAttributes do
   describe "#attributes" do
     let(:klass) { create_model :attr1, :attr2 }
 
+    it "returns an empty hash when no attributes were defined" do
+      instance = Class.new { include HasAttributes }.new
+
+      instance.attributes = {a: true, b: false}
+      expect(instance.attributes).to eq({})
+    end
+
     it "sets a hash of attributes on the instance" do
       instance = klass.new
 
@@ -98,7 +105,8 @@ describe HasAttributes do
       expect(instance.attr1).to be_nil
       expect(instance.attr2).to be_false
 
-      expect(instance.attributes).to eq(attr1: nil, attr2: false)
+      expect(instance.attributes).not_to include(:attr1)
+      expect(instance.attributes).to include(attr2: false)
     end
 
     it "only sets attributes that were declared with .has_attributes" do
@@ -109,7 +117,9 @@ describe HasAttributes do
       expect(instance.attr1).to be_true
       expect(instance.attr2).to be_nil
 
-      expect(instance.attributes).to eq(attr1: true, attr2: nil)
+      expect(instance.attributes).to include(attr1: true)
+      expect(instance.attributes).not_to include(:attr2)
+      expect(instance.attributes).not_to include(:another_attr)
     end
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: has_attributes
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Ben Reinhart
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-07 00:00:00.000000000 Z
+date: 2014-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,35 +27,31 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 description: Extend your classes with simple methods for creating elegant plain-ruby
   models
 email:
@@ -82,27 +75,26 @@ files:
 homepage: https://github.com/benjreinhart/has_attributes
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Better plain-ruby models
 test_files:
 - spec/has_attributes_spec.rb