loquor 0.5.4 → 0.6.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OWM1ZjMxMmJhNjYyM2IwNWMyMzllNWNiOWIzNzk5Mjc0MjU1ZTUyZg==
-  data.tar.gz: !binary |-
-    YmNkNzIzMTEzNmY0MmE4YTg5NWVhYjdhZDU4YTAwNGFiNjRiZDZjZQ==
+SHA1:
+  metadata.gz: 2cfe52db79896211774e1d089c9214411c2357a6
+  data.tar.gz: 624d56b874f89f65dbcba8fae1d58701a12ae967
 SHA512:
-  metadata.gz: !binary |-
-    ZGYxZmZlNzlhZGM4NjViNGNhOTViM2I5Y2E0NzE2MzBjNGYyYTAzZDE2ZDcz
-    MzRmNGJjNDYzMTllNmJiNWVhZTk1ZGJiY2U0MTI1MWMwODI5NjMwNTc5NDc4
-    NzU0YmMyYjlkZDJlMjcwZjE1MGVlYTE0ZTI3MWFmMWQ0MWUzMWM=
-  data.tar.gz: !binary |-
-    NzJjMWM1ODcwNGI1ZjEyNDc1ZTExYTRlZTI1NDQ4YWFmZmFiNzQ3MTZjOGNl
-    MzlhNjQwMWMwNTkwMGI3NjhiMDUwMzk4N2E5MGI4OWYyZTkzOGEzMDNiZjI2
-    YmVkYTUyNWVlMzA0NzcyMGI5NGVjNWZhMWQ0MmEwODcyYWMyMDQ=
+  metadata.gz: 3b877ce234feba0ccbdf1b22da876456dac29f12fe4a3fad2b05114dbbf7f051bcc581ab9aabbbdfd04e2ab4b23389f870d8f801fe675c5bee99492f2eabe3af
+  data.tar.gz: 5a964b9378199a23451a913fbdf5a246009cb9820a06cf0c4ed7c98fc6dcd6e6bb40d22ecf72b7a14cd9f2e286fdc12517e69988c229364e821e329c53482048

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.6.0 / 2013-12-13
+* [FEATURE] Add strict mode to ObjectHash
+* [FEATURE] Don't allow arbitary sample attributes to be overriden
+
 # 0.5.4 / 2013-12-13
 * [FEATURE] Add support for basic resource caching
 

data/lib/loquor/object_hash.rb

@@ -3,8 +3,9 @@ module Loquor
   end
 
   class ObjectHash
-    def initialize(hash)
+    def initialize(hash, options = {})
       @hash = hash
+      @strict = options[:strict]
     end
 
     def ==(other)
@@ -20,13 +21,19 @@ module Loquor
     def [](key)
       fetch_indescriminately(key)
     rescue ObjectHashKeyMissingError
-      nil
+      if @strict
+        raise $!
+      else
+        nil
+      end
     end
 
     def method_missing(name, *args)
-      fetch_indescriminately(name, *args)
-    rescue ObjectHashKeyMissingError
-      @hash.send(name, *args)
+      if name[-1] == "="
+        @hash.send(name, *args) 
+      else
+        self[name]
+      end
     end
 
     private
@@ -39,7 +46,7 @@ module Loquor
       elsif @hash.has_key?(name.to_s.to_sym)
         @hash[name.to_s.to_sym]
       else
-        raise ObjectHashKeyMissingError.new
+        raise ObjectHashKeyMissingError.new(name)
       end
     end
   end

data/lib/loquor/resource.rb

@@ -2,11 +2,13 @@ module Loquor
   class Resource
 
     def initialize(data)
-      @data = ObjectHash.new(data)
+      @data = ObjectHash.new(data, strict: true)
     end
 
     def method_missing(name, *args)
       @data[name]
+    rescue
+      raise NameError.new("undefined local variable or method '#{name}' for #{self.class.name}")
     end
 
     def self.path=(path)

data/lib/loquor/resource_mock.rb

@@ -9,7 +9,7 @@ module Loquor
               attr = name.to_s[0..-2].to_sym
               @data[attr] = args[0]
             else
-              raise NameError.new("undefined local variable or method '#{name}' for Resource Mock")
+              raise NameError.new("undefined local variable or method '#{name}' for #{self.class.name}")
             end
           else
             super(name, *args)
@@ -27,6 +27,10 @@ module Loquor
     end
 
     def sample(overrides = {})
+      arbitary_attributes = (overrides.keys - attributes.keys)
+      unless arbitary_attributes.empty?
+        raise NameError.new("undefined local variable or method '#{arbitary_attributes.first}' for #{self.name}")
+      end
       self.new(attributes.merge(overrides))
     end
 

data/lib/loquor/version.rb

@@ -1,3 +1,3 @@
 module Loquor
-  VERSION = "0.5.4"
+  VERSION = "0.6.0"
 end

data/test/object_hash_test.rb

@@ -26,5 +26,18 @@ module Loquor
       representation = ObjectHash.new({foo: "bar"})
       assert_equal "bar", representation.foo
     end
+
+    def test_non_strict_returns_nil_on_missing_attribute
+      representation = ObjectHash.new({foo: "bar"})
+      assert_equal nil, representation.cat
+    end
+
+    def test_strict_raises_on_missing_attribute
+      representation = ObjectHash.new({foo: "bar"}, strict: true)
+      ex = assert_raises(ObjectHashKeyMissingError) do
+        representation.cat
+      end
+      assert_equal "cat", ex.message
+    end
   end
 end

data/test/resource_mock_test.rb

@@ -18,9 +18,10 @@ module Loquor
 
     def test_should_not_be_able_to_set_arbitary_attributes
       foobar = Foobar.find(1)
-      assert_raises(NameError) do
+      ex = assert_raises(NameError) do
         foobar.description = "Cat"
       end
+      assert_equal "undefined local variable or method 'description=' for Loquor::ResourceMockTest::Foobar", ex.message
     end
 
     def test_should_return_sample_object
@@ -33,6 +34,13 @@ module Loquor
       foobar = Foobar.sample(name: name)
       assert_equal name, foobar.name
     end
+
+    def test_should_not_be_able_to_override_arbitary_attributes
+      ex = assert_raises(NameError) do
+        Foobar.sample(cat: "foobar")
+      end
+      assert_equal "undefined local variable or method 'cat' for Loquor::ResourceMockTest::Foobar", ex.message
+    end
   end
 end
 

data/test/resource_test.rb

@@ -19,10 +19,11 @@ module Loquor
 
     def test_find_each_should_yield_block
       Loquor.expects(:get).returns([{id: 1}])
-      ids = []
+      count = 0
       Foobar.find_each do |json|
-        ids << json['id']
+        count += 1
       end
+      assert_equal 1, count
     end
 
     def test_select_should_proxy
@@ -43,13 +44,21 @@ module Loquor
       Loquor.expects(:put).with("/foobar/#{id}", payload: payload)
       Foobar.update(id, payload)
     end
-   
+
     def test_can_read_path
       assert_equal "/foobar", Foobar.path
     end
-    
+
     def test_cache_flag_false_by_default
       refute Foobar.cache
     end
+
+    def test_raises_on_missing_attribute
+      representation = Foobar.new({})
+      ex = assert_raises(NameError) do
+        representation.random_attr
+      end
+      assert_equal "undefined local variable or method 'random_attr' for Loquor::ResourceTest::Foobar", ex.message
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: loquor
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Jeremy Walker
@@ -84,28 +84,28 @@ dependencies:
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: An API dispatcher for Meducation
@@ -164,12 +164,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []