hash_control 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c58ba9b45b5b93680cc8d22d8dd859b355bafd3
-  data.tar.gz: c98ed21ba6469980f703b23f2eefeccdd6f2f8f0
+  metadata.gz: 91db8077b43e392011ad2d957a0b1994fc504170
+  data.tar.gz: a05d93cb0a18727dd4ab9645dfad99d2aeb100bf
 SHA512:
-  metadata.gz: c0bf551ed0f381f37b44fc87d922ca5aec7bd16f7d8839388e58c557528f69110ea962125e991608fd35a0d9abb4ca149426a755c9cee5b13df6c7f9c8188504
-  data.tar.gz: e72d077a10b5161b67637ad9602df132cb753283db5b5bf6d006f172783f538ac8f6c2b56f24c06496cd2f437bd7fd6b175ec21f7e01e98e372cc17d137c69f8
+  metadata.gz: ef8617b5b1ddd826b5560cbf7f579234dbd712097986c9cd0ad58ed845a17d6cbf63ee38abcfcc85d5eda3064ef54795d6255af8ccfe4480534aa3901b09c718
+  data.tar.gz: 9fe6d8c6302fbe60a1e8d2a500d479ff2a71579ae5406eaa665d159727d583465daf412f3cc94ec39d0e57ba38b5a3726352b997e88b327a1a8db3a7b96e9f81

data/.travis.yml

@@ -3,5 +3,10 @@ script: rspec
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.6
+  - 2.2.2
   - ruby-head
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+  fast_finish: true

data/README.md

