restfolia 1.0.1 → 1.0.2

data/Changelog.md

@@ -0,0 +1,12 @@
+# Restfolia Changelog
+
+## 1.0.2 / edge
+
+* \+ [Resource Creator supports Json - Array](https://github.com/rogerleite/restfolia/commit/363b00abf379a2849790ed4be86b9085bddbd2af)
+* \+ [Support to multiple levels of hash on ResourceCreator](https://github.com/rogerleite/restfolia/commit/aa1e96a82f9b34a9415e46066874e35dfb7a1dbd)
+* ! [Fix bug on not supporting id attribute on resource](https://github.com/rogerleite/restfolia/issues/5)
+* \+ [Support http basic authentication](https://github.com/rogerleite/restfolia/commit/372aa40b9b2f4df35b7c30ed70534fc99e3b3233)
+
+## 1.0.1 / 2012-05-28
+
+* ! [Fix bug on links method](https://github.com/rogerleite/restfolia/issues/4)

data/ReadmeDeveloper.md

@@ -10,7 +10,6 @@ $ gem install redcarpet
 $ yard
 $ open doc/index.html
 ```
-**Obs:** ignore errors :X, until my [pull request](https://github.com/rubyworks/yard-tomdoc/pull/5) be accepted.
 
 ## TODO:
 

data/lib/restfolia/http/request.rb

@@ -46,6 +46,7 @@ module Restfolia::HTTP
         verb["Cookie"] = cookies
       end
 
+      verb.basic_auth(uri.user, uri.password) if uri.user
       http.request(verb)
     end
 

data/lib/restfolia/resource.rb

@@ -56,7 +56,7 @@ module Restfolia
       #Add json keys as methods of Resource
       #http://blog.jayfields.com/2008/02/ruby-replace-methodmissing-with-dynamic.html
       @_json.each do |method, value|
-        next if self.respond_to?(method)  #avoid method already defined
+        next if self.respond_to?(method) && (method != :id)
 
         (class << self; self; end).class_eval do
           define_method(method) do |*args|

data/lib/restfolia/resource_creator.rb

@@ -38,24 +38,45 @@ module Restfolia
     # objects and transforming in Resources. To create Resource,
     # this method use #resource_class.new(json).
     #
-    # json - Hash parsed from Response body.
+    # json - Hash or Array parsed from Response body.
+    #
+    # Returns if json is Hash, returns Resource from #resource_class if
+    # json is Array, returns an Array of Resource from #resource_class.
+    # Raises ArgumentError if json is not a Hash or Array.
+    def create(json)
+      if json.is_a?(Array)
+        json.inject([]) do |result, json_hash|
+          result << create_resource(json_hash)
+        end
+      elsif json.is_a?(Hash)
+        create_resource(json)
+      else
+        raise(ArgumentError, "JSON parameter have to be a Hash or Array object", caller)
+      end
+    end
+
+    protected
+
+    # Internals: creates Resource looking recursively for JSON
+    # objects and transforming in Resources. To create Resource,
+    # this method use #resource_class.new(json).
+    #
+    # json_hash - Hash parsed from Response body.
     #
     # Returns Resource from #resource_class.
     # Raises ArgumentError if json is not a Hash.
-    def create(json)
-      unless json.is_a?(Hash)
+    def create_resource(json_hash)
+      unless json_hash.is_a?(Hash)
         raise(ArgumentError, "JSON parameter have to be a Hash object", caller)
       end
 
       json_parsed = {}
-      json.each do |attr, value|
+      json_hash.each do |attr, value|
         json_parsed[attr] = look_for_resource(attr, value)
       end
       resource_class.new(json_parsed)
     end
 
-    protected
-
     # Internal: By default, returns Restfolia::Resource. You can use
     # this method to override and returns a custom Resource.
     #
@@ -108,6 +129,11 @@ module Restfolia
           resources << look_for_resource(attr_name, array_obj)
         end
       elsif value.is_a?(Hash)
+
+        value.each do |attr, v|
+          value[attr] = look_for_resource(attr, v)
+        end
+
         value = resource_class.new(value)
       end
       value

data/lib/restfolia/version.rb

@@ -1,3 +1,3 @@
 module Restfolia
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/test/restfolia/resource_creator_test.rb

@@ -59,6 +59,38 @@ describe Restfolia::ResourceCreator do
       resource.attr_test[0][0].nested.must_equal("nested2")
     end
 
+    it "transforms multiple levels of hash" do
+      resource = subject.create(:slug => "4fb15a526f32412f37000012",
+                                :hash1 => {
+                                  :hash2 => {
+                                    :link => [
+                                      {:href => "http://exemplo.com",
+                                       :rel => "interno",
+                                       :type => "image/jpeg"
+                                      }
+                                    ],
+                                    :origem => "sistema",
+                                    :hash3 => {
+                                      :test => "test"
+                                    }
+                                  }
+                                })
+
+      resource.slug.must_equal("4fb15a526f32412f37000012")
+      resource.hash1.must_be_instance_of(OpenStruct)
+      resource.hash1.hash2.must_be_instance_of(OpenStruct)
+      resource.hash1.hash2.origem.must_equal("sistema")
+      resource.hash1.hash2.hash3.must_be_instance_of(OpenStruct)
+    end
+
+    it "supports Array of hashes" do
+      resource = subject.create([{:slug => "slug1"}, {:slug => "slug2"}])
+
+      resource.must_be_instance_of(Array)
+      resource[0].slug.must_equal("slug1")
+      resource[1].slug.must_equal("slug2")
+    end
+
   end
 
 end

data/test/restfolia/resource_test.rb

@@ -21,6 +21,12 @@ describe Restfolia::Resource do
       resource.attr_test.must_equal("test")
     end
 
+    it "should support id attribute" do
+      resource = subject.new(:id => "123abc")
+
+      resource.id.must_equal("123abc")
+    end
+
   end
 
   describe "#links" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: restfolia
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Roger Leite
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-28 00:00:00 Z
+date: 2012-06-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -104,6 +104,7 @@ files:
 - .gitignore
 - .travis.yml
 - .yardopts
+- Changelog.md
 - Gemfile
 - MIT-LICENSE
 - Rakefile