Merge pull request #80 from intridea/release-2.0.0

Release 2.0.0

6 files changed, 49 insertions, 10 deletions

diff --git a/.gitignore b/.gitignore
index e6df40b..42bfa64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ pkg
 *.gem
 .bundle
 .rvmrc
+Gemfile.lock
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..8039652
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,16 @@
+# CHANGELOG
+
+## 2.0.0
+
+* update gemspec with license info jordimassaguerpla #72
+* fix readme typo jcamenisch #71
+* initialize with merge coerces values mattfawcett #27
+* Hashie::Extensions::Coercion coerce_keys takes arguments mattfawcett #28
+* Trash removes translated values on initialization sleverbor #39
+* Mash#fetch works with symbol or string keys arthwood #66
+* Hashie::Hash inherits from ::Hash to avoid ambiguity meh, orend #49
+* update respond_to? method signature to match ruby core definition dlupu #62
+* DeepMerge extension nashby #41
+* Dash defaults are dup'ed before assigned ohrite #63
+* remove id, type, and object_id as special allowable keys jch #77
+* merge and update accepts a block jch #78
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..a39f73f
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,27 @@
+## Note on Patches/Pull Requests
+
+Thanks for taking the time to contribute back! To make it easier for us to
+review your changes, try to follow these guidelines:
+
+* Keep changesets small and on topic. Itching to refactor or clean something
+  up? Do it in a separate branch.
+* Stay consistent with existing code conventions.
+* Break changes into smaller logical commits.
+
+To propose a change:
+
+* [Fork the project.](https://help.github.com/articles/fork-a-repo)
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a future version unintentionally.
+* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* [Send me a pull request](https://help.github.com/articles/using-pull-requests). Bonus points for topic branches.
+* [Check that your pull request passes the build](https://travis-ci.org/intridea/hashie/pull_requests).
+
+## Bug triage
+
+Have a problem? File an [issue here](https://github.com/intridea/hashie/issues).
+
+To make bug squashing easier, include the following in your issue:
+
+* What version of hashie are you using?
+* Is it still a problem in master?
\ No newline at end of file
diff --git a/README.markdown b/README.markdown
index 2402dcf..89ccc76 100644
--- a/README.markdown
+++ b/README.markdown
@@ -227,14 +227,9 @@ provide.
     c.where(:abc => 'def').where(:hgi => 123)
     c # => {:where => {:abc => 'def', :hgi => 123}}
 
+## Contributing
 
-## Note on Patches/Pull Requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a future version unintentionally.
-* Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+See [CONTRIBUTING.md](CONTRIBUTING.md)
 
 ## Authors
 
diff --git a/hashie.gemspec b/hashie.gemspec
index f3fd184..47f22bc 100644
--- a/hashie.gemspec
+++ b/hashie.gemspec
@@ -1,8 +1,8 @@
 require File.expand_path('../lib/hashie/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Michael Bleigh"]
-  gem.email         = ["michael@intridea.com"]
+  gem.authors       = ["Michael Bleigh", "Jerry Cheung"]
+  gem.email         = ["michael@intridea.com", "jollyjerry@gmail.com"]
   gem.description   = %q{Hashie is a small collection of tools that make hashes more powerful. Currently includes Mash (Mocking Hash) and Dash (Discrete Hash).}
   gem.summary       = %q{Your friendly neighborhood hash toolkit.}
   gem.homepage      = 'https://github.com/intridea/hashie'
diff --git a/lib/hashie/version.rb b/lib/hashie/version.rb
index 8e908ef..e647cd8 100644
--- a/lib/hashie/version.rb
+++ b/lib/hashie/version.rb
@@ -1,3 +1,3 @@
 module Hashie
-  VERSION = '2.0.0.beta'
+  VERSION = '2.0.0'
 end