@@ -1,4 +1,5 @@
-# HashControl
+HashControl
+===========
 
 [![Build Status](https://travis-ci.org/szhu/hashcontrol.svg?branch=master)](https://travis-ci.org/szhu/hashcontrol)
 [![Code Climate](https://codeclimate.com/github/szhu/hashcontrol/badges/gpa.svg)](https://codeclimate.com/github/szhu/hashcontrol)
@@ -89,3 +90,10 @@ end
 CustomValidator.new(get_request).validate_get_request
 CustomValidator.new(post_request).validate_post_request
 ```
+
+## Credit
+
+**HashControl** was originally designed and written by [@szhu] at [@IFTTT].
+
+[@szhu]: https://github.com/szhu
+[@IFTTT]: https://github.com/IFTTT

data/hash_control.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
     END
 
   gem.version       = ::HashControl::VERSION
-  gem.date          = '2014-08-22'
+  gem.date          = '2015-06-26'
 
   gem.homepage      = 'https://github.com/szhu/hashcontrol'
   gem.authors       = ['Sean Zhu']

data/lib/hash_control/model.rb

@@ -17,7 +17,7 @@ module HashControl
     end
 
     def slice(*keys)
-      @symbolized_hash.select { |key, _| keys.include? key.to_sym }
+      symbolized_hash.select { |key, _| keys.include? key.to_sym }
     end
 
     def [](name)
@@ -58,7 +58,7 @@ module HashControl
 
       def key_accessor(name)
         name = name.to_sym
-        return if self.respond_to?(name)
+        return if self.method_defined?(name)
         class_eval do
           define_method(name) { @hash[name] }
         end
@@ -78,7 +78,7 @@ module HashControl
     module ClassMethods
       def key_accessor(name)
         name = name.to_sym
-        return if self.respond_to?(name)
+        return if self.method_defined?(name)
         class_eval do
           define_method(name) { @hash[name] }
           define_method("#{name}=") { |x| @hash[name] = x }

data/lib/hash_control/version.rb

@@ -1,3 +1,3 @@
 module HashControl
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/spec/lib/hash_control/model_spec.rb

@@ -13,6 +13,26 @@ describe HashControl::Model do
       require_key :id
       permit_all_keys
     end
+
+    # This class is used to test for the bug from 0.1.2. #require_key and
+    # #permit_key are supposed to make a reader method iff the key does not
+    # conflict with an instance method, not a class method.
+    #
+    # Below, :name and :superclass are class-only methods (reader method
+    # should be made), while :symbolized_hash and :slice are instance-only
+    # methods (reader method should not be made).
+    class MethodConflictTest
+      include ::HashControl::Model
+      require_key :name, :symbolized_hash
+      permit_key :superclass, :slice
+    end
+
+    @method_conflict_test = MethodConflictTest.new(
+      name: 'value of :name',
+      symbolized_hash: 'value of :symbolized_hash',
+      superclass: 'value of :superclass',
+      slice: 'value of :slice'
+    )
   end
 
   describe "making an instance should error if it" do
@@ -47,7 +67,17 @@ describe HashControl::Model do
           expect(@comment.image).to eq(nil)
         end
         it "not other keys" do
-          expect{@comment.nonexistent}.to raise_error(NoMethodError)
+          expect { @comment.nonexistent }.to raise_error(NoMethodError)
+        end
+        it "even keys that conflict with class methods" do
+          expect(@method_conflict_test.name).to eq('value of :name')
+          expect(@method_conflict_test.superclass).to eq('value of :superclass')
+        end
+        it "not keys that conflict with instance methods" do
+          # If these methods were unintentionally overwritten (as they were in
+          # 0.1.2), then they would return Strings.
+          expect(@method_conflict_test.symbolized_hash).to be_a Hash
+          expect(@method_conflict_test.slice).to be_a Hash
         end
       end
 
@@ -62,6 +92,9 @@ describe HashControl::Model do
         end
       end
 
+      it "#slice should work" do
+        expect(@comment.slice(:author, :body).keys.to_set).to eq([:author, :body].to_set)
+      end
     end
 
     describe "that permits all keys" do
@@ -74,12 +107,12 @@ describe HashControl::Model do
           expect(@something.id).to eq(1)
         end
         it "not implicitly-permitted keys" do
-          expect{@something.body}.to raise_error(NoMethodError)
-          expect{@something.nonexistent}.to raise_error(NoMethodError)
+          expect { @something.body }.to raise_error(NoMethodError)
+          expect { @something.nonexistent }.to raise_error(NoMethodError)
         end
         it "not other keys" do
-          expect{@something.body}.to raise_error(NoMethodError)
-          expect{@something.nonexistent}.to raise_error(NoMethodError)
+          expect { @something.body }.to raise_error(NoMethodError)
+          expect { @something.nonexistent }.to raise_error(NoMethodError)
         end
       end
 
@@ -91,6 +124,10 @@ describe HashControl::Model do
           expect(@something[:nonexistent]).to eq(nil)
         end
       end
+
+      it "#slice should work" do
+        expect(@something.slice(:body).keys.to_set).to eq([:body].to_set)
+      end
     end
   end
 end

data/spec/lib/hash_control/validator_spec.rb

@@ -28,28 +28,28 @@ describe HashControl::Validator do
   describe "when used as its own class," do
     # `require` ensures certain keys are present
     it "require should work properly" do
-      expect{ validate(@post_request).require(:post) }.not_to raise_error
-      expect{ validate(@post_request).require(:body) }.not_to raise_error
-      expect{ validate(@post_request).require(:post, :body) }.not_to raise_error
-      expect{ validate(@post_request).require(:nonexistent) }.to raise_error(ArgumentError)
+      expect { validate(@post_request).require(:post) }.not_to raise_error
+      expect { validate(@post_request).require(:body) }.not_to raise_error
+      expect { validate(@post_request).require(:post, :body) }.not_to raise_error
+      expect { validate(@post_request).require(:nonexistent) }.to raise_error(ArgumentError)
     end
 
     # `require_n_of` ensures at least n of certain keys are present
     it "require_n_of should work properly" do
-      expect{ validate(@post_request).require_n_of(2, :post, :body) }.not_to raise_error
+      expect { validate(@post_request).require_n_of(2, :post, :body) }.not_to raise_error
     end
 
     # `permit` marks keys as allowed but doesn't do any verification
     it "permit should work properly" do
-      expect{ validate(@post_request).permit(:body) }.not_to raise_error
-      expect{ validate(@post_request).permit(:nonexistent) }.not_to raise_error
+      expect { validate(@post_request).permit(:body) }.not_to raise_error
+      expect { validate(@post_request).permit(:nonexistent) }.not_to raise_error
     end
 
     # `only` ensures no other keys are present
     it "only should work properly" do
-      expect{ validate(@post_request).only }.to raise_error(ArgumentError)
-      expect{ validate(@post_request).require(:post).only }.to raise_error(ArgumentError)
-      expect{ validate(@post_request).require(:post).permit(:body).only }.not_to raise_error
+      expect { validate(@post_request).only }.to raise_error(ArgumentError)
+      expect { validate(@post_request).require(:post).only }.to raise_error(ArgumentError)
+      expect { validate(@post_request).require(:post).permit(:body).only }.not_to raise_error
     end
   end
 
@@ -71,13 +71,13 @@ describe HashControl::Validator do
     end
 
     it "should work properly for allowed hashes" do
-      expect{ CustomValidator.new(@get_request).validate_get_request }.not_to raise_error
-      expect{ CustomValidator.new(@post_request).validate_post_request }.not_to raise_error
-      expect{ CustomValidator.new(@not_allowed_but_currently_ok).validate_post_request }.not_to raise_error
+      expect { CustomValidator.new(@get_request).validate_get_request }.not_to raise_error
+      expect { CustomValidator.new(@post_request).validate_post_request }.not_to raise_error
+      expect { CustomValidator.new(@not_allowed_but_currently_ok).validate_post_request }.not_to raise_error
     end
 
     it "should work properly for invalid hashes" do
-      expect{ CustomValidator.new(@empty).validate_get_request }.to raise_error(ArgumentError)
+      expect { CustomValidator.new(@empty).validate_get_request }.to raise_error(ArgumentError)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hash_control
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Sean Zhu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,8 +24,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-description: |2
-        Provides some conveniences for validating and manipulating hash-like data.
+description: "      Provides some conveniences for validating and manipulating hash-like
+  data.\n"
 email: interestinglythere@gmail.com
 executables: []
 extensions: []