camel_snake_keys 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd107c36f9563eb3887c4ab9b4805e2b6ee46796
-  data.tar.gz: 9bf618e70270ac65ea28c2ac3346193ba082d526
+  metadata.gz: 60878589862b05c4c1b707c7840614c473b9ea52
+  data.tar.gz: fbf67796982570c635fad519603702847e0163ae
 SHA512:
-  metadata.gz: b8fe1fa43f82a6792ef7e5ac39d3952cf8647d2d326c5939c5f8db64ed70d3c97aa3b9a8d3d122b87fc7f5fa982e5ffacb6ef04b842daaa064ae87f82b2dbd57
-  data.tar.gz: 9598f2d06a0123881eff4afde3970a72fe1151409b3ed1c00f59cd04452f4a2b26a5c3eba6cd6c2532456bf9622e606bbeac3dde684b8d7b94ab74c756aa3406
+  metadata.gz: 3aca7eee031b8ad0592bbeb8e3dae912d797bef57a20605c31d5ee40b5231429194329f65ae91688d68ee0b62b692e72eddfad958a759abb8ff1a66bdd90c08d
+  data.tar.gz: d43e5649843a5a9a14b98185d9ebc8b6a0ff5b255236f3f5cc87728aace3e220df48214a03f9914739c670c4e6063d4f3272bdddd08447e35700da159f148cc9

data/.travis.yml

@@ -0,0 +1,36 @@
+language: ruby
+before_install:
+  - gem install bundler
+install: bundle install --jobs=1 --retry=1
+script:
+  - bundle install
+  - bundle exec rspec
+
+rvm:
+  - 2.2
+  - 2.1
+  - 2.0.0
+  - jruby-9.0.4.0
+  - ruby-head
+  - jruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+
+env:
+  matrix:
+    - RAILS=3.2.22
+    - RAILS=4.1.13
+    - RAILS=4.2.5.1
+    - RAILS=master
+  global:
+    - JRUBY_OPTS="-J-Xmx1024m --debug"
+
+notifications:
+  email: 
+    recipients:
+    - buermann@gmail.com
+    on_success: change
+    on_failure: always

data/README.md

@@ -1,20 +1,39 @@
 # camel_snake_keys
 
-Add recursive with_snake_keys and with_camel_keys to Enumerable without converting everything into a string.
+[![Gem Version][GV img]][Gem Version]
+[![Build Status][BS img]][Build Status]
+[![Dependency Status][DS img]][Dependency Status]
+[![Coverage Status][CS img]][Coverage Status]
+
+[Gem Version]: https://rubygems.org/gems/camel_snake_keys
+[Build Status]: https://travis-ci.org/buermann/camel_snake_keys
+[travis pull requests]: https://travis-ci.org/buermann/camel_snake_keys/pull_requests
+[Dependency Status]: https://gemnasium.com/buermann/camel_snake_keys
+[Coverage Status]: https://coveralls.io/r/buermann/camel_snake_keys
+
+[GV img]: https://badge.fury.io/rb/camel_snake_keys.png
+[BS img]: https://travis-ci.org/buermann/camel_snake_keys.png
+[DS img]: https://gemnasium.com/buermann/camel_snake_keys.png
+[CS img]: https://coveralls.io/repos/buermann/camel_snake_keys/badge.png?branch=master
+
+
+Add recursive with_snake_keys and with_camel_keys to Enumerable, preserve strings and symbols in hashes, and treat hash descendents like ActiveSupport::HashWithIndifferentAccess and Hashie::Mash agnostically.
 
 ## Documentation
 
-Add gem 'camel_snake_keys' to your gemfile or gem install camel_snake_keys.
+Add `gem 'camel_snake_keys'` to your Gemfile or gem install camel_snake_keys.
 
 Enumerables will be monkey patched the following methods:
 
