summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Preparing for release, 3.3.2.v3.3.2dblock2014-11-262-3/+2
|
* Added Hashie::Extensions::MethodAccessWithOverride to autoloads.Fritz Meissner2014-11-263-0/+26
|
* Merge pull request #243 from dblock/lock-rubocopDaniel Doubrovkine (dB.) @dblockdotorg2014-11-186-34/+54
|\ | | | | Locked version of RuboCop.
| * Locked version of RuboCop.dblock2014-11-186-34/+54
|/
* Merge pull request #237 from taylormartin/masterDaniel Doubrovkine (dB.) @dblockdotorg2014-10-221-1/+1
|\ | | | | fixed documentation
| * fixed documentationTaylor Martin2014-10-221-1/+1
|/
* Merge pull request #234 from cvengros/patch-1Daniel Doubrovkine (dB.) @dblockdotorg2014-10-101-5/+2
|\ | | | | README.md: Fixed issue in deep_merge example
| * README.md: Fixed issue in deep_merge example Petr Cvengros2014-10-091-5/+2
| | | | | | The way it was written doesn't work, because h1 and h2 will be standard Hashes (not MyHashes) that don't have the deep_merge method.
* | Merge pull request #233 from joss/issue-98bDaniel Doubrovkine (dB.) @dblockdotorg2014-10-094-9/+49
|\ \ | |/ |/| Custom error messages for required properties in Hashie::Dash subclasses
| * Custom error messages for required properties in Hashie::Dash subclassesPetr Balaban2014-10-074-9/+49
|/
* Merge pull request #231 from gregory/fix_issue_230_cant_coerce_hwiaDaniel Doubrovkine (dB.) @dblockdotorg2014-10-033-2/+23
|\ | | | | add support for coercion on class type that inherit from Hash
| * add support for coercion for hash that inherit from Hashgregory2014-10-033-2/+23
|/
* Merge pull request #228 from jperville/yaml_erb_parser_with_filenameDaniel Doubrovkine (dB.) @dblockdotorg2014-09-163-1/+34
|\ | | | | Extend YamlErbParser to understand __FILE__ when interpolating ERB.
| * Updated CHANGELOG.mdJulien Pervillé2014-09-161-0/+1
| |
| * Extend YamlErbParser to understand __FILE__ when interpolating ERB.Julien Pervillé2014-09-162-1/+33
|/
* Merge pull request #226 from michaelherold/update-some-configurationDaniel Doubrovkine (dB.) @dblockdotorg2014-09-082-11/+14
|\ | | | | Update some configuration
| * Add simple RSpec.configure block for expect syntaxMichael Herold2014-09-071-1/+7
| | | | | | | | | | | | | | | | | | Without the configure block, [mutant][mutant] was raising an error. I'm interested in mutation testing our test suite, so thought this would be the simplest thing to add to get that working. It also enforces the expect syntax, which is a nice side benefit. [mutant]: https://github.com/mbj/mutant
| * Don't require rubygems in spec_helperMichael Herold2014-09-061-1/+0
| |
| * Remove lines adding lib to the load pathMichael Herold2014-09-061-3/+0
| | | | | | | | RSpec does this automatically now.
| * Update the way files are added in the gemspecMichael Herold2014-09-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the gem is packaged based on this file list, it seems pertinent to only include files that users might want to see when they install the gem, so let's explicitly list those files from the root that we want to include. Also, let's use Ruby globbing instead of `git ls-files` so it's all in-Ruby calls. Note: `.yardopts` is included explicitly to show the file list on rdoc.info if later added. See [this Twitter conversation][twitter]. [twitter]: https://twitter.com/lsegal/status/270950893875245057
| * Reorganize gemspec according to common conventionMichael Herold2014-09-051-4/+4
| |
| * Remove gem executables, since there aren't anyMichael Herold2014-09-051-1/+0
| |
* | Merge pull request #225 from michaelherold/bump-rubocopDaniel Doubrovkine (dB.) @dblockdotorg2014-09-081-1/+1
|\ \ | | | | | | Bump rubocop to 0.26 and address new cops
| * | Bump rubocop to 0.26 and address new copsMichael Herold2014-09-066-6/+6
| |/
* | Merge pull request #224 from amysutedja/merge-blocksDaniel Doubrovkine (dB.) @dblockdotorg2014-09-078-6/+13
|\ \ | |/ |/| Merging Hashie::Mash now correctly only calls the block on duplicate values
| * Merging Hashie::Mash now correctly only calls the block on duplicate valuesAmy Sutedja2014-09-058-6/+13
|/
* Merge pull request #221 from kubum/object-alloc3-3-stableDaniel Doubrovkine (dB.) @dblockdotorg2014-09-012-2/+3
|\ | | | | Object allocation during parsing method name
| * suffix parser pattern is constant - we shouldn't compile it every time for ↵Andrey Fadeyev2014-09-012-2/+3
|/ | | | suffix recognition
* Merge pull request #220 from michaelherold/add-spec-for-trash-subclassingDaniel Doubrovkine (dB.) @dblockdotorg2014-08-301-0/+14
|\ | | | | Add spec from #112 for Trash subclasses
| * Add spec from #112 for Trash subclassesMichael Herold2014-08-291-0/+14
|/
* Merge pull request #219 from kenips/bug/add_test_case_for_197Daniel Doubrovkine (dB.) @dblockdotorg2014-08-271-0/+10
|\ | | | | Add a test to prevent Mash from losing indifferent_access of nested hash
| * Add a test to prevent Mash from losing indifferent_access of nested hashKen Ip2014-08-271-0/+10
|/ | | | See discussion at https://github.com/intridea/hashie/pull/197
* Merge pull request #217 from dblock/revert-197v3.3.1Daniel Doubrovkine (dB.) @dblockdotorg2014-08-267-45/+59
|\ | | | | Revert #197
| * Preparing for 3.3.1 release.dblock2014-08-262-2/+2
| |
| * Fix: method is now a string.dblock2014-08-261-1/+1
| |
| * Revert "dont convert keys on initialization"dblock2014-08-264-42/+56
|/ | | | | | | This reverts commit 33f73e0635fc4d2c9f4726c744b50667c82d7b39. Conflicts: CHANGELOG.md
* Preparing for next releaseMichael Herold2014-08-262-1/+5
|
* Preparing for release, 3.3.0v3.3.0Michael Herold2014-08-263-4/+3
|
* Merge pull request #214 from michaelherold/releasing-instructionsDaniel Doubrovkine (dB.) @dblockdotorg2014-08-261-0/+83
|\ | | | | Add releasing policy
| * Add releasing policyMichael Herold2014-08-251-0/+83
|/ | | | | | | | | This is based on [Grape's release policy][grape], per discussion. I left out the section on making an announcement, since there isn't a news group for Hashie to the best of my knowledge. Does this process look complete? Is anything confusing or wrong? [grape]: https://github.com/intridea/grape/blob/master/RELEASING.md
* Merge pull request #211 from dblock/guardMichael Herold2014-08-242-5/+8
|\ | | | | Fix: working guard.
| * Fix: working guard.dB2014-08-242-5/+8
|/
* Merge pull request #213 from michaelherold/add-some-debugging-toolsDaniel Doubrovkine (dB.) @dblockdotorg2014-08-242-0/+6
|\ | | | | Add pry and pry-stack_explorer for debugging
| * Add pry and pry-stack_explorer for debuggingMichael Herold2014-08-242-0/+6
| |
* | Merge pull request #212 from dblock/69-multiple-properties-in-trashMichael Herold2014-08-243-10/+54
|\ \ | | | | | | Fix #69: multiple property assignments in Trash.
| * | Preserve backward-compatible translations when a single property is translated.dB2014-08-242-10/+24
| | |
| * | Fix #69: regression, multiple property assignments in Trash.dB2014-08-233-5/+16
| | | | | | | | | | | | Heavily inspired from https://github.com/intridea/hashie/commit/9a389853c98af876a80d1914acc0e24c4084ffb3.
| * | Add failing spec for #69.Michael Herold2014-08-231-0/+19
|/ /
* | Merge pull request #210 from michaelherold/update-rubocopDaniel Doubrovkine (dB.) @dblockdotorg2014-08-237-35/+33
|\ \ | |/ |/| Update Rubocop to 0.25.0 and address TODO in .rubocop.yml
| * Address TODO about the Lambda style copMichael Herold2014-08-235-20/+16
| |