+```
 with_snake_keys(with_indifferent=false) 
 with_camel_keys(with_indifferent=false)
+```
 
 If with_indifference is set to a true value hashes will be returned as ActiveSupport's HashWithIndifferentAccess.
 
 ```
-require './lib/camel_snake_keys'
+require 'camel_snake_keys'
 
 {fooBar: "Frob"}.with_snake_keys
 => {:foo_bar=>"Frob"}

data/lib/camel_snake_keys.rb

@@ -1,6 +1,5 @@
 require 'active_support/core_ext/hash'
 require 'active_support/core_ext/string/inflections'
-require 'hashie/mash'
 
 module CamelSnakeKeys
   class << self
@@ -28,7 +27,7 @@ module CamelSnakeKeys
       if data.kind_of? Array
         data.map { |v| snake_keys(v) }
       elsif data.kind_of? Hash
-        hash = Hash[data.map {|k, v| [if_underscore(k), snake_keys(v)] }]
+        hash = Hash[data.sort_by {|k,v| k =~ /_/ ? 0 : 1 }.map {|k, v| [if_underscore(k), snake_keys(v)] }]
         hash = hash.with_indifferent_access if indifference
         data.class == Hash ? hash : data.class.new(hash)
       else
@@ -40,7 +39,7 @@ module CamelSnakeKeys
       if data.kind_of? Array
         data.map { |v| camel_keys(v) }
       elsif data.kind_of? Hash
-        hash = Hash[data.map {|k, v| [if_camelize(k), camel_keys(v)] }]
+        hash = Hash[data.sort_by {|k,v| k =~ /_/ ? 1 : 0 }.map {|k, v| [if_camelize(k), camel_keys(v)] }]
         hash = hash.with_indifferent_access if indifference
         data.class == Hash ? hash : data.class.new(hash)
       else

data/lib/version.rb

@@ -1,5 +1,5 @@
 module CamelSnakeKeys
-  VERSION = "0.0.3".freeze
+  VERSION = "0.0.4".freeze
 
   def self.version
     VERSION

data/spec/lib/camel_snake_keys_spec.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'hashie/mash'
 
 RSpec.describe Enumerable do
 
@@ -13,6 +14,7 @@ RSpec.describe Enumerable do
     it "should camel case keys of hashes" do
       snaked.with_camel_keys.should eq camelized
     end
+
   end
 
   context "hashes" do
@@ -21,26 +23,40 @@ RSpec.describe Enumerable do
 
     it "should snake case keys of hashes" do
       hash = camelized.with_snake_keys
-      hash.class.should == Hash
+      hash.class.should eq Hash
       hash.should eq snaked
     end
 
     it "should camel case keys of hashes" do
       hash = snaked.with_camel_keys
-      hash.class.should == Hash
+      hash.class.should eq Hash
       hash.should eq camelized
     end
 
+    it "should preserve symbol keys" do 
+      camelized.with_snake_keys[:foo_bar].should_not be_nil
+      camelized.with_snake_keys['foo_bar'].should be_nil
+      snaked.with_camel_keys[:fooBar].should be_present
+      snaked.with_camel_keys['fooBar'].should be_nil
+    end
+
+    it "should preserve string keys" do 
+      camelized.with_snake_keys['dark_matter'].should be_present
+      camelized.with_snake_keys[:dark_matter].should be_nil
+      snaked.with_camel_keys['darkMatter'].should be_present
+      snaked.with_camel_keys[:darkMatter].should be_nil
+    end
+
     it "should snake case keys of hashes with indifference" do
       hash = camelized.with_snake_keys(true)
-      hash.class.should == HashWithIndifferentAccess
+      hash.class.should eq HashWithIndifferentAccess
       hash.should eq snaked.with_indifferent_access
       hash[:foo_bar].should eq hash["foo_bar"]
     end
 
     it "should camel case keys of hashes with indifference" do
       hash = snaked.with_camel_keys(true)
-      hash.class.should == HashWithIndifferentAccess
+      hash.class.should eq HashWithIndifferentAccess
       hash.should eq camelized.with_indifferent_access
       hash["fooBar"].should eq hash[:fooBar]
     end
@@ -53,25 +69,25 @@ RSpec.describe Enumerable do
 
     it "should snake case keys of hashes" do
       hash = camelized.with_snake_keys
-      hash.class.should == HashWithIndifferentAccess
+      hash.class.should eq HashWithIndifferentAccess
       hash.should eq snaked
     end
 
     it "should camel case keys of hashes" do
       hash = snaked.with_camel_keys
-      hash.class.should == HashWithIndifferentAccess
+      hash.class.should eq HashWithIndifferentAccess
       hash.should eq camelized
     end
 
     it "should snake case keys of hashes with indifference" do
       hash = camelized.with_snake_keys(true)
-      hash.class.should == HashWithIndifferentAccess
+      hash.class.should eq HashWithIndifferentAccess
       hash.should eq snaked
     end
 
     it "should camel case keys of hashes with indifference" do
       hash = snaked.with_camel_keys(true)
-      hash.class.should == HashWithIndifferentAccess
+      hash.class.should eq HashWithIndifferentAccess
       hash.should eq camelized
     end
 
@@ -83,32 +99,51 @@ RSpec.describe Enumerable do
 
     it "should snake case keys of hashes" do
       hash = camelized.with_snake_keys
-      hash.class.should == Hashie::Mash
+      hash.class.should eq Hashie::Mash
       hash.should eq snaked
-      hash["fooBar"].should == hash[:fooBar]
+      hash["fooBar"].should eq hash[:fooBar]
     end
 
     it "should camel case keys of hashes" do
       hash = snaked.with_camel_keys
-      hash.class.should == Hashie::Mash
+      hash.class.should eq Hashie::Mash
       hash.should eq camelized
-      hash["foo_bar"].should == hash[:foo_bar]
+      hash["foo_bar"].should eq hash[:foo_bar]
     end
  
     it "should snake case keys of hashes with redundant indifference" do
       hash = camelized.with_snake_keys(true)
-      hash.class.should == Hashie::Mash
+      hash.class.should eq Hashie::Mash
       hash.should eq snaked
-      hash["foo_bar"].should == hash[:foo_bar]
+      hash["foo_bar"].should eq hash[:foo_bar]
     end
 
     it "should camel case keys of hashes with redundant indifference" do
       hash = snaked.with_camel_keys(true)
-      hash.class.should == Hashie::Mash
+      hash.class.should eq Hashie::Mash
       hash.should eq camelized
-      hash["foo_bar"].should == hash[:foo_bar]
+      hash["foo_bar"].should eq hash[:foo_bar]
     end
  
   end
 
+  context "hash merge conflicts should be resolved predictably" do
+    it "should give camel case key values priority when snake casing" do
+      hash   = { foo_bar: 1, fooBar: 2 }
+      result = { foo_bar: 2 }
+      hash.with_snake_keys.should eq result
+
+      hash = { fooBar: 2, foo_bar: 1 }
+      hash.with_snake_keys.should eq result
+    end
+
+    it "should give snake case key values priority when camel casing" do
+      hash   = { foo_bar: 1, fooBar: 2 }
+      result = { fooBar: 1 }
+      hash.with_camel_keys.should eq result
+
+      hash = { fooBar: 2, foo_bar: 1 }
+      hash.with_camel_keys.should eq result
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camel_snake_keys
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Josh Buermann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -48,6 +48,7 @@ files:
 - ".coveralls.yml"
 - ".gitignore"
 - ".rubocop.yml"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -77,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Convert nested data structure hash keys between camel and snake